Merge remote-tracking branch 'origin/uat-temp-nht-2503130000-chengdu-shipping' into uat-temp-wj-chongqingdaqu-prod-chengdu

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesSortShippingCheckController.java

@@ -77,7 +77,7 @@ public class MesSortShippingCheckController {
             MesSortShippingCheckModel model = sortShippingCheckService.doShippingOrderNoQuery(shippingOrderManagement);
             long end = System.currentTimeMillis();
             scanLogUtil.info("扫描发运单执行结束", end - start);
-            return ResultBean.success(model.getMsg()).setResultObject(model);
+            return ResultBean.success(model != null ? model.getMsg() : "").setResultObject(model);
         } catch (ImppBusiException imppException) {
             scanLogUtil.error(imppException.getErrorMsg());
             return ResultBean.fail(imppException);

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

@@ -210,7 +210,7 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
 
                     //根据扫描的装车单找到是否先装车配置
                     //若配置为否，则查询装车单中所有的发运单是否都进行【排序发运校验】完成，若【排序发运校验】没完成，则提示，先进行排序发运校验。
-                    if (!Objects.equals(loadingList.getIsFirstInstall(), MesCommonConstant.TRUE_INTEGER)) {
+                    if (!Objects.equals(shippingGroup.getIsFirstInstall(), MesCommonConstant.TRUE_INTEGER)) {
                         DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
                         DdlPreparedPack.getNumEqualPack(loadingListDetail.getShippingId(),"id",packBean);
                         MesShippingOrderManagement orderManagement = shippingOrderManagementRepository.getByProperty(packBean);

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

@@ -136,17 +136,18 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
 
     @Override
     public MesSortShippingCheckModel doShippingOrderNoQuery(MesShippingOrderManagement shippingOrderManagement) {
+        //返回数据组装
+        MesSortShippingCheckModel model = new MesSortShippingCheckModel();
         //校验发运单
         MesShippingOrderManagement orderManagement = getMesShippingOrderManagement(shippingOrderManagement);
         if(Objects.isNull(orderManagement)){
-            return null;
+            model.setMsg(String.format("发运单【%s】已跳过，请扫描下一个发运单",shippingOrderManagement.getShippingCode()));
+            return model;
         }
         //校验发运单扫描顺序
         checkShippingOrderSeq(shippingOrderManagement, orderManagement);
         //根据扫描的发运单找到是否装车配置，若是，则根据发运单查询是否生成装车单，若没生成装车单则提示此发运单配置是否装车为是,但没生成装车单，请检查数据！
         checkLoadingList(shippingOrderManagement, orderManagement);
-        //返回数据组装
-        MesSortShippingCheckModel model = new MesSortShippingCheckModel();
         if (!StringUtils.isEmpty(orderManagement.getCheckSeqCode())) {
             model.setIsScanLocationCode(true);
         }
@@ -752,7 +753,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
             if (!CollectionUtils.isEmpty(mesJisShippings)) {
                 shippingList.addAll(mesJisShippings);
             }
-        } else {
+        } else if (Objects.equals(shippingGroup.getIsFirstInstall(), CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue())){
             //查询装车单明细
             DdlPackBean orderManagementPackBean = DdlPackBean.getDdlPackBean(organizeCode);
             DdlPreparedPack.getNumEqualPack(orderManagement.getLoadingListId(),"pid",orderManagementPackBean);