装车单 新增 增加状态

明细 增加单号

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingVehiclesOrderService.java

@@ -41,7 +41,7 @@ public class MesLoadingVehiclesOrderService extends BaseMesService<MesLoadingVeh
             MesLoadingVehiclesOrderDetail detail = new MesLoadingVehiclesOrderDetail();
 
             BeanUtils.copyProperties(k, detail, "id");
-            detail.setShippingOrderNo(finalBean.getLoadingOrderNo());
+            detail.setLoadingOrderNo(finalBean.getLoadingOrderNo());
             detail.setWeatherCondition(finalBean.getWeatherCondition());
             detailList.add(detail);
         });
@@ -49,6 +49,7 @@ public class MesLoadingVehiclesOrderService extends BaseMesService<MesLoadingVeh
         String customerName = bean.getShippingOrderNoList().get(0).getCustomerName();
         String customerOrganizeCode = bean.getShippingOrderNoList().get(0).getCustomerOrganizeCode();
         String customerOrganizeName = bean.getShippingOrderNoList().get(0).getCustomerOrganizeName();
+        bean.setStatus(MesExtEnumUtil.LOADING_ORDER_STATUS.CREATE.getValue());
         bean.setCustomerCode(customerCode);
         bean.setCustomerName(customerName);
         bean.setCustomerOrganizeCode(customerOrganizeCode);

modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java

@@ -1601,6 +1601,50 @@ public class MesExtEnumUtil {
         }
     }
 
+
+    /**
+     * 装车单-状态
+     */
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum LOADING_ORDER_STATUS {
+        CREATE(10, "创建"),
+        LOADING(15, "装车中"),
+        LOADED(20, "已装车"),
+        SHIPPING(30, "已发运"),
+        CLOSE(40, "关闭");
+
+        private int value;
+        private String description;
+
+
+        private LOADING_ORDER_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+    }
+
     /**
      * 装车单-状态
      */