发运

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

@@ -130,6 +130,7 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
                 if (loadingListDetail.getTempStatus() == MesCommonConstant.TRUE_INTEGER) {
                     throw new ImppBusiException(String.format("【%s】此发运单已经扫描过，请检查数据！", model.getShippingCode()));
                 }
+                loadingListDetail.setScanSn(model.getShippingCode());
                 loadingListDetail.setTempStatus(MesCommonConstant.TRUE_INTEGER);
                 loadingListDetail.setTempStatusVal("扫描完成");
 
@@ -204,9 +205,9 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
         }
 
         //校验装车单状态 必须是未装车条码
-        if (loadingList.getStatus() != MesExtEnumUtil.LOADING_ORDER_STATUS.CREATE.getValue()) {
+        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】状态的装车单", loadingList.getOrderCode(),
+            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.valueOfDescription(loadingList.getStatus()), MesExtEnumUtil.LOADING_ORDER_STATUS.CREATE.getDescription(), MesExtEnumUtil.LOADING_ORDER_STATUS.LOADING.getValue()));
         }
         return loadingList;
     }

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

@@ -72,9 +72,9 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         }
 
         //校验发运单状态 必须是未装车条码
-        if (orderManagement.getStatus() != MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue() && orderManagement.getStatus() != MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getValue()) {
+        if (orderManagement.getStatus() != MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPING.getValue() && orderManagement.getStatus() != MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getValue()) {
-            throw new ImppBusiException(String.format("【%s】此发运单状态为【%s】,请选择状态为【%s】状态的发运单", shippingOrderManagement.getShippingCode(), orderManagement.getStatus(),
+            throw new ImppBusiException(String.format("【%s】此发运单状态为【%s】,请选择状态为【%s】或【%s】状态的发运单", shippingOrderManagement.getShippingCode(), orderManagement.getStatus(),
-                    MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue()));
+                    MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPING.getValue(),MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getValue()));
         }