From 077acacd84dbde2df4545bfeb55069e123468408 Mon Sep 17 00:00:00 2001 From: z Date: Wed, 27 Aug 2025 18:07:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bdgzsomthing/bdgzsomthingController.java | 6 +- .../fpuserdetail/FpUserDetailController.java | 4 +- .../fpuserdetail/vo/FpUserDetailRespVO.java | 6 +- .../admin/fpuserdetail/vo/UserVo.java | 4 + .../vo/MaterialPlanPageReqVO.java | 3 +- .../vo/MaterialPlanBoomPageReqVO.java | 2 + .../admin/pgmaster/PgMasterController.java | 52 +- .../vo/ProcessDesignPageReqVO.java | 2 + .../projectorder/ProjectOrderController.java | 6 +- .../vo/PurchaseOrderMakePageReqVO.java | 2 + .../PurchaseOrderNoController.java | 1 + .../vo/PurchaseOrderNoPageReqVO.java | 8 +- .../PurchaseOrderNoDetailController.java | 29 + .../vo/PurchaseOrderNoDetailPageReqVO.java | 6 + .../taskdispatch/TaskDispatchController.java | 11 +- .../fpuserdetail/FpUserDetailDO.java | 8 +- .../PurchaseOrderMakeDetailDO.java | 2 + .../PurchaseOrderNoDetailDO.java | 2 + .../taskdispatch/TaskDispatchDetailDO.java | 3 +- .../fpuserdetail/FpUserDetailMapper.java | 21 + .../MaterialPlanBoomMapper.java | 5 +- .../mysql/pgmaster/PgMasterLineMapper.java | 7 +- .../mysql/processbom/ProcessBomMapper.java | 2 + .../processdesign/ProcessDesignMapper.java | 23 +- .../PurchaseOrderMakeDetailMapper.java | 5 +- .../PurchaseOrderNoMapper.java | 73 +++ .../PurchaseOrderNoDetailMapper.java | 49 +- .../TaskDispatchDetailMapper.java | 12 +- .../bdgzsomthing/bdgzsomthingServiceImpl.java | 131 ++-- .../fpuserdetail/FpUserDetailServiceImpl.java | 17 +- .../service/pgmaster/PgMasterServiceImpl.java | 2 + .../processbom/ProcessBomServiceImpl.java | 3 +- .../ProcessDesignServiceImpl.java | 6 + .../PurchaseOrderNoServiceImpl.java | 3 + .../PurchaseOrderNoDetailService.java | 4 + .../PurchaseOrderNoDetailServiceImpl.java | 40 ++ .../taskdispatch/TaskDispatchService.java | 2 + .../taskdispatch/TaskDispatchServiceImpl.java | 51 +- .../fpuserdetail/FpUserDetailMapper.xml | 3 + .../mapper/processbom/ProcessBomMapper.xml | 14 + .../taskdispatch/TaskDispatchDetailMapper.xml | 14 + .../src/api/heli/taskdispatch/index.ts | 3 + mes-ui/mes-ui-admin-vue3/src/utils/dict.ts | 4 +- .../src/views/heli/fpuserdetail/edit.vue | 8 +- .../src/views/heli/fpuserdetail/index.vue | 2 +- .../src/views/heli/materialplan/standard.vue | 2 +- .../views/heli/materialplan/standardbuy.vue | 75 ++- .../src/views/heli/partpurchase/index.vue | 80 ++- .../views/heli/partpurchasecheck/indexs.vue | 18 +- .../src/views/heli/plan/productionPrint.vue | 10 +- .../src/views/heli/plantask/edit.vue | 3 +- .../src/views/heli/processdesign/detail.vue | 21 +- .../src/views/heli/processdesign/overview.vue | 14 +- .../views/heli/processdesign/printDialog.vue | 2 +- .../src/views/heli/purchaseorderno/detail.vue | 5 +- .../src/views/heli/purchaseorderno/index.vue | 20 +- .../views/heli/purchaseorderno/management.vue | 14 +- .../heli/purchaseorderno/managementdetail.vue | 1 + .../views/heli/taskdispatch/detailDialog.vue | 103 +-- .../assembleReport/components/dataItem.vue | 26 +- mes-ui/mini-app/src/pages/index/index.vue | 17 +- .../pages/pgMaster/components/dataItem.vue | 79 ++- .../productionReport/components/dataItem.vue | 50 +- .../pages/receivingGoods/receivingGoods.vue | 620 ++++++++++++++++++ .../pages/zjPgMaster/components/dataItem.vue | 14 +- mes-ui/mini-app/src/services/constants.ts | 4 +- mes-ui/mini-app/src/services/home.ts | 6 + .../mini-app/src/services/productionReport.ts | 24 +- 68 files changed, 1606 insertions(+), 263 deletions(-) create mode 100644 mes-ui/mini-app/src/pages/receivingGoods/receivingGoods.vue 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 864fa23e..93ad04af 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/controller/admin/fpuserdetail/FpUserDetailController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/fpuserdetail/FpUserDetailController.java index c82c03e5..a1e0094e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/fpuserdetail/FpUserDetailController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/fpuserdetail/FpUserDetailController.java @@ -73,9 +73,9 @@ public class FpUserDetailController { @GetMapping("/page") @Operation(summary = "获得业务人员配置子分页") @PreAuthorize("@ss.hasPermission('heli:fp-user-detail:query')") - public CommonResult> getFpUserDetailPage(@Valid FpUserDetailPageReqVO pageReqVO) { + public CommonResult> getFpUserDetailPage(@Valid FpUserDetailPageReqVO pageReqVO) { PageResult pageResult = fpUserDetailService.getFpUserDetailPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, FpUserDetailRespVO.class)); + return success(pageResult); } @PostMapping("/selectFpUserDetail") @Operation(summary = "获得业务人员配置子表") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/fpuserdetail/vo/FpUserDetailRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/fpuserdetail/vo/FpUserDetailRespVO.java index c981d81e..f38cb1f0 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/fpuserdetail/vo/FpUserDetailRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/fpuserdetail/vo/FpUserDetailRespVO.java @@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.time.LocalDateTime; +import java.util.Set; @Schema(description = "管理后台 - 业务人员配置子 Response VO") @Data @@ -58,7 +59,6 @@ public class FpUserDetailRespVO { @Schema(description = "工序名称") private String procedureName; - - - + @Schema(description = "工序名称") + private Set procCd; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/fpuserdetail/vo/UserVo.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/fpuserdetail/vo/UserVo.java index 48123430..5327957c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/fpuserdetail/vo/UserVo.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/fpuserdetail/vo/UserVo.java @@ -3,6 +3,8 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.fpuserdetail.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.util.Set; + @Schema(description = "管理后台 - 业务人员配置子表集合") @Data public class UserVo { @@ -12,6 +14,8 @@ public class UserVo { private String postId; @Schema(description = "工序id") private Long procedureId; + @Schema(description = "工序集合") + private Set procCd; @Schema(description = "是否负责人") private String isRes; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/vo/MaterialPlanPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/vo/MaterialPlanPageReqVO.java index 9de393a2..db0c5c07 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/vo/MaterialPlanPageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/vo/MaterialPlanPageReqVO.java @@ -79,5 +79,6 @@ public class MaterialPlanPageReqVO extends PageParam { private String blueprintNo; @Schema(description = "工序") private String procedureName; - + @Schema(description = "供应商") + private String supplierName; } \ 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/controller/admin/materialplanboom/vo/MaterialPlanBoomPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplanboom/vo/MaterialPlanBoomPageReqVO.java index c3fff949..9217b326 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplanboom/vo/MaterialPlanBoomPageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplanboom/vo/MaterialPlanBoomPageReqVO.java @@ -87,4 +87,6 @@ public class MaterialPlanBoomPageReqVO extends PageParam { @Schema(description = "物料需求单号") private String projectMaterialPlanNo; + @Schema(description = "供应商") + private String supplierName; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java index cc5ade35..45f67e76 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java @@ -1,12 +1,19 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.pgmaster; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.chanko.yunxi.mes.module.heli.controller.admin.plansub.vo.PlanSubRespVO; import com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo.TaskDispatchDetailPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.zjpgmaster.vo.ZjPgMasterSaveReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterLineDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.plansub.PlanSubDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDetailDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO; +import com.chanko.yunxi.mes.module.heli.dal.mysql.processbom.ProcessBomDetailMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch.TaskDispatchDetailMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch.TaskDispatchMapper; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -25,6 +32,8 @@ import com.chanko.yunxi.mes.framework.common.pojo.PageParam; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.common.pojo.CommonResult; import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; + +import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.error; import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success; import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils; @@ -46,7 +55,12 @@ public class PgMasterController { @Resource private PgMasterService pgMasterService; - + @Resource + private ProcessBomDetailMapper processBomDetailMapper; + @Resource + private TaskDispatchDetailMapper taskDispatchDetailMapper; + @Resource + private TaskDispatchMapper taskDispatchMapper; @GetMapping("/getBomMx") @@ -134,6 +148,42 @@ public class PgMasterController { @PreAuthorize("@ss.hasPermission('heli:task-dispatch:query')") public CommonResult> getTaskDispatchPageDetailWx(@Valid PgMasterLinePageReqVO pageReqVO) { PageResult pageResult = pgMasterService.getTaskDispatchDetailPageWx(pageReqVO); + if (ObjectUtil.isEmpty(pageResult.getList())){ + if (ObjectUtil.isNotEmpty(pageReqVO.getSubOrDetailName())&&pageReqVO.getPageNo()==1){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ProcessBomDetailDO::getBomBlueprintNo,pageReqVO.getSubOrDetailName()); + ProcessBomDetailDO bomDetailDO = processBomDetailMapper.selectOne(queryWrapper); + if (ObjectUtil.isNotEmpty(bomDetailDO)){ + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(TaskDispatchDO::getBomDetailId, bomDetailDO.getId()); + TaskDispatchDO taskDispatchDO = taskDispatchMapper.selectOne(queryWrapper1); + if (ObjectUtil.isNotEmpty(taskDispatchDO)){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDO.getId()); + wrapper.eq(TaskDispatchDetailDO::getCheckYn,0); + List detailDOS = taskDispatchDetailMapper.selectList(wrapper); + if (ObjectUtil.isEmpty(detailDOS)){ + return error(400,"该零件没有需要检验工序"); + }else { + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDO.getId()); + wrapper1.eq(TaskDispatchDetailDO::getCheckYn,0); + wrapper1.eq(TaskDispatchDetailDO::getTestYn,"Y"); + List list = taskDispatchDetailMapper.selectList(wrapper1); + if (ObjectUtil.isNotEmpty( list)){ + if (list.size()==detailDOS.size()){ + return error(400,"该零件已全部检验完成"); + }else{ + return error(400,"该零件没有报工完成,请联系报工人员！"); + } + }else{ + return error(400,"该零件没有报工完成,请联系报工人员！"); + } + } + } + } + } + } return success(pageResult); } @GetMapping("/task-dispatch-detail/pages") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignPageReqVO.java index e49b830b..f07a8709 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignPageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignPageReqVO.java @@ -107,4 +107,6 @@ public class ProcessDesignPageReqVO extends PageParam { @Schema(description = "负责人名称") private String ownerName; + @Schema(description = "状态") + private Integer isOverProcess; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/ProjectOrderController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/ProjectOrderController.java index 4d48cd45..90b1e5f0 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/ProjectOrderController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/ProjectOrderController.java @@ -146,13 +146,13 @@ public class ProjectOrderController { orderYsService.createOrUpdate(operateReqVO); // 订单批准时创建或者更新生产计划数据 crossOrderManager.generatePlan(operateReqVO.getId()); - projectOrderService.createProjectOrderSnapshot(operateReqVO); +// projectOrderService.createProjectOrderSnapshot(operateReqVO); break; case TERMINATE: orderYsService.delete(operateReqVO); // 订单终止时更新生产计划状态 crossOrderManager.updatePlanStatusToTerminate(operateReqVO.getId()); - projectOrderService.createProjectOrderSnapshot(operateReqVO); +// projectOrderService.createProjectOrderSnapshot(operateReqVO); break; } return success(operateReqVO.getId()); @@ -211,7 +211,7 @@ public class ProjectOrderController { yunFeiCost = deliverOrderService.getListYf(projectOrderDO.getId(),projectOrderDO.getProjectSubId()); projectOrderDO.setYunFeiCost(yunFeiCost); - BigDecimal sum = projectOrderDO.getYunFeiCost().add(projectOrderDO.getCailiaoCost()).add(projectOrderDO.getBiaoZhunJianCost()).add(projectOrderDO.getNeibuCost()).add(projectOrderDO.getWaixeiCost().add(projectOrderDO.getZpCost())); + BigDecimal sum = projectOrderDO.getYunFeiCost().add(projectOrderDO.getCailiaoCost()).add(projectOrderDO.getBiaoZhunJianCost()).add(projectOrderDO.getNeibuCost()).add(projectOrderDO.getZpCost()); projectOrderDO.setSumCost(sum); } return success(BeanUtils.toBean(pageResult, ProjectOrderCostRespVO.class)); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PurchaseOrderMakePageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PurchaseOrderMakePageReqVO.java index 132d1e96..82e2c76f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PurchaseOrderMakePageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PurchaseOrderMakePageReqVO.java @@ -97,4 +97,6 @@ public class PurchaseOrderMakePageReqVO extends PageParam { private String blueprintNo; @Schema(description = "图号") private String procedureName; + @Schema(description = "收货状态 未收货/收货中/收货完成 1/2/3", example = "1") + private Integer receivingStatus; } \ 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/controller/admin/purchaseorderno/PurchaseOrderNoController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/PurchaseOrderNoController.java index 6be01d56..10de2047 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/PurchaseOrderNoController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/PurchaseOrderNoController.java @@ -178,4 +178,5 @@ public class PurchaseOrderNoController { public CommonResult updateIsPrint(@RequestParam("id") Long id) { return purchaseOrderNoService.updateIsPrint(id); } + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/vo/PurchaseOrderNoPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/vo/PurchaseOrderNoPageReqVO.java index 9c44e4cf..e02df332 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/vo/PurchaseOrderNoPageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/vo/PurchaseOrderNoPageReqVO.java @@ -92,6 +92,12 @@ public class PurchaseOrderNoPageReqVO extends PageParam { private String projectName; @Schema(description = "子项目名称") private String projectSubName; - @Schema(description = "责任人") + @Schema(description = "零件") private String username; + @Schema(description = "工序") + private String boomName; + @Schema(description = "子项目名称") + private String procedureName; + @Schema(description = "图号") + private String blueprintNo; } \ 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/controller/admin/purchaseordernodetail/PurchaseOrderNoDetailController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/PurchaseOrderNoDetailController.java index efb95b6b..c3a5cd85 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/PurchaseOrderNoDetailController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/PurchaseOrderNoDetailController.java @@ -104,12 +104,28 @@ public class PurchaseOrderNoDetailController { public CommonResult verification(@Valid @RequestBody List list) { return purchaseOrderNoDetailService.verification(list); } + @PostMapping("/verifications") + @Operation(summary = "收货校验") + @PreAuthorize("@ss.hasPermission('heli:process-bom:create')") + public CommonResult verifications(@Valid @RequestBody PurchaseOrderNoDetailDO detailDO) { + List list=new ArrayList<>(); + list.add(detailDO); + return purchaseOrderNoDetailService.verification(list); + } @PostMapping("/receiveGoods") @Operation(summary = "收货") @PreAuthorize("@ss.hasPermission('heli:process-bom:create')") public CommonResult receiveGoods(@Valid @RequestBody List list) { return purchaseOrderNoDetailService.receiveGoods(list); } + @PostMapping("/receiveGood") + @Operation(summary = "收货") + @PreAuthorize("@ss.hasPermission('heli:process-bom:create')") + public CommonResult receiveGood(@Valid @RequestBody PurchaseOrderNoDetailDO detailDO) { + List list=new ArrayList<>(); + list.add(detailDO); + return purchaseOrderNoDetailService.receiveGoods(list); + } @GetMapping("/received") @Operation(summary = "获得标准件收货分页") @PreAuthorize("@ss.hasPermission('project:purchase-order-no-detail:query')") @@ -149,4 +165,17 @@ public class PurchaseOrderNoDetailController { ExcelUtils.write(response, "外协费用查询.xlsx", "数据", OutsourcingExcelVo.class, BeanUtils.toBean(list, OutsourcingExcelVo.class)); } + @GetMapping("/getReceivingGoods") + @Operation(summary = "小程序获得采购单收货分页") + @PreAuthorize("@ss.hasPermission('project:purchase-order-no-detail:query')") + public CommonResult> getReceivingGoods(@Valid PurchaseOrderNoDetailPageReqVO pageReqVO) { + PageResult pageResult = purchaseOrderNoDetailService.getReceivingGoods(pageReqVO); + return success(pageResult); + } + @GetMapping("/getReceivingGoodsMessage") + @Operation(summary = "小程序获得采购单收货分页") + @PreAuthorize("@ss.hasPermission('project:purchase-order-no-detail:query')") + public CommonResult getReceivingGoodsMessage() { + return success( purchaseOrderNoDetailService.getReceivingGoodsMessage()); + } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/vo/PurchaseOrderNoDetailPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/vo/PurchaseOrderNoDetailPageReqVO.java index 562173c8..2a3c44c2 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/vo/PurchaseOrderNoDetailPageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/vo/PurchaseOrderNoDetailPageReqVO.java @@ -126,4 +126,10 @@ public class PurchaseOrderNoDetailPageReqVO extends PageParam { private String supplierName; @Schema(description = "采购员") private String ownerName; + @Schema(description = "图号") + private String blueprintNo; + @Schema(description = "工序") + private String procedureName; + @Schema(description = "工序") + private String subOrDetailName; } \ 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/controller/admin/taskdispatch/TaskDispatchController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/TaskDispatchController.java index d31b0d22..61bdb373 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/TaskDispatchController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/TaskDispatchController.java @@ -184,7 +184,7 @@ public class TaskDispatchController { @GetMapping("/task-dispatch-detail/pagewx") @Operation(summary = "小程序获得派工明细分页") @PreAuthorize("@ss.hasPermission('heli:task-dispatch:query')") - public CommonResult> getTaskDispatchPageDetailWx(@Valid TaskDispatchDetailPageReqVO pageReqVO) { + public CommonResult> getTaskDispatchPageDetailWx(@Valid TaskDispatchDetailPageReqVO pageReqVO) { PageResult pageResult = taskDispatchService.getTaskDispatchDetailPageWx(pageReqVO); return success(pageResult); } @@ -231,6 +231,15 @@ public class TaskDispatchController { List> owner = taskDispatchService.getOwner(id, type); return success(owner); } + @GetMapping("/task-dispatch-detail/getOwners") + @Operation(summary = "任务单责任人名单") + @Parameter(name = "id", description = "人员id", required = false) + @Parameter(name = "type", description = "类型", required = true) + @PreAuthorize("@ss.hasPermission('heli:task-dispatch:query')") + public CommonResult>> getOwners(@RequestParam("id") Long id) { + List> owner = taskDispatchService.getOwners(id); + return success(owner); + } @GetMapping("/task-dispatch-detail/getOwnerUserList") @Operation(summary = "获取责任人名单") @Parameter(name = "id", description = "人员id", required = false) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/fpuserdetail/FpUserDetailDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/fpuserdetail/FpUserDetailDO.java index 16ee6622..bd7763f3 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/fpuserdetail/FpUserDetailDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/fpuserdetail/FpUserDetailDO.java @@ -5,15 +5,18 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO; +import com.chanko.yunxi.mes.framework.mybatis.core.type.JsonLongSetTypeHandler; import lombok.*; +import java.util.Set; + /** * 业务人员配置子 DO * * @author 管理员 */ -@TableName("base_fp_user_detail") +@TableName(value = "base_fp_user_detail" ,autoResultMap = true) @KeySequence("base_fp_user_detail_seq") // 用于 Oracle、PostgreSQL、Kingheli、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @EqualsAndHashCode(callSuper = true) @@ -61,6 +64,9 @@ public class FpUserDetailDO extends BaseDO { * 工序编码 */ private String code; + @TableField(typeHandler = JsonLongSetTypeHandler.class) + private Set procCd; + @TableField(exist = false) private String nickName; @TableField(exist = false) 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 8f9a4761..5c2835b1 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 @@ -189,6 +189,8 @@ public class PurchaseOrderMakeDetailDO extends BaseDO { private String blueprintNo; @TableField(exist = false) private String duEmpName; + @TableField(exist = false) + private Integer effectiveReceivingStatus; /** * 零件理论重量 */ diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordernodetail/PurchaseOrderNoDetailDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordernodetail/PurchaseOrderNoDetailDO.java index 4a63a009..0192eec2 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordernodetail/PurchaseOrderNoDetailDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordernodetail/PurchaseOrderNoDetailDO.java @@ -227,4 +227,6 @@ public class PurchaseOrderNoDetailDO extends BaseDO { private String ordDates; @TableField(exist = false) private String acarrDates; + @TableField(exist = false) + private Integer goodsType; } 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 39a9fba7..5223a19e 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 @@ -100,6 +100,7 @@ public class TaskDispatchDetailDO extends BaseDO { private String projectMaterialPlanNo; private Long projectMaterialPlanDetailId; private Integer planStatus; + private Integer isReport; /** * 工序状态 默认 已提交 已完成 0 1 2 */ @@ -176,8 +177,6 @@ public class TaskDispatchDetailDO extends BaseDO { @TableField(exist = false) private String procedureCode; @TableField(exist = false) - private Integer isReport; - @TableField(exist = false) private Integer numAmount; @TableField(exist = false) private Long beginProduce; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/fpuserdetail/FpUserDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/fpuserdetail/FpUserDetailMapper.java index 685ec870..83bd1290 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/fpuserdetail/FpUserDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/fpuserdetail/FpUserDetailMapper.java @@ -1,8 +1,10 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.fpuserdetail; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; +import com.chanko.yunxi.mes.framework.mybatis.core.type.JsonLongSetTypeHandler; import com.chanko.yunxi.mes.module.heli.controller.admin.fpuserdetail.vo.FpUserDetailPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.fpuserdetail.vo.FpUserDetailRespVO; import com.chanko.yunxi.mes.module.heli.controller.admin.fpuserdetail.vo.FpUserDetailSaveReqVO; @@ -131,6 +133,25 @@ public interface FpUserDetailMapper extends BaseMapperX { } + + default List selectOwnerLists(Long id){ + MPJLambdaWrapper queery1 = new MPJLambdaWrapper(); + List list = new ArrayList(); + list.add(id); + queery1.selectAll(FpUserDetailDO.class) + .select("c.nickname as nick_Name ") +// .leftJoin(PostDO.class,"b", PostDO::getId,FpUserDetailDO::getPostId) + .leftJoin(AdminUserDO.class,"c",AdminUserDO::getId,FpUserDetailDO::getBusyId) +// .leftJoin(FpUserDO.class,"a",FpUserDO::getId, FpUserDetailDO::getFpId) +// .eq(FpUserDO::getType,"1") +// .eq(FpUserDetailDO::getIsRes,"Y") + .in(FpUserDetailDO::getPostId,list); + + + return selectList(queery1); + } + + void removeByPostId(String postId); // void deleteFpId(@Param("fpId") Long fpId); // // void deleteByFuId(@Param("id")Long id); 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 74d473ab..8757c5f6 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 @@ -92,6 +92,7 @@ public interface MaterialPlanBoomMapper extends BaseMapperX .leftJoin(ProjectOrderDO.class,"po",ProjectOrderDO::getId,MaterialPlanDO::getProjectId) .leftJoin(AdminUserDO.class,"u",AdminUserDO::getId, MaterialPlanBoomDO::getDuEmpId) .leftJoin(MaterialDO.class,"m",MaterialDO::getId, MaterialPlanBoomDO::getMaterialId) + .leftJoin(SupplierDO.class, "f", SupplierDO::getId, MaterialPlanBoomDO::getSupplierId) .eq(MaterialPlanDO::getMatType,0) .in(MaterialPlanBoomDO::getIsPurYard,Arrays.asList(0,5)) .disableSubLogicDel() @@ -102,6 +103,7 @@ public interface MaterialPlanBoomMapper extends BaseMapperX query.like(ObjectUtil.isNotEmpty(pageReqVO.getMaterialName()),MaterialPlanBoomDO::getMatName, pageReqVO.getMaterialName()); query.like(ObjectUtil.isNotEmpty(pageReqVO.getProjectCode()),ProjectOrderDO::getCode, pageReqVO.getProjectCode()); query.like(ObjectUtil.isNotEmpty(pageReqVO.getOwnerName()),AdminUserDO::getNickname, pageReqVO.getOwnerName()); + query.like(ObjectUtil.isNotEmpty(pageReqVO.getSupplierName()),SupplierDO::getBrief, pageReqVO.getSupplierName()); query.like(ObjectUtil.isNotEmpty(pageReqVO.getProjectMaterialPlanNo()),MaterialPlanDO::getProjectMaterialPlanNo, pageReqVO.getProjectMaterialPlanNo()); if (pageReqVO.getMplanStatus() == 0){ query.in(MaterialPlanBoomDO::getMplanStatus,Arrays @@ -239,7 +241,7 @@ public interface MaterialPlanBoomMapper extends BaseMapperX .leftJoin(AdminUserDO.class, "a", AdminUserDO::getId, MaterialPlanBoomDO::getDuEmpId) .leftJoin(ProcedureDO.class, "c", ProcedureDO::getId, MaterialPlanBoomDO::getProcedureId) .leftJoin(CompositionDO.class, "e", CompositionDO::getId, ProcessBomDetailDO::getCompositionId) - .leftJoin(SupplierDO.class, "f", SupplierDO::getId, MaterialPlanBoomDO::getSupplierId) + .leftJoin(SupplierDO.class, "f", SupplierDO::getId, PurchaseOrderMakeDetailDO::getSupplierId) .disableSubLogicDel(); query .like(!StringUtils.isEmpty(pageReqVO.getProjectName()),MaterialPlanDO::getProjectName, pageReqVO.getProjectName()) @@ -252,6 +254,7 @@ public interface MaterialPlanBoomMapper extends BaseMapperX .like(!StringUtils.isEmpty(pageReqVO.getProcedureName()), ProcedureDO::getName, pageReqVO.getProcedureName()) .eq(!StringUtils.isEmpty(pageReqVO.getMatType()), MaterialPlanDO::getMatType, pageReqVO.getMatType()) .eq(!StringUtils.isEmpty(pageReqVO.getStatus()), MaterialPlanBoomDO::getIsPurYard, pageReqVO.getStatus()) + .like(ObjectUtil.isNotEmpty(pageReqVO.getSupplierName()), SupplierDO::getBrief, pageReqVO.getSupplierName()) .in(Objects.nonNull(pageReqVO.getMplanStatus()), MaterialPlanBoomDO::getMplanStatus, pageReqVO.getMplanStatus() != null && pageReqVO.getMplanStatus() != 0 ? Arrays.asList(pageReqVO.getMplanStatus()) : Arrays.asList(0, 3)) .eq(Objects.nonNull(pageReqVO.getProjectMaterialPlanNo()), MaterialPlanDO::getProjectMaterialPlanNo, pageReqVO.getProjectMaterialPlanNo()); 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 6ea65889..9c1d8cac 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 @@ -80,9 +80,10 @@ public interface PgMasterLineMapper extends BaseMapperX { .select("pd.name as procedureName") .leftJoin("(select SUM(c.amount) as amounts ,SUM(c.work_time) as workTime,c.zj_mx_id from quality_bg_master_line c group by c.zj_mx_id) d on d.zj_mx_id = t.id") .leftJoin(ProjectOrderSubDO.class,"pos",ProjectOrderSubDO::getId,PgMasterLineDO::getProjectSubId) - .leftJoin(PlanDO.class,"pl",PlanDO::getProjectId,ProjectOrderSubDO::getProjectOrderId) .leftJoin(ProcedureDO.class,"pd",ProcedureDO::getId,PgMasterLineDO::getProcedureId) - .eq(PlanDO::getStatus,2) + .leftJoin(TaskDispatchDetailDO.class,"td",TaskDispatchDetailDO::getId,PgMasterLineDO::getDispatchDetailId) + .leftJoin(TaskDispatchDO.class,"ta",TaskDispatchDO::getId,TaskDispatchDetailDO::getDispatchId) + .leftJoin(ProcessBomDetailDO.class,"pb",ProcessBomDetailDO::getId,TaskDispatchDO::getBomDetailId) .disableSubLogicDel(); if (reqVO.getPgType() == 1){ query.orderByDesc(PgMasterLineDO::getPgNumber); @@ -95,7 +96,7 @@ public interface PgMasterLineMapper extends BaseMapperX { if (reqVO.getSubOrDetailName() != null && !reqVO.getSubOrDetailName().trim().equals("")){ query.and( e ->e.eq(PgMasterLineDO::getProjectName, reqVO.getSubOrDetailName()).or().eq( PgMasterLineDO::getProjectSubName, reqVO.getSubOrDetailName() - ).or().eq(PgMasterLineDO::getMaterialName, reqVO.getSubOrDetailName())); + ).or().eq(PgMasterLineDO::getMaterialName, reqVO.getSubOrDetailName()).or().eq(ProcessBomDetailDO::getBomBlueprintNo, reqVO.getSubOrDetailName())); // query.eq(" (b.project_name like '%" + reqVO.getSubOrDetailName() + "%' or c.name like '%" + reqVO.getSubOrDetailName() + "%')"); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomMapper.java index 20f9fa05..4c154f6b 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomMapper.java @@ -205,4 +205,6 @@ public interface ProcessBomMapper extends BaseMapperX { BigDecimal inspection1(@Param("id") Long id,@Param("projectSubId") Long projectSubId); void delMaterialPlan(@Param("id")Long id); + + BigDecimal outsourcingExpenses(@Param("id") Long id,@Param("projectSubId") Long projectSubId); } 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 b36aace7..75ffe2f2 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 @@ -1,5 +1,6 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.processdesign; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; @@ -224,9 +225,14 @@ public interface ProcessDesignMapper extends BaseMapperX { .like(!StringUtils.isEmpty(reqVO.getProjectName()), ProjectOrderDO::getProjectName, reqVO.getProjectName()) .like(!StringUtils.isEmpty(reqVO.getProjectSubName()), ProjectOrderSubDO::getName, reqVO.getProjectSubName()) // .in(reqVO.getProcessDesignTypeList() != null && !reqVO.getProcessDesignTypeList().isEmpty(), ProcessDesignDO::getProcessDesignType, reqVO.getProcessDesignTypeList()) - .like(!StringUtils.isEmpty(reqVO.getProcessDesignType()), ProcessDesignDO::getProcessDesignType, reqVO.getProcessDesignType()) - - ; + .like(!StringUtils.isEmpty(reqVO.getProcessDesignType()), ProcessDesignDO::getProcessDesignType, reqVO.getProcessDesignType()); + if (ObjectUtil.isNotEmpty(reqVO.getIsOverProcess())){ + if (reqVO.getIsOverProcess() == 1){ + query.eq(ProcessDesignDO::getIsOverProcess, 1); + }else { + query.ne(ProcessDesignDO::getIsOverProcess, 1); + } + } query.and(q -> q .and(innerQ -> innerQ @@ -311,9 +317,14 @@ public interface ProcessDesignMapper extends BaseMapperX { .like(!StringUtils.isEmpty(reqVO.getProjectName()), ProjectOrderDO::getProjectName, reqVO.getProjectName()) .like(!StringUtils.isEmpty(reqVO.getProjectSubName()), ProjectOrderSubDO::getName, reqVO.getProjectSubName()) // .in(reqVO.getProcessDesignTypeList() != null && !reqVO.getProcessDesignTypeList().isEmpty(), ProcessDesignDO::getProcessDesignType, reqVO.getProcessDesignTypeList()) - .like(!StringUtils.isEmpty(reqVO.getProcessDesignType()), ProcessDesignDO::getProcessDesignType, reqVO.getProcessDesignType()) - - ; + .like(!StringUtils.isEmpty(reqVO.getProcessDesignType()), ProcessDesignDO::getProcessDesignType, reqVO.getProcessDesignType()); + if (ObjectUtil.isNotEmpty(reqVO.getIsOverProcess())){ + if (reqVO.getIsOverProcess() == 1){ + query.eq(ProcessDesignDO::getIsOverProcess, 1); + }else { + query.ne(ProcessDesignDO::getIsOverProcess, 1); + } + } query.and(q -> q .and(innerQ -> innerQ .apply("a.craft_start_date is not null and a.craft_end_date is not null and t.process_design_type = {0}", ProcessDesignTypeEnum.BLUEPRINT_FOUNDRY_TECHNOLOGY.name()) 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 1f6cc5bc..1ba3593c 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 @@ -177,6 +177,8 @@ public interface PurchaseOrderMakeDetailMapper extends BaseMapperX { .select("u1.nickname as submitUserName") .select("CASE " + " WHEN COUNT(d.id) = 0 THEN 1 " + // 无子记录 + " WHEN SUM(CASE d.receiving_status WHEN 2 THEN 1 ELSE 0 END) > 0 THEN 2 " + // 只要有一个状态为2 " WHEN SUM(CASE d.receiving_status WHEN 3 THEN 0 ELSE 1 END) = 0 THEN 3 " + // 全部为3 " WHEN SUM(CASE d.receiving_status WHEN 1 THEN 1 ELSE 0 END) = COUNT(d.id) THEN 1 " + // 全部为1 " ELSE 2 " + // 其他情况 "END AS receivingStatus1") .leftJoin(SupplierDO.class, "s", SupplierDO::getId, PurchaseOrderNoDO::getSupplierId) .leftJoin(PurchaseOrderNoDetailDO.class,"d", PurchaseOrderNoDetailDO::getPurchaseOrderId, PurchaseOrderNoDO::getId) +// .leftJoin(ProcedureDO.class,"pro", ProcedureDO::getId, PurchaseOrderNoDetailDO::getProcedureId) + .leftJoin(ProcedureDO.class, "pro", wrapper -> wrapper + .eq(ProcedureDO::getId, PurchaseOrderNoDetailDO::getProcedureId) +// .like(ProcedureDO::getName, "%下料%")) + .like(!ObjectUtil.isEmpty(reqVO.getProcedureName()), ProcedureDO::getName, reqVO.getProcedureName())) + .leftJoin(ProcessBomDetailDO.class,"b", ProcessBomDetailDO::getId, PurchaseOrderNoDetailDO::getBoomDetailId) .leftJoin(MaterialPlanDO.class, "m", MaterialPlanDO::getId, PurchaseOrderNoDO::getProjectMaterialPlanId) .leftJoin(AdminUserDO.class,"u", AdminUserDO::getId, PurchaseOrderNoDetailDO::getDuEmpId) .leftJoin(AdminUserDO.class,"u1", AdminUserDO::getId, PurchaseOrderNoDO::getCreator) @@ -53,16 +62,80 @@ public interface PurchaseOrderNoMapper extends BaseMapperX { .like(!StringUtils.isEmpty(reqVO.getMaterialPlanNo()), "m.project_material_plan_no", reqVO.getMaterialPlanNo()) .apply(!StringUtils.isEmpty(reqVO.getCreateTime()), "DATE_FORMAT(t.create_time,'%Y-%m-%d') = {0}", reqVO.getCreateTime()) .eq(reqVO.getStatus() != null, PurchaseOrderNoDO::getStatus, reqVO.getStatus()) + .eq(PurchaseOrderNoDetailDO::getDeleted,0) // .eq(reqVO.getReceivingStatus() != null, PurchaseOrderNoDO::getReceivingStatus, reqVO.getReceivingStatus()) .eq(reqVO.getPurchaseType() != null, PurchaseOrderNoDO::getPurchaseType, reqVO.getPurchaseType()) .eq(reqVO.getGoodsType() != null, PurchaseOrderNoDO::getGoodsType, reqVO.getGoodsType()) .like(!StringUtils.isEmpty(reqVO.getProjectName()), PurchaseOrderNoDetailDO::getProjectName, reqVO.getProjectName()) .like(!StringUtils.isEmpty(reqVO.getProjectSubName()), PurchaseOrderNoDetailDO::getName, reqVO.getProjectSubName()) .like(!StringUtils.isEmpty(reqVO.getUsername()), AdminUserDO::getNickname, reqVO.getUsername()) + .like(!ObjectUtil.isEmpty(reqVO.getBoomName()), PurchaseOrderNoDetailDO::getBoomName, reqVO.getBoomName()) +// .like(!ObjectUtil.isEmpty(reqVO.getProcedureName()), ProcedureDO::getName, reqVO.getProcedureName()) + .like(!ObjectUtil.isEmpty(reqVO.getBlueprintNo()), ProcessBomDetailDO::getBlueprintNo, reqVO.getBlueprintNo()) .having(reqVO.getReceivingStatus() != null,"receivingStatus1 = {0}", reqVO.getReceivingStatus()) + .having(!ObjectUtil.isEmpty(reqVO.getProcedureName()),"COUNT(pro.id) > 0") + .in(reqVO.getIds() != null && !reqVO.getIds().isEmpty(),PurchaseOrderNoDO::getId,reqVO.getIds()); return selectPage(reqVO, query); +// MPJLambdaWrapper query = new MPJLambdaWrapper<>(); +// +// query.selectAll(PurchaseOrderNoDO.class) +// .select("s.brief as supplierName", "m.project_material_plan_no as materialPlanNo") +// .select("u1.nickname as submitUserName") +// .select("pro.name") +// .select("CASE " + +// " WHEN COUNT(d.id) = 0 THEN 1 " + +// " WHEN SUM(CASE d.receiving_status WHEN 3 THEN 0 ELSE 1 END) = 0 THEN 3 " + +// " WHEN SUM(CASE d.receiving_status WHEN 1 THEN 1 ELSE 0 END) = COUNT(d.id) THEN 1 " + +// " ELSE 2 " + +// "END AS receivingStatus1") +// .leftJoin(SupplierDO.class, "s", wrapper -> wrapper +// .eq(SupplierDO::getId, PurchaseOrderNoDO::getSupplierId) +// ) +// .leftJoin(PurchaseOrderNoDetailDO.class, "d", wrapper -> wrapper +// .eq(PurchaseOrderNoDetailDO::getPurchaseOrderId, PurchaseOrderNoDO::getId) +// ) +// .leftJoin(ProcessBomDetailDO.class, "b", wrapper -> wrapper +// .eq(ProcessBomDetailDO::getId, PurchaseOrderNoDetailDO::getBoomDetailId) +// ) +// .leftJoin(ProcedureDO.class, "pro", wrapper -> wrapper +// .eq(ProcedureDO::getId, PurchaseOrderNoDetailDO::getProcedureId) +//// .like(ProcedureDO::getName, "%下料%")) +// .like(!ObjectUtil.isEmpty(reqVO.getProcedureName()), ProcedureDO::getName, reqVO.getProcedureName())) +// .leftJoin(MaterialPlanDO.class, "m", wrapper -> wrapper +// .eq(MaterialPlanDO::getId, PurchaseOrderNoDO::getProjectMaterialPlanId) +// ) +// .leftJoin(AdminUserDO.class, "u", wrapper -> wrapper +// .eq(AdminUserDO::getId, PurchaseOrderNoDetailDO::getDuEmpId) +// ) +// .leftJoin(AdminUserDO.class, "u1", wrapper -> wrapper +// .eq(AdminUserDO::getId, PurchaseOrderNoDO::getCreator) +// .eq(AdminUserDO::getTenantId, 2)) +// .eq(PurchaseOrderNoDO::getDeleted, 0) +// .eq(PurchaseOrderNoDO::getGoodsType, 2) // t.goods_type = 2 +// .eq(PurchaseOrderNoDetailDO::getDeleted, 0) // d.deleted = 0 +// .groupBy(PurchaseOrderNoDO::getId) +//// .having("receivingStatus1 = 2 AND COUNT(pro.id) > 0") // HAVING 条件 +// .having(reqVO.getReceivingStatus() != null,"receivingStatus1 = {0}", reqVO.getReceivingStatus()) +// .having(!ObjectUtil.isEmpty(reqVO.getProcedureName()),"COUNT(pro.id) > 0") +// .orderByDesc(PurchaseOrderNoDO::getCreateTime); +// +//// 添加其他动态查询条件 +// query.like(!StringUtils.isEmpty(reqVO.getPurchaseNo()), PurchaseOrderNoDO::getPurchaseNo, reqVO.getPurchaseNo()) +// .like(!StringUtils.isEmpty(reqVO.getSupplierName()), "s.brief", reqVO.getSupplierName()) +// .like(!StringUtils.isEmpty(reqVO.getMaterialPlanNo()), "m.project_material_plan_no", reqVO.getMaterialPlanNo()) +// .apply(!StringUtils.isEmpty(reqVO.getCreateTime()), "DATE_FORMAT(t.create_time,'%Y-%m-%d') = {0}", reqVO.getCreateTime()) +// .eq(reqVO.getStatus() != null, PurchaseOrderNoDO::getStatus, reqVO.getStatus()) +// .eq(reqVO.getPurchaseType() != null, PurchaseOrderNoDO::getPurchaseType, reqVO.getPurchaseType()) +// .like(!StringUtils.isEmpty(reqVO.getProjectName()), PurchaseOrderNoDetailDO::getProjectName, reqVO.getProjectName()) +// .like(!StringUtils.isEmpty(reqVO.getProjectSubName()), PurchaseOrderNoDetailDO::getName, reqVO.getProjectSubName()) +// .like(!StringUtils.isEmpty(reqVO.getUsername()), "u.nickname", reqVO.getUsername()) +// .like(!ObjectUtil.isEmpty(reqVO.getBoomName()), PurchaseOrderNoDetailDO::getBoomName, reqVO.getBoomName()) +// .like(!ObjectUtil.isEmpty(reqVO.getBlueprintNo()), "b.blueprint_no", reqVO.getBlueprintNo()) +// .in(reqVO.getIds() != null && !reqVO.getIds().isEmpty(), PurchaseOrderNoDO::getId, reqVO.getIds()); +// +// return selectPage(reqVO, query); } default PageResult getPurchaseOrderPage(PurchaseOrderNoPageReqVO pageReqVO){ diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java index bea0ce06..34a273a7 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java @@ -3,6 +3,7 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseordernodetail; import java.time.LocalDateTime; import java.util.*; +import cn.hutool.core.util.ObjectUtil; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; @@ -70,7 +71,7 @@ public interface PurchaseOrderNoDetailMapper extends BaseMapperX query = new MPJLambdaWrapper<>(); query.selectAll(PurchaseOrderNoDetailDO.class) .select("t.composition as compositionName","t.purchase_rem_amount as purchaseRemAmounts","mat.code as matCode","pro.name as procedureName","bom.blueprint_no as blueprintNo","psub.id as projectSubId") - .select("ROUND(t.estimated_price / t.purchase_amount, 1) as unitPrice") + .select("ROUND(t.estimated_price / t.purchase_amount, 1) as unitPrice","bom.spec as matSpec") .leftJoin(PurchaseOrderNoDO.class, "pb", PurchaseOrderNoDO::getId, PurchaseOrderBoomDO::getPurchaseOrderId) .leftJoin(ProcessBomDetailDO.class,"bom", ProcessBomDetailDO::getId, PurchaseOrderNoDetailDO::getBoomDetailId) .leftJoin(MaterialPlanBoomDO.class,"plan", MaterialPlanBoomDO::getId, PurchaseOrderNoDetailDO::getProjectMaterialPlanBoomId) @@ -191,4 +192,50 @@ public interface PurchaseOrderNoDetailMapper extends BaseMapperX getReceivingGoods(PurchaseOrderNoDetailPageReqVO pageReqVO){ + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + + query.selectAll(PurchaseOrderNoDetailDO.class) + .select("s.brief as supplierName","t.purchase_rem_amount as purchaseRemAmounts") + .select("DATE_FORMAT(t.require_time,'%Y-%m-%d') as requireTimes","DATE_FORMAT(t.arrive_time,'%Y-%m-%d') as arriveTimes") + .select("bom.blueprint_no as blueprintNo","d.name as procedureName") + .select("p.goods_type as goodsType") + .leftJoin(PurchaseOrderNoDO.class,"p", PurchaseOrderNoDO::getId, PurchaseOrderNoDetailDO::getPurchaseOrderId) + .leftJoin(SupplierDO.class, "s", SupplierDO::getId, PurchaseOrderNoDO::getSupplierId) + .leftJoin(MaterialDO.class,"m", MaterialDO::getId, PurchaseOrderNoDetailDO::getMaterialId) + .leftJoin(ProjectOrderDO.class,"pro", ProjectOrderDO::getId, PurchaseOrderNoDetailDO::getProjectId) + .leftJoin(ProcessBomDetailDO.class,"bom", ProcessBomDetailDO::getId, PurchaseOrderNoDetailDO::getBoomDetailId) + .leftJoin(ProcedureDO.class, "d", ProcedureDO::getId, PurchaseOrderNoDetailDO::getProcedureId) + .disableSubLogicDel() + .groupBy(PurchaseOrderNoDetailDO::getId) + .orderByDesc(PurchaseOrderNoDetailDO::getCreateTime); + if (pageReqVO.getSubOrDetailName() != null && !pageReqVO.getSubOrDetailName().trim().equals("")){ + query.and( e ->e.like(PurchaseOrderNoDetailDO::getBoomName, pageReqVO.getSubOrDetailName()).or().like( + ProcessBomDetailDO::getBlueprintNo, pageReqVO.getSubOrDetailName() + ).or().like(ProcedureDO::getName, pageReqVO.getSubOrDetailName())); + } + query + .like(!StringUtils.isEmpty(pageReqVO.getProjectName()), PurchaseOrderNoDetailDO::getProjectName, pageReqVO.getProjectName()) + .like(!StringUtils.isEmpty(pageReqVO.getProjectSubName()), PurchaseOrderNoDetailDO::getName, pageReqVO.getProjectSubName()) + .like(!StringUtils.isEmpty(pageReqVO.getSupplierName()), SupplierDO::getBrief, pageReqVO.getSupplierName()) + .like(ObjectUtil.isNotEmpty(pageReqVO.getBlueprintNo()), ProcessBomDetailDO::getBlueprintNo, pageReqVO.getBlueprintNo()) +// .ne(PurchaseOrderNoDO::getPurchaseType, 2) + .eq(PurchaseOrderNoDO::getGoodsType,2) + .in(PurchaseOrderNoDetailDO::getReceivingStatus, 1,2) + .like(!StringUtils.isEmpty(pageReqVO.getBoomName()), PurchaseOrderNoDetailDO::getBoomName, pageReqVO.getBoomName()) + .like(!StringUtils.isEmpty(pageReqVO.getProcedureName()), ProcedureDO::getName, pageReqVO.getProcedureName()); + + return selectPage(pageReqVO, query); + + } + + default Long getReceivingGoodsMessage(){ + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + query + .leftJoin(PurchaseOrderNoDO.class,"p", PurchaseOrderNoDO::getId, PurchaseOrderNoDetailDO::getPurchaseOrderId) + .eq(PurchaseOrderNoDO::getGoodsType,2) + .in(PurchaseOrderNoDetailDO::getReceivingStatus, 1,2); + return selectCount( query); + } } \ 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/mysql/taskdispatch/TaskDispatchDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java index 80f3fd18..fe45d0c7 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java @@ -2,6 +2,7 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; @@ -302,7 +303,7 @@ public interface TaskDispatchDetailMapper extends BaseMapperX selectPageWx(TaskDispatchDetailPageReqVO reqVO , Map postIds) { + default PageResult selectPageWx(TaskDispatchDetailPageReqVO reqVO , Map> postIds) { // 假设reqVO中包含了页码(page)和每页数量(limit) MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(TaskDispatchDetailDO.class) @@ -332,7 +333,7 @@ public interface TaskDispatchDetailMapper extends BaseMapperXe.eq(ProjectOrderDO::getProjectName, reqVO.getSubOrDetailName()).or().eq( ProjectOrderSubDO::getName, reqVO.getSubOrDetailName() - ).or().eq(ProcessBomDetailDO::getMaterialName, reqVO.getSubOrDetailName())); + ).or().eq(ProcessBomDetailDO::getMaterialName, reqVO.getSubOrDetailName()).or().eq(ProcessBomDetailDO::getBomBlueprintNo, reqVO.getSubOrDetailName())); // query.eq(" (b.project_name like '%" + reqVO.getSubOrDetailName() + "%' or c.name like '%" + reqVO.getSubOrDetailName() + "%')"); } query.and(wrapper -> { @@ -342,10 +343,10 @@ public interface TaskDispatchDetailMapper extends BaseMapperX { // 为每个岗位创建对应的工序查询条件 for (String postId : postIds.keySet()) { - Long processId = postIds.get(postId); + Set processId = postIds.get(postId); if (ObjectUtil.isNotEmpty(processId)) { i.or(j -> j.eq(TaskDispatchDetailDO::getPostId, postId) - .eq(TaskDispatchDetailDO::getProcedureId, processId) + .in(TaskDispatchDetailDO::getProcedureId, processId) .isNull(TaskDispatchDetailDO::getOwner)); } else { i.or(j -> j.eq(TaskDispatchDetailDO::getPostId, postId) @@ -361,7 +362,7 @@ public interface TaskDispatchDetailMapper extends BaseMapperX selectfhtj = planMapper.selectfhtj(attentiontodoRespVO.getTxrid()); { for (PlanDO deliverOrderDO : selectfhtj) { - bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); - BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称 - BdgzsomthingDO.setAttr4("0");//是否点击 - LocalDateTime projectEndTime = deliverOrderDO.getChangeEndTime();//要求完成时间 - LocalDate projectEndDay = projectEndTime.toLocalDate(); - String timetype=""; - if(deliverOrderDO.getProcessDesignType().equals("BLUEPRINT_WORKBLANK")){ - timetype="毛坯设计"; - } - if(deliverOrderDO.getProcessDesignType().equals("BLUEPRINT_3D")){ - timetype="3D设计"; - } - if(deliverOrderDO.getProcessDesignType().equals("BLUEPRINT_2D")){ - timetype="2D设计"; - } - if (today4.equals(projectEndDay.minusDays(1))) { - BdgzsomthingDO.setThings("编号:"+deliverOrderDO.getProjectSubCode()+timetype+"设计任务明天到期");//事件名称 - } else if (today4.equals(projectEndDay)) { - BdgzsomthingDO.setThings("编号:"+deliverOrderDO.getProjectSubCode()+timetype+"设计任务今日到期");//事件名称 - } else if (projectEndDay.isBefore(today4)) { - BdgzsomthingDO.setThings("编号:"+deliverOrderDO.getProjectSubCode()+timetype+"设计任务已逾期");//事件名称 - }else{ - BdgzsomthingDO.setAttr4("1"); - } - BdgzsomthingDO.setAttr2(null);//因为不用跳转所以为null - BdgzsomthingDO.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期 - BdgzsomthingDO.setTenantId(attentiontodoRespVO.getTxrid()); + ProjectOrderDO projectOrderDO = projectOrderMapper.selectById(deliverOrderDO.getProjectId()); + if (ObjectUtil.isNotEmpty(projectOrderDO)){ + CustomerDO customerDO = customerMapper.selectById(projectOrderDO.getCustomerId()); + if (ObjectUtil.isNotEmpty(customerDO)) { + ProjectOrderSubDO projectOrderSubDO = projectOrderSubMapper.selectById(deliverOrderDO.getProjectSubId()); + if (ObjectUtil.isNotEmpty(projectOrderSubDO)) { + bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); + BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称 + BdgzsomthingDO.setAttr4("0");//是否点击 + LocalDateTime projectEndTime = deliverOrderDO.getChangeEndTime();//要求完成时间 + LocalDate projectEndDay = projectEndTime.toLocalDate(); + String timetype = ""; + if (deliverOrderDO.getProcessDesignType().equals("BLUEPRINT_WORKBLANK")) { + timetype = "毛坯设计"; + } + if (deliverOrderDO.getProcessDesignType().equals("BLUEPRINT_3D")) { + timetype = "3D设计"; + } + if (deliverOrderDO.getProcessDesignType().equals("BLUEPRINT_2D")) { + timetype = "2D设计"; + } + if (today4.equals(projectEndDay.minusDays(1))) { + BdgzsomthingDO.setThings(customerDO.getBrief() +","+projectOrderSubDO.getName()+"的"+ timetype + "进度明天到期");//事件名称 + } else if (today4.equals(projectEndDay)) { + BdgzsomthingDO.setThings( customerDO.getBrief() +","+projectOrderSubDO.getName()+"的"+ timetype +"进度今日到期");//事件名称 + } else if (projectEndDay.isBefore(today4)) { + BdgzsomthingDO.setThings(customerDO.getBrief() +","+projectOrderSubDO.getName()+"的"+ timetype +"进度已逾期");//事件名称 + } else { + BdgzsomthingDO.setAttr4("1"); + } + BdgzsomthingDO.setAttr2(null);//因为不用跳转所以为null + BdgzsomthingDO.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期 + BdgzsomthingDO.setTenantId(attentiontodoRespVO.getTxrid()); // BdgzsomthingDO.setShowname(new Date());比较创建时间,不用单独填写 - if(attentiontodoRespVO.getAttr5().equals("1")){//提醒状态 - BdgzsomthingDO.setDborgz("待办"); - } - else if(attentiontodoRespVO.getAttr5().equals("2")){ - BdgzsomthingDO.setDborgz("关注"); - } - if (ObjectUtil.isEmpty(attentiontodoRespVO.getAttr4())){ - AdminUserDO user = adminUserService.getUser(Long.valueOf(deliverOrderDO.getCreator())); - if (ObjectUtil.isNotEmpty(user)){ - BdgzsomthingDO.setClick(user.getNickname()); - } + if (attentiontodoRespVO.getAttr5().equals("1")) {//提醒状态 + BdgzsomthingDO.setDborgz("待办"); + } else if (attentiontodoRespVO.getAttr5().equals("2")) { + BdgzsomthingDO.setDborgz("关注"); + } + if (ObjectUtil.isEmpty(attentiontodoRespVO.getAttr4())) { + AdminUserDO user = adminUserService.getUser(Long.valueOf(deliverOrderDO.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");//是否点击 + } 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(deliverOrderDO.getProjectSubCode());//获取数据当前表的id 改 + BdgzsomthingDO.setAttr3(deliverOrderDO.getProjectSubCode());//获取数据当前表的id 改 // BdgzsomthingDO.setShowname(deliverOrderDO.getCreateTime());//获取数据当前表的创建事件 改 - //去重查询,重复则不加 - List selecteqint = bdgzsomthingMapper.selecteqintq(BdgzsomthingDO); + //去重查询,重复则不加 + List selecteqint = bdgzsomthingMapper.selecteqintq(BdgzsomthingDO); - if(selecteqint.size()>0){ + if (selecteqint.size() > 0) { - }else{ - //插入方法 - bdgzsomthingMapper.insert(BdgzsomthingDO); + } else { + //插入方法 + bdgzsomthingMapper.insert(BdgzsomthingDO); + } + } + } } } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/fpuserdetail/FpUserDetailServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/fpuserdetail/FpUserDetailServiceImpl.java index 029cc17b..e81eea32 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/fpuserdetail/FpUserDetailServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/fpuserdetail/FpUserDetailServiceImpl.java @@ -17,7 +17,10 @@ import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +import java.util.Iterator; import java.util.List; +import java.util.StringJoiner; +import java.util.stream.Collectors; import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.FP_USER_DETAIL_NOT_EXISTS; @@ -45,7 +48,8 @@ public class FpUserDetailServiceImpl implements FpUserDetailService { if (fpUser!=null){ fpId = fpUser.getId(); // fpUserDetailMapper.delete("fp_id", String.valueOf(fpId)); - fpUserDetailMapper.delete("post_id", String.valueOf(createReqVO.getPostId())); +// fpUserDetailMapper.delete("post_id", String.valueOf(createReqVO.getPostId())); + fpUserDetailMapper.removeByPostId(createReqVO.getPostId()); }else { FpUserDO fpUserDO = new FpUserDO(); fpUserDO.setType(createReqVO.getType()); @@ -59,12 +63,13 @@ public class FpUserDetailServiceImpl implements FpUserDetailService { fpUserDetailDO.setFpId(fpId); fpUserDetailDO.setBusyId(user.getBusyId()); fpUserDetailDO.setPostId(user.getPostId()); + fpUserDetailDO.setProcCd(user.getProcCd()); fpUserDetailDO.setIsRes(user.getIsRes()); - fpUserDetailDO.setProcedureId(user.getProcedureId()); - ProcedureDO procedureDO = procedureMapper.selectById(user.getProcedureId()); - if (ObjectUtil.isNotEmpty(procedureDO)){ - fpUserDetailDO.setCode(procedureDO.getCode()); - } +// fpUserDetailDO.setProcedureId(user.getProcedureId()); +// ProcedureDO procedureDO = procedureMapper.selectById(user.getProcedureId()); +// if (ObjectUtil.isNotEmpty(procedureDO)){ +// fpUserDetailDO.setCode(procedureDO.getCode()); +// } fpUserDetailMapper.insert(fpUserDetailDO); } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java index aa87bfa8..86e1cb21 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java @@ -33,6 +33,7 @@ import com.chanko.yunxi.mes.module.heli.dal.mysql.pgmaster.PgMasterMapper; //import com.chanko.yunxi.mes.module.heli.dal.mysql.pgmasterline.PgMasterLineMapper; import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.chanko.yunxi.mes.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*; /** @@ -71,6 +72,7 @@ public class PgMasterServiceImpl implements PgMasterService { List pgMasterLineDOList = new ArrayList<>(); processBomDOList.forEach( o ->{ PgMasterLineDO pgMasterLineDO = new PgMasterLineDO(); + pgMasterLineDO.setCreator(getLoginUser().getId().toString()); //bomID pgMasterLineDO.setBomId(o.getBomId()); //工序id 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 5908ae27..8370d94e 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 @@ -1472,7 +1472,8 @@ public class ProcessBomServiceImpl implements ProcessBomService { @Override public BigDecimal outsourcedProcessingFee(Long id, Long projectSubId) { - BigDecimal cost=processBomMapper.outsourcedProcessingFee(id,projectSubId); +// BigDecimal cost=processBomMapper.outsourcedProcessingFee(id,projectSubId); + BigDecimal cost=processBomMapper.outsourcingExpenses(id,projectSubId); if (ObjectUtil.isEmpty(cost)) cost=BigDecimal.ZERO; return cost; } 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 2122f23e..d882ed8e 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 @@ -216,6 +216,12 @@ public class ProcessDesignServiceImpl implements ProcessDesignService { validateProcessDesignExists(updateReqVO.getId()); // 更新 ProcessDesignDO updateObj = BeanUtils.toBean(updateReqVO, ProcessDesignDO.class); + if (ObjectUtil.isNotEmpty(updateReqVO.getIsDelay())){ + if (updateReqVO.getIsDelay()!=1){ + updateReqVO.setDelayReason( null); + } + } + updateObj.setReReason(null); processDesignMapper.updateById(updateObj); // 更新子表 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 216a903e..3ae3e86c 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 @@ -378,6 +378,9 @@ public class PurchaseOrderNoServiceImpl implements PurchaseOrderNoService { if (ObjectUtil.isNotEmpty(noDetailDOS)) { return CommonResult.error(400,"该订单已收货，请确认！"); } +// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); +// wrapper.eq(PurchaseOrderNoDetailDO::getPurchaseOrderId, id); + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); queryWrapper1.eq(PurchaseOrderNoDetailDO::getPurchaseOrderId, id); purchaseOrderNoDetailMapper.delete(queryWrapper1); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailService.java index 7a21021a..35a6f663 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailService.java @@ -66,4 +66,8 @@ public interface PurchaseOrderNoDetailService { PageResult getOutsourcingExpenses(PurchaseOrderNoDetailPageReqVO pageReqVO); PageResult exportOutsourcing(PurchaseOrderNoDetailPageReqVO pageReqVO); + + PageResult getReceivingGoods(PurchaseOrderNoDetailPageReqVO pageReqVO); + + Long getReceivingGoodsMessage(); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java index b9d462f1..d540881b 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java @@ -10,6 +10,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthing import com.chanko.yunxi.mes.module.heli.dal.dataobject.material.MaterialDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplanboom.MaterialPlanBoomDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplandetail.MaterialPlanDetailDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.procedure.ProcedureDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDetailDO; @@ -20,11 +21,14 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagein.StorageInDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.storageindetail.StorageInDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelog.StorageLogDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagemat.StorageMatDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO; import com.chanko.yunxi.mes.module.heli.dal.mysql.attentiontodo.AttentiontodoMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.material.MaterialMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.materialplan.MaterialPlanMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.materialplanboom.MaterialPlanBoomMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.materialplandetail.MaterialPlanDetailMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.plan.PlanMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.processbom.ProcessBomDetailMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.processbom.ProcessBomMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseorderno.PurchaseOrderNoMapper; @@ -33,8 +37,11 @@ import com.chanko.yunxi.mes.module.heli.dal.mysql.storagein.StorageInMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.storageindetail.StorageInDetailMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.storagelog.StorageLogMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.storagemat.StorageMatMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch.TaskDispatchDetailMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch.TaskDispatchMapper; import com.chanko.yunxi.mes.module.heli.enums.CodeEnum; import com.chanko.yunxi.mes.module.heli.service.attentiontodo.AttentiontodoService; +import com.chanko.yunxi.mes.module.heli.service.pgmaster.PgMasterService; import com.chanko.yunxi.mes.module.heli.service.procedure.ProcedureService; import com.chanko.yunxi.mes.module.heli.service.serialnumber.SerialNumberService; import com.chanko.yunxi.mes.module.heli.service.storage.StorageService; @@ -117,6 +124,14 @@ public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailSe private StorageInDetailMapper storageInDetailMapper; @Resource private StorageLogMapper storageLogMapper; + @Resource + private TaskDispatchDetailMapper taskDispatchDetailMapper; + @Resource + private TaskDispatchMapper taskDispatchMapper; + @Resource + private PlanMapper planMapper; + @Resource + private PgMasterService pgMasterService; @Override public Long createPurchaseOrderNoDetail(PurchaseOrderNoDetailSaveReqVO createReqVO) { @@ -243,6 +258,21 @@ public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailSe byId.setEstimatedPrice(detailDO.getEstimatedPrice()); if (byId.getPurchaseRemAmount().compareTo(detailDO.getPurchaseRemAmounts())==0){ byId.setReceivingStatus(3); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(TaskDispatchDO::getBomDetailId, byId.getBoomDetailId()); + TaskDispatchDO taskDispatchDO = taskDispatchMapper.selectOne(queryWrapper); + if (ObjectUtil.isNotEmpty(taskDispatchDO)){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDO.getId()); + wrapper.eq(TaskDispatchDetailDO::getProcedureId, byId.getProcedureId()); + TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectOne(wrapper); + if (ObjectUtil.isNotEmpty(taskDispatchDetailDO)){ + PlanDO planDO = planMapper.selectById(taskDispatchDO.getPlanId()); + if (ObjectUtil.isNotEmpty(planDO)&&taskDispatchDetailDO.getCheckYn()==0){ + pgMasterService.insertPgList(planDO.getId(),planDO.getProjectId(),taskDispatchDO.getBomDetailId(),taskDispatchDetailDO); + } + } + } }else { byId.setReceivingStatus(2); } @@ -510,4 +540,14 @@ public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailSe }); return outsourcingExpenses; } + + @Override + public PageResult getReceivingGoods(PurchaseOrderNoDetailPageReqVO pageReqVO) { + return purchaseOrderNoDetailMapper.getReceivingGoods(pageReqVO); + } + + @Override + public Long getReceivingGoodsMessage() { + return purchaseOrderNoDetailMapper.getReceivingGoodsMessage(); + } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchService.java index 30d42bb9..bbf76e75 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchService.java @@ -106,4 +106,6 @@ public interface TaskDispatchService { List getListZp(Long id, Long projectSubId); List getListCl(Long id, Long projectSubId); + + List> getOwners(Long id); } 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 35d1ff9b..f5fbd6b2 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 @@ -565,7 +565,6 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { }else { throw exception(new ErrorCode(400,"该工序"+procedureDO.getName()+"已做报工,不允许删除")); } - } } taskDispatchDetailMapper.deleteByDispatchId(id); @@ -579,7 +578,6 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { @Override public PageResult getGroupTaskDispatchDetailPage(YgjxPageReqVO pageReqVO) { - return taskDispatchDetailMapper.selectPageGroup(pageReqVO); } @@ -597,10 +595,10 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { List fpUserDetailDOS = fpUserDetailMapper.selectList(new LambdaQueryWrapper().eq(FpUserDetailDO::getBusyId, pageReqVO.getOwner())); // Set postIds = new HashSet<>(); // Set procedureIds = new HashSet<>(); - Map postIds = new HashMap<>(); + Map> postIds = new HashMap<>(); for (FpUserDetailDO fpUserDetailDO : fpUserDetailDOS) { - if (ObjectUtil.isNotEmpty(fpUserDetailDO.getPostId())&&ObjectUtil.isNotEmpty(fpUserDetailDO.getProcedureId())){ - postIds.put(fpUserDetailDO.getPostId(), fpUserDetailDO.getProcedureId()); + if (ObjectUtil.isNotEmpty(fpUserDetailDO.getPostId())&&ObjectUtil.isNotEmpty(fpUserDetailDO.getProcCd())){ + postIds.put(fpUserDetailDO.getPostId(), fpUserDetailDO.getProcCd()); }else if (ObjectUtil.isNotEmpty(fpUserDetailDO.getPostId())){ postIds.put(fpUserDetailDO.getPostId(), null); } @@ -913,14 +911,14 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { } } //看待办 - List bdgzsomthingDOList = bdgzsomthingMapper.selecteqintAttr12IsNull(taskDispatchDO.getCode(), "任务单"); - if (CollUtil.isNotEmpty(bdgzsomthingDOList)){ - for (bdgzsomthingDO bdgzsomthingDO : bdgzsomthingDOList) { - bdgzsomthingDO.setAttr4("1"); - bdgzsomthingDO.setAttr12("0"); - bdgzsomthingMapper.updateById(bdgzsomthingDO); - } - } +// List bdgzsomthingDOList = bdgzsomthingMapper.selecteqintAttr12IsNull(taskDispatchDO.getCode(), "任务单"); +// if (CollUtil.isNotEmpty(bdgzsomthingDOList)){ +// for (bdgzsomthingDO bdgzsomthingDO : bdgzsomthingDOList) { +// bdgzsomthingDO.setAttr4("1"); +// bdgzsomthingDO.setAttr12("0"); +// bdgzsomthingMapper.updateById(bdgzsomthingDO); +// } +// } if (taskDispatchDO.getDispatchType().equals("PRODUCTION") && taskDispatchDetailDO.getTestYn().equals("N")){ pgMasterService.insertPgList(planDO.getId(),planDO.getProjectId(),taskDispatchDO.getBomDetailId(),taskDispatchDetailDO); } @@ -1172,7 +1170,8 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { for (TaskDispatchDetailDO detailDO : detailDOS) { ProcedureDO procedureDO = procedureMapper.selectById(detailDO.getProcedureId()); BigDecimal procedureCost=taskDispatchDetailMapper.bubbleFees(taskDispatchDO.getBomDetailId(),detailDO.getProcedureId()); - BigDecimal materialCost = taskDispatchDetailMapper.materialCost(detailDO.getId()); +// BigDecimal materialCost = taskDispatchDetailMapper.materialCost(detailDO.getId()); + BigDecimal materialCost = taskDispatchDetailMapper.materialCosts(taskDispatchDO.getBomDetailId(),detailDO.getProcedureId()); BigDecimal internalLaborCost = taskDispatchDetailMapper.internalLaborCost(detailDO.getId()); BigDecimal processInspection=taskDispatchDetailMapper.processInspection(detailDO.getId()); @@ -1195,6 +1194,25 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { return taskDispatchDOS; } + @Override + public List> getOwners(Long id) { + List fpUserDetailDOS = fpUserDetailMapper.selectOwnerLists(id); + List> fpUserMapList = new ArrayList<>(); + if (CollUtil.isNotEmpty(fpUserDetailDOS)){ + Map> collect = fpUserDetailDOS.stream().collect(Collectors.groupingBy(vo -> vo.getBusyId() == null ? 0 : vo.getBusyId())); + collect.forEach((userId,list)->{ + if (userId.intValue() != 0){ + HashMap fpUserMap = new HashMap<>(); + fpUserMap.put(userId.toString(), list.get(0).getNickName()); + fpUserMapList.add(fpUserMap); + } + }); + }else { +// throw exception(OWNER_NOT_EXISTS); + } + return fpUserMapList; + } + private void updateAssembleDetail(OperateTypeEnum operateTypeEnum,Long dispatchId, List list) { list.forEach(o -> o.setDispatchId(dispatchId)); @@ -1312,8 +1330,13 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { if ("true".equals(item.getIsOutsourcing())) { // 外协处理逻辑 item.setIsOutsourcing("Y"); + item.setIsReport(0); }else { item.setIsOutsourcing("N"); + ProcedureDO procedureDO = procedureMapper.selectById(item.getProcedureId()); + if (ObjectUtil.isNotEmpty(procedureDO)){ + item.setIsReport(procedureDO.getIsReport()); + } } if ("true".equals(item.getIsFoam())) { item.setIsFoam("Y"); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/fpuserdetail/FpUserDetailMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/fpuserdetail/FpUserDetailMapper.xml index ff2fffc1..65736ca7 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/fpuserdetail/FpUserDetailMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/fpuserdetail/FpUserDetailMapper.xml @@ -14,4 +14,7 @@ DELETE FROM base_fp_user_detail WHERE id = #{id} + + DELETE FROM base_fp_user_detail WHERE post_id = #{postId} + diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/processbom/ProcessBomMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/processbom/ProcessBomMapper.xml index 96f41587..346ab16b 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/processbom/ProcessBomMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/processbom/ProcessBomMapper.xml @@ -110,6 +110,20 @@ left join pro_task_dispatch_detail d on d.id=g.dispatch_detail_id and d.deleted=0 and d.tenant_id=2 where g.deleted = 0 and g.project_id=#{id} and g.project_sub_id= #{projectSubId} and d.is_outsourcing='N' + UPDATE pro_process_bom_detail diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchDetailMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchDetailMapper.xml index aa246da1..31b764b1 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchDetailMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchDetailMapper.xml @@ -165,4 +165,18 @@ left join system_post p on p.id=u.post_id and u.deleted=0 and p.tenant_id=2 and p.status=0 where g.deleted = 0 and g.dispatch_detail_id=#{id} + diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/taskdispatch/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/taskdispatch/index.ts index 8d6e712b..c8205270 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/taskdispatch/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/taskdispatch/index.ts @@ -77,6 +77,9 @@ export const getTaskDispatchDetailListByWorkTime = async (params) => { export const getOwnerList = async(id:number,type:number)=>{ return await request.get({url:`/heli/task-dispatch/task-dispatch-detail/getOwner?id=`+id+`&type=`+type}) } +export const getOwnerLists = async(id:number)=>{ + return await request.get({url:`/heli/task-dispatch/task-dispatch-detail/getOwners?id=`+id}) +} export const getAssmebleDispatchPage = async() => { return await request.get({ url: '/heli/task-dispatch/assmebleDispatchPage' }) } diff --git a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts index a8d3cc68..da746381 100644 --- a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts +++ b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts @@ -298,6 +298,6 @@ export enum DICT_TYPE { HELI_DISPATCH_PRODUCTION_STATUS = 'heli_dispatch_production_status', // 派工单状态 HELI_STORAGE_IN_STATUS = 'heli_storage_in_status',//入库出库状态 HELI_STOCK_MODE = 'heli_stock_mode',//库存变动日志类型 - HELI_PROCESS_TYPE="heli_process_type" - + HELI_PROCESS_TYPE="heli_process_type", + HELI_RECEIVING_STATUS="heli_receiving_status" } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/fpuserdetail/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/fpuserdetail/edit.vue index 526f99c1..9c8c133b 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/fpuserdetail/edit.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/fpuserdetail/edit.vue @@ -68,16 +68,16 @@ - + - +