diff --git a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java index d18bf60..768078f 100644 --- a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java +++ b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java @@ -106,6 +106,7 @@ public interface ErrorCodeConstants { ErrorCode TASK_DISPATCH_TASK_NOT_EXISTS = new ErrorCode(1_009_004, "任务不存在或已完成"); ErrorCode TASK_DISPATCH_TASK_NO_PERMISSION_FOR_OPERATE = new ErrorCode(1_009_005, "任务不满足操作条件"); + ErrorCode TASK_DISPATCH_TASK_IS_OVER = new ErrorCode(1_009_007, "报工数量已完成"); ErrorCode TASK_DISPATCH_TASK_REPORT_AMOUNT_EXCESS = new ErrorCode(1_009_006, "无法超额报工"); /*************质量管理***********/ ErrorCode UNQUALIFIED_NOTIFICATION_NOT_EXISTS = new ErrorCode(1_010_001, "品质异常通知单审核不存在"); 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 c030311..bc34a66 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 @@ -150,6 +150,7 @@ public class bdgzsomthingController { public void init() { selectHasPrice(); } + @Scheduled(cron = "0 0 2 * * ?") //每天十天执行一次 public void selectHasPrice(){ bdgzsomthingService.selectHasPrice(); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignRespVO.java index 203b4ec..ee02aee 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignRespVO.java @@ -89,7 +89,8 @@ public class ProcessDesignRespVO { @Schema(description = "毛坯结束日期") private LocalDateTime blankDate; - + @Schema(description = "毛坯开始日期") + private LocalDateTime startBlankDate; @Schema(description = "毛坯负责人名称") private String blankOwnerName; @@ -98,7 +99,8 @@ public class ProcessDesignRespVO { @Schema(description = "2D结束日期") private LocalDateTime twoDimDate; - + @Schema(description = "2D开始日期") + private LocalDateTime startTwoDimDate; @Schema(description = "2D负责人名称") private String twoDimOwnerName; @@ -107,7 +109,8 @@ public class ProcessDesignRespVO { @Schema(description = "3D结束日期") private LocalDateTime threeDimDate; - + @Schema(description = "3D结束日期") + private LocalDateTime startThreeDimDate; @Schema(description = "3D负责人名称") private String threeDimOwnerName; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesign/ProcessDesignDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesign/ProcessDesignDO.java index 8491924..06fe207 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesign/ProcessDesignDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesign/ProcessDesignDO.java @@ -95,7 +95,8 @@ public class ProcessDesignDO extends BaseDO { @TableField(exist = false) private LocalDateTime blankDate; - + @TableField(exist = false) + private LocalDateTime startBlankDate; @TableField(exist = false) private String blankOwnerName; @@ -104,7 +105,8 @@ public class ProcessDesignDO extends BaseDO { @TableField(exist = false) private LocalDateTime twoDimDate; - + @TableField(exist = false) + private LocalDateTime startTwoDimDate; @TableField(exist = false) private String twoDimOwnerName; @@ -113,7 +115,8 @@ public class ProcessDesignDO extends BaseDO { @TableField(exist = false) private LocalDateTime threeDimDate; - + @TableField(exist = false) + private LocalDateTime startThreeDimDate; @TableField(exist = false) private String threeDimOwnerName; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterLineMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterLineMapper.java index 1251ed2..7583c39 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterLineMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterLineMapper.java @@ -86,7 +86,8 @@ public interface PgMasterLineMapper extends BaseMapperX { if (reqVO.getPgType() == 1){ query.orderByDesc(PgMasterLineDO::getPgNumber); }else{ - query.orderByDesc(PlanDO::getId); + query.orderByAsc(PgMasterLineDO::getPgNumber); + // query.orderByDesc(PlanDO::getId); } query.eq(reqVO.getDetilUser() != null&&reqVO.getDetilUser() != 0, PgMasterLineDO::getDetilUser, reqVO.getDetilUser()) .eq(reqVO.getPgType() != null, PgMasterLineDO::getPgType, reqVO.getPgType()) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java index 926b6f6..8cde572 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java @@ -30,7 +30,7 @@ public interface ProcessDesignMapper extends BaseMapperX { .select("a.plan_no as planCode","a.has_craft as hasCraft", "a.craft_start_date as craftStartDate", "a.craft_end_date as craftEndDate", "e.name as customerName") .select("d.code as projectCode", "d.project_name as projectName", "d.business_line as businessLine", "d.property","d.is_urgency as isUrgency") .select("u1.nickname as projectOwnerName", "u2.nickname as craftOwnerName") - .select("b.blank_date as blankDate", "b.two_dim_date as twoDimDate", "b.three_dim_date as threeDimDate") + .select("b.blank_date as blankDate","b.start_blank_date as startBlankDate", "b.two_dim_date as twoDimDate","b.start_two_dim_date as startTwoDimDate", "b.three_dim_date as threeDimDate", "b.start_three_dim_date as startThreeDimDate") .select("u3.nickname as blankOwnerName", "u4.nickname as twoDimOwnerName", "u5.nickname as threeDimOwnerName") .select("c.name as projectSubName", "b.project_sub_code as projectSubCode") .select("z.progress,z.blueprint_link as blueprintLink ") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/zjpgmaster/ZjPgMasterLineMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/zjpgmaster/ZjPgMasterLineMapper.java index 30d4035..3d090f5 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/zjpgmaster/ZjPgMasterLineMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/zjpgmaster/ZjPgMasterLineMapper.java @@ -107,9 +107,11 @@ public interface ZjPgMasterLineMapper extends BaseMapperX { .leftJoin("(select SUM(c.amount) as amounts ,SUM(c.work_time) as workTime,c.zj_mx_id from quality_zj_bg_master_line c group by c.zj_mx_id) d on d.zj_mx_id = t.id") .disableSubLogicDel(); if(reqVO.getPgType() == 1){ + query.orderByDesc(ZjPgMasterLineDO::getPgNumber); }else { - query.orderByAsc(ZjPgMasterLineDO::getTaskNo,ZjPgMasterLineDO::getPgNumber); + query.orderByAsc(ZjPgMasterLineDO::getPgNumber); + // query.orderByAsc(ZjPgMasterLineDO::getTaskNo,ZjPgMasterLineDO::getPgNumber); } query.eq(reqVO.getDetilUser() != null&&reqVO.getDetilUser() != 0, ZjPgMasterLineDO::getDetilUser, reqVO.getDetilUser()) .eq(reqVO.getPgType() != null, ZjPgMasterLineDO::getPgType, reqVO.getPgType()) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignServiceImpl.java index a845ece..7562523 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignServiceImpl.java @@ -217,14 +217,17 @@ public class ProcessDesignServiceImpl implements ProcessDesignService { detailResult.getList().forEach(processDesign -> { if(ProcessDesignTypeEnum.BLUEPRINT_WORKBLANK.name().equals(processDesign.getProcessDesignType())){ processDesignDO.setBlankDate(processDesign.getBlankDate()) + .setStartBlankDate(processDesign.getStartBlankDate()) .setBlankOwnerName(processDesign.getBlankOwnerName()) .setProgressBlank(processDesign.getProgress()); }else if(ProcessDesignTypeEnum.BLUEPRINT_3D.name().equals(processDesign.getProcessDesignType())){ processDesignDO.setThreeDimDate(processDesign.getThreeDimDate()) + .setStartThreeDimDate(processDesign.getStartThreeDimDate()) .setThreeDimOwnerName(processDesign.getThreeDimOwnerName()) .setProgress3d(processDesign.getProgress()); }else if(ProcessDesignTypeEnum.BLUEPRINT_2D.name().equals(processDesign.getProcessDesignType())){ processDesignDO.setTwoDimDate(processDesign.getTwoDimDate()) + .setStartTwoDimDate(processDesign.getStartTwoDimDate()) .setTwoDimOwnerName(processDesign.getTwoDimOwnerName()) .setProgress2d(processDesign.getProgress()); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java index dd7d71d..044e35d 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java @@ -97,6 +97,7 @@ public class StorageLogServiceImpl implements StorageLogService { @Override public PageResult getStorageNowPage(StorageLogPageReqVO pageReqVO) { + PageResult storageLogNowDOPageResult = storageLogNowMapper.selectPage(pageReqVO); return storageLogNowMapper.selectPage(pageReqVO); } 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 52df929..30bf443 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 @@ -414,12 +414,15 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { } // 不能超额报工 - if(operate == TaskReportOperateEnum.SUBMIT){ + if(operate==TaskReportOperateEnum.START || operate == TaskReportOperateEnum.SUBMIT){ List historyReportList = taskReportMapper.selectList(new LambdaQueryWrapper() {{ eq(TaskReportDO::getDispatchDetailId, taskDispatchDetailDO.getId()) .ne(TaskReportDO::getAmount, 0); }}); int historyReportAmount = historyReportList.stream().mapToInt(TaskReportDO::getAmount).sum(); + if (taskDispatchDetailDO.getAmount() <= historyReportAmount){ + throw exception(TASK_DISPATCH_TASK_IS_OVER); + } if(taskDispatchDetailDO.getAmount() < (historyReportAmount + operateReqVO.getAmount())){ throw exception(TASK_DISPATCH_TASK_REPORT_AMOUNT_EXCESS); } diff --git a/mes-ui/mini-app/src/pages/moJuSheJiReport/components/dataItem.vue b/mes-ui/mini-app/src/pages/moJuSheJiReport/components/dataItem.vue index 2d963bd..25f8a40 100644 --- a/mes-ui/mini-app/src/pages/moJuSheJiReport/components/dataItem.vue +++ b/mes-ui/mini-app/src/pages/moJuSheJiReport/components/dataItem.vue @@ -105,9 +105,10 @@ const getListData = async () => { e.twoDimDate = formatDate(e.twoDimDate, "YYYY-MM-DD"); e.threeDimDate = formatDate(e.threeDimDate, "YYYY-MM-DD"); e.endTime = formatDate(e.endTime, "YYYY-MM-DD"); - - - + e.startTwoDimDate = formatDate(e.startTwoDimDate, "YYYY-MM-DD"); + e.startThreeDimDate = formatDate(e.startThreeDimDate, "YYYY-MM-DD"); + e.startBlankDate = formatDate(e.startBlankDate, "YYYY-MM-DD"); + e.blankDate = formatDate(e.blankDate, "YYYY-MM-DD"); }) // 数组追加 dataList.value.push(...data.list) @@ -225,7 +226,12 @@ const handleClose = () =>{ 项目：{{ item.projectName }} 子项目：{{ item.projectSubCode || "" }} 客户名称：{{ item.customerName }} - 工艺起止日期：{{item.twoDimDate}} ～ {{item.threeDimDate}} + 工艺起止日期：{{item.startTwoDimDate}} ～ {{item.twoDimDate}} + 工艺起止日期：{{item.startThreeDimDate}} ～ {{item.threeDimDate}} + 工艺起止日期：{{item.startBlankDate}} ～ {{item.blankDate}} + + + 最新进度：{{item.progress}}%