diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/plantask/vo/PlanTaskRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/plantask/vo/PlanTaskRespVO.java index a828ba87..27e122d5 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/plantask/vo/PlanTaskRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/plantask/vo/PlanTaskRespVO.java @@ -86,5 +86,7 @@ public class PlanTaskRespVO { @Schema(description = "bom编号") @ExcelProperty("bom编号") private String bomCode; + private Integer refreshStatus; + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plantask/PlanTaskDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plantask/PlanTaskDO.java index 83e00a83..d2de1665 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plantask/PlanTaskDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plantask/PlanTaskDO.java @@ -79,5 +79,7 @@ public class PlanTaskDO extends BaseDO { private String bomCode; @TableField(exist = false) private Long projectSubNum; + @TableField(exist = false) + private Integer refreshStatus; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processbom/ProcessBomDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processbom/ProcessBomDO.java index d3d620b2..294189a6 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processbom/ProcessBomDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processbom/ProcessBomDO.java @@ -9,6 +9,8 @@ import com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum; import com.chanko.yunxi.mes.module.heli.enums.ProcessBomStatusEnum; import lombok.*; +import java.time.LocalDateTime; + /** * 工艺bom DO * @@ -67,6 +69,10 @@ public class ProcessBomDO extends BaseDO { * 审核人 */ private Long shenheUser; + /** + * 审核时间 + */ + private LocalDateTime shenheTime; /** * 编辑状态 0.初始状态 1.被修改了 diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java index e3aee450..ee5116bf 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java @@ -260,14 +260,21 @@ public interface MaterialPlanBoomMapper extends BaseMapperX if (Objects.nonNull(pageReqVO.getMplanStatus())) { // 根据 mplanStatus 的值动态设置排序字段 - if (pageReqVO.getMplanStatus() == 1) { + if (pageReqVO.getMplanStatus() == 0){ + query.orderByAsc(MaterialPlanDO::getProjectName); + query.orderByAsc(ProcessBomDetailDO::getBlueprintNo); + + }else if (pageReqVO.getMplanStatus() == 1 || pageReqVO.getMplanStatus() == 2) { query.orderByDesc(MaterialPlanBoomDO::getPurchaseNo); + query.orderByAsc(ProcessBomDetailDO::getBlueprintNo); } else { query.orderByAsc(MaterialPlanBoomDO::getCreateTime); - } - } + }else { + query.orderByDesc(MaterialPlanDO::getProjectMaterialPlanNo); + query.orderByAsc(ProcessBomDetailDO::getBlueprintNo); + } PageResult pageResult = selectPage(pageReqVO, query); return pageResult; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plantask/PlanTaskMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plantask/PlanTaskMapper.java index d39efd57..b5353448 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plantask/PlanTaskMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plantask/PlanTaskMapper.java @@ -43,7 +43,7 @@ public interface PlanTaskMapper extends BaseMapperX { .leftJoin(CustomerDO.class, "e", CustomerDO::getId, ProjectOrderDO::getCustomerId) .leftJoin(ProcessBomDO.class, "pb", ProcessBomDO::getId, PlanTaskDO::getProcessBomId) .disableSubLogicDel() - .orderByDesc(PlanTaskDO::getCreateTime); + .orderByDesc(ProcessBomDO::getShenheTime); query.like(!StringUtils.isEmpty(reqVO.getTaskNo()), PlanTaskDO::getTaskNo, reqVO.getTaskNo()) .like(!StringUtils.isEmpty(reqVO.getProjectCode()), "p.code", reqVO.getProjectCode()) .like(!StringUtils.isEmpty(reqVO.getCustomerName()), "e.name", reqVO.getCustomerName()) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermakedetail/PurchaseOrderMakeDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermakedetail/PurchaseOrderMakeDetailMapper.java index b84a67f1..1ae72953 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermakedetail/PurchaseOrderMakeDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermakedetail/PurchaseOrderMakeDetailMapper.java @@ -1,5 +1,6 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseordermakedetail; +import java.time.LocalDateTime; import java.util.*; import cn.hutool.core.util.ObjectUtil; @@ -24,6 +25,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermakedetail.P import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordernodetail.PurchaseOrderNoDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.supplier.SupplierDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskreport.TaskReportDO; import com.chanko.yunxi.mes.module.heli.service.purchaseordermakedetail.PurchaseOrderMakeDetailService; import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; import com.github.yulichang.wrapper.MPJLambdaWrapper; @@ -201,6 +203,15 @@ public interface PurchaseOrderMakeDetailMapper extends BaseMapperX getPlanTaskPage(PlanTaskPageReqVO pageReqVO) { - return planTaskMapper.selectPage(pageReqVO); + PageResult pageResult = planTaskMapper.selectPage(pageReqVO); + for (PlanTaskDO planTaskDO : pageResult.getList()) { + if(planTaskDO.getProcessBomId()==null){ + // 无bomid时,需要刷新 + planTaskDO.setRefreshStatus(1); + }else{ + ProcessBomDO processBomDO = processBomMapper.selectById(planTaskDO.getProcessBomId()); + // 生产任务版本号与bom版本号不同,需要刷新 + if (ObjectUtil.isNotEmpty(processBomDO)&&ObjectUtil.isNotEmpty(planTaskDO)){ + if(!planTaskDO.getBomVersion().equals(processBomDO.getVersion())){ + planTaskDO.setRefreshStatus(1); } + else{ + planTaskDO.setRefreshStatus(0); + } + }else { + planTaskDO.setRefreshStatus(0); + } + + } + } + return pageResult; } @Override 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 a601d55e..a6c46ec2 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 @@ -797,6 +797,7 @@ public class ProcessBomServiceImpl implements ProcessBomService { if(shenheDOS.size()==0) { updateObj.setBomStatus(7); + updateObj.setShenheTime(LocalDateTime.now()); // for (ProcessBomDetailDO processBomDetail : processBomDetails) { // processBomDetail.setBomEditStatus(BomEditStatusEnum.DEFAULT.getStatus()); // } @@ -1188,6 +1189,7 @@ public class ProcessBomServiceImpl implements ProcessBomService { } } + if(operateReqVO.getActive().equals("AUDIT")||operateReqVO.getActive().equals("CANCEL_SUBMIT")){ bdgzsomthingDO abc= new bdgzsomthingDO(); diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue index 4854f357..6eee4250 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue @@ -80,7 +80,8 @@ - + + @@ -110,7 +111,6 @@ -