Merge branch 'uat-temp-xw-202501200000-44905' into dev

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());