licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

物料需求计划采购的关注待办

Browse Source
This commit is contained in:
z 2025-07-09 17:59:00 +08:00
parent 12fb38dd3f
commit 7ba9e18346
6 changed files with 38 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java
View File

@ -161,6 +161,7 @@ public class bdgzsomthingController {
public void init() {
selectHasPrice();
selectSafeStorageAndDeliverOneYear();
bdgzsomthingService.selectds();
}
@Scheduled(cron = "0 0 2 * * ?")
public void selectHasPrice(){

4
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java
View File

@ -424,11 +424,13 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService {
if (ObjectUtil.isEmpty(attentiontodoRespVO.getAttr4())){
TaskDispatchDO taskDispatchDO = taskDispatchMapper.selectOne(new LambdaQueryWrapper<TaskDispatchDO>().eq(TaskDispatchDO::getCode, deliverOrderDO.getCode()));
if (ObjectUtil.isNotEmpty(taskDispatchDO)){
if (ObjectUtil.isNotEmpty(taskDispatchDO.getCreator())){
AdminUserDO user = adminUserService.getUser(Long.valueOf(taskDispatchDO.getCreator()));
if (ObjectUtil.isNotEmpty(user)){
BdgzsomthingDO.setClick(user.getNickname());
}
}
}
}else {
BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4());
}//提醒人
@ -780,8 +782,6 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService {
attentiontodoDO.setLevel("1");
attentiontodoDO.setEvday("10");
attentiontodookddfh9.add(attentiontodoDO);
}
}

1
mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/attentiontodo/AttentiontodoMapper.xml
View File

@ -24,6 +24,7 @@ SELECT a.*, a.tenant_id as txrid
FROM db_attentiontodo a
LEFT JOIN system_users b ON a.attr4 = b.nickname
WHERE a.attr2 = #{param1}
group by a.id
</select>
<select id="selectListByEvent"

38
mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/materialplanboom/MaterialPlanBoomMapper.xml
View File

@ -11,50 +11,24 @@
<select id="selectafterten"
parameterType="map"
resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplanboom.MaterialPlanBoomDO">
-- select w.*from project_purchase_order_no q,
-- (SELECT
-- b.project_material_plan_no,a.project_material_plan_id,c.material_name as name,a.boom_detail_id
-- FROM
-- project_material_plan_boom a
-- JOIN
-- project_material_plan b ON a.project_material_plan_id = b.id
-- JOIN pro_process_bom_detail c ON c.id=a.boom_detail_id
-- WHERE
-- CURDATE() >= DATE_SUB(a.boom_arrive_date, INTERVAL #{evday} DAY)
-- and b.tenant_id =#{id}
-- ) w
-- where q.project_material_plan_id =w.project_material_plan_id
-- and q.receiving_status !='3'
-- group by project_material_plan_no
SELECT
w.*
FROM (
SELECT
t.*,
CASE
WHEN COUNT(d.id) = 0 THEN 1
WHEN SUM(CASE d.receiving_status WHEN 3 THEN 0 ELSE 1 END) = 0 THEN 3
WHEN SUM(CASE d.receiving_status WHEN 1 THEN 1 ELSE 0 END) = COUNT(d.id) THEN 1
ELSE 2
END AS receivingStatus1
FROM project_purchase_order_no t
LEFT JOIN project_purchase_order_no_detail d ON d.purchase_order_id = t.id
GROUP BY t.id -- 按主表ID分组
) q -- 添加子查询别名
RIGHT JOIN (
SELECT
b.project_material_plan_no,
a.project_material_plan_id,
a.mat_name as name,
a.creator
a.creator,
a.id
FROM project_material_plan_boom a
JOIN project_material_plan b ON a.project_material_plan_id = b.id
JOIN base_material bm ON a.material_id = bm.id
WHERE CURDATE() >= DATE_SUB(a.boom_arrive_date, INTERVAL #{evday} DAY)
AND b.tenant_id = #{id}
) w ON q.project_material_plan_id = w.project_material_plan_id
WHERE q.receivingStatus1 != '3' -- 移动过滤条件到WHERE
GROUP BY w.project_material_plan_no;
and a.deleted=0
) w -- 添加子查询别名
left JOIN project_purchase_order_no_detail q ON q.project_material_plan_boom_id = w.id and q.receiving_status != '3' and q.deleted=0
GROUP BY w.id,w.project_material_plan_no;
</select>
<select id="hasPurchase"

28
mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/materialplandetail/MaterialPlanDetailMapper.xml
View File

@ -51,34 +51,26 @@
-- where q.project_material_plan_id =w.project_material_plan_id
-- and q.receiving_status !='3'
-- group by project_material_plan_no
SELECT
w.*
FROM (
SELECT
t.*,
CASE
WHEN COUNT(d.id) = 0 THEN 1
WHEN SUM(CASE d.receiving_status WHEN 3 THEN 0 ELSE 1 END) = 0 THEN 3
WHEN SUM(CASE d.receiving_status WHEN 1 THEN 1 ELSE 0 END) = COUNT(d.id) THEN 1
ELSE 2
END AS receivingStatus1
FROM project_purchase_order_no t
LEFT JOIN project_purchase_order_no_detail d ON d.purchase_order_id = t.id
GROUP BY t.id -- 按主表ID分组
) q -- 添加子查询别名
RIGHT JOIN (
SELECT
b.project_material_plan_no,
a.project_material_plan_id,
bm.NAME ,
a.creator
a.mat_name as name,
a.creator,
a.id
FROM project_material_plan_boom a
JOIN project_material_plan b ON a.project_material_plan_id = b.id
JOIN base_material bm ON a.material_id = bm.id
WHERE CURDATE() >= DATE_SUB(a.boom_arrive_date, INTERVAL 10 DAY)
) w ON q.project_material_plan_id = w.project_material_plan_id
WHERE q.receivingStatus1 != '3' -- 移动过滤条件到WHERE
GROUP BY w.project_material_plan_no;
AND b.tenant_id = 2
and a.deleted=0
) w -- 添加子查询别名
left JOIN project_purchase_order_no_detail q ON q.project_material_plan_boom_id = w.id and q.receiving_status != '3' and q.deleted=0
GROUP BY w.id,w.project_material_plan_no;
</select>
</mapper>

1
mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue
View File

@ -190,6 +190,7 @@ class="!w-260px" v-model="formData.createTime" type="date" value-format="x"
<el-checkbox label="数控1" size="large" border />
<el-checkbox label="数控2" size="large" border />
<el-checkbox label="火花" size="large" border />
<el-checkbox label="线切割" size="large" border />
<el-checkbox label="刻字" size="large" border />
<el-checkbox label="网格" size="large" border />
<el-checkbox label="深孔钻" size="large" border />