Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingLoadingCheckService.java

@@ -251,15 +251,25 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
                 //装车单明细
                 List<MesLoadingListDetail> vehiclesOrderDetailList = model.getDetailList();
                 vehiclesOrderDetailList.forEach(k -> {
-//                    if(MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue() == k.getStatus()){
-//                        k.setStatus(MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.PUBLISHED.getValue()); // todo 不改变为发运状态
-//                    }
                     k.setSystemSyncStatus(CommonEnumUtil.FALSE);
                     ConvertBean.serviceModelUpdate(k, userInfo);
                 });
 
                 vehiclesOrderDetailRepository.saveAll(vehiclesOrderDetailList);
             }
+
+            List<MesShippingOrderManagement> shippingOrderList = new ArrayList<>();
+            model.getDetailList().forEach(k -> {
+                DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+                DdlPreparedPack.getNumEqualPack(k.getShippingId(),"id",packBean);
+                MesShippingOrderManagement orderManagement = shippingOrderManagementRepository.getByProperty(packBean);
+                if (orderManagement != null) {
+                    orderManagement.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.LOADING.getValue());
+                    shippingOrderList.add(orderManagement);
+                }
+            });
+            shippingOrderManagementRepository.saveAll(shippingOrderList);
+
             update(loadingList);
         }
         return model;

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java

@@ -587,7 +587,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
 //            throw new ImppBusiException(String.format("【%s】此条码已经扫描过，请检查数据！", model.getSn()));
 //        }
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(org);
-        DdlPreparedPack.getStringEqualPack(model.getSn(), "productSn", packBean);
+        DdlPreparedPack.getStringEqualPack(model.getSn(), "custSn", packBean);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, packBean);
         MesProduceSn produceSn = produceSnRepository.getByProperty(packBean);
 

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingCheckVolvoRackNoAndPartNoStrategyServiceImpl.java

@@ -85,8 +85,8 @@ public class MesShippingCheckVolvoRackNoAndPartNoStrategyServiceImpl implements
         boolean scanFlg = false;
         for (MesShippingOrderManagementDetail detail : model.getDetailList()) {
             if (detail.getPartNo().equals(produceSn.getPartNo()) && StringUtils.isEmpty(detail.getBarcode()) && !Objects.equals(detail.getIsScanFlg(), MesCommonConstant.TRUE_INTEGER)) {
-                if (Objects.equals(detail.getVin(), workOrder.getVinCode())) {
-                    throw new ImppBusiException(String.format("产品条码明细【%s】与发运单明细不匹配，请重新扫描！", model.getSn()));
+                if (!Objects.equals(detail.getVin(), workOrder.getVinCode())) {
+                    throw new ImppBusiException(String.format("产品条码【%s】对应工单Vince号与发运单明细的Vin号不匹配，请重新扫描！", model.getSn()));
                 }
                 checkDetailScanSeq(orderManagement, detail, workOrder);
                 //校验发运明细