diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/ProcessDesignController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/ProcessDesignController.java index 06f3298..0f8fd5b 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/ProcessDesignController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/ProcessDesignController.java @@ -143,4 +143,12 @@ public class ProcessDesignController { public void send(@Valid @RequestBody ProcessDesignSaveReqVO createReqVO) { processDesignService.send(createReqVO); } + + @PostMapping("/reWork") + @Operation(summary = "返工") + @PreAuthorize("@ss.hasPermission('heli:process-design:create')") + public CommonResult reWork(@Valid @RequestBody ProcessDesignSaveReqVO createReqVO) { + processDesignService.reWork(createReqVO); + return success(true); + } } 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 2e265b7..d3c33e1 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 @@ -138,5 +138,9 @@ public class ProcessDesignRespVO { @Schema(description = "图纸链接") private String blueprintLink; + @Schema(description = "返工原因") + private String reReason; + @Schema(description = "返工日期") + private LocalDateTime reTime; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignSaveReqVO.java index 454eed9..c63f172 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignSaveReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignSaveReqVO.java @@ -2,6 +2,8 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.processdesign.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; + +import java.time.LocalDateTime; import java.util.*; import javax.validation.constraints.*; import java.util.*; @@ -44,4 +46,9 @@ public class ProcessDesignSaveReqVO { @Schema(description = "工艺设计进度列表") private List processDesignProgressList; + @Schema(description = "返工原因", example = "28809") + private String reReason; + @Schema(description = "返工日期") + private LocalDateTime reTime; + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/bdgzsomthing/bdgzsomthingDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/bdgzsomthing/bdgzsomthingDO.java index 4ce165e..f5f05fe 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/bdgzsomthing/bdgzsomthingDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/bdgzsomthing/bdgzsomthingDO.java @@ -142,5 +142,7 @@ public class bdgzsomthingDO extends BaseDO { * 备注3 */ private Long tenantId; + @TableField(exist = false) + private String userName; } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplanboom/MaterialPlanBoomDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplanboom/MaterialPlanBoomDO.java index 7e36ebf..761fffb 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplanboom/MaterialPlanBoomDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplanboom/MaterialPlanBoomDO.java @@ -228,4 +228,6 @@ public class MaterialPlanBoomDO extends BaseDO { private String rgName; @TableField(exist = false) private String pnName; + @TableField(exist = false) + private BigDecimal foamPrice; } 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 d67a05f..247a24a 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 @@ -154,4 +154,7 @@ public class ProcessDesignDO extends BaseDO { @TableField(exist = false) private String brief; + + private String reReason; + private LocalDateTime reTime; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermakedetail/PurchaseOrderMakeDetailDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermakedetail/PurchaseOrderMakeDetailDO.java index 03493a5..2a1cec6 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermakedetail/PurchaseOrderMakeDetailDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermakedetail/PurchaseOrderMakeDetailDO.java @@ -169,4 +169,9 @@ public class PurchaseOrderMakeDetailDO extends BaseDO { private String projectName; @TableField(exist = false) private String matName; + + /** + * 零件理论重量 + */ + private BigDecimal foamPrice; } 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 0185cf5..88d600e 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 @@ -152,6 +152,11 @@ public class TaskDispatchDetailDO extends BaseDO { * 预计工时 */ @TableField(exist = false) + private BigDecimal estimatedPrice; + /** + * 预计工时 + */ + @TableField(exist = false) private BigDecimal bgWorkTime; /** * 派工数量 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 014827a..1e80b2c 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 @@ -221,7 +221,7 @@ public interface MaterialPlanBoomMapper extends BaseMapperX .select("m.the_weight as theWeight") .select("COALESCE(m.purchase_amount, t.boom_amount) AS purchaseAmounts,m.supplier_id as supplierIds,m.estimated_price as estimatedPrices") .select("m.arrive_time as arriveTimes,m.description as descriptions") - .select("m.is_foam as isFoams") + .select("m.is_foam as isFoams","m.foam_price as foamPrice") .leftJoin(PurchaseOrderMakeDetailDO.class,"m",PurchaseOrderMakeDetailDO::getId,MaterialPlanBoomDO::getProjectPurchaseOrderMakeDetailId) .select(MaterialPlanDO::getBrief, MaterialPlanDO::getCustomerId, MaterialPlanDO::getProjectId, MaterialPlanDO::getProjectNameSim) .leftJoin(MaterialPlanDO.class, "p", MaterialPlanDO::getId,MaterialPlanBoomDO::getProjectMaterialPlanId) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermake/PurchaseOrderMakeMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermake/PurchaseOrderMakeMapper.java index 86a71cb..938f4c3 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermake/PurchaseOrderMakeMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermake/PurchaseOrderMakeMapper.java @@ -107,8 +107,7 @@ public interface PurchaseOrderMakeMapper extends BaseMapperX selectafterten = materialPlanDetailMapper.selectafterten(attentiontodoRespVO.getTxrid(),attentiontodoRespVO.getEvday()); +// List selectafterten = materialPlanDetailMapper.selectafterten(attentiontodoRespVO.getTxrid(),attentiontodoRespVO.getEvday()); List selectafterten1 = materialPlanBoomMapper.selectafterten(attentiontodoRespVO.getTxrid(), attentiontodoRespVO.getEvday()); { - for (MaterialPlanDetailDO materialPlanDetailDO : selectafterten) { - bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); - BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称 - BdgzsomthingDO.setAttr4("0");//是否点击 - BdgzsomthingDO.setThings("计划单号:"+materialPlanDetailDO.getProjectMaterialPlanNo()+" 物料:"+materialPlanDetailDO.getName()+",临近到货日期");//事件名称 - BdgzsomthingDO.setAttr2(null);//因为不用跳转所以为null - BdgzsomthingDO.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期 - BdgzsomthingDO.setTenantId(attentiontodoRespVO.getTxrid()); -// BdgzsomthingDO.setShowname(LocalDateTime.now());//比较创建时间,不用单独填写 - if(attentiontodoRespVO.getAttr5().equals("1")){//提醒状态 - BdgzsomthingDO.setDborgz("待办"); - } - else if(attentiontodoRespVO.getAttr5().equals("2")){ - BdgzsomthingDO.setDborgz("关注"); - } - if (ObjectUtil.isEmpty(attentiontodoRespVO.getAttr4())){ - MaterialPlanDO planDO = materialPlanMapper.selectOne(new LambdaQueryWrapper().eq(MaterialPlanDO::getProjectMaterialPlanNo, materialPlanDetailDO.getProjectMaterialPlanNo())); - if (ObjectUtil.isNotEmpty(planDO)){ - AdminUserDO user = adminUserService.getUser(Long.valueOf(planDO.getCreator())); - if (ObjectUtil.isNotEmpty(user)){ - BdgzsomthingDO.setClick(user.getNickname()); - } - } - - }else { - BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4()); - } - if(attentiontodoRespVO.getLevel().equals("1")){ - BdgzsomthingDO.setLevel("紧急"); - } - else if(attentiontodoRespVO.getLevel().equals("2")){ - BdgzsomthingDO.setLevel("一般"); - } - else if(attentiontodoRespVO.getLevel().equals("3")){ - BdgzsomthingDO.setLevel("非紧急"); - } - BdgzsomthingDO.setYesorno("0");//是否点击 - - BdgzsomthingDO.setAttr3(materialPlanDetailDO.getProjectMaterialPlanNo());//获取数据当前表的id 改 - BdgzsomthingDO.setShowname(null);//获取数据当前表的创建事件 改 - //去重查询,重复则不加 +// for (MaterialPlanDetailDO materialPlanDetailDO : selectafterten) { +// bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); +// BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称 +// BdgzsomthingDO.setAttr4("0");//是否点击 +// BdgzsomthingDO.setThings("计划单号:"+materialPlanDetailDO.getProjectMaterialPlanNo()+" 物料:"+materialPlanDetailDO.getName()+",临近到货日期");//事件名称 +// BdgzsomthingDO.setAttr2(null);//因为不用跳转所以为null +// BdgzsomthingDO.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期 +// BdgzsomthingDO.setTenantId(attentiontodoRespVO.getTxrid()); +//// BdgzsomthingDO.setShowname(LocalDateTime.now());//比较创建时间,不用单独填写 +// if(attentiontodoRespVO.getAttr5().equals("1")){//提醒状态 +// BdgzsomthingDO.setDborgz("待办"); +// } +// else if(attentiontodoRespVO.getAttr5().equals("2")){ +// BdgzsomthingDO.setDborgz("关注"); +// } +// if (ObjectUtil.isEmpty(attentiontodoRespVO.getAttr4())){ +// MaterialPlanDO planDO = materialPlanMapper.selectOne(new LambdaQueryWrapper().eq(MaterialPlanDO::getProjectMaterialPlanNo, materialPlanDetailDO.getProjectMaterialPlanNo())); +// if (ObjectUtil.isNotEmpty(planDO)){ +// AdminUserDO user = adminUserService.getUser(Long.valueOf(planDO.getCreator())); +// if (ObjectUtil.isNotEmpty(user)){ +// BdgzsomthingDO.setClick(user.getNickname()); +// } +// } +// +// }else { +// BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4()); +// } +// if(attentiontodoRespVO.getLevel().equals("1")){ +// BdgzsomthingDO.setLevel("紧急"); +// } +// else if(attentiontodoRespVO.getLevel().equals("2")){ +// BdgzsomthingDO.setLevel("一般"); +// } +// else if(attentiontodoRespVO.getLevel().equals("3")){ +// BdgzsomthingDO.setLevel("非紧急"); +// } +// BdgzsomthingDO.setYesorno("0");//是否点击 +// +// BdgzsomthingDO.setAttr3(materialPlanDetailDO.getProjectMaterialPlanNo());//获取数据当前表的id 改 +// BdgzsomthingDO.setShowname(null);//获取数据当前表的创建事件 改 +// //去重查询,重复则不加 // List selecteqint = bdgzsomthingMapper.selecteqintone(BdgzsomthingDO); // // @@ -856,9 +856,9 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { // }else{ //插入方法 - bdgzsomthingMapper.insert(BdgzsomthingDO); +// bdgzsomthingMapper.insert(BdgzsomthingDO); // } - } +// } for (MaterialPlanBoomDO materialPlanBoomDO : selectafterten1) { bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); @@ -936,7 +936,16 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { Long userId = WebFrameworkUtils.getLoginUserId(); AdminUserDO user = adminUserService.getUser(userId); pageReqVO.setClick(user.getNickname()); - return bdgzsomthingMapper.getMessage(pageReqVO); + PageResult message = bdgzsomthingMapper.getMessage(pageReqVO); + List list = message.getList(); + for (bdgzsomthingDO bdgzsomthingDO : list) { + AdminUserDO user1 = adminUserService.getUser(Long.valueOf(bdgzsomthingDO.getCreator())); + if (ObjectUtil.isNotEmpty(user1)){ + bdgzsomthingDO.setUserName(user1.getNickname()); + } + bdgzsomthingDO.setClicktime(null); + } + return message; } @Override @@ -1028,7 +1037,7 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { BdgzsomthingDO.setYesorno("0");//是否点击 BdgzsomthingDO.setAttr4("0");//是否点击 BdgzsomthingDO.setAttr3(storageLogNowDO.getId().toString());//获取数据当前表的id 改 - BdgzsomthingDO.setShowname(storageLogNowDO.getCreateTime());//获取数据当前表的创建事件 改 + BdgzsomthingDO.setShowname(LocalDateTime.now());//获取数据当前表的创建事件 改 //查之前没有达到安全库存的数据 List selecteqint = bdgzsomthingMapper.selecteqintDeletedButNoOver(BdgzsomthingDO); if(CollUtil.isEmpty(selecteqint)){ @@ -1038,7 +1047,6 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { //插入方法 bdgzsomthingMapper.insert(BdgzsomthingDO); } - }else{ if (hasRemindTimeSafeStorage){ LocalDate today = LocalDate.now(); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java index 3753745..b48a7de 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java @@ -350,7 +350,6 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{ @Override public Long countReview() { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PurchaseOrderMakeDO::getSubmitUserId,getLoginUser().getId()); queryWrapper.eq(PurchaseOrderMakeDO::getStatus,1); queryWrapper.eq(PurchaseOrderMakeDO::getDeleted,0); return purchaseOrderMakeMapper.selectCount(queryWrapper); @@ -375,6 +374,7 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{ purchaseOrderMakeDetailDO.setProjectPlanSubId(updateReqVO.getProjectPlanSubId()); purchaseOrderMakeDetailDO.setName(updateReqVO.getProjectSubName()); purchaseOrderMakeDetailDO.setNameSim(updateReqVO.getProjectSubNameSim()); + purchaseOrderMakeDetailDO.setFoamPrice(updateReqVO.getFoamPrice()); purchaseOrderMakeDetailDO.setOrderStatus(1); PlanSubDO planSubDO = planSubMapper.selectOne("project_sub_id", updateReqVO.getProjectPlanSubId()); purchaseOrderMakeDetailDO.setProjectSubCode(Objects.nonNull(planSubDO)?planSubDO.getProjectSubCode(): null); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignService.java index ff1439a..3eb751d 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignService.java @@ -83,4 +83,6 @@ public interface ProcessDesignService { WarningMessageVO getWarnings(); void send(ProcessDesignSaveReqVO createReqVO); + + void reWork(ProcessDesignSaveReqVO createReqVO); } 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 6f28522..f0c64c8 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 @@ -433,6 +433,39 @@ public class ProcessDesignServiceImpl implements ProcessDesignService { } } + @Override + public void reWork(ProcessDesignSaveReqVO createReqVO) { + ProcessDesignDO processDesignDO = processDesignMapper.selectById(createReqVO.getId()); + processDesignDO.setReReason(createReqVO.getReReason()); + processDesignDO.setIsOverProcess(0); + processDesignDO.setReTime(LocalDateTime.now()); + processDesignMapper.updateById(processDesignDO); + List attentiontodookddfh = attentiontodoMapper.selectByIdlist(16);//查找该类型的待办和关注人 + String thingname = ""; + if ("BLUEPRINT_FOUNDRY_TECHNOLOGY".equals(processDesignDO.getProcessDesignType())){ + thingname="铸造设计任务提醒"; + }else if ("BLUEPRINT_3D".equals(processDesignDO.getProcessDesignType())){ + thingname="3D设计任务提醒"; + }else if ("BLUEPRINT_2D".equals(processDesignDO.getProcessDesignType())){ + thingname="2D设计任务提醒"; + }else if ("BLUEPRINT_WORKBLANK".equals(processDesignDO.getProcessDesignType())){ + thingname="毛坯设计任务提醒"; + } + for (AttentiontodoDO attentiontodoDO : attentiontodookddfh) { + bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); + BdgzsomthingDO.setClick(attentiontodoDO.getAttr4()); + BdgzsomthingDO.setThingname(thingname); +// BdgzsomthingDO.setThings(things); + BdgzsomthingDO.setAttr4("1"); + BdgzsomthingDO.setAttr6(processDesignDO.getBrief()); + BdgzsomthingDO.setAttr7(processDesignDO.getProjectName()); + BdgzsomthingDO.setAttr8(processDesignDO.getProjectSubName()); + BdgzsomthingDO.setAttr9(createReqVO.getReReason()); + BdgzsomthingDO.setAttr13("1"); + bdgzsomthingMapper.insert(BdgzsomthingDO); + } + } + private void createProcessDesignProgressList(Long processDesignId, List list) { list.forEach(o -> o.setProcessDesignId(processDesignId)); // 按创建时间排序 diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordermake/PurchaseOrderMakeServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordermake/PurchaseOrderMakeServiceImpl.java index 711e193..6308c13 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordermake/PurchaseOrderMakeServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordermake/PurchaseOrderMakeServiceImpl.java @@ -75,7 +75,6 @@ public class PurchaseOrderMakeServiceImpl implements PurchaseOrderMakeService { @Override public PageResult review(PurchaseOrderMakePageReqVO pageReqVO) { - pageReqVO.setSubmitUserId(getLoginUser().getId()); return purchaseOrderMakeMapper.review(pageReqVO); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorderno/PurchaseOrderNoServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorderno/PurchaseOrderNoServiceImpl.java index 16aa81b..3471d10 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorderno/PurchaseOrderNoServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorderno/PurchaseOrderNoServiceImpl.java @@ -153,7 +153,7 @@ public class PurchaseOrderNoServiceImpl implements PurchaseOrderNoService { } } if(updateReqVO.getStatus()== 3){ -// pOrderReceivedCompleted(updateReqVO.getPurchaseNo(),updateReqVO.getId()); + pOrderReceivedCompleted(updateReqVO.getPurchaseNo(),updateReqVO.getId()); } purchaseOrderNoMapper.updateById(updateObj); } @@ -176,14 +176,12 @@ public class PurchaseOrderNoServiceImpl implements PurchaseOrderNoService { List attentiontodook1 = attentiontodoService.getAttentiontodolistdaiban(10); if (attentiontodook1.size()<1){ { - AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); attentiontodoDO.setEvent("《采购订单》到货时通知检验"); attentiontodoDO.setAttr5("1"); attentiontodoDO.setAttr4(nickname); attentiontodoDO.setLevel("1"); attentiontodook.add(attentiontodoDO); - } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storage/StorageServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storage/StorageServiceImpl.java index e40eac1..a270833 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storage/StorageServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storage/StorageServiceImpl.java @@ -159,6 +159,7 @@ private StorageLogService storageLogService; storageDO.setDescription("由委外验收单"+outsourceStockDO.getOutsourceNo()+"提交后自动生成");//备注 storageDO.setKeeperTime(LocalDateTime.now());//单据日期 storageDO.setKeeper(userId);//提交人 + storageDO.setDeleted(true); storageMapper.insert(storageDO); //根据委外单号查出提交明细 @@ -171,6 +172,7 @@ private StorageLogService storageLogService; storageMatDO.setMatId(o.getMaterialId()); storageMatDO.setProjectNo(String.valueOf(o.getProjectSubId())); storageMatDO.setStorageOkQty(o.getQualifiedCount()); + storageMatDO.setDeleted(true); storageMatMapper.insert(storageMatDO); @@ -222,6 +224,7 @@ private StorageLogService storageLogService; storageDO.setDescription("由委外验收单"+outsourceStockDO.getOutsourceNo()+"提交后自动生成");//备注 storageDO.setKeeperTime(LocalDateTime.now());//单据日期 storageDO.setKeeper(userId);//提交人 + storageDO.setDeleted(true); storageMapper.insert(storageDO); //根据委外单号查出提交明细 @@ -253,6 +256,7 @@ private StorageLogService storageLogService; storageMatDO.setProjectNo(String.valueOf(o.getProjectSubId())); storageMatDO.setStorageOkQty(o.getQualifiedCount()); + storageDO.setDeleted(true); storageMatMapper.insert(storageMatDO); @@ -296,6 +300,7 @@ private StorageLogService storageLogService; storageDO.setDescription("由委外验收单"+outsourceStockDO.getOutsourceNo()+"提交后自动生成");//备注 storageDO.setOutboundTime(LocalDateTime.now());//单据日期 storageDO.setOutbound(userId);//提交人 + storageDO.setDeleted(true); storageMapper.insert(storageDO); @@ -317,6 +322,7 @@ private StorageLogService storageLogService; System.out.println(materialDO.getId()); storageMatDO.setProjectNo(String.valueOf(o.getProjectSubId())); storageMatDO.setStorageOkQty(o.getQualifiedCount()); + storageMatDO.setDeleted(true); storageMatMapper.insert(storageMatDO); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/materialplanboom/MaterialPlanBoomMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/materialplanboom/MaterialPlanBoomMapper.xml index f47b05d..2cd6b4a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/materialplanboom/MaterialPlanBoomMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/materialplanboom/MaterialPlanBoomMapper.xml @@ -11,23 +11,50 @@ \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/plan/PlanMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/plan/PlanMapper.xml index 333ff64..4e7ba23 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/plan/PlanMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/plan/PlanMapper.xml @@ -47,6 +47,7 @@ WHERE d.process_design_type = 'BLUEPRINT_WORKBLANK' AND d.status = '1' + and d.is_over_process != '1' GROUP BY d.project_id, d.project_sub_id, @@ -93,6 +94,7 @@ WHERE d.process_design_type = 'BLUEPRINT_3D' AND d.status = '1' + and d.is_over_process != '1' GROUP BY d.project_id, d.project_sub_id, @@ -139,6 +141,7 @@ WHERE d.process_design_type = 'BLUEPRINT_2D' AND d.status = '1' + and d.is_over_process != '1' GROUP BY d.project_id, d.project_sub_id, @@ -191,6 +194,7 @@ WHERE d.process_design_type = 'BLUEPRINT_WORKBLANK' AND d.status = '1' + and d.is_over_process != '1' GROUP BY d.project_id, d.creator, @@ -239,6 +243,7 @@ WHERE d.process_design_type = 'BLUEPRINT_3D' AND d.status = '1' + and d.is_over_process != '1' GROUP BY d.project_id, d.creator, @@ -287,6 +292,7 @@ WHERE d.process_design_type = 'BLUEPRINT_2D' AND d.status = '1' + and d.is_over_process != '1' GROUP by d.creator, d.project_id, diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogNowMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogNowMapper.xml index 653a4cb..0fdfe33 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogNowMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogNowMapper.xml @@ -109,33 +109,23 @@ parameterType="Long" resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow.StorageLogNowDO"> - - SELECT - b.mat_code id, - b.create_time, - b.mat_name, - b.total_storage_ok_qty, - b.creator + t.code as id, + t.name as matName, + t.creator as creator FROM - (SELECT - mat_code, - create_time, - mat_name,creator, - id, - SUM(storage_ok_qty) AS total_storage_ok_qty - FROM - v_storage_material_now - GROUP BY - mat_code, - create_time, - mat_name, - id,creator) b - JOIN - base_material a ON b.mat_code = a.code + base_material t + LEFT JOIN wms_storage_inventory s ON (s.material_id = t.id) + AND s.tenant_id = 2 WHERE - b.total_storage_ok_qty < a.inv_safe - and a.tenant_id =#{param1} + t.deleted = 0 + and t.tenant_id =#{param1} + GROUP BY + t.id + HAVING + COALESCE(SUM(s.yard_amount), 0) < COALESCE(MAX(t.inv_safe), 0) + + @@ -178,32 +168,19 @@ parameterType="Long" resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow.StorageLogNowDO"> - - SELECT - b.mat_code id, - b.create_time, - b.mat_name, - b.total_storage_ok_qty, - b.creator + t.code as id, + t.name as matName, + t.creator as creator FROM - (SELECT - mat_code, - create_time, - mat_name,creator, - id, - SUM(storage_ok_qty) AS total_storage_ok_qty - FROM - v_storage_material_now - GROUP BY - mat_code, - create_time, - mat_name, - id,creator) b - JOIN - base_material a ON b.mat_code = a.code + base_material t + LEFT JOIN wms_storage_inventory s ON (s.material_id = t.id) + AND s.tenant_id = 2 WHERE - b.total_storage_ok_qty < a.inv_safe + t.deleted = 0 GROUP BY + t.id + HAVING + COALESCE(SUM(s.yard_amount), 0) < COALESCE(MAX(t.inv_safe), 0)