From e069468f3c383d10794a26d4a020055494b35193 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Tue, 25 Feb 2025 09:24:59 +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

---
 .../base/MesShippingOrderManagementDetailService.java            | 9 +++++++++
 1 file changed, 9 insertions(+)

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 d191970..96a9735 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
@@ -122,6 +122,14 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
         List<MesShippingOrderManagementDetail> detailList = getManagementDetails(ids, organizeCode, userName);
 
         for (MesShippingOrderManagementDetail mesShippingOrderManagementDetail : detailList) {
+            DdlPackBean cbrPackBean = DdlPackBean.getDdlPackBean(organizeCode);
+            DdlPreparedPack.getStringEqualPack(mesShippingOrderManagementDetail.getCustPartNo(), "custPartNo", cbrPackBean);
+            MesCimGmCbrRule mesCimGmCbrRule = mesCimGmCbrRuleRepository.getByProperty(cbrPackBean);
+            if (mesCimGmCbrRule != null) {
+                log.info("CBR规则已配置,不允许此操作,你通过CBR匹配零件号：客户零件号:{}", mesShippingOrderManagementDetail.getCustPartNo());
+                return ResultBean.fail(String.format("CBR规则已配置,不允许此操作,你通过CBR匹配零件号：客户零件号:%s", mesShippingOrderManagementDetail.getCustPartNo()));
+            }
+
             DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
             DdlPreparedPack.getStringEqualPack(mesShippingOrderManagementDetail.getCustPartNo(), "custPartNo", ddlPackBean);
             MesCustomerPart mesCustomerPart = mesCustomerPartRepository.getByProperty(ddlPackBean);
@@ -253,6 +261,7 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
         jisShipping.setCarNo(orderManagementDetail.getVin());
         jisShipping.setSerialNumber(orderManagementDetail.getBarcode());
         jisShipping.setQuantityPerCar(1d);
+        jisShipping.setPartNo(orderManagementDetail.getPartNo());
         jisShipping.setOffTime(TimeTool.getNowTime(true));
         jisShipping.setShippingOrderCode(orderManagement.getShippingCode());
         jisShipping.setFid(UUID.randomUUID().toString());