From 69a8bab035cc73062a146af0b720aeeec8b63a1b Mon Sep 17 00:00:00 2001 From: z Date: Sun, 27 Jul 2025 19:25:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=B4=BE=E5=B7=A5=E5=8D=95bu?= =?UTF-8?q?g=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bdgzsomthing/bdgzsomthingController.java | 6 +- .../taskdispatch/TaskDispatchDetailDO.java | 2 + .../materialplan/MaterialPlanServiceImpl.java | 2 + .../taskdispatch/TaskDispatchServiceImpl.java | 20 +++-- mes-ui/mes-ui-admin-vue3/.env.pro | 6 +- .../views/heli/taskdispatch/detailDialog.vue | 87 +++++++++++-------- 6 files changed, 75 insertions(+), 48 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 864fa23..93ad04a 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/taskdispatch/TaskDispatchDetailDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDetailDO.java index bff2868..39a9fba 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDetailDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDetailDO.java @@ -104,6 +104,8 @@ public class TaskDispatchDetailDO extends BaseDO { * 工序状态 默认 已提交 已完成 0 1 2 */ private Integer procedureStatus; + private Integer reportProcess; + private String matPlanProcess; @TableField(exist = false) private String projectName; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java index 6932c3c..2e91c82 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java @@ -251,6 +251,7 @@ public class MaterialPlanServiceImpl implements MaterialPlanService { lambdaUpdateWrapper.set(TaskDispatchDetailDO::getProjectMaterialPlanNo, null); lambdaUpdateWrapper.set(TaskDispatchDetailDO::getPlanStatus,0); lambdaUpdateWrapper.set(TaskDispatchDetailDO::getProjectMaterialPlanDetailId,null); + lambdaUpdateWrapper.set(TaskDispatchDetailDO::getMatPlanProcess,"N"); taskDispatchDetailMapper.update(lambdaUpdateWrapper); } materialPlanBoomMapper.delete(queryWrapper1); @@ -306,6 +307,7 @@ public class MaterialPlanServiceImpl implements MaterialPlanService { materialPlanBoomDOList.add(boomDO); taskDispatchDetailDO.setProjectMaterialPlanDetailId(boomDO.getId()); taskDispatchDetailDO.setPlanStatus(1); + taskDispatchDetailDO.setMatPlanProcess("Y"); taskDispatchDetailDO.setProjectMaterialPlanNo(planDO.getProjectMaterialPlanNo()); } // materialPlanBoomMapper.insertBatch(materialPlanBoomDOList); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java index d752faf..29c4b3f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java @@ -195,6 +195,14 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { for (TaskDispatchDetailDO dispatchDetailDO : list) { TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectById(dispatchDetailDO.getId()); if (ObjectUtil.isNotEmpty(taskDispatchDetailDO)){ + if ("false".equals(dispatchDetailDO.getIsOutsourcing())){ + if ("Y".equals(taskDispatchDetailDO.getMatPlanProcess())){ + ProcedureDO procedureDO = procedureMapper.selectById(dispatchDetailDO.getProcedureId()); + if (ObjectUtil.isNotEmpty(procedureDO)){ + throw exception(new ErrorCode(400,"该工序"+procedureDO.getName()+"已做物料需求计划,不允许去掉外协,请确认！")); + } + } + } if (isDetailChanged(taskDispatchDetailDO, dispatchDetailDO)) { if (taskDispatchDetailDO.getPlanStatus()==1){ ProcessBomDetailDO bomDetailDO = processBomDetailMapper.selectById(taskDispatchDO.getBomDetailId()); @@ -521,12 +529,10 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { @Override public void deleteTaskDispatchDetail(Long id) { TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectById(id); - if (ObjectUtil.isNotEmpty(taskDispatchDetailDO)&&taskDispatchDetailDO.getPlanStatus()==1){ - TaskDispatchDO taskDispatchDO = taskDispatchMapper.selectById(taskDispatchDetailDO.getDispatchId()); - ProcessBomDetailDO bomDetailDO = processBomDetailMapper.selectById(taskDispatchDO.getBomDetailId()); + if (ObjectUtil.isNotEmpty(taskDispatchDetailDO)&&("Y".equals(taskDispatchDetailDO.getMatPlanProcess())||taskDispatchDetailDO.getReportProcess()!=0)){ ProcedureDO procedureDO = procedureMapper.selectById(taskDispatchDetailDO.getProcedureId()); - if (ObjectUtil.isNotEmpty(bomDetailDO)&&ObjectUtil.isNotEmpty(procedureDO)){ - throw exception(new ErrorCode(400,bomDetailDO.getMaterialName()+" "+procedureDO.getName()+"已做物料需求计划,不能更改,请确认")); + if (ObjectUtil.isNotEmpty(procedureDO)){ + throw exception(new ErrorCode(400,"该工序"+procedureDO.getName()+"已做报工或者已做需求计划,不允许删除")); } } taskDispatchDetailMapper.deleteByDispatchId(id); @@ -737,7 +743,6 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { if(operateReqVO.getOwnerId()!=null){ lastReportDO.setOwner(operateReqVO.getOwnerId()); taskDispatchDetailDO.setOwner(operateReqVO.getOwnerId()); - taskDispatchDetailMapper.updateById(taskDispatchDetailDO); }else{ lastReportDO.setOwner(taskDispatchDetailDO.getOwner()); } @@ -746,6 +751,8 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { }else { lastReportDO.setWorkType("1"); } + taskDispatchDetailDO.setReportProcess(1); + taskDispatchDetailMapper.updateById(taskDispatchDetailDO); //更新生产计划单 if (planDO.getStatus() != 2 && planDO.getStatus()!=3){ planDO.setStatus(2); @@ -775,6 +782,7 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { case FINISH: taskDispatchDetailDO.setProcedureStatus(TaskDispatchProcedureStatusEnum.COMPLETED.getCode()); + taskDispatchDetailDO.setReportProcess(2); //装配看看是不是多人，如果是多人，判断一下 boolean allReport = true; HashMap dispatchDetailDOHashMap = new HashMap<>(); diff --git a/mes-ui/mes-ui-admin-vue3/.env.pro b/mes-ui/mes-ui-admin-vue3/.env.pro index a909bd4..392a4f0 100644 --- a/mes-ui/mes-ui-admin-vue3/.env.pro +++ b/mes-ui/mes-ui-admin-vue3/.env.pro @@ -4,14 +4,14 @@ NODE_ENV=production VITE_DEV=false # 请求路径https://nxhs.cjyx.cc/admin-api http://192.168.1.87:8080 https://star.hz-hl.com -VITE_BASE_URL='https://star.hz-hl.com' +VITE_BASE_URL='https://nxhs.cjyx.cc' # 上传路径 http://218.75.46.166:8080 -VITE_UPLOAD_URL='https://star.hz-hl.com/admin-api/infra/file/upload' +VITE_UPLOAD_URL='https://nxhs.cjyx.cc/admin-api/infra/file/upload' # 上传路径 -VITE_UPLOAD_BATCH_URL='https://star.hz-hl.com/admin-api/infra/file/uploadBatch' +VITE_UPLOAD_BATCH_URL='https://nxhs.cjyx.cc/admin-api/infra/file/uploadBatch' # 接口前缀 VITE_API_BASEPATH= diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue index b121ee3..389c324 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue @@ -179,22 +179,22 @@ class="!w-260px" v-model="formData.requiredCompletedDate" type="date" value-form - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +