发运

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

@@ -75,7 +75,7 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
         }
 
         MesShippingLoadingCheckModel model = new MesShippingLoadingCheckModel();
-        Long count = detailList.stream().filter(k -> k.getStatus() == MesExtEnumUtil.LOADING_DETAIL_ORDER_DETAIL_STATUS.SCAN.getValue()).count();
+        Long count = detailList.stream().filter(k -> k.getStatus() == MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue()).count();
         model.setIsScanCount(count.intValue());
         model.setOrderCode(loadingList.getOrderCode());
 
@@ -89,6 +89,15 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
 
             model.setRecentlyScanVehiclesOrder(recentlyVehiclesOrder.getOrderCode());
         }
+
+        detailList.forEach(k -> {
+            if (k.getStatus() == MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue()){
+                k.setScanSn(k.getShippingCode());
+                k.setTempStatus(MesCommonConstant.TRUE_INTEGER);
+                k.setTempStatusVal("扫描完成");
+            }
+        });
+
         model.setDetailList(detailList);
 
         return model;
@@ -141,7 +150,7 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
                     ConvertBean.serviceModelUpdate(loadingList, AuthUtil.getSessionUser().getUserName());
                     vehiclesOrderRepository.save(loadingList);
 
-                    loadingListDetail.setStatus(MesExtEnumUtil.LOADING_DETAIL_ORDER_DETAIL_STATUS.SCAN.getValue());
+                    loadingListDetail.setStatus(MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue());
                     ConvertBean.serviceModelUpdate(loadingListDetail, AuthUtil.getSessionUser().getUserName());
                     vehiclesOrderDetailRepository.save(loadingListDetail);
                 }
@@ -178,7 +187,7 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
             DdlPreparedPack.getNumEqualPack(loadingList.getId(), "pid", vehiclesOrderDetailPackBean);
             List<MesLoadingListDetail> vehiclesOrderDetailList = vehiclesOrderDetailRepository.findByHqlWhere(vehiclesOrderDetailPackBean);
             vehiclesOrderDetailList.forEach(k -> {
-                k.setStatus(MesExtEnumUtil.LOADING_DETAIL_ORDER_STATUS.LOADED.getValue());
+                k.setStatus(MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue());
                 ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName());
             });
 
@@ -207,7 +216,7 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
         //校验装车单状态 必须是未装车条码
         if (loadingList.getStatus() != MesExtEnumUtil.LOADING_ORDER_STATUS.CREATE.getValue() && loadingList.getStatus() != MesExtEnumUtil.LOADING_ORDER_STATUS.LOADING.getValue()) {
             throw new ImppBusiException(String.format("【%s】此装车单状态为【%s】,请选择状态为【%s】或状态【%s】的装车单", loadingList.getOrderCode(),
-                    MesExtEnumUtil.LOADING_ORDER_STATUS.valueOfDescription(loadingList.getStatus()), MesExtEnumUtil.LOADING_ORDER_STATUS.CREATE.getDescription(), MesExtEnumUtil.LOADING_ORDER_STATUS.LOADING.getValue()));
+                    MesExtEnumUtil.LOADING_ORDER_STATUS.valueOfDescription(loadingList.getStatus()), MesExtEnumUtil.LOADING_ORDER_STATUS.CREATE.getDescription(), MesExtEnumUtil.LOADING_ORDER_STATUS.LOADING.getDescription()));
         }
         return loadingList;
     }