From d3cc6b9c2c06046bae39abcf2f291aa97c0f1b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LML=E4=B8=B6?= <mingliang.li@estsh.com>
Date: Tue, 7 May 2024 21:05:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E8=BD=A6=E5=8D=95=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=20=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81=20=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=20=E5=A2=9E=E5=8A=A0=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/MesLoadingVehiclesOrderService.java       |  3 +-
 .../i3plus/ext/mes/pojo/util/MesExtEnumUtil.java   | 44 ++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingVehiclesOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingVehiclesOrderService.java
index 0d2b8e0..e458ad1 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingVehiclesOrderService.java
+++ b/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);
diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java
index 3dd8008..29fd1db 100644
--- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java
+++ b/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;
+        }
+    }
+
     /**
      * 装车单-状态
      */