From b607ef302655ce8e73949e4b59884c4bfdfda83e Mon Sep 17 00:00:00 2001 From: z Date: Mon, 21 Jul 2025 18:51:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=BF=9B=E5=BA=A6=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bdgzsomthing/bdgzsomthingController.java | 6 +++--- .../processbom/ProcessBomDetailDO.java | 2 ++ .../bgmasterline/BgMasterLineMapper.java | 10 ++++++++++ .../processbom/ProcessBomDetailMapper.java | 4 ++-- .../processbom/ProcessBomServiceImpl.java | 7 ++++--- .../src/views/heli/plan/planSchedule.vue | 20 +++++++++---------- 6 files changed, 31 insertions(+), 18 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java index 93ad04a..864fa23 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java @@ -151,7 +151,7 @@ public class bdgzsomthingController { BeanUtils.toBean(list, bdgzsomthingRespVO.class)); } -// @Scheduled(fixedRate = 10800000) + @Scheduled(fixedRate = 10800000) public void scheduledTask() { bdgzsomthingService.selectds(); } @@ -159,8 +159,8 @@ public class bdgzsomthingController { //@Scheduled(cron = "0 2 0 * * ?") //每天十天执行一次 @PostConstruct public void init() { -// selectHasPrice(); -// selectSafeStorageAndDeliverOneYear(); + selectHasPrice(); + selectSafeStorageAndDeliverOneYear(); // bdgzsomthingService.selectds(); } @Scheduled(cron = "0 0 2 * * ?") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processbom/ProcessBomDetailDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processbom/ProcessBomDetailDO.java index 583e1e0..1a261a2 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processbom/ProcessBomDetailDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processbom/ProcessBomDetailDO.java @@ -202,6 +202,8 @@ public class ProcessBomDetailDO extends BaseDO { @TableField(exist = false) private Integer orderNoExists; @TableField(exist = false) + private BigDecimal boomAmounts; + @TableField(exist = false) private List taskDispatchDetailDOList; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/bgmasterline/BgMasterLineMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/bgmasterline/BgMasterLineMapper.java index afa49bf..97245bd 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/bgmasterline/BgMasterLineMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/bgmasterline/BgMasterLineMapper.java @@ -105,4 +105,14 @@ public interface BgMasterLineMapper extends BaseMapperX { return selectCount(query); } + + default Long getCount(Long id){ + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + query + .leftJoin(PgMasterLineDO.class, "a", PgMasterLineDO::getId, BgMasterLineDO::getZjMxId); + + query.eq( PgMasterLineDO::getDispatchDetailId, id) + .eq(PgMasterLineDO::getDeleted,0); + return selectCount(query); + } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomDetailMapper.java index 3b2b614..a15699c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomDetailMapper.java @@ -242,7 +242,7 @@ public interface ProcessBomDetailMapper extends BaseMapperX MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(ProcessBomDetailDO.class) .select("f.name as compositionName") - .select("t.amount*d.amount as boomAmount") + .select("t.amount*d.amount as boomAmounts") .leftJoin(PlanTaskBomDO.class,"ptb",PlanTaskBomDO::getBomDetailId,ProcessBomDetailDO::getId) .leftJoin(PlanTaskDO.class,"pt",PlanTaskDO::getId,PlanTaskBomDO::getTaskId) .leftJoin(ProcessBomDO.class,"g",ProcessBomDO::getId,ProcessBomDetailDO::getBomId) @@ -273,7 +273,7 @@ public interface ProcessBomDetailMapper extends BaseMapperX .select("m.status as makeStatus") .select("r.receiving_status as receivingStatus") .select("CASE WHEN r.id IS NOT NULL THEN 1 ELSE 0 END AS orderNoExists") - .select("t.amount*d.amount as boomAmount") + .select("t.amount*d.amount as boomAmounts") .leftJoin(PlanTaskBomDO.class,"ptb",PlanTaskBomDO::getBomDetailId,ProcessBomDetailDO::getId) .leftJoin(PlanTaskDO.class,"pt",PlanTaskDO::getId,PlanTaskBomDO::getTaskId) .leftJoin(ProcessBomDO.class,"g",ProcessBomDO::getId,ProcessBomDetailDO::getBomId) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java index 79966c6..54f540d 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java @@ -1244,7 +1244,7 @@ public class ProcessBomServiceImpl implements ProcessBomService { } Integer Postponement=0; Integer flag=0; - if (detailDO.getCheckYn()==1){ + if (detailDO.getCheckYn()==0){ if (ObjectUtil.isNotEmpty(taskReportDO)){ boolean after = taskReportDO.getReportTime().isAfter(detailDO.getEndTime()); if (after){ @@ -1257,11 +1257,12 @@ public class ProcessBomServiceImpl implements ProcessBomService { } } Long bgMasterLineDO = bgMasterLineMapper.getByDispatchDetail(detailDO.getId()); + Long count = bgMasterLineMapper.getCount(detailDO.getId()); if (bgMasterLineDO>0){ flag=3; - }else if (Postponement==0){ + }else if (Postponement==0&&count>0){ flag=1; - }else if (Postponement==1){ + }else if (Postponement==1&&count>0){ flag=2; } } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/planSchedule.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/planSchedule.vue index 58ec373..ec6fb24 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/planSchedule.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/planSchedule.vue @@ -54,16 +54,16 @@ /> - - - - + /> + + + @@ -94,7 +94,7 @@ - +