From a4d6e8009a7c05812323b505713de9a14deb2675 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Tue, 21 Jan 2025 22:02:58 +0800
Subject: [PATCH] =?UTF-8?q?44905=20=20MES-=E5=8F=91=E8=BF=90=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IMesShippingOrderManagementDetailService.java  |  3 +++
 ...MesShippingOrderManagementDetailController.java | 15 +++++++++--
 .../MesShippingOrderManagementDetailService.java   | 31 +++++++++++++++++++---
 3 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShippingOrderManagementDetailService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShippingOrderManagementDetailService.java
index 61137fd..62002ab 100644
--- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShippingOrderManagementDetailService.java
+++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShippingOrderManagementDetailService.java
@@ -37,6 +37,9 @@ public interface IMesShippingOrderManagementDetailService extends IBaseMesServic
     @ApiOperation("手动发运改数量")
     public ResultBean updateQty(Long[] ids);
 
+    @ApiOperation("同步")
+    public ResultBean syncShip(Long[] ids);
+
     @ApiOperation("发运退回")
     void doShippingBack(Long[] idList,String organizeCode,String userName);
 
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 4b00413..bc5af0f 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
@@ -90,8 +90,7 @@ public class MesShippingOrderManagementDetailController extends BaseMesControlle
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
     }
-
-    @ApiOperation(value = "手工发运", notes = "手工发运")
+    @ApiOperation(value = "修改数量", notes = "修改数量")
     @GetMapping("/master/part/updateQty")
     public ResultBean updateQty(Long[] ids) {
         try {
@@ -103,6 +102,18 @@ public class MesShippingOrderManagementDetailController extends BaseMesControlle
         }
     }
 
+    @ApiOperation(value = "发运同步", notes = "发运同步")
+    @GetMapping("/master/part/syncShip")
+    public ResultBean syncShip(Long[] ids) {
+        try {
+            return shippingOrderManagementDetailService.syncShip(ids);
+        } catch (ImppBusiException e) {
+            return ResultBean.fail(e);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
     @ApiOperation(value = "发运退回", notes = "发运退回")
     @PutMapping("/doShippingBack")
     public ResultBean doShippingBack(@RequestBody Long[] idList) {
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 0976597..ba6db7b 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
@@ -152,6 +152,27 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
         /*String organizeCode = "CR01";
         String userName ="zxw";*/
         List<MesShippingOrderManagementDetail> detailList = getManagementDetails(ids, organizeCode, userName);
+
+        for (MesShippingOrderManagementDetail mesShippingOrderManagementDetail : detailList) {
+            if (StringUtils.isEmpty(mesShippingOrderManagementDetail.getPartNo())) {
+                log.info("发运单明细对应零件号为空");
+                return ResultBean.fail(String.format("发运单明细对应零件号为空"));
+            }
+            mesShippingOrderManagementDetail.setActualQty((int)mesShippingOrderManagementDetail.getPlanQty());
+            ConvertBean.serviceModelUpdate(mesShippingOrderManagementDetail, userName); }
+        if (!CollectionUtils.isEmpty(detailList)) {
+            shippingOrderDetailRepository.saveAll(detailList);
+        }
+        return ResultBean.success("操作成功");
+    }
+
+    @Override
+    public ResultBean syncShip(Long[] ids) {
+        String organizeCode = AuthUtil.getOrganizeCode();
+        String userName = AuthUtil.getSessionUser().getUserName();
+        /*String organizeCode = "CR01";
+        String userName ="zxw";*/
+        List<MesShippingOrderManagementDetail> detailList = getManagementDetails(ids, organizeCode, userName);
         List<Long> idList = detailList.stream().map(MesShippingOrderManagementDetail::getPid).distinct().collect(Collectors.toList());
 
         DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(organizeCode);
@@ -165,10 +186,13 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
         for (MesShippingOrderManagementDetail mesShippingOrderManagementDetail : detailList) {
             MesShippingOrderManagement mesShippingOrderManagement = orderMap.get(mesShippingOrderManagementDetail.getPid());
             if (StringUtils.isEmpty(mesShippingOrderManagementDetail.getPartNo())) {
-                log.info("客户零件号对应的零件号为空:{}", mesShippingOrderManagementDetail.getCustPartNo());
-                return ResultBean.fail(String.format("客户零件号对应的零件号为空:%s", mesShippingOrderManagementDetail.getCustPartNo()));
+                log.info("发运单明细对应零件号为空");
+                return ResultBean.fail(String.format("发运单明细对应零件号为空"));
+            }
+            if ((int) mesShippingOrderManagementDetail.getPlanQty() == mesShippingOrderManagementDetail.getActualQty()) {
+                log.info("计划数量和实际数量不相等");
+                return ResultBean.fail(String.format("计划数量和实际数量不相等"));
             }
-            mesShippingOrderManagementDetail.setActualQty((int)mesShippingOrderManagementDetail.getPlanQty());
             mesShippingOrderManagementDetail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue());
             mesShippingOrderManagementDetail.setRemark("手工发运");
             ConvertBean.serviceModelUpdate(mesShippingOrderManagementDetail, userName);
@@ -204,7 +228,6 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
         return ResultBean.success("操作成功");
     }
 
-
     public MesJisShipping getMesJisShipping(MesShippingOrderManagement orderManagement,MesShippingOrderManagementDetail detail, String srcLocateNo, MesWorkOrderPart orderPart, String userName) {
         MesJisShipping jisShipping = new MesJisShipping();
         BeanUtils.copyProperties(orderManagement, jisShipping);