From f29bef72a0d80fb716af3be83a9893915e8b6fed Mon Sep 17 00:00:00 2001
From: jason <backo@163.com>
Date: Thu, 20 Feb 2025 17:33:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Ecockpit=E5=8F=91=E8=BF=90?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MesShippingOrderManagementDetailController.java | 12 ++++++++++--
 .../MesShippingOrderManagementDetailService.java    | 21 ++++++++++++++-------
 .../mes/pojo/model/MesHandleShippingErrorModel.java | 11 +++++++++++
 3 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/MesHandleShippingErrorModel.java

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementDetailController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementDetailController.java
index 0a7d297..4ddc33e 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementDetailController.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementDetailController.java
@@ -3,6 +3,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
 import cn.estsh.i3plus.ext.mes.api.base.IMesShippingOrderManagementDetailService;
 import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.ext.mes.pojo.model.MesHandleShippingErrorModel;
 import cn.estsh.i3plus.ext.mes.pojo.model.MesShippingOrderManagementDetailModel;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
@@ -70,9 +71,16 @@ public class MesShippingOrderManagementDetailController extends BaseMesControlle
 
     @ApiOperation(value = "cockpit发运处理", notes = "cockpit发运处理")
     @PostMapping("/handle-cockpit-shipping-error")
-    public ResultBean handleCockpitShippingError(MesShippingOrderManagementDetail detail, MesWorkOrder workOrder) {
+    public ResultBean handleCockpitShippingError(@RequestBody MesHandleShippingErrorModel request) {
         try {
-            shippingOrderManagementDetailService.doHandleCockpitShippingError(detail, workOrder);
+            MesShippingOrderManagementDetail detail = shippingOrderManagementDetailService.get(request.getDetail().getId());
+            if (detail == null) {
+                return ResultBean.fail("无效发运单明细");
+            }
+            if (detail.getPid() == null) {
+                return ResultBean.fail("发运单明细未关联有效发运单");
+            }
+            shippingOrderManagementDetailService.doHandleCockpitShippingError(detail, request.getWorkOrder());
             return ResultBean.success("处理成功");
         } catch (ImppBusiException e) {
             return ResultBean.fail(e);
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java
index d441446..271e932 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java
@@ -5,6 +5,7 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesShippingOrderManagementDetailService
 import cn.estsh.i3plus.ext.mes.apiservice.dao.IMesShippingOrderManagementDetailDao;
 import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
 import cn.estsh.i3plus.ext.mes.pojo.model.MesShippingOrderManagementDetailModel;
+import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
@@ -239,8 +240,8 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
 
     public MesJisShipping getMesJisShipping(MesShippingOrderManagement orderManagement,MesShippingOrderManagementDetail detail, String srcLocateNo, MesWorkOrderPart orderPart, String userName) {
         MesJisShipping jisShipping = new MesJisShipping();
-        BeanUtils.copyProperties(orderManagement, jisShipping);
-        BeanUtils.copyProperties(detail, jisShipping);
+        BeanUtils.copyProperties(orderManagement, jisShipping, MesExtConstWords.ID);
+        BeanUtils.copyProperties(detail, jisShipping, MesExtConstWords.ID);
         jisShipping.setFactoryCode(orderManagement.getCustOrganizeCode());
         jisShipping.setShippingTime(TimeTool.getNowTime(true));
         jisShipping.setErpWarerhouse(srcLocateNo);
@@ -259,6 +260,8 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
         jisShipping.setOffTime(TimeTool.getNowTime(true));
         jisShipping.setShippingOrderCode(orderManagement.getShippingCode());
         jisShipping.setFid(UUID.randomUUID().toString());
+        jisShipping.setRemark(null);
+        jisShipping.setDescription(null);
         jisShipping.setSystemSyncStatus(CommonEnumUtil.FALSE);
         ConvertBean.serviceModelInitialize(jisShipping, userName);
         return jisShipping;
@@ -340,8 +343,8 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
         if (StringUtils.isEmpty(detail.getPartNo())) {
             MesException.throwFlowException("发运单明细对应零件号为空");
         }
-        if (StringUtils.isEmpty(detail.getBarcode())) {
-            MesException.throwMesBusiException("发运单条码信息不存在");
+        if (StringUtils.isEmpty(workOrder.getCustSn())) {
+            MesException.throwMesBusiException("工单【%s】不存在客户条码", workOrder.getWorkOrderNo());
         }
         String organizeCode = AuthUtil.getOrganizeCode();
         String userName = AuthUtil.getSessionUser().getUserName();
@@ -376,8 +379,11 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
 
             for (MesWorkOrderPart orderPart : workOrderParts) {
                 MesPart itemPart = mesPartService.getPartByPartNo(orderPart.getPartNo(), organizeCode);
+                if (itemPart == null) {
+                    continue;
+                }
                 MesMoveRule moveRule = mesMoveRuleMap.get(itemPart.getEsd());
-                if (Objects.equals(moveRule.getMoveNum(), MesExtEnumUtil.MOVE_RULE_MOVE_NUM.MOVE_RULE_MOVE_NUM_20.getValue()) && MesExtEnumUtil.MOVE_TYPE_REPORT_TYPE.SHIPPING.getValue() == moveRule.getReportType()) {
+                if (moveRule != null && Objects.equals(moveRule.getMoveNum(), MesExtEnumUtil.MOVE_RULE_MOVE_NUM.MOVE_RULE_MOVE_NUM_20.getValue()) && MesExtEnumUtil.MOVE_TYPE_REPORT_TYPE.SHIPPING.getValue() == moveRule.getReportType()) {
                     shippingList.add(getMesJisShipping(orderManagement, detail, moveRule.getErpSrcLocateNo(), orderPart, userName));
                 } else {
                     log.info("客供品移库零件【{}】在零件发运组【{}】的移库规则中，汇报类型未维护或不为发运", orderPart.getPartNo(), workOrder.getPartProdGroupCode());
@@ -387,8 +393,8 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
             jisShippingRepository.saveAll(shippingList);
         }
 
-        List<MesProduceSn> mesProduceSnList = mesProduceSnService.findMesProduceSn(organizeCode, detail.getBarcode());
-        for (MesProduceSn mesProduceSn : mesProduceSnList) {
+        MesProduceSn mesProduceSn = mesProduceSnService.getMesProduceSnByCustSn(organizeCode, workOrder.getCustSn());
+        if (mesProduceSn != null) {
             //更新条码状态为完成
             mesProduceSn.setSnStatus(MesExtEnumUtil.PRODUCE_SN_STATUS.SHIPPED.getValue());
             mesProduceSn.setSystemSyncStatus(CommonEnumUtil.FALSE);
@@ -401,6 +407,7 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
         ConvertBean.serviceModelUpdate(workOrder, userName);
         mesWorkOrderRDao.update(workOrder);
 
+        detail.setBarcode(workOrder.getWorkOrderNo() + "," + workOrder.getCustSn());
         detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue());
         detail.setSystemSyncStatus(CommonEnumUtil.FALSE);
         detail.setRemark("cockpit发运处理");
diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/MesHandleShippingErrorModel.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/MesHandleShippingErrorModel.java
new file mode 100644
index 0000000..0d48379
--- /dev/null
+++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/MesHandleShippingErrorModel.java
@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.ext.mes.pojo.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail;
+import lombok.Data;
+
+@Data
+public class MesHandleShippingErrorModel {
+    private MesShippingOrderManagementDetail detail;
+    private MesWorkOrder workOrder;
+}