diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/LnshKilnTrussDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/LnshKilnTrussDeviceDriver.java
index 2dd594d..f66f168 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/LnshKilnTrussDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/LnshKilnTrussDeviceDriver.java
@@ -216,6 +216,7 @@ public class LnshKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implement
             JSONObject param = new JSONObject();
             param.put("kiln_number", kiln_number);
             param.put("vehicle_code", barcode);
+            param.put("type", "1");
             HttpResponse response = acsToWmsService.inKiln(param);
             if (ObjectUtil.isNotEmpty(response)) {
                 if (response.getStatus() == HttpStatus.OK.value()) {
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/ItemProtocol.java
index 0d7eef3..2189bbe 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/ItemProtocol.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/ItemProtocol.java
@@ -22,6 +22,8 @@ public class ItemProtocol {
     public static String item_standby_time = "standby_time";
     public static String item_production_time = "production_time";
     public static String item_error_time = "error_time";
+    public static String item_cool_number = "cool_number";
+
     public static String item_to_command = "to_command";
     public static String item_to_target = "to_target";
     public static String item_to_task = "to_task";
@@ -84,6 +86,10 @@ public class ItemProtocol {
         return this.getOpcIntegerValue(item_to_task);
     }
 
+    public int getCool_number() {
+        return this.getOpcIntegerValue(item_cool_number);
+    }
+
     //是否有货
     public int hasGoods(int move) {
         return move;
@@ -113,23 +119,24 @@ public class ItemProtocol {
     }
 
     public static List<ItemDto> getReadableItemDtos() {
-        ArrayList list = new ArrayList();
-        list.add(new ItemDto(item_heartbeat, "心跳", "DB1.B0"));
-        list.add(new ItemDto(item_mode, "工作模式", "DB1.B1", Boolean.valueOf(true)));
+        ArrayList<ItemDto> list = new ArrayList<>();
+        list.add(new ItemDto(item_heartbeat, "心跳", "DB100.B0"));
+        list.add(new ItemDto(item_mode, "工作模式", "DB1.B1", Boolean.TRUE));
         list.add(new ItemDto(item_status, "设备状态", "DB1.B2"));
         list.add(new ItemDto(item_outKiln_move, "出窑光电", "DB1.B3"));
         list.add(new ItemDto(item_outKiln_barcode, "出窑条码", "DB1.W4"));
         list.add(new ItemDto(item_outKiln_device, "出窑设备", "DB1.D6"));
-        list.add(new ItemDto(item_open_time, "开机时间", "DB1.STRING10.50"));
-        list.add(new ItemDto(item_standby_time, "待机时间", "DB1.D62"));
-        list.add(new ItemDto(item_production_time, "生产时间", "DB1.D66"));
-        list.add(new ItemDto(item_error_time, "故障时间", "DB1.D70"));
+        list.add(new ItemDto(item_cool_number, "冷却道号", "DB1.D10"));
+        list.add(new ItemDto(item_open_time, "开机时间", "DB1.STRING14.50"));
+        list.add(new ItemDto(item_standby_time, "待机时间", "DB1.D66"));
+        list.add(new ItemDto(item_production_time, "生产时间", "DB1.D70"));
+        list.add(new ItemDto(item_error_time, "故障时间", "DB1.D74"));
         return list;
     }
 
     public static List<ItemDto> getWriteableItemDtos() {
-        ArrayList list = new ArrayList();
-        list.add(new ItemDto(item_to_command, "下发指令", "DB1.W0", Boolean.valueOf(true)));
+        ArrayList<ItemDto> list = new ArrayList<>();
+        list.add(new ItemDto(item_to_command, "下发指令", "DB1.W0", Boolean.TRUE));
         list.add(new ItemDto(item_to_target, "下发目标站", "DB1.W2"));
         list.add(new ItemDto(item_to_task, "下发任务号", "DB1.D4"));
         return list;
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDefination.java
index 668d493..7828ecb 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDefination.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDefination.java
@@ -54,18 +54,7 @@ public class LnshOutKilnTrussDefination implements OpcDeviceDriverDefination {
     }
 
     public static List<ItemDto> getReadableItemDtos2() {
-        ArrayList list = new ArrayList();
-        list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB1.B0"));
-        list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB1.B1", Boolean.valueOf(true)));
-        list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB1.B2"));
-        list.add(new ItemDto(ItemProtocol.item_outKiln_move, "出窑光电", "DB1.B3"));
-        list.add(new ItemDto(ItemProtocol.item_outKiln_barcode, "出窑条码", "DB1.W4"));
-        list.add(new ItemDto(ItemProtocol.item_outKiln_device, "出窑设备", "DB1.D6"));
-        list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB1.STRING10.50"));
-        list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB1.D62"));
-        list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB1.D66"));
-        list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB1.D70"));
-        return list;
+        return ItemProtocol.getReadableItemDtos();
     }
 
     @Override
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDeviceDriver.java
index 7d7ed8b..add1ba7 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDeviceDriver.java
@@ -23,7 +23,6 @@ import org.nl.acs.route.service.RouteLineService;
 import org.nl.acs.task.service.TaskService;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.openscada.opc.lib.da.Server;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 
 import java.util.Date;
@@ -102,6 +101,9 @@ public class LnshOutKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implem
     //出窑设备
     int outKiln_device = 0;
     int last_outKiln_device = 0;
+    // 冷却道号
+    int cool_number = 0;
+    int last_cool_number = 0;
 
     @Override
     public Device getDevice() {
@@ -123,6 +125,7 @@ public class LnshOutKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implem
             outKiln_move = this.itemProtocol.getOutKiln_move();
             outKiln_barcode = this.itemProtocol.getOutKiln_barcode();
             outKiln_device = this.itemProtocol.getOutKiln_device();
+            cool_number = this.itemProtocol.getCool_number();
 
             if (mode != last_mode) {
                 this.setRequireSucess(false);
@@ -202,10 +205,16 @@ public class LnshOutKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implem
 
                     break;
                 case 5:
-                    if (!requireSucess && outKiln_move != 0) {
+                    if (!requireSucess && outKiln_move != 0 && outKiln_barcode != 0) {
                         outKiln();
                     }
                     break;
+
+                case 17:
+                    if (!requireSucess && outKiln_move != 0 && outKiln_barcode != 0 && cool_number != 0) {
+                        outKilnConfirm();
+                    }
+                    break;
             }
         }
 
@@ -218,6 +227,7 @@ public class LnshOutKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implem
         last_outKiln_move = outKiln_move;
         last_outKiln_barcode = outKiln_barcode;
         last_outKiln_device = outKiln_device;
+        last_cool_number = cool_number;
     }
 
 
@@ -254,7 +264,6 @@ public class LnshOutKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implem
                 if (result.getStatus() == HttpStatus.OK.value()) {
                     JSONObject jsonObject = JSONObject.parseObject(result.body());
                     if (ObjectUtil.isNotEmpty(jsonObject) && "200".equals(jsonObject.getString("status"))) {
-                        this.writing(jsonObject.getBooleanValue("data") ? 22 : 23);
                         this.writing(jsonObject.getBooleanValue("data") ? 22 : 23);
                         this.setRequireSucess(true);
                     }
@@ -293,6 +302,29 @@ public class LnshOutKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implem
         logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value);
     }
 
+    public synchronized void outKilnConfirm() {
+        Date date = new Date();
+        if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) {
+            log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out);
+        } else {
+            this.instruction_require_time = date;
+            JSONObject param = new JSONObject();
+            param.put("cool_number", cool_number);
+            param.put("vehicle_code", outKiln_barcode);
+            param.put("type", "2");
+            HttpResponse response = acsToWmsService.inKiln(param);
+            if (ObjectUtil.isNotEmpty(response)) {
+                if (response.getStatus() == HttpStatus.OK.value()) {
+                    JSONObject jsonObject = JSONObject.parseObject(response.body());
+                    if (ObjectUtil.isNotEmpty(jsonObject) && "200".equals(jsonObject.getString("status"))) {
+                        this.writing(this.mode);
+                        this.requireSucess = true;
+                    }
+                }
+            }
+        }
+    }
+
     @Override
     public JSONObject getDeviceStatusName() throws Exception {
         String mode;
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/ItemProtocol.java
index bb88a7d..20fac26 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/ItemProtocol.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/ItemProtocol.java
@@ -27,6 +27,7 @@ public class ItemProtocol {
     public static String item_qualified = "qualified";
     public static String item_unqualified = "unqualified";
     public static String item_order_No = "order_No";
+    public static String item_avg_piece_weight = "avg_piece_weight";
     public static String item_to_command = "to_command";
     public static String item_to_error = "to_error";
     public static String item_to_order_No = "to_order_No";
@@ -141,6 +142,10 @@ public class ItemProtocol {
         return this.getOpcIntegerValue(item_to_Wthickness);
     }
 
+    public int getAvg_piece_weight() {
+        return this.getOpcIntegerValue(item_avg_piece_weight);
+    }
+
     //是否有货
     public int hasGoods(int move) {
         return move;
@@ -171,36 +176,37 @@ public class ItemProtocol {
     }
 
     public static List<ItemDto> getReadableItemDtos() {
-        ArrayList list = new ArrayList();
-        list.add(new ItemDto(item_heartbeat, "心跳", "DB8.B0"));
-        list.add(new ItemDto(item_mode, "工作模式", "DB8.B1", Boolean.valueOf(true)));
-        list.add(new ItemDto(item_status, "设备状态", "DB8.B2"));
-        list.add(new ItemDto(item_error, "故障", "DB8.B3"));
-        list.add(new ItemDto(item_open_time, "开机时间", "DB8.STRING4.50"));
-        list.add(new ItemDto(item_standby_time, "待机时间", "DB8.D56"));
-        list.add(new ItemDto(item_production_time, "生产时间", "DB8.D60"));
-        list.add(new ItemDto(item_error_time, "故障时间", "DB8.D64"));
-        list.add(new ItemDto(item_material, "当前生产物料", "DB8.STRING68.50"));
-        list.add(new ItemDto(item_qty, "当前已生产数量", "DB8.D120"));
-        list.add(new ItemDto(item_weight, "当前已生产重量", "DB8.D124"));
-        list.add(new ItemDto(item_qualified, "当前已生产合格数", "DB8.D128"));
-        list.add(new ItemDto(item_unqualified, "当前已生产不合格数", "DB8.D132"));
-        list.add(new ItemDto(item_order_No, "工单号", "DB8.STRING136.50"));
+        ArrayList<ItemDto> list = new ArrayList<>();
+        list.add(new ItemDto(item_heartbeat, "心跳", "DB.B0"));
+        list.add(new ItemDto(item_mode, "工作模式", "DB.B1", Boolean.TRUE));
+        list.add(new ItemDto(item_status, "设备状态", "DB.B2"));
+        list.add(new ItemDto(item_error, "故障", "DB.B3"));
+        list.add(new ItemDto(item_open_time, "开机时间", "DB.STRING4.50"));
+        list.add(new ItemDto(item_standby_time, "待机时间", "DB.D56"));
+        list.add(new ItemDto(item_production_time, "生产时间", "DB.D60"));
+        list.add(new ItemDto(item_error_time, "故障时间", "DB.D64"));
+        list.add(new ItemDto(item_material, "当前生产物料", "DB.STRING68.50"));
+        list.add(new ItemDto(item_qty, "当前已生产数量", "DB.D120"));
+        list.add(new ItemDto(item_weight, "当前已生产重量", "DB.D124"));
+        list.add(new ItemDto(item_qualified, "当前已生产合格数", "DB.D128"));
+        list.add(new ItemDto(item_unqualified, "当前已生产不合格数", "DB.D132"));
+        list.add(new ItemDto(item_order_No, "工单号", "DB.STRING136.50"));
+        list.add(new ItemDto(item_avg_piece_weight, "当前工单平均单重", "DB.D188"));
         return list;
     }
 
     public static List<ItemDto> getWriteableItemDtos() {
-        ArrayList list = new ArrayList();
-        list.add(new ItemDto(item_to_command, "反馈", "DB9.W0", Boolean.valueOf(true)));
-        list.add(new ItemDto(item_to_error, "error", "DB9.W2"));
-        list.add(new ItemDto(item_to_order_No, "工单号", "DB9.STRING4.50"));
-        list.add(new ItemDto(item_to_qty, "生产重量", "DB9.D56"));
-        list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB9.STRING60.50"));
-        list.add(new ItemDto(item_to_product_code, "产品编号", "DB4.W112"));
-        list.add(new ItemDto(item_to_AlongSide, "A长边", "DB4.W114"));
-        list.add(new ItemDto(item_to_BshortSide, "B短边", "DB4.W116"));
-        list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB4.W118"));
-        list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB4.W120"));
+        ArrayList<ItemDto> list = new ArrayList<>();
+        list.add(new ItemDto(item_to_command, "反馈", "DB.W0", Boolean.TRUE));
+        list.add(new ItemDto(item_to_error, "error", "DB.W2"));
+        list.add(new ItemDto(item_to_order_No, "工单号", "DB.STRING4.50"));
+        list.add(new ItemDto(item_to_qty, "生产重量", "DB.D56"));
+        list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB.STRING60.50"));
+        list.add(new ItemDto(item_to_product_code, "产品编号", "DB.W112"));
+        list.add(new ItemDto(item_to_AlongSide, "A长边", "DB.W114"));
+        list.add(new ItemDto(item_to_BshortSide, "B短边", "DB.W116"));
+        list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB.W118"));
+        list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB.W120"));
         return list;
     }
 
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDefination.java
index 58f77f5..9c23d60 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDefination.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDefination.java
@@ -56,22 +56,7 @@ public class LnshPressDefination implements OpcDeviceDriverDefination {
     }
 
     public static List<ItemDto> getReadableItemDtos2() {
-        ArrayList list = new ArrayList();
-        list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB8.B0"));
-        list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB8.B1", Boolean.valueOf(true)));
-        list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB8.B2"));
-        list.add(new ItemDto(ItemProtocol.item_error, "故障", "DB8.B3"));
-        list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB8.STRING4.50"));
-        list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB8.D56"));
-        list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB8.D60"));
-        list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB8.D64"));
-        list.add(new ItemDto(ItemProtocol.item_material, "当前生产物料", "DB8.STRING68.50"));
-        list.add(new ItemDto(ItemProtocol.item_qty, "当前已生产数量", "DB8.D120"));
-        list.add(new ItemDto(ItemProtocol.item_weight, "当前已生产重量", "DB8.D124"));
-        list.add(new ItemDto(ItemProtocol.item_qualified, "当前已生产合格数", "DB8.D128"));
-        list.add(new ItemDto(ItemProtocol.item_unqualified, "当前已生产不合格数", "DB8.D132"));
-        list.add(new ItemDto(ItemProtocol.item_order_No, "工单号", "DB8.STRING136.50"));
-        return list;
+        return ItemProtocol.getReadableItemDtos();
     }
 
     @Override
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDeviceDriver.java
index 7cdebe7..08cf8ca 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDeviceDriver.java
@@ -110,6 +110,8 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De
     int last_unqualified = 0;
     String order_No = "0";
     String last_order_No = "0";
+    int avg_piece_weight = 0;
+    int last_avg_piece_weight = 0;
 
     @Override
     public Device getDevice() {
@@ -135,6 +137,7 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De
             unqualified = this.itemProtocol.getUnqualified();
             qty = this.itemProtocol.getQty();
             material = this.itemProtocol.getMaterial();
+            avg_piece_weight = this.itemProtocol.getAvg_piece_weight();
 
             if (mode != last_mode) {
                 this.setRequireSucess(false);
@@ -189,6 +192,10 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De
                 logServer.deviceItemValue(this.device_code, "order_No", order_No);
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号order_No：" + last_order_No + " -> " + order_No);
             }
+            if (avg_piece_weight != last_avg_piece_weight) {
+                logServer.deviceItemValue(this.device_code, "avg_piece_weight", String.valueOf(avg_piece_weight));
+                logServer.deviceExecuteLog(this.device_code, "", "", "avg_piece_weight：" + last_avg_piece_weight + " -> " + avg_piece_weight);
+            }
 
         } catch (Exception var17) {
             return;
@@ -218,7 +225,7 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De
                 case 2:
                     break;
                 case 3:
-                    //排产单确认
+                    // 工单确认确认
                     if (!requireSucess && !"0".equals(order_No) && StrUtil.isNotBlank(order_No)) {
                         JSONObject json = new JSONObject();
                         json.put("workorder_code", order_No);
@@ -227,19 +234,46 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De
                     }
                     break;
                 case 4:
-                    //工单完成反馈
+                    // 工单完成
                     if (!requireSucess && !"0".equals(order_No) && StrUtil.isNotBlank(order_No)) {
                         JSONObject json = new JSONObject();
                         json.put("workorder_code", order_No);
                         json.put("qty", qty);
+                        json.put("qualified_qty", qualified);
                         json.put("unqualified_qty", unqualified);
+                        json.put("weight", weight);
+                        json.put("avg_piece_weight", avg_piece_weight);
                         json.put("type", "2");
                         enterProduction(json);
                     }
                     break;
+                case 5:
+                    // 报工
+                    if (!requireSucess && !"0".equals(order_No) && StrUtil.isNotBlank(order_No)) {
+                        JSONObject json = new JSONObject();
+                        json.put("workorder_code", order_No);
+                        json.put("qty", qty);
+                        json.put("qualified_qty", qualified);
+                        json.put("unqualified_qty", unqualified);
+                        json.put("weight", weight);
+                        json.put("avg_piece_weight", avg_piece_weight);
+                        this.reportForWork(json);
+                    }
+                case 6:
+                    // 工单暂停
+                    if (!requireSucess && !"0".equals(order_No) && StrUtil.isNotBlank(order_No)) {
+                        JSONObject json = new JSONObject();
+                        json.put("workorder_code", order_No);
+                        json.put("qty", qty);
+                        json.put("qualified_qty", qualified);
+                        json.put("unqualified_qty", unqualified);
+                        json.put("weight", weight);
+                        json.put("avg_piece_weight", avg_piece_weight);
+                        json.put("type", "3");
+                        enterProduction(json);
+                    }
             }
 
-            
 
         }
         last_mode = mode;
@@ -255,6 +289,7 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De
         last_qualified = qualified;
         last_unqualified = unqualified;
         last_order_No = order_No;
+        last_avg_piece_weight = avg_piece_weight;
     }
 
 
@@ -284,13 +319,6 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De
                 if (result.getStatus() == HttpStatus.OK.value()) {
                     JSONObject jsonObject = JSONObject.parseObject(result.body());
                     if (ObjectUtil.isNotEmpty(jsonObject) && "200".equals(jsonObject.getString("status"))) {
-//                        ProduceshiftorderDto dto = produceshiftorderService.findByCode(order_No);
-//                        if (this.mode == 3) {
-//                            dto.setOrder_status("1");
-//                        } else if (this.mode == 4) {
-//                            dto.setOrder_status("2");
-//                        }
-//                        produceshiftorderService.update(dto);
                         this.writing(this.mode);
                         this.setRequireSucess(true);
                     }
@@ -300,6 +328,29 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De
         }
     }
 
+    public synchronized boolean reportForWork(JSONObject json) {
+        Date date = new Date();
+        if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) {
+            log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out);
+            return false;
+        } else {
+            this.instruction_require_time = date;
+            HttpResponse result = acsToWmsService.reportForWork(json);
+            if (ObjectUtil.isNotEmpty(result) && HttpStatus.OK.value() == result.getStatus()) {
+                JSONObject responseBody = JSONObject.parseObject(result.body());
+                if (ObjectUtil.isNotEmpty(responseBody)) {
+                    if (HttpStatus.OK.value() == responseBody.getIntValue("status")) {
+                        this.writing(this.mode);
+                        this.setRequireSucess(true);
+                    } else {
+                        this.writing(7);
+                    }
+                }
+            }
+            return true;
+        }
+    }
+
     public boolean exe_business() {
         return true;
     }
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java
index 5877509..ce83a62 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java
@@ -281,7 +281,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
                     }
                 case 17:
                     // 反向组盘
-                    if (!requireSucess && this.move != 0 && this.task != 0) {
+                    if (!requireSucess && this.move != 0 && this.task != 0 && this.barcode != 0) {
                         reverseGroup();
                     }
             }
@@ -541,15 +541,14 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out);
         } else {
             this.instruction_require_time = date;
-            Instruction inst = SpringContextHolder.getBean(InstructionService.class).findByCode(String.valueOf(task));
-            if (!StrUtil.startWith(inst.getTask_code(), "-")) {
-                JSONObject json = new JSONObject();
-                json.put("task_code", inst.getTask_code());
-                json.put("vehicle_code", barcode);
-                HttpResponse result = acsToWmsService.reverseGroup(json);
-                if (ObjectUtil.isNotEmpty(result)) {
-                    JSONObject jsonObject = JSONObject.parseObject(result.body());
-                    if (result.getStatus() == 200 || StrUtil.equals(jsonObject.getString("status"), "200")) {
+            JSONObject json = new JSONObject();
+            json.put("device_code", this.device_code);
+            json.put("vehicle_code", this.barcode);
+            HttpResponse response = acsToWmsService.reverseGroup(json);
+            if (ObjectUtil.isNotEmpty(response)) {
+                if (response.getStatus() == HttpStatus.OK.value()) {
+                    JSONObject jsonObject = JSONObject.parseObject(response.body());
+                    if (ObjectUtil.isNotEmpty(jsonObject) && "200".equals(jsonObject.getString("status"))) {
                         this.writing(this.mode);
                         this.setRequireSucess(true);
                     }
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java
index d677a0c..09496a1 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java
@@ -174,4 +174,6 @@ public interface AcsToWmsService {
     HttpResponse feedbackVehicleType(JSONObject param);
 
     HttpResponse mark(JSONObject param);
+
+    HttpResponse reportForWork(JSONObject param);
 }
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
index 3d02ede..8fa318e 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
@@ -997,9 +997,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                         .execute();
                 log.info("reverseGroup - 响应参数 {}", result.body());
             } catch (Exception e) {
-                String msg = e.getMessage();
-                //网络不通
-                System.out.println(msg);
+                log.error("reverseGroup - 请求错误！", e);
             }
             return result;
         } finally {
@@ -1059,4 +1057,29 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             MDC.remove(log_file_type);
         }
     }
+
+    @Override
+    public HttpResponse reportForWork(JSONObject param) {
+        try {
+            MDC.put(log_file_type, log_type);
+            String wmsurl = acsConfigService.findByCode(AcsConfig.WMSURL).getValue();
+
+            HttpResponse result = null;
+            log.info("reportForWork - 请求参数 {}", param);
+            AddressDto addressDto = addressService.findByCode("reportForWork");
+            String methods_url = addressDto.getMethods_url();
+            try {
+                result = HttpRequest
+                        .post(wmsurl + methods_url)
+                        .body(param.toJSONString())
+                        .execute();
+                log.info("reportForWork - 响应参数 {}", result.body());
+            } catch (Exception e) {
+                log.error("reportForWork - 请求错误！", e);
+            }
+            return result;
+        } finally {
+            MDC.remove(log_file_type);
+        }
+    }
 }
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
index ffcb134..c7a6f90 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
@@ -259,8 +259,9 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
             JSONObject json = orders.getJSONObject(i);
             String producetask_code = json.getString("workorder_code");
             String device_code = json.getString("device_code");
-            String material_code = json.getString("material_code");
+            String material_code = json.getString("material_number");
             String qty = json.getString("plan_qty");
+            String weight = json.getString("plan_weight");
             String product_code = json.getString("product_code");
             String AlongSide = json.getString("a");
             String BshortSide = json.getString("b");
@@ -285,7 +286,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                 if (lnshMixingMillDeviceDriver.getMode() == 0) {
                     throw new BadRequestException("设备未联机，下发失败！");
                 }
-                if (StrUtil.isEmpty(qty)) {
+                if (StrUtil.isEmpty(weight)) {
                     throw new BadRequestException("重量不能为空！");
                 }
                 if (StrUtil.isEmpty(material_code)) {
@@ -293,7 +294,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                 }
                 HashMap<String, Object> map = new HashMap<>();
                 map.put("to_order_No", producetask_code);
-                map.put("to_weight", qty);
+                map.put("to_weight", weight);
                 map.put("to_material_code", material_code);
                 map.put("to_command", 1);
                 lnshMixingMillDeviceDriver.writing(map);
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
index 8ba0454..61ab956 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
@@ -309,8 +309,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
             task_code = CodeUtil.getNewCode("TASK_NO");
             task_code = "-" + task_code;
         }
-        String start_point_code = dto.getStart_point_code();
-        String next_point_code = dto.getNext_point_code();
         String start_device_code = dto.getStart_device_code();
         String next_device_code = dto.getNext_device_code();
         String route_plan_code = dto.getRoute_plan_code();
@@ -327,19 +325,12 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
         }
         String plan_code = dto.getRoute_plan_code();
         //判断起点终点设备类型
-        String startDeviceType = deviceAppService.findDeviceTypeByCode(dto.getStart_device_code());
-        String nextDeviceType = deviceAppService.findDeviceTypeByCode(dto.getNext_device_code());
         if (routelineserver.getShortPathLines(dto.getStart_device_code(), dto.getNext_device_code(), plan_code).size() == 0) {
             throw new Exception(dto.getStart_point_code() + "->" + dto.getNext_point_code() + "路由不通!");
         }
-        String createTaskCheck = acsConfigService.findByCode(AcsConfig.CREATETASKCHECK).getValue();
-        DeviceService deviceService = SpringContextHolder.getBean(DeviceServiceImpl.class);
         DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
-        Device nextdevice = appService.findDeviceByCode(next_device_code);
         Device startdevice = appService.findDeviceByCode(start_device_code);
         dto.setMaterial(startdevice.getMaterial_type());
-        StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
-        StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
         WQLObject wo = WQLObject.getWQLObject("acs_task");
         JSONObject json = (JSONObject) JSONObject.toJSON(dto);
 
diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
index 8677789..c6cd796 100644
--- a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
+++ b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
@@ -56,9 +56,8 @@ public class AutoCreateInst {
             String route_plan_code = acsTask.getRoute_plan_code();
             String vehicleType = acsTask.getVehicle_type();
             //是否复合任务 =0非复合任务
-            String compound_task = acsTask.getCompound_task();
             String compound_task_data = null;
-            String next_point_code = acsTask.getNext_point_code();
+            String next_point_code;
             String next_device_code = acsTask.getNext_device_code();
             if (StrUtil.isEmpty(start_device_code)) {
                 log.info("任务 [" + taskcode + "] 起点设备为空，无法生成指令。");
diff --git a/acs/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java b/acs/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
index ef1f424..51d2d53 100644
--- a/acs/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
+++ b/acs/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
@@ -36,6 +36,7 @@ import org.springframework.stereotype.Component;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.util.Date;
 import java.util.Map;
@@ -90,7 +91,9 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
             ip = acsConfigService.findByCode(AcsConfig.AGVURL).getValue();
             port = Integer.parseInt(acsConfigService.findByCode(AcsConfig.AGVPORT).getValue());
             byte[] b = new byte[1028];
-            s = new Socket(ip, port);
+            s = new Socket();
+            s.connect(new InetSocketAddress(ip, port), 2 * 1000);
+            s.setKeepAlive(true);
             dos = new DataOutputStream(s.getOutputStream());
             dis = new DataInputStream(s.getInputStream());
 
@@ -154,8 +157,6 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                     StandardAutodoorDeviceDriver standardAutodoorDeviceDriver;
                     LnshStationDeviceDriver lnshStationDeviceDriver;
                     LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver;
-                    int type = Integer.parseInt(acsConfigService.findByCode(AcsConfig.BUSINESSTYPE).getValue());
-
                     try {
                         if (phase == 0x01) {
                             data = AgvService.sendAgvOneModeInst(phase, index);
diff --git a/acs/nladmin-system/src/main/resources/config/application-dev.yml b/acs/nladmin-system/src/main/resources/config/application-dev.yml
index 7eb57bd..1436d67 100644
--- a/acs/nladmin-system/src/main/resources/config/application-dev.yml
+++ b/acs/nladmin-system/src/main/resources/config/application-dev.yml
@@ -6,7 +6,7 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lnsh_acs2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:yksh_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
       password: ${DB_PWD:123456}
       # 初始连接数
diff --git a/acs/nladmin-system/src/main/resources/config/application-prod.yml b/acs/nladmin-system/src/main/resources/config/application-prod.yml
index fdcbec5..e0e3fcd 100644
--- a/acs/nladmin-system/src/main/resources/config/application-prod.yml
+++ b/acs/nladmin-system/src/main/resources/config/application-prod.yml
@@ -6,7 +6,7 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.4.210}:${DB_PORT:3306}/${DB_NAME:acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.4.210}:${DB_PORT:3306}/${DB_NAME:acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
       username: ${DB_USER:root}
       password: ${DB_PWD:123456}
       # 初始连接数
@@ -52,7 +52,7 @@ spring:
             multi-statement-allow: true
   redis:
     #数据库索引
-    database: ${REDIS_DB:2}
+    database: ${REDIS_DB:1}
     host: ${REDIS_HOST:127.0.0.1}
     port: ${REDIS_PORT:6379}
     password: ${REDIS_PWD:}
diff --git a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_station.vue b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_station.vue
index 5633cc5..145664f 100644
--- a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_station.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_station.vue
@@ -337,31 +337,31 @@ export default {
         }
         for (const val in this.data1) {
           if (this.data1[val].code.indexOf('heartbeat') !== -1) {
-            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) - 1)
+            this.data1[val].db = beforeStr + '.' + 'B0'
           }
           if (this.data1[val].code.indexOf('move') !== -1) {
-            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 1)
+            this.data1[val].db = beforeStr + '.' + 'B2'
           }
           if (this.data1[val].code.indexOf('action') !== -1) {
-            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2)
+            this.data1[val].db = beforeStr + '.' + 'B3'
           }
           if (this.data1[val].code.indexOf('ioaction') !== -1) {
-            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 3)
+            this.data1[val].db = beforeStr + '.' + 'B4'
           }
           if (this.data1[val].code.indexOf('error') !== -1) {
-            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 4)
+            this.data1[val].db = beforeStr + '.' + 'B5'
           }
           if (this.data1[val].code.indexOf('task') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 5)
+            this.data1[val].db = beforeStr + '.' + 'D6'
           }
           if (this.data1[val].code.indexOf('weight') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 9)
+            this.data1[val].db = beforeStr + '.' + 'D10'
           }
           if (this.data1[val].code.indexOf('material') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 13) + '.50'
+            this.data1[val].db = beforeStr + '.' + 'STRING14.50'
           }
           if (this.data1[val].code.indexOf('barcode') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 63)
+            this.data1[val].db = beforeStr + '.' + 'W66'
           }
         }
       }
@@ -382,10 +382,10 @@ export default {
         }
         for (const val in this.data2) {
           if (this.data2[val].code.indexOf('to_target') !== -1) {
-            this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2)
+            this.data2[val].db = beforeStr + '.' + 'W2'
           }
           if (this.data2[val].code.indexOf('to_task') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 4)
+            this.data2[val].db = beforeStr + '.' + 'D4'
           }
         }
       }
diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/PointUpdateUtil.java b/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/PointUpdateUtil.java
index a3bf136..ae106da 100644
--- a/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/PointUpdateUtil.java
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/PointUpdateUtil.java
@@ -35,7 +35,7 @@ public class PointUpdateUtil {
         pointObj.put("weight_unit_id", "");
         pointObj.put("instorage_time", "");
         pointObj.put("is_full", "0");
-        pointObj.put("standing_time", "0");
+        pointObj.put("stand_time", "0");
         pointObj.put("warn_time", "0");
         pointObj.put("group_id", "");
         pointTab.update(pointObj);
@@ -56,7 +56,7 @@ public class PointUpdateUtil {
         pointObj.put("ivt_qty", "0");
         pointObj.put("pcsn", null);
         pointObj.put("material_id", null);
-        pointObj.put("standing_time", "0");
+        pointObj.put("stand_time", "0");
         pointTab.update(pointObj);
     }
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialDetailDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialDetailDto.java
index ba6021e..c79d143 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialDetailDto.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialDetailDto.java
@@ -24,7 +24,7 @@ public class MaterialDetailDto implements Serializable {
     /**
      * 物料编码
      */
-    private String material_code;
+    private String material_number;
 
     /**
      * 物料名称
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialbaseDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialbaseDto.java
index 09fd61a..4ebee8d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialbaseDto.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialbaseDto.java
@@ -5,7 +5,6 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * @author zhouz
@@ -21,9 +20,10 @@ public class MaterialbaseDto implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long material_id;
 
-    private String material_code;
+    private String material_number;
+    private String material_name;
 
-    private Integer standing_time;
+    private Integer stand_time;
 
     private Integer threshold_time;
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java
index bd4e5cf..f63d50f 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java
@@ -29,8 +29,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * @author zhouz
@@ -50,11 +48,8 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
 
         HashMap<String, String> map = new HashMap<>();
         map.put("flag", "1");
-        map.put("search", name);
-        map.put("material_type", MapUtil.getStr(whereJson, "material_type"));
-        map.put("order_code", MapUtil.getStr(whereJson, "order_code"));
-        map.put("product_grade", MapUtil.getStr(whereJson, "product_grade"));
-        map.put("brick_type", MapUtil.getStr(whereJson, "brick_type"));
+        map.put("material_number", MapUtil.getStr(whereJson, "material_number"));
+        map.put("material_name", MapUtil.getStr(whereJson, "material_name"));
 
         return WQL.getWO("QMD_ME_MATERIAL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time DESC");
     }
@@ -81,7 +76,7 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
         if (StrUtil.isNotEmpty(code) && code.contains("\\")) {
             code = code.replace("\\", "\\\\");
         }
-        JSONObject json = wo.query("material_code ='" + code + "'").uniqueResult(0);
+        JSONObject json = wo.query("material_number ='" + code + "'").uniqueResult(0);
         if (ObjectUtil.isEmpty(json)) return null;
         String unit_name = WQLObject.getWQLObject("md_pb_measureunit").query("measure_unit_id= '" + json.getString("base_unit_id") + "'").uniqueResult(0).getString("unit_name");
         json.put("base_unit_name", unit_name);
@@ -93,10 +88,10 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
     @Transactional(rollbackFor = Exception.class)
     public void create(MaterialbaseDto dto) {
         WQLObject wo = WQLObject.getWQLObject("md_me_materialbase");
-        String material_code = dto.getMaterial_code();
-        JSONObject material = wo.query("material_code = '" + material_code + "'").uniqueResult(0);
+        String material_number = dto.getMaterial_number();
+        JSONObject material = wo.query("material_number = '" + material_number + "'").uniqueResult(0);
         if (ObjectUtil.isNotEmpty(material)) {
-            throw new BadRequestException("物料编码 [" + material_code + "] 已存在！");
+            throw new BadRequestException("物料号 [" + material_number + "] 已存在！");
         }
 
         Long currentUserId = SecurityUtils.getCurrentUserId();
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_ME_MATERIAL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_ME_MATERIAL.wql
index ac1de57..91ce79d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_ME_MATERIAL.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_ME_MATERIAL.wql
@@ -22,6 +22,8 @@
     输入.order_code   			        TYPEAS s_string
     输入.product_grade   			    TYPEAS s_string
     输入.brick_type   			        TYPEAS s_string
+    输入.material_number   			    TYPEAS s_string
+    输入.material_name   			    TYPEAS s_string
 
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -53,20 +55,11 @@
             	md_me_materialbase mb
             WHERE
                 is_delete = '0'
-                OPTION 输入.search <> ""
-                    mb.material_code like '%' 输入.search '%'
+                OPTION 输入.material_number <> ""
+                    mb.material_number like '%' 输入.material_number '%'
                 ENDOPTION
-                OPTION 输入.material_type <> ""
-                    mb.material_type = 输入.material_type
-                ENDOPTION
-                OPTION 输入.order_code <> ""
-                    mb.order_code LIKE '%' 输入.order_code '%'
-                ENDOPTION
-                OPTION 输入.product_grade <> ""
-                    mb.product_grade LIKE '%' 输入.product_grade '%'
-                ENDOPTION
-                OPTION 输入.brick_type <> ""
-                    mb.brick_type LIKE '%' 输入.brick_type '%'
+                OPTION 输入.material_name <> ""
+                    mb.material_name = like '%' 输入.material_name '%'
                 ENDOPTION
 			ENDSELECT
 		ENDPAGEQUERY
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_STORAGEVEHICLEINFO.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_STORAGEVEHICLEINFO.wql
index 36ac5f7..0d33527 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_STORAGEVEHICLEINFO.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_STORAGEVEHICLEINFO.wql
@@ -46,7 +46,7 @@
 			SELECT
             	s.*,
             	d.label AS storagevehicle_type_name,
-                mater.material_code,
+                mater.material_number,
                 mater.material_name,
                 point.point_code,
                 point.point_name
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/dashboard/service/DashboardService.java b/lms/nladmin-system/src/main/java/org/nl/wms/dashboard/service/DashboardService.java
index 640ba11..bb506aa 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/dashboard/service/DashboardService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/dashboard/service/DashboardService.java
@@ -712,9 +712,9 @@ public class DashboardService {
         monthlyFailureStatistics.put("average", average);
         // 真实获取
         average.put("mix", mixData.isEmpty() ? 0 : mixData.stream().mapToInt(o -> ((JSONObject) o).getIntValue("count")).sum() / mixData.size());
-        average.put("press", mixData.isEmpty() ? 0 : pressData.stream().mapToInt(o -> ((JSONObject) o).getIntValue("count")).sum() / mixData.size());
-        average.put("dry", mixData.isEmpty() ? 0 : dryData.stream().mapToInt(o -> ((JSONObject) o).getIntValue("count")).sum() / mixData.size());
-        average.put("sort", mixData.isEmpty() ? 0 : sortData.stream().mapToInt(o -> ((JSONObject) o).getIntValue("count")).sum() / mixData.size());
+        average.put("press", pressData.isEmpty() ? 0 : pressData.stream().mapToInt(o -> ((JSONObject) o).getIntValue("count")).sum() / mixData.size());
+        average.put("dry", dryData.isEmpty() ? 0 : dryData.stream().mapToInt(o -> ((JSONObject) o).getIntValue("count")).sum() / mixData.size());
+        average.put("sort", sortData.isEmpty() ? 0 : sortData.stream().mapToInt(o -> ((JSONObject) o).getIntValue("count")).sum() / mixData.size());
 
         // 当日工序生产统计------------------------------------------------------------------------------------------------
         JSONObject dailyProductionStatistics = new JSONObject();
@@ -776,6 +776,7 @@ public class DashboardService {
      *
      * @return 大屏首页设备数据
      */
+    @SuppressWarnings("all")
     public JSONObject homepageEquipment1() {
         JSONObject result = new JSONObject();
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
index 5d7d155..09cc9a3 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
@@ -68,7 +68,7 @@ public class AcsToWmsController {
         RLock lock = SpringContextHolder.getBean(RedissonClient.class).getFairLock(type);
         boolean try_lock = false;
         try {
-            try_lock = lock.tryLock(5, TimeUnit.SECONDS);
+            try_lock = lock.tryLock(10, TimeUnit.SECONDS);
             if (try_lock) {
                 return new ResponseEntity<>(acsToWmsService.apply(whereJson), HttpStatus.OK);
             }
@@ -150,8 +150,8 @@ public class AcsToWmsController {
     }
 
     @PostMapping("/getVehicleInfoBycode")
-    @Log("根据设备编码编码获取托盘信息")
-    @ApiOperation("根据设备编码编码获取托盘信息")
+    @Log("根据设备号编码获取托盘信息")
+    @ApiOperation("根据设备号编码获取托盘信息")
     @SaIgnore
     public ResponseEntity<Object> getVehicleInfoByDevice_code(@RequestBody Map whereJson) {
         return new ResponseEntity<>(acsToWmsService.getVehicleInfoByDeviceCode(whereJson), HttpStatus.OK);
@@ -189,4 +189,12 @@ public class AcsToWmsController {
     public ResponseEntity<Object> inKiln(@RequestBody JSONObject param) {
         return ResponseEntity.ok(acsToWmsService.inKiln(param));
     }
+
+    @PostMapping("/reportForWork")
+    @Log("报工")
+    @ApiOperation("报工")
+    @SaIgnore
+    public ResponseEntity<Object> reportForWork(@RequestBody JSONObject param) {
+        return ResponseEntity.ok(acsToWmsService.reportForWork(param));
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
index 0d4c7de..7ea841c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
@@ -96,7 +96,7 @@ public interface AcsToWmsService {
     JSONObject reverseGroup(JSONObject whereJson);
 
     /**
-     * 根据设备编码获取托盘信息
+     * 根据设备号获取托盘信息
      *
      * @param jsonObject 条件
      * @return Map<String, Object>
@@ -108,4 +108,6 @@ public interface AcsToWmsService {
     JSONObject outKiln(JSONObject whereJson);
 
     JSONObject inKiln(JSONObject param);
+
+    JSONObject reportForWork(JSONObject param);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index 45934fc..5f6c8ee 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -14,37 +14,21 @@ import org.nl.modules.system.util.CodeUtil;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
-import org.nl.wms.basedata.eum.StandStatus;
 import org.nl.wms.basedata.eum.TrueOrFalse;
 import org.nl.wms.basedata.eum.VehicleType;
 import org.nl.wms.basedata.service.dto.VehicleDto;
-import org.nl.wms.common.PickType;
 import org.nl.wms.ext.acs.service.AcsToWmsService;
-import org.nl.wms.ext.acs.service.WmsToAcsService;
+import org.nl.wms.pdm.service.WorkordeService;
 import org.nl.wms.sch.manage.*;
-import org.nl.wms.sch.task.call.empty.FJCallEmptyTask;
-import org.nl.wms.sch.task.call.empty.GTKCallEmptyTask;
-import org.nl.wms.sch.task.call.empty.HLCallEmptyTask;
 import org.nl.wms.sch.task.call.empty.YZCallEmptyTask;
-import org.nl.wms.sch.task.call.material.FJCallMaterialTask;
-import org.nl.wms.sch.task.call.material.SZCallMaterialTask;
-import org.nl.wms.sch.task.call.material.YZCallMaterialTask;
-import org.nl.wms.sch.task.send.empty.FJSendEmptyTask;
-import org.nl.wms.sch.task.send.empty.YZSendEmptyTask;
-import org.nl.wms.sch.task.send.material.FJSendMaterialTask;
-import org.nl.wms.sch.task.send.material.HLSendMaterialTask;
-import org.nl.wms.sch.task.send.material.SZSendMaterialTask;
+import org.nl.wms.sch.task.call.material.GZCallMaterialTask;
 import org.nl.wms.sch.task.send.material.YZSendMaterialTask;
-import org.nl.wms.sch.task.to.pack.BTHCToPackageTask;
-import org.nl.wms.sch.task.to.pack.FJToPackageTask;
 import org.nl.wms.sch.task.util.TaskUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.lang.reflect.Method;
-import java.math.BigDecimal;
-import java.util.Date;
 import java.util.Map;
 
 @Service
@@ -52,37 +36,13 @@ import java.util.Map;
 @Slf4j
 public class AcsToWmsServiceImpl implements AcsToWmsService {
 
-    private final HLCallEmptyTask hlCallEmptyTask;
-
-    private final HLSendMaterialTask hlSendMaterialTask;
+    private final WorkordeService workordeService;
 
     private final YZCallEmptyTask yzCallEmptyTask;
 
     private final YZSendMaterialTask yzSendMaterialTask;
 
-    private final SZSendMaterialTask szSendMaterialTask;
-
-    private final FJCallMaterialTask fjCallMaterialTask;
-
-    private final FJSendEmptyTask fjSendEmptyTask;
-
-    private final GTKCallEmptyTask gtkCallEmptyTask;
-
-    private final FJSendMaterialTask fjSendMaterialTask;
-
-    private final FJCallEmptyTask fjCallEmptyTask;
-
-    private final FJToPackageTask fjToPackageTask;
-
-    private final BTHCToPackageTask bthcToPackageTask;
-
-    private final YZCallMaterialTask yzCallMaterialTask;
-
-    private final YZSendEmptyTask yzSendEmptyTask;
-
-    private final SZCallMaterialTask szCallMaterialTask;
-
-    private final WmsToAcsService wmsToAcsService;
+    private final GZCallMaterialTask gzCallMaterialTask;
 
     /**
      * task_id：任务标识
@@ -207,7 +167,91 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public JSONObject apply(JSONObject param) {
-        return null;
+        String type = param.getString("type");
+        if (StrUtil.isBlank(type)) {
+            throw new BadRequestException("任务类型不能为空！");
+        }
+        String pointCode = param.getString("device_code");
+        if (StrUtil.isBlank(pointCode)) {
+            throw new BadRequestException("点位不能为空！");
+        }
+
+        JSONObject point = param.getJSONObject("point");
+        if (ObjectUtil.isEmpty(point)) {
+            point = WQLObject
+                    .getWQLObject("sch_base_point")
+                    .query("is_used = '1' AND point_code = '" + pointCode + "'")
+                    .uniqueResult(0);
+            if (ObjectUtil.isEmpty(point)) {
+                throw new BadRequestException("[" + pointCode + "] 已删除或未启用！");
+            }
+        }
+
+        TaskUtils.isLocked(point);
+
+        JSONObject methodParam = new JSONObject();
+        methodParam.put("point", point);
+        methodParam.put("create_mode", CreateMode.ACSSQ.value());
+        String request_param = param.getString("request_param");
+        if (StrUtil.isBlank(request_param)) {
+            request_param = param.toJSONString();
+        }
+        methodParam.put("request_param", request_param);
+        methodParam.put("create_id", ACSSystem.id);
+        methodParam.put("create_name", ACSSystem.nick_name);
+
+        Region region = Region.get(point.getString("region_code"));
+        String taskCode = null;
+        switch (type) {
+            case "1":
+                // 送料
+                switch (region) {
+                    case YZ:
+                        methodParam.put("workorder", param.getJSONObject("workorder"));
+                        methodParam.put("vd", param.getJSONObject("vd"));
+                        taskCode = yzSendMaterialTask.createTask(methodParam);
+                        break;
+                    default:
+                        throw new BadRequestException("[" + region.label() + "] 不能发起送料任务！");
+                }
+                break;
+            case "2":
+                // 叫料
+                switch (region) {
+                    case GZ:
+                        taskCode = gzCallMaterialTask.createTask(methodParam);
+                        break;
+                    default:
+                        throw new BadRequestException("[" + region.label() + "] 不能发起叫料任务！");
+                }
+                break;
+            case "3":
+                // 送空
+                break;
+            case "4":
+                // 叫空
+                JSONObject workOrder = WQLObject
+                        .getWQLObject("pdm_bd_workorder")
+                        .query("is_delete = '0' AND device_code = '" + point.getString("device_code") + "' AND order_status = '3'")
+                        .uniqueResult(0);
+                methodParam.put("workorder", workOrder);
+
+                switch (region) {
+                    case YZ:
+                        taskCode = yzCallEmptyTask.createTask(methodParam);
+                        break;
+                    default:
+                        throw new BadRequestException("[" + region.label() + "] 不能发起叫空任务！");
+                }
+                break;
+            default:
+                throw new BadRequestException("未知任务类型！");
+        }
+
+        JSONObject result = new JSONObject();
+        result.put("message", "申请任务成功，任务编码 [" + taskCode + "]");
+        result.put("status", HttpStatus.OK.value());
+        return result;
     }
 
     /**
@@ -263,7 +307,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         vd.put("vehicle_code", vehicle_code);
         vd.put("material_id", workorder.getString("material_id"));
         vd.put("qty", qty);
-        vd.put("weight", weight);
+        vd.put("weight", Long.parseLong(weight) / 1000.00);
         vd.put("is_full", is_full);
         vd.put("workorder_id", workorder.getString("workorder_id"));
         vd.put("point_code", point_code);
@@ -395,52 +439,83 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         if (StrUtil.isEmpty(type)) {
             throw new BadRequestException("类型不能为空！");
         }
-        String workorder_code = jsonObject.getString("workorder_code");
-        if (StrUtil.isEmpty(type)) {
-            throw new BadRequestException("工单编码不能为空！");
+        String WorkOrderCode = jsonObject.getString("workorder_code");
+        if (StrUtil.isEmpty(WorkOrderCode)) {
+            throw new BadRequestException("工单号不能为空！");
         }
-        WQLObject workorder_table = WQLObject.getWQLObject("pdm_bd_workorder");
-        JSONObject workorder = workorder_table
-                .query("workorder_code = '" + workorder_code + "'")
+        WQLObject workOrderTable = WQLObject.getWQLObject("pdm_bd_workorder");
+        JSONObject workOrder = workOrderTable
+                .query("workorder_code = '" + WorkOrderCode + "'")
                 .uniqueResult(0);
+        if (ObjectUtil.isEmpty(workOrder)) {
+            throw new BadRequestException("工单不存在！");
+        }
+        long workOrderId = workOrder.getLongValue("workorder_id");
 
-        if ("1".equals(type)) {
-            // 排产确认
-            if (workorder.getIntValue("order_status") < 3) {
-                workorder.put("order_status", WorkOrderEnum.ORDER_STATUS_PRODUCING.value());
-                workorder.put("realproducestart_date", DateUtil.now());
-                TaskUtils.addACSUpdateColum(workorder);
-                workorder_table.update(workorder);
-            }
-        } else if ("2".equals(type)) {
-            // 工单完成
-            String qty = jsonObject.getString("qty");
-            if (StrUtil.isBlank(qty)) {
-                throw new BadRequestException("数量不能为空！");
-            }
+        switch (type) {
+            case "1":
+                // 工单确认
+                workOrder.put("order_status", WorkOrderEnum.ORDER_STATUS_PRODUCING.value());
+                workOrder.put("realproducestart_date", DateUtil.now());
+                TaskUtils.addACSUpdateColum(workOrder);
+                workOrderTable.update(workOrder);
+                break;
+            case "2":
+                // 工单完成
+            {
+                int qty = jsonObject.getIntValue("qty");
+                int qualifiedQty = jsonObject.getIntValue("qualified_qty");
+                int unqualifiedQty = jsonObject.getIntValue("unqualified_qty");
+                int weightG = jsonObject.getIntValue("weight");
+                double weightKG = weightG / 1000.00;
+                int avgPieceWeightG = jsonObject.getIntValue("avg_piece_weight");
+                double avgPieceWeightKG = avgPieceWeightG / 1000.00;
 
-            if (workorder.getIntValue("order_status") < 5) {
-                workorder.put("order_status", WorkOrderEnum.ORDER_STATUS_FINISH.value());
-                if (!"0".equals(qty)) {
-                    workorder.put("real_qty", qty);
-                } else {
-                    workorder.put("real_qty", workorder.getIntValue("unqualified_qty") + workorder.getIntValue("qualified_qty"));
-                }
-                String unqualified_qty = jsonObject.getString("unqualified_qty");
-                if (StrUtil.isNotBlank(unqualified_qty) && !"0".equals(unqualified_qty)) {
-                    workorder.put("unqualified_qty", unqualified_qty);
-                }
-                String qualified_qty = jsonObject.getString("qualified_qty");
-                if (StrUtil.isNotBlank(qualified_qty) && !"0".equals(qualified_qty)) {
-                    workorder.put("qualified_qty", qualified_qty);
-                } else {
-                    workorder.put("qualified_qty", workorder.getIntValue("real_qty") - workorder.getIntValue("unqualified_qty"));
-                }
+                // 报工
+                workordeService.reportWorkOrderDaily(workOrderId, qty, qualifiedQty, unqualifiedQty, weightKG, avgPieceWeightKG);
 
-                workorder.put("realproduceend_date", DateUtil.now());
-                TaskUtils.addACSUpdateColum(workorder);
-                workorder_table.update(workorder);
+                // 汇总
+                JSONArray workOrderDailyList = WQLObject.getWQLObject("pdm_bd_work_order_daily").query("workorder_id = " + workOrderId).getResultJSONArray(0);
+                workOrder.put("real_qty", workOrderDailyList.stream().mapToInt(o -> ((JSONObject) o).getIntValue("qty")).sum());
+                workOrder.put("real_weight", workOrderDailyList.stream().mapToDouble(o -> ((JSONObject) o).getDoubleValue("weight")).sum());
+                workOrder.put("qualified_qty", workOrderDailyList.stream().mapToInt(o -> ((JSONObject) o).getIntValue("qualified_qty")).sum());
+                workOrder.put("unqualified_qty", workOrderDailyList.stream().mapToInt(o -> ((JSONObject) o).getIntValue("unqualified_qty")).sum());
+                workOrder.put("avg_piece_weight", workOrderDailyList.stream().mapToDouble(o -> ((JSONObject) o).getDoubleValue("avg_piece_weight")).sum() / workOrderDailyList.size());
+                workOrder.put("order_status", WorkOrderEnum.ORDER_STATUS_FINISH.value());
+                workOrder.put("realproduceend_date", DateUtil.now());
+                TaskUtils.addACSUpdateColum(workOrder);
+                workOrderTable.update(workOrder);
             }
+            break;
+            case "3":
+                // 工单暂停
+            {
+                int qty = jsonObject.getIntValue("qty");
+                int qualifiedQty = jsonObject.getIntValue("qualified_qty");
+                int unqualifiedQty = jsonObject.getIntValue("unqualified_qty");
+                int weightG = jsonObject.getIntValue("weight");
+                double weightKG = weightG / 1000.00;
+                int avgPieceWeightG = jsonObject.getIntValue("avg_piece_weight");
+                double avgPieceWeightKG = avgPieceWeightG / 1000.00;
+
+                // 报工
+                workordeService.reportWorkOrderDaily(workOrderId, qty, qualifiedQty, unqualifiedQty, weightKG, avgPieceWeightKG);
+
+                // 汇总
+                JSONArray workOrderDailyList = WQLObject.getWQLObject("pdm_bd_work_order_daily").query("workorder_id = " + workOrderId).getResultJSONArray(0);
+                workOrder.put("real_qty", workOrderDailyList.stream().mapToInt(o -> ((JSONObject) o).getIntValue("qty")).sum());
+                workOrder.put("real_weight", workOrderDailyList.stream().mapToDouble(o -> ((JSONObject) o).getDoubleValue("weight")).sum());
+                workOrder.put("qualified_qty", workOrderDailyList.stream().mapToInt(o -> ((JSONObject) o).getIntValue("qualified_qty")).sum());
+                workOrder.put("unqualified_qty", workOrderDailyList.stream().mapToInt(o -> ((JSONObject) o).getIntValue("unqualified_qty")).sum());
+                workOrder.put("avg_piece_weight", workOrderDailyList.stream().mapToDouble(o -> ((JSONObject) o).getDoubleValue("avg_piece_weight")).sum() / workOrderDailyList.size());
+                workOrder.put("order_status", WorkOrderEnum.ORDER_STATUS_STOP.value());
+                workOrder.put("realproduceend_date", DateUtil.now());
+                TaskUtils.addACSUpdateColum(workOrder);
+                workOrderTable.update(workOrder);
+            }
+                break;
+            default:
+                throw new BadRequestException("未知操作类型！");
         }
 
         JSONObject result = new JSONObject();
@@ -475,27 +550,42 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
     /**
      * 入窑口反向组盘
      *
-     * @param whereJson
+     * @param param
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public JSONObject reverseGroup(JSONObject whereJson) {
-        String vehicle_code = whereJson.getString("vehicle_code");
-        if (StrUtil.isBlank(vehicle_code)) {
+    public JSONObject reverseGroup(JSONObject param) {
+        String vehicle_code = TaskUtils.formatVehicleCode(param.getString("vehicle_code"));
+        if ("0000".equals(vehicle_code)) {
             throw new BadRequestException("条码不能为空！");
         }
-        String task_code = whereJson.getString("task_code");
-        if (StrUtil.isBlank(task_code)) {
-            throw new BadRequestException("任务编码不能为空！");
+        String device_code = param.getString("device_code");
+        if (StrUtil.isBlank(device_code)) {
+            throw new BadRequestException("设备号不能为空！");
         }
 
-        JSONObject task = WQLObject.getWQLObject("sch_base_task").query("task_code = '" + task_code + "'").uniqueResult(0);
-        if (ObjectUtil.isEmpty(task)) {
-            throw new BadRequestException("未查询到任务 [" + task_code + "] ！");
+        WQLObject pointTable = WQLObject.getWQLObject("sch_base_point");
+        JSONObject point = pointTable.query("point_code = '" + device_code + "'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(point)) {
+            throw new BadRequestException("[" + device_code + "] 点位不存在！");
+        }
+        // 等待任务完成
+        TaskUtils.isLocked(point);
+
+        String vdId = point.getString("vd_id");
+        if (StrUtil.isNotBlank(vdId)) {
+            JSONObject vdUpdate = new JSONObject();
+            vdUpdate.put("vehicle_code", vehicle_code);
+            WQLObject.getWQLObject("st_ivt_vehicle_detail").update(vdUpdate, "vd_id = " + vdId);
+
+            // 解绑点位防止人工放料出错
+            point.put("vehicle_type", "");
+            point.put("vehicle_code", "");
+            point.put("vd_id", null);
+            point.put("point_status", PointStatus.EMPTY.value());
+            TaskUtils.addACSUpdateColum(point);
+            pointTable.update(point);
         }
-        JSONObject vd_update = new JSONObject();
-        vd_update.put("vehicle_code", vehicle_code);
-        WQLObject.getWQLObject("st_ivt_vehicle_detail").update(vd_update, "vd_id = " + task.getString("group_id"));
 
         JSONObject result = new JSONObject();
         result.put("status", HttpStatus.OK.value());
@@ -504,7 +594,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
     }
 
     /**
-     * 根据设备编码获取托盘信息
+     * 根据设备号获取托盘信息
      *
      * @param jsonObject 条件
      * @return Map<String, Object>
@@ -622,12 +712,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 .query("is_delete = '0' AND vehicle_type = '2' AND vehicle_code = '" + vehicle_code + "'")
                 .uniqueResult(0);
         if (ObjectUtil.isNotEmpty(vd)) {
-            vd.put("is_fire", "1");
-            vd.put("is_in_kiln", "0");
-            vd_table.update(vd);
-
             JSONObject workorder = WQLObject.getWQLObject("pdm_bd_workorder").query("workorder_id = " + vd.getString("workorder_id")).uniqueResult(0);
             to_package = TrueOrFalse.trueOrFalse(workorder.getString("is_pri"));
+
+            vd.put("out_kiln_time", DateUtil.now());
+            TaskUtils.addACSUpdateColum(vd);
+            vd_table.update(vd);
         }
 
         JSONObject result = new JSONObject();
@@ -645,13 +735,25 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
     @Override
     public JSONObject inKiln(JSONObject param) {
         String vehicle_code = TaskUtils.formatVehicleCode(param.getString("vehicle_code"));
-        if (StrUtil.isNotBlank(vehicle_code)) {
-            String kiln_number = param.getString("kiln_number");
-            if (StrUtil.isNotBlank(kiln_number)) {
-                JSONObject vd_update = new JSONObject();
-                vd_update.put("kiln_number", "Y0" + kiln_number);
-                vd_update.put("in_kiln_time", DateUtil.now());
-                WQLObject.getWQLObject("st_ivt_vehicle_detail").update(vd_update, "is_delete = '0' AND vehicle_code = '" + vehicle_code + "'");
+        if (!"0000".equals(vehicle_code)) {
+            String type = param.getString("type");
+            if ("1".equals(type)) {
+                String kilnNumber = param.getString("kiln_number");
+                if (StrUtil.isNotBlank(kilnNumber) && !"0".equals(kilnNumber)) {
+                    JSONObject vd_update = new JSONObject();
+                    vd_update.put("kiln_number", "Y0" + kilnNumber);
+                    vd_update.put("in_kiln_time", DateUtil.now());
+                    TaskUtils.addACSUpdateColum(vd_update);
+                    WQLObject.getWQLObject("st_ivt_vehicle_detail").update(vd_update, "is_delete = '0' AND vehicle_code = '" + vehicle_code + "'");
+                }
+            } else if ("2".equals(type)) {
+                String coolNumber = param.getString("cool_number");
+                if (StrUtil.isNotBlank(coolNumber) && !"0".equals(coolNumber)) {
+                    JSONObject vd_update = new JSONObject();
+                    vd_update.put("cool_number", "LQD0" + coolNumber);
+                    TaskUtils.addACSUpdateColum(vd_update);
+                    WQLObject.getWQLObject("st_ivt_vehicle_detail").update(vd_update, "is_delete = '0' AND vehicle_code = '" + vehicle_code + "'");
+                }
             }
         }
 
@@ -660,4 +762,67 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         result.put("message", "反馈成功！");
         return result;
     }
+
+    @Override
+    public JSONObject reportForWork(JSONObject param) {
+        String WorkOrderCode = param.getString("workorder_code");
+        if (StrUtil.isEmpty(WorkOrderCode)) {
+            throw new BadRequestException("工单号不能为空！");
+        }
+        WQLObject workOrderTable = WQLObject.getWQLObject("pdm_bd_workorder");
+        JSONObject workOrder = workOrderTable
+                .query("workorder_code = '" + WorkOrderCode + "'")
+                .uniqueResult(0);
+        if (ObjectUtil.isEmpty(workOrder)) {
+            throw new BadRequestException("工单不存在！");
+        }
+        long workOrderId = workOrder.getLongValue("workorder_id");
+        int qty = param.getIntValue("qty");
+        int qualifiedQty = param.getIntValue("qualified_qty");
+        int unqualifiedQty = param.getIntValue("unqualified_qty");
+        int weightG = param.getIntValue("weight");
+        double weightKG = weightG / 1000.00;
+        int avgPieceWeightG = param.getIntValue("avg_piece_weight");
+        double avgPieceWeightKG = avgPieceWeightG / 1000.00;
+
+        String today = DateUtil.today();
+        WQLObject wodTable = WQLObject.getWQLObject("pdm_bd_work_order_daily");
+        JSONObject workOrderDaily = wodTable.query("workorder_id = " + workOrderId + " AND date = '" + today + "'").uniqueResult(0);
+
+        if (ObjectUtil.isEmpty(workOrderDaily)) {
+            workOrderDaily = new JSONObject();
+            workOrderDaily.put("id", IdUtil.getSnowflake().nextId());
+            workOrderDaily.put("date", today);
+            workOrderDaily.put("workorder_id", workOrderId);
+            workOrderDaily.put("qty", qty);
+            workOrderDaily.put("qualified_qty", qualifiedQty);
+            workOrderDaily.put("unqualified_qty", unqualifiedQty);
+            workOrderDaily.put("weight", weightKG);
+            workOrderDaily.put("avg_piece_weight", avgPieceWeightKG);
+            workOrderDaily.put("is_report", TrueOrFalse.TRUE.value());
+            TaskUtils.addACSCreateColum(workOrderDaily);
+            wodTable.insert(workOrderDaily);
+        } else {
+            if ("1".equals(workOrderDaily.getString("is_report"))) {
+                JSONObject result = new JSONObject();
+                result.put("status", HttpStatus.CREATED.value());
+                result.put("message", "当日已报工！");
+                return result;
+            }
+
+            workOrderDaily.put("qty", qty);
+            workOrderDaily.put("qualified_qty", qualifiedQty);
+            workOrderDaily.put("unqualified_qty", unqualifiedQty);
+            workOrderDaily.put("weight", weightKG);
+            workOrderDaily.put("avg_piece_weight", avgPieceWeightKG);
+            workOrderDaily.put("is_report", TrueOrFalse.TRUE.value());
+            TaskUtils.addACSUpdateColum(workOrderDaily);
+            wodTable.update(workOrderDaily);
+        }
+
+        JSONObject result = new JSONObject();
+        result.put("status", HttpStatus.OK.value());
+        result.put("message", "反馈成功！");
+        return result;
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACS_TO_WMS.wql b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACS_TO_WMS.wql
index 796d970..0b2b2f9 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACS_TO_WMS.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACS_TO_WMS.wql
@@ -78,7 +78,7 @@
         QUERY
             SELECT
             	vd.is_package,
-            	material.material_code,
+            	material.material_number,
             	material.furnace,
             	material.material_brick_type,
             	material.product_grade,
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/service/PdaService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/service/PdaService.java
index 8e4bc53..79ec05a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/service/PdaService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/service/PdaService.java
@@ -32,7 +32,7 @@ public interface PdaService {
      * 查询设备
      *
      * @param func 手持功能
-     * @return 设备编码 设备名称
+     * @return 设备号 设备名称
      */
     JSONArray device(String func);
 
@@ -47,7 +47,7 @@ public interface PdaService {
     /**
      * 不合格品上报
      *
-     * @param device_code     设备编码
+     * @param device_code     设备号
      * @param unqualified_qty 不合格数量
      */
     void report(String device_code, String unqualified_qty);
@@ -120,7 +120,7 @@ public interface PdaService {
     /**
      * 呼叫次品料
      *
-     * @param device_code 设备编码
+     * @param device_code 设备号
      */
     void callDefective(String device_code, String request_param);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/WorkordeService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/WorkordeService.java
index 1bd390d..118d0de 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/WorkordeService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/WorkordeService.java
@@ -126,4 +126,6 @@ public interface WorkordeService {
     JSONArray getMaterial();
 
     void downloadExcel(Map<String, Object> params, HttpServletResponse response);
+
+    void reportWorkOrderDaily(long workOrderId, int qty, int qualifiedQty, int unqualifiedQty, double weight, double avgPieceWeight);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/DeviceDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/DeviceDto.java
index 736ed46..5874ee4 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/DeviceDto.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/DeviceDto.java
@@ -23,7 +23,7 @@ public class DeviceDto implements Serializable {
     private Long device_id;
 
     /**
-     * 设备编码
+     * 设备号
      */
     private String device_code;
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/WorkorderDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/WorkorderDto.java
index 54b1207..6a5b57d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/WorkorderDto.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/WorkorderDto.java
@@ -65,7 +65,7 @@ public class WorkorderDto implements Serializable {
     /** 回传MES状态 */
     private String passback_status;
 
-    /** 设备编码 */
+    /** 设备号 */
     private String device_code;
 
     /** 外部标识 */
@@ -96,7 +96,7 @@ public class WorkorderDto implements Serializable {
     private String update_time;
 
     /** 静置时间 */
-    private String standing_time;
+    private String stand_time;
 
     /** 阈值时间 */
     private String warn_time;
@@ -112,4 +112,10 @@ public class WorkorderDto implements Serializable {
     private String region_code;
 
     private String plan_date;
+
+    private BigDecimal plan_weight;
+
+    private BigDecimal real_weight;
+
+    private BigDecimal avg_piece_weight;
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java
index 7ee8172..e73c8b1 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java
@@ -19,12 +19,10 @@ import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.basedata.eum.TrueOrFalse;
-import org.nl.wms.basedata.eum.VehicleType;
 import org.nl.wms.ext.acs.service.WmsToAcsService;
 import org.nl.wms.pdm.service.WorkordeService;
 import org.nl.wms.pdm.service.dto.WorkorderDto;
 import org.nl.wms.sch.manage.Region;
-import org.nl.wms.sch.manage.RegionInType;
 import org.nl.wms.sch.manage.WorkOrderEnum;
 import org.nl.wms.sch.task.util.TaskUtils;
 import org.springframework.data.domain.Pageable;
@@ -34,7 +32,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -127,15 +124,7 @@ public class WorkorderServiceImpl implements WorkordeService {
         work_order.put("planproducestart_date", dto.getPlanproducestart_date());
         work_order.put("planproduceend_date", dto.getPlanproduceend_date());
         work_order.put("material_id", dto.getMaterial_id());
-        String region_code = dto.getRegion_code();
         String vehicle_type = dto.getVehicle_type();
-        if (!Region.FJ.value().equals(region_code)) {
-            if (Region.YZ.value().equals(region_code)) {
-                vehicle_type = VehicleType.STEEL_TRAY.value();
-            } else if (Region.HL.value().equals(region_code)) {
-                vehicle_type = VehicleType.CUP.value();
-            }
-        }
         work_order.put("vehicle_type", vehicle_type);
         work_order.put("device_id", dto.getDevice_id());
         work_order.put("device_code", dto.getDevice_code());
@@ -145,6 +134,7 @@ public class WorkorderServiceImpl implements WorkordeService {
         work_order.put("ext_code", dto.getExt_code());
         work_order.put("is_delete", TrueOrFalse.FALSE.value());
         work_order.put("plan_date", dto.getPlan_date());
+        work_order.put("plan_weight", dto.getPlan_weight());
         Long user_id = SecurityUtils.getCurrentUserId();
         String nick_name = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
@@ -209,8 +199,20 @@ public class WorkorderServiceImpl implements WorkordeService {
                 .addParam("workorder_id", workorder_id)
                 .process()
                 .uniqueResult(0);
-        if (submit_obj.getIntValue("order_status") > 2) {
-            throw new BadRequestException("工单已开工！");
+        int orderStatus = submit_obj.getIntValue("order_status");
+        if (orderStatus == 3) {
+            throw new BadRequestException("工单已在生产中！");
+        }
+        if (orderStatus == 5) {
+            throw new BadRequestException("工单已完成！");
+        }
+        int product_code = submit_obj.getIntValue("product_code");
+        int a = submit_obj.getIntValue("a");
+        int b = submit_obj.getIntValue("b");
+        int h = submit_obj.getIntValue("h");
+        int w = submit_obj.getIntValue("w");
+        if (product_code == 0 || a == 0 || b == 0 || h == 0 || w == 0) {
+            throw new BadRequestException("工单所生产物料的砖型参数未正确配置！");
         }
 
         JSONObject workorder = WQLObject
@@ -222,29 +224,34 @@ public class WorkorderServiceImpl implements WorkordeService {
         }
 
         if (Region.HL.value().equals(submit_obj.getString("region_code"))) {
-            String material_code = submit_obj.getString("material_code");
-            submit_obj.put("material_code", material_code.substring(5, 11));
-        }
+            JSONObject order_update = new JSONObject();
+            order_update.put("order_status", WorkOrderEnum.ORDER_STATUS_PRODUCING.value());
+            TaskUtils.addCurrentUpdateColum(order_update);
+            WQLObject
+                    .getWQLObject("pdm_bd_workorder")
+                    .update(order_update, "workorder_id = " + workorder_id);
+        } else {
 
-        JSONArray request = new JSONArray();
-        request.add(submit_obj);
-        Map<String, Object> result;
-        try {
-            result = wmsToAcsService.order(request);
-        } catch (Exception e) {
-            log.error("工单开工报错！", e);
-            throw new RuntimeException(e);
-        }
-        if (HttpStatus.OK.value() != MapUtil.getInt(result, "status")) {
-            throw new BadRequestException(String.valueOf(result.get("message")));
-        }
+            JSONArray request = new JSONArray();
+            request.add(submit_obj);
+            Map<String, Object> result;
+            try {
+                result = wmsToAcsService.order(request);
+            } catch (Exception e) {
+                log.error("工单开工报错！", e);
+                throw new BadRequestException(e.getMessage());
+            }
+            if (HttpStatus.OK.value() != MapUtil.getInt(result, "status")) {
+                throw new BadRequestException(String.valueOf(result.get("message")));
+            }
 
-        JSONObject order_update = new JSONObject();
-        order_update.put("order_status", WorkOrderEnum.ORDER_STATUS_DELIVERED.value());
-        TaskUtils.addCurrentUpdateColum(order_update);
-        WQLObject
-                .getWQLObject("pdm_bd_workorder")
-                .update(order_update, "workorder_id = " + workorder_id);
+            JSONObject order_update = new JSONObject();
+            order_update.put("order_status", WorkOrderEnum.ORDER_STATUS_DELIVERED.value());
+            TaskUtils.addCurrentUpdateColum(order_update);
+            WQLObject
+                    .getWQLObject("pdm_bd_workorder")
+                    .update(order_update, "workorder_id = " + workorder_id);
+        }
     }
 
     @Override
@@ -307,7 +314,7 @@ public class WorkorderServiceImpl implements WorkordeService {
         String workprocedure_id = row.getString("workprocedure_id");
         String produceorder_code = row.getString("produceorder_code");
         String material_id = row.getString("material_id");
-        String material_code = row.getString("material_code");
+        String material_number = row.getString("material_number");
         String material_name = row.getString("material_name");
         String material_spec = row.getString("material_spec");
         String is_needmove = row.getString("is_needmove");
@@ -323,7 +330,7 @@ public class WorkorderServiceImpl implements WorkordeService {
         produceorderMap.put("update_optid", currentUserId);
         produceorderMap.put("update_optname", nickName);
         produceorderMap.put("update_time", now);
-        if (order_status.equals("01")){
+        if (order_status.equals("01")) {
             produceorderMap.put("realproducestart_date", now);
         }
         wo.update(produceorderMap);
@@ -346,15 +353,15 @@ public class WorkorderServiceImpl implements WorkordeService {
             // TODO
             JSONArray array = new JSONArray();
             JSONObject acsObj = new JSONObject();
-            acsObj.put("ext_order_id",workorder_id);
-            acsObj.put("is_needmove",is_needmove);
-            acsObj.put("order_code",produceorder_code);
-            acsObj.put("qty",plan_qty);
-            acsObj.put("material_uuid",material_id);
-            acsObj.put("material_code",material_code);
-            acsObj.put("material_name",material_name);
-            acsObj.put("material_spec",material_spec);
-            acsObj.put("device_code",device_code);
+            acsObj.put("ext_order_id", workorder_id);
+            acsObj.put("is_needmove", is_needmove);
+            acsObj.put("order_code", produceorder_code);
+            acsObj.put("qty", plan_qty);
+            acsObj.put("material_uuid", material_id);
+            acsObj.put("material_number", material_number);
+            acsObj.put("material_name", material_name);
+            acsObj.put("material_spec", material_spec);
+            acsObj.put("device_code", device_code);
             array.add(acsObj);
             wmsToAcsService.order(array);
         } else {
@@ -372,8 +379,8 @@ public class WorkorderServiceImpl implements WorkordeService {
             // TODO
             JSONArray array = new JSONArray();
             JSONObject map = new JSONObject();
-            map.put("ext_order_id",workorder_id);
-            map.put("type","2");
+            map.put("ext_order_id", workorder_id);
+            map.put("type", "2");
             array.add(map);
             wmsToAcsService.orderStatusUpdate(array);
         }
@@ -395,12 +402,12 @@ public class WorkorderServiceImpl implements WorkordeService {
         WQLObject wo = WQLObject.getWQLObject("PDM_BD_WORKORDER");
         JSONObject jsonObject = wo.query("workorder_id = '" + workorder_id + "'").uniqueResult(0);
         JSONObject produceorderMap = new JSONObject();
-        produceorderMap.put("workorder_id",workorder_id);
-        if (row.getString("report_qty").equals("0") || StrUtil.isEmpty(row.getString("report_qty"))){
-            produceorderMap.put("report_qty",report_qty);
-        }else {
+        produceorderMap.put("workorder_id", workorder_id);
+        if (row.getString("report_qty").equals("0") || StrUtil.isEmpty(row.getString("report_qty"))) {
+            produceorderMap.put("report_qty", report_qty);
+        } else {
             Integer sum = Integer.parseInt(row.getString("report_qty")) + Integer.parseInt(report_qty);
-            produceorderMap.put("report_qty",sum);
+            produceorderMap.put("report_qty", sum);
         }
         produceorderMap.put("order_status", "03");
         produceorderMap.put("update_optid", currentUserId);
@@ -410,20 +417,20 @@ public class WorkorderServiceImpl implements WorkordeService {
         //同时修改这条工单对应的记录表中最新的一条数据的报工数量
         WQLObject wo_record = WQLObject.getWQLObject("MPS_BD_MacOperateRecord");
         //获取最新的工单的对应记录信息
-        JSONObject newRecord = wo_record.query("workorder_id = '"+workorder_id+"' and (operatetime_end is null or operatetime_end = '')").uniqueResult(0);
-        newRecord.put("report_qty",report_qty);
-        newRecord.put("finish_qty",jsonObject.getString("real_qty"));
+        JSONObject newRecord = wo_record.query("workorder_id = '" + workorder_id + "' and (operatetime_end is null or operatetime_end = '')").uniqueResult(0);
+        newRecord.put("report_qty", report_qty);
+        newRecord.put("finish_qty", jsonObject.getString("real_qty"));
         Integer finishproduct_qty = Integer.parseInt(jsonObject.getString("real_qty")) - Integer.parseInt(newRecord.getString("init_qty"));
-        newRecord.put("finishproduct_qty",finishproduct_qty);
-        newRecord.put("operatetime_end",now);
+        newRecord.put("finishproduct_qty", finishproduct_qty);
+        newRecord.put("operatetime_end", now);
         wo_record.update(newRecord);
         //wms向acs发送请求 工单暂停
         // 报工的时候同时向acs发送工单暂停状态
         // TODO
         JSONArray array = new JSONArray();
         JSONObject map = new JSONObject();
-        map.put("ext_order_id",workorder_id);
-        map.put("type","1");
+        map.put("ext_order_id", workorder_id);
+        map.put("type", "1");
         array.add(map);
         wmsToAcsService.orderStatusUpdate(array);
     }
@@ -468,11 +475,11 @@ public class WorkorderServiceImpl implements WorkordeService {
         JSONObject jsonProduceShiftOrder = wo.query("workorder_id = '" + workorder_id + "'").uniqueResult(0);
         WQLObject wo_record = WQLObject.getWQLObject("MPS_BD_MacOperateRecord");
         //获取最新的工单的对应记录信息
-        JSONObject jsonObject = wo_record.query("workorder_id = '"+workorder_id+"' and (operatetime_end is null or operatetime_end = '')").uniqueResult(0);
+        JSONObject jsonObject = wo_record.query("workorder_id = '" + workorder_id + "' and (operatetime_end is null or operatetime_end = '')").uniqueResult(0);
         String finish_qty = jsonProduceShiftOrder.getString("real_qty");
-        jsonObject.put("finish_qty",finish_qty);
+        jsonObject.put("finish_qty", finish_qty);
         Integer finishproduct_qty = Integer.parseInt(finish_qty) - Integer.parseInt(jsonObject.getString("init_qty"));
-        jsonObject.put("finishproduct_qty",finishproduct_qty);
+        jsonObject.put("finishproduct_qty", finishproduct_qty);
         return jsonObject;
     }
 
@@ -486,8 +493,8 @@ public class WorkorderServiceImpl implements WorkordeService {
     public JSONArray getDtl(JSONObject param) {
         final String workorder_id = param.getString("workorder_id");
         JSONObject map = new JSONObject();
-        map.put("flag","5");
-        map.put("workorder_id",workorder_id);
+        map.put("flag", "5");
+        map.put("workorder_id", workorder_id);
         JSONArray resultJSONArray = WQL.getWO("MPS_PRODUCEDURE001").addParamMap(map).process().getResultJSONArray(0);
         return resultJSONArray;
     }
@@ -532,10 +539,10 @@ public class WorkorderServiceImpl implements WorkordeService {
         List<Map<String, Object>> list = workorders.stream().map(o -> {
             JSONObject workorder = (JSONObject) o;
             Map<String, Object> workorder_map = new LinkedHashMap<>();
-            workorder_map.put("工单编码", workorder.getString("workorder_code"));
+            workorder_map.put("工单号", workorder.getString("workorder_code"));
             workorder_map.put("工单状态", workorder.getString("order_status"));
             workorder_map.put("设备", workorder.getString("device_name"));
-            workorder_map.put("物料编码", workorder.getString("material_code"));
+            workorder_map.put("物料编码", workorder.getString("material_number"));
             workorder_map.put("载具类型", workorder.getString("vehicle_type"));
             workorder_map.put("计划数量", workorder.getString("plan_qty"));
             workorder_map.put("计划生产日期", workorder.getString("plan_date"));
@@ -553,4 +560,35 @@ public class WorkorderServiceImpl implements WorkordeService {
             throw new RuntimeException(e);
         }
     }
+
+    @Override
+    public void reportWorkOrderDaily(long workOrderId, int qty, int qualifiedQty, int unqualifiedQty, double weight, double avgPieceWeight) {
+        String today = DateUtil.today();
+        WQLObject wodTable = WQLObject.getWQLObject("pdm_bd_work_order_daily");
+        JSONObject workOrderDaily = wodTable.query("workorder_id = " + workOrderId + " AND date = '" + today + "'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(workOrderDaily)) {
+            workOrderDaily = new JSONObject();
+            workOrderDaily.put("id", IdUtil.getSnowflake().nextId());
+            workOrderDaily.put("date", today);
+            workOrderDaily.put("workorder_id", workOrderId);
+            workOrderDaily.put("qty", qty);
+            workOrderDaily.put("qualified_qty", qualifiedQty);
+            workOrderDaily.put("unqualified_qty", unqualifiedQty);
+            workOrderDaily.put("weight", weight);
+            workOrderDaily.put("avg_piece_weight", avgPieceWeight);
+            workOrderDaily.put("is_report", "1");
+            TaskUtils.addACSCreateColum(workOrderDaily);
+            wodTable.insert(workOrderDaily);
+        } else {
+            workOrderDaily.put("qty", qty);
+            workOrderDaily.put("qualified_qty", qualifiedQty);
+            workOrderDaily.put("unqualified_qty", unqualifiedQty);
+            workOrderDaily.put("weight", weight);
+            workOrderDaily.put("avg_piece_weight", avgPieceWeight);
+            workOrderDaily.put("is_report", "1");
+            TaskUtils.addACSUpdateColum(workOrderDaily);
+            wodTable.update(workOrderDaily);
+        }
+
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql
index 1deca4c..ccf1f58 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql
@@ -55,7 +55,8 @@
 		PAGEQUERY
 		SELECT
         	ShiftOrder.*,
-        	material.material_code,
+        	material.material_number,
+        	material.material_name,
         	device.device_name
         FROM
         	PDM_BD_WORKORDER ShiftOrder
@@ -84,7 +85,7 @@
              ENDOPTION
              OPTION 输入.material <> ""
                     (
-                    material.material_code like 输入.material
+                    material.material_number like 输入.material
                     )
              ENDOPTION
              OPTION 输入.region_code <> ""
@@ -115,7 +116,7 @@
     		SELECT
             	shiftOrder.*,
             	workprocedure.workprocedure_name,
-                material.material_code,
+                material.material_number,
                 material.material_spec
             FROM
             	PDM_BD_WORKORDER shiftOrder
@@ -172,7 +173,7 @@
             	workorder.order_status,
             	workorder.device_id,
             	device.device_code,
-            	material.material_code,
+            	material.material_number,
             	material.product_code,
             	material.a,
             	material.b,
@@ -197,7 +198,7 @@
         	ShiftOrder.workorder_code,
         	d1.label AS order_status,
         	device.device_name,
-        	material.material_code,
+        	material.material_number,
             d2.label AS vehicle_type,
             ShiftOrder.plan_qty,
             ShiftOrder.plan_date,
@@ -235,7 +236,7 @@
              ENDOPTION
              OPTION 输入.material <> ""
                     (
-                    material.material_code like 输入.material
+                    material.material_number like 输入.material
                     )
              ENDOPTION
              OPTION 输入.region_code <> ""
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
index 3863e34..102f3e0 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
@@ -257,6 +257,7 @@ public abstract class AbstractAcsTask {
             point1.put("task_code", "");
             point1.put("vehicle_type", "");
             point1.put("vehicle_code", "");
+            point1.put("vd_id", null);
             point1.put("point_status", PointStatus.EMPTY.value());
             TaskUtils.addACSUpdateColum(point1);
             point_table.update(point1);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java
index 4276dfc..45c7b88 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java
@@ -11,18 +11,20 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.wms.sch.AcsUtil;
 import org.nl.wms.sch.task.AcsTaskDTO;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
 import org.reflections.Reflections;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 @Slf4j
 @Component("autoCreateTask")
 public class AutoCreateTask {
     // 下发acs的任务集合
-    private List<AcsTaskDTO> taskList = null;
     private Set<Class<? extends AbstractAcsTask>> subTypes = null;
 
     WQLObject taskTab = null;
@@ -34,13 +36,26 @@ public class AutoCreateTask {
             subTypes = reflections.getSubTypesOf(AbstractAcsTask.class);
         }
         if (ObjectUtil.isNull(taskTab)) taskTab = WQLObject.getWQLObject("sch_base_task");
-        taskList = new ArrayList<>();
 
-        this.doExecute();
+        RLock lock = SpringContextHolder.getBean(RedissonClient.class).getFairLock("autoCreateTask");
+        boolean try_lock = false;
+        try {
+            try_lock = lock.tryLock(0, TimeUnit.SECONDS);
+            if (try_lock) {
+                this.doExecute();
+            }
+        } catch (Exception e) {
+            log.error("auto create task error !", e);
+        } finally {
+            if (try_lock) {
+                lock.unlock();
+            }
+        }
     }
 
 
     private void doExecute() {
+        ArrayList<AcsTaskDTO> taskList = new ArrayList<>();
         subTypes.forEach(clz -> {
             // 调用AbstractAcsTask类的每个子类的schedule()方法
             try {
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoUpdateStandStatus.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoUpdateStandStatus.java
index eadf5b8..32dffb7 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoUpdateStandStatus.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoUpdateStandStatus.java
@@ -36,7 +36,7 @@ public class AutoUpdateStandStatus {
             for (int i = 0; i < vds.size(); i++) {
                 JSONObject vd = vds.getJSONObject(i);
                 DateTime create_time = DateUtil.parse(vd.getString("create_time"));
-                DateTime time = DateUtil.offsetMinute(create_time, vd.getIntValue("standing_time"));
+                DateTime time = DateUtil.offsetMinute(create_time, vd.getIntValue("stand_time"));
                 int compare = DateUtil.compare(DateUtil.date(), time);
                 if (compare >= 0) {
                     ids.add(vd.getLong("vd_id"));
@@ -58,8 +58,8 @@ public class AutoUpdateStandStatus {
                 JSONObject vd = vds.getJSONObject(i);
                 DateTime create_time = DateUtil.parse(vd.getString("create_time"));
                 int threshold_time = vd.getIntValue("threshold_time");
-                int standing_time = vd.getIntValue("standing_time");
-                if (threshold_time != 0 && threshold_time < standing_time) {
+                int stand_time = vd.getIntValue("stand_time");
+                if (threshold_time != 0 && threshold_time < stand_time) {
                     DateTime time = DateUtil.offsetMinute(create_time, threshold_time);
                     int compare = DateUtil.compare(DateUtil.date(), time);
                     if (compare >= 0) {
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/PointStatus.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/PointStatus.java
index 41aae09..e22df5a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/PointStatus.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/PointStatus.java
@@ -12,7 +12,7 @@ public enum PointStatus {
 
     EMPTY("空位", "1"),
     EMPTY_VEHICLE("空载具", "2"),
-    HAS_GOODS("有货", "3");
+    HAS_GOODS("有箱有料", "3");
 
     private final String label;
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/Region.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/Region.java
index 549bbe5..c8dd013 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/Region.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/Region.java
@@ -17,10 +17,10 @@ public enum Region {
     HL("混料区", "HL"),
     KLHJ("困料货架", "KLHJ"),
     YZ("压制区", "YZ"),
-    BCPHJ("半成品货架", "BCPHJ"),
-    SZ("烧制区", "SZ"),
+    YQHJ("窑前货架", "YQHJ"),
+    GZ("干燥区", "GZ"),
+    YHHJ("窑后货架", "YHHJ"),
     FJ("分拣区", "FJ"),
-    BTHC("半托缓存区", "BTHC"),
     GTK("钢托库", "GTK");
 
     private final String label;
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/wql/MANAGE_QUERY.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/wql/MANAGE_QUERY.wql
index 2e574ff..fbbea6e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/wql/MANAGE_QUERY.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/wql/MANAGE_QUERY.wql
@@ -41,7 +41,7 @@
 	    QUERY
 	        SELECT
             	vd.*,
-            	mb.standing_time
+            	mb.stand_time
             FROM
             	st_ivt_vehicle_detail vd
             	LEFT JOIN md_me_materialbase mb ON vd.material_id = mb.material_id
@@ -57,7 +57,7 @@
         QUERY
             SELECT
                 vd.*,
-                mb.standing_time,
+                mb.stand_time,
                 mb.threshold_time
             FROM
                 st_ivt_vehicle_detail vd
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java
index 68062d7..a0f22c9 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java
@@ -43,7 +43,7 @@ public class PointDto implements Serializable {
     /** 锁定类型 */
     private String lock_type;
 
-    /** 设备编码 */
+    /** 设备号 */
     private String device_code;
 
     /** 载具类型 */
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/TaskQueryDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/TaskQueryDto.java
index 24911c7..9eae8e3 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/TaskQueryDto.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/TaskQueryDto.java
@@ -72,7 +72,7 @@ public class TaskQueryDto implements Serializable {
     /**
      * 物料编码
      */
-    private String material_code;
+    private String material_number;
 
     /**
      * 车号
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java
index 45ad63f..a4b2541 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java
@@ -112,7 +112,7 @@ public class PointServiceImpl implements PointService {
         String point_code = dto.getPoint_code();
         PointDto byCode = this.findByCode(point_code);
         if (ObjectUtil.isNotEmpty(byCode)) {
-            throw new BadRequestException("存在相同的点位编码");
+            throw new BadRequestException("存在相同的点位号");
         }
         Long currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getCurrentNickName();
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java
index 4faf50e..af5ed84 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java
@@ -45,7 +45,7 @@ public class RegionServiceImpl implements RegionService {
         map.put("flag", "1");
         if (ObjectUtil.isNotEmpty(region_code)) map.put("region_code",region_code+"%");
 
-        JSONObject json = WQL.getWO("QSCH_REGION_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "region.region_code ASC");
+        JSONObject json = WQL.getWO("QSCH_REGION_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "region.create_time DESC");
         return json;
     }
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/YZCallEmptyTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/YZCallEmptyTask.java
index 0795382..25af5b2 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/YZCallEmptyTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/YZCallEmptyTask.java
@@ -39,12 +39,12 @@ public class YZCallEmptyTask extends AbstractAcsTask {
     @Override
     public String createTask(JSONObject form) {
         JSONObject point = form.getJSONObject("point");
-        JSONObject work_order = form.getJSONObject("workorder");
+        JSONObject workOrder = form.getJSONObject("workorder");
         int priority = 1;
-        String material_id = null;
-        if (ObjectUtil.isNotEmpty(work_order)) {
-            priority = TrueOrFalse.trueOrFalse(work_order.getString("is_urgent")) ? 50 : 1;
-            material_id = work_order.getString("material_id");
+        String materialId = null;
+        if (ObjectUtil.isNotEmpty(workOrder)) {
+            priority = TrueOrFalse.trueOrFalse(workOrder.getString("is_urgent")) ? 2 : 1;
+            materialId = workOrder.getString("material_id");
         }
 
         JSONObject task = TaskUtils.buildTask(
@@ -54,7 +54,7 @@ public class YZCallEmptyTask extends AbstractAcsTask {
                 null,
                 point.getString("point_code"),
                 null,
-                material_id,
+                materialId,
                 VehicleType.STEEL_TRAY.value(),
                 null,
                 priority,
@@ -90,34 +90,52 @@ public class YZCallEmptyTask extends AbstractAcsTask {
                 JSONObject point = null;
                 String material_id = task.getString("material_id");
                 if (StrUtil.isNotBlank(material_id)) {
-                     point = WQL
+                    point = WQL
                             .getWO("CALL_EMPTY_TASK")
-                            .addParam("flag", "1")
+                            .addParam("flag", "2")
                             .addParam("point_code", task.getString("point_code2"))
                             .addParam("material_id", material_id)
                             .process()
                             .uniqueResult(0);
+
+                    if (ObjectUtil.isNotEmpty(point)) {
+                        task.put("task_status", TaskStatus.START_AND_END.value());
+                        task.put("point_code1", point.getString("point_code"));
+                        task.put("vehicle_type", VehicleType.STEEL_TRAY.value());
+                        task.put("vehicle_code", TaskUtils.formatVehicleCode(point.getString("vehicle_code")));
+                        task.put("group_id", point.getLongValue("vd_id"));
+                        task.put("remark", "");
+                        TaskUtils.addAutoUpdateColum(task);
+                        task_table.update(task);
+
+                        point.put("lock_type", LockType.TASK_LOCKED.value());
+                        point.put("task_code", task.getString("task_code"));
+                        TaskUtils.addAutoUpdateColum(point);
+                        point_table.update(point);
+                    }
                 }
                 if (ObjectUtil.isEmpty(point)) {
-                    task.put("material_id", null);
                     point = WQL
                             .getWO("CALL_EMPTY_TASK")
-                            .addParam("flag", "2")
+                            .addParam("flag", "1")
                             .process()
                             .uniqueResult(0);
-                }
-                if (ObjectUtil.isNotEmpty(point)) {
-                    task.put("task_status", TaskStatus.START_AND_END.value());
-                    task.put("point_code1", point.getString("point_code"));
-                    task.put("vehicle_code", TaskUtils.formatVehicleCode(point.getString("vehicle_code")));
-                    task.put("remark", "");
-                    TaskUtils.addAutoUpdateColum(task);
-                    task_table.update(task);
 
-                    point.put("lock_type", LockType.TASK_LOCKED.value());
-                    point.put("task_code", task.getString("task_code"));
-                    TaskUtils.addAutoUpdateColum(point);
-                    point_table.update(point);
+                    if (ObjectUtil.isNotEmpty(point)) {
+                        task.put("task_status", TaskStatus.START_AND_END.value());
+                        task.put("point_code1", point.getString("point_code"));
+                        task.put("vehicle_type", VehicleType.STEEL_TRAY.value());
+                        task.put("vehicle_code", TaskUtils.formatVehicleCode(point.getString("vehicle_code")));
+                        task.put("material_id", null);
+                        task.put("remark", "");
+                        TaskUtils.addAutoUpdateColum(task);
+                        task_table.update(task);
+
+                        point.put("lock_type", LockType.TASK_LOCKED.value());
+                        point.put("task_code", task.getString("task_code"));
+                        TaskUtils.addAutoUpdateColum(point);
+                        point_table.update(point);
+                    }
                 }
             }
         }
@@ -186,14 +204,14 @@ public class YZCallEmptyTask extends AbstractAcsTask {
         }
     }
 
-        public void finishTask(JSONObject task, OperationType operation_type) {
+    public void finishTask(JSONObject task, OperationType operation_type) {
         int current_task_status = task.getIntValue("task_status");
         if (current_task_status < Integer.parseInt(TaskStatus.FINISHED.value())) {
             if (operation_type == OperationType.MANUAL
-                && current_task_status < Integer.parseInt(TaskStatus.START_AND_END.value())) {
+                    && current_task_status < Integer.parseInt(TaskStatus.START_AND_END.value())) {
                 throw new BadRequestException("只能手动完成 [确认起点和终点] 之后的任务！");
             }
-            
+
             task.put("task_status", TaskStatus.FINISHED.value());
             if (operation_type == OperationType.AUTO) {
                 TaskUtils.addACSUpdateColum(task);
@@ -232,6 +250,7 @@ public class YZCallEmptyTask extends AbstractAcsTask {
                 point2.put("task_code", "");
                 point2.put("vehicle_type", task.getString("vehicle_type"));
                 point2.put("vehicle_code", task.getString("vehicle_code"));
+                point2.put("vd_id", task.getString("group_id"));
                 point2.put("point_status", PointStatus.EMPTY_VEHICLE.value());
                 if (operation_type == OperationType.AUTO) {
                     TaskUtils.addACSUpdateColum(point2);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/wql/CALL_EMPTY_TASK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/wql/CALL_EMPTY_TASK.wql
index 64eef90..a2bbeeb 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/wql/CALL_EMPTY_TASK.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/wql/CALL_EMPTY_TASK.wql
@@ -15,7 +15,6 @@
 	#################################################
 	输入.flag                         TYPEAS s_string
 	输入.point_code                   TYPEAS s_string
-	输入.vehicle_type                 TYPEAS s_string
 	输入.material_id                  TYPEAS f_string
 
 [临时表]
@@ -42,29 +41,6 @@
 
 	IF 输入.flag = "1"
 	    QUERY
-	        SELECT
-            	*
-            FROM
-            	sch_base_point point
-            	LEFT JOIN st_ivt_vehicle_detail vd ON point.vehicle_type = vd.vehicle_type
-            	AND point.vehicle_code = vd.vehicle_code
-            WHERE
-            	point.is_used = '1'
-            	AND point.lock_type = '1'
-            	AND point.region_code = 'BCPHJ'
-            	AND point.point_status = '1'
-            	AND point.vehicle_type = '2'
-            	AND vd.is_delete = '0'
-            	AND vd.point_code = 输入.point_code
-            	AND vd.material_id = 输入.material_id
-            	AND vd.is_full = '0'
-            	AND vd.is_in_kiln = '0'
-            ENDSELECT
-	    ENDQUERY
-	ENDIF
-
-    IF 输入.flag = "2"
-        QUERY
             SELECT
             	*
             FROM
@@ -73,90 +49,25 @@
             	is_used = '1'
             	AND lock_type = '1'
             	AND region_code = 'GTK'
-            	AND point_type = '3'
+            	AND point_type = '1'
             ENDSELECT
-        ENDQUERY
-    ENDIF
+	    ENDQUERY
+	ENDIF
 
-    IF 输入.flag = "3"
-        QUERY
-            SELECT
-            	point.*
+	IF 输入.flag = "2"
+	    QUERY
+	        SELECT
+            	p.*
             FROM
-            	sch_base_point point
-            	LEFT JOIN sch_base_task task ON point.point_code = task.point_code1
-            	AND task.task_status <> '7'
-            	AND task_status <> '8'
+            	sch_base_point p
+            	LEFT JOIN st_ivt_vehicle_detail vd ON p.vd_id = vd.vd_id
             WHERE
-            	point.is_used = '1'
-            	AND point.lock_type = '1'
-            	AND point.region_code = 'GTK'
-            	AND point.point_type = '1'
-            	AND task.task_id IS NULL
-            ENDSELECT
-        ENDQUERY
-    ENDIF
-
-    IF 输入.flag = "4"
-        QUERY
-            SELECT
-                tpw.*
-            FROM
-                sch_base_point tpw
-                LEFT JOIN sch_base_point djw ON tpw.device_code = djw.point_code
-            WHERE
-                tpw.is_used = '1'
-                AND djw.is_used = '1'
-                AND tpw.region_code = 'FJ'
-                AND djw.region_code = 'FJ'
-                AND tpw.point_type = '4'
-                AND djw.point_type = '3'
-                AND djw.lock_type = '1'
-                AND tpw.vehicle_type = 输入.vehicle_type
-            ENDSELECT
-        ENDQUERY
-    ENDIF
-
-    IF 输入.flag = "5"
-        QUERY
-            SELECT
-                point.*
-            FROM
-                sch_base_point point
-                LEFT JOIN st_ivt_vehicle_detail vd ON point.vehicle_type = vd.vehicle_type
-                AND point.vehicle_code = vd.vehicle_code
-                AND vd.is_delete = '0'
-            WHERE
-                is_used = '1'
-                AND lock_type = '1'
-                AND region_code = 'KLHJ'
-                AND point_type = '1'
-                AND point_status = '1'
-                AND point.vehicle_type = '1'
-                AND vd.vd_id IS NULL
-            ENDSELECT
-        ENDQUERY
-    ENDIF
-
-    IF 输入.flag = "6"
-        QUERY
-            SELECT
-            	point.*,
-            	vd.vd_id
-            FROM
-            	sch_base_point point
-            	LEFT JOIN st_ivt_vehicle_detail vd ON point.vehicle_type = vd.vehicle_type
-            	AND point.vehicle_code = vd.vehicle_code
+            	p.is_used = '1'
+            	AND p.lock_type = '1'
             	AND vd.is_delete = '0'
-            WHERE
-            	point.is_used = '1'
-            	AND point.lock_type = '1'
-            	AND point.region_code = 'BTHC'
-            	AND point.point_type = '1'
-            	AND point.point_status = '1'
-            	AND point.vehicle_type = 输入.vehicle_type
-            	AND vd.material_id = 输入.material_id
+            	AND vd.is_full = '0'
             	AND vd.point_code = 输入.point_code
+            	AND vd.material_id = 输入.material_id
             ENDSELECT
-        ENDQUERY
-    ENDIF
+	    ENDQUERY
+	ENDIF
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/SZCallMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/GZCallMaterialTask.java
similarity index 94%
rename from lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/SZCallMaterialTask.java
rename to lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/GZCallMaterialTask.java
index 6ae5e32..f4444b2 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/SZCallMaterialTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/GZCallMaterialTask.java
@@ -2,7 +2,6 @@ package org.nl.wms.sch.task.call.material;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import org.nl.modules.common.exception.BadRequestException;
@@ -18,7 +17,7 @@ import org.springframework.stereotype.Component;
  */
 @RequiredArgsConstructor
 @Component
-public class SZCallMaterialTask extends AbstractAcsTask {
+public class GZCallMaterialTask extends AbstractAcsTask {
 
 
     @Override
@@ -40,7 +39,7 @@ public class SZCallMaterialTask extends AbstractAcsTask {
         JSONObject point = form.getJSONObject("point");
 
         JSONObject task = TaskUtils.buildTask(
-                "烧制区叫料",
+                "干燥区叫料",
                 TaskType.CALL_MATERIAL.value(),
                 TaskStatus.SURE_END.value(),
                 null,
@@ -50,7 +49,7 @@ public class SZCallMaterialTask extends AbstractAcsTask {
                 VehicleType.STEEL_TRAY.value(),
                 null,
                 1,
-                SZCallMaterialTask.class.getName(),
+                GZCallMaterialTask.class.getName(),
                 form.getString("create_mode"),
                 form.getString("request_param"),
                 form.getString("create_id"),
@@ -181,6 +180,7 @@ public class SZCallMaterialTask extends AbstractAcsTask {
                 point1.put("task_code", "");
                 point1.put("vehicle_type", "");
                 point1.put("vehicle_code", "");
+                point1.put("vd_id", null);
                 point1.put("point_status", PointStatus.EMPTY.value());
                 if (operation_type == OperationType.AUTO) {
                     TaskUtils.addACSUpdateColum(point1);
@@ -191,8 +191,12 @@ public class SZCallMaterialTask extends AbstractAcsTask {
             }
 
             JSONObject point2 = new JSONObject();
+            point2.put("point_status", PointStatus.HAS_GOODS.value());
             point2.put("lock_type", LockType.UNLOCKED.value());
             point2.put("task_code", "");
+            point2.put("vehicle_type", task.getString("vehicle_type"));
+            point2.put("vehicle_code", task.getString("vehicle_code"));
+            point2.put("vd_id", task.getString("group_id"));
             if (operation_type == OperationType.AUTO) {
                 TaskUtils.addACSUpdateColum(point2);
             } else if (operation_type == OperationType.MANUAL) {
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/wql/CALL_MATERIAL_TASK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/wql/CALL_MATERIAL_TASK.wql
index 806c5c5..b509ae0 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/wql/CALL_MATERIAL_TASK.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/wql/CALL_MATERIAL_TASK.wql
@@ -42,26 +42,22 @@
 	IF 输入.flag = "1"
 	    QUERY
             SELECT
-            	point.*,
-            	vd.vd_id,
+            	p.*,
             	vd.material_id,
-            	workorder.is_urgent
+            	wo.is_urgent
             FROM
-            	sch_base_point point
-            	JOIN st_ivt_vehicle_detail vd ON point.vehicle_type = vd.vehicle_type
-            	AND point.vehicle_code = vd.vehicle_code
-            	AND vd.is_delete = '0'
-            	LEFT JOIN pdm_bd_workorder workorder ON vd.workorder_id = workorder.workorder_id
+            	sch_base_point p
+            	LEFT JOIN st_ivt_vehicle_detail vd ON p.vd_id = vd.vd_id
+            	LEFT JOIN pdm_bd_workorder wo ON vd.workorder_id = wo.workorder_id
             WHERE
-            	point.is_used = '1'
-            	AND point.lock_type = '1'
-            	AND point.region_code = 'BCPHJ'
-            	AND point.point_status = '1'
-            	AND point.vehicle_type = '2'
-            	AND vd.is_fire = '0'
-            	AND vd.is_in_kiln = '1'
+            	p.is_used = '1'
+            	AND p.lock_type = '1'
+            	AND p.region_code = 'YQHJ'
+            	AND p.point_type = '1'
+            	AND p.point_status = '3'
             ORDER BY
-            	workorder.is_urgent DESC, vd.create_time ASC
+            	wo.is_urgent DESC,
+            	vd.create_time ASC
             ENDSELECT
 	    ENDQUERY
 	ENDIF
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/SZSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/GZSendMaterialTask.java
similarity index 98%
rename from lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/SZSendMaterialTask.java
rename to lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/GZSendMaterialTask.java
index 4c93bfc..3c22800 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/SZSendMaterialTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/GZSendMaterialTask.java
@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component;
  */
 @RequiredArgsConstructor
 @Component
-public class SZSendMaterialTask extends AbstractAcsTask {
+public class GZSendMaterialTask extends AbstractAcsTask {
 
 
     @Override
@@ -50,7 +50,7 @@ public class SZSendMaterialTask extends AbstractAcsTask {
                 vd.getString("vehicle_type"),
                 vd.getString("vehicle_code"),
                 1,
-                SZSendMaterialTask.class.getName(),
+                GZSendMaterialTask.class.getName(),
                 form.getString("create_mode"),
                 form.getString("request_param"),
                 form.getString("create_id"),
@@ -71,7 +71,7 @@ public class SZSendMaterialTask extends AbstractAcsTask {
     public void findNextPoint() {
         WQLObject task_table = WQLObject.getWQLObject("sch_base_task");
         JSONArray tasks = task_table
-                .query("is_delete = '0' AND task_status = '" + TaskStatus.SURE_START.value() + "' AND handle_class = '" + SZSendMaterialTask.class.getName() + "'", "priority DESC, create_time ASC")
+                .query("is_delete = '0' AND task_status = '" + TaskStatus.SURE_START.value() + "' AND handle_class = '" + GZSendMaterialTask.class.getName() + "'", "priority DESC, create_time ASC")
                 .getResultJSONArray(0);
         if (ObjectUtil.isNotEmpty(tasks)) {
             WQLObject point_table = WQLObject.getWQLObject("sch_base_point");
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/YZSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/YZSendMaterialTask.java
index 83541d6..4ecb3dc 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/YZSendMaterialTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/YZSendMaterialTask.java
@@ -39,7 +39,7 @@ public class YZSendMaterialTask extends AbstractAcsTask {
     public String createTask(JSONObject form) {
         JSONObject point = form.getJSONObject("point");
         JSONObject work_order = form.getJSONObject("workorder");
-        int priority = TrueOrFalse.trueOrFalse(work_order.getString("is_urgent")) ? 50 : 1;
+        int priority = TrueOrFalse.trueOrFalse(work_order.getString("is_urgent")) ? 2 : 1;
         JSONObject vd = form.getJSONObject("vd");
 
         JSONObject task = TaskUtils.buildTask(
@@ -48,7 +48,7 @@ public class YZSendMaterialTask extends AbstractAcsTask {
                 TaskStatus.SURE_START.value(),
                 point.getString("point_code"),
                 null,
-                vd.getLong("vd_id"),
+                vd.getLongValue("vd_id"),
                 vd.getString("material_id"),
                 vd.getString("vehicle_type"),
                 vd.getString("vehicle_code"),
@@ -63,6 +63,7 @@ public class YZSendMaterialTask extends AbstractAcsTask {
 
         point.put("lock_type", LockType.TASK_LOCKED.value());
         point.put("task_code", task.getString("task_code"));
+        point.put("vd_id", vd.getLongValue("vd_id"));
         TaskUtils.addFormUpdateColum(point, form);
         WQLObject.getWQLObject("sch_base_point").update(point);
 
@@ -145,6 +146,7 @@ public class YZSendMaterialTask extends AbstractAcsTask {
                         && task.getString("task_code").equals(point1.getString("task_code"))) {
                     point1.put("lock_type", LockType.UNLOCKED.value());
                     point1.put("task_code", "");
+                    point1.put("vd_id", null);
                     if (operation_type == OperationType.AUTO) {
                         TaskUtils.addACSUpdateColum(point1);
                     } else if (operation_type == OperationType.MANUAL) {
@@ -172,14 +174,14 @@ public class YZSendMaterialTask extends AbstractAcsTask {
     }
 
 
-        public void finishTask(JSONObject task, OperationType operation_type) {
+    public void finishTask(JSONObject task, OperationType operation_type) {
         int current_task_status = task.getIntValue("task_status");
         if (current_task_status < Integer.parseInt(TaskStatus.FINISHED.value())) {
             if (operation_type == OperationType.MANUAL
-                && current_task_status < Integer.parseInt(TaskStatus.START_AND_END.value())) {
+                    && current_task_status < Integer.parseInt(TaskStatus.START_AND_END.value())) {
                 throw new BadRequestException("只能手动完成 [确认起点和终点] 之后的任务！");
             }
-            
+
             task.put("task_status", TaskStatus.FINISHED.value());
             if (operation_type == OperationType.AUTO) {
                 TaskUtils.addACSUpdateColum(task);
@@ -217,6 +219,7 @@ public class YZSendMaterialTask extends AbstractAcsTask {
                 point2.put("task_code", "");
                 point2.put("vehicle_type", task.getString("vehicle_type"));
                 point2.put("vehicle_code", task.getString("vehicle_code"));
+                point2.put("vd_id", task.getLongValue("group_id"));
                 point2.put("point_status", PointStatus.HAS_GOODS.value());
                 if (operation_type == OperationType.AUTO) {
                     TaskUtils.addACSUpdateColum(point2);
@@ -225,19 +228,6 @@ public class YZSendMaterialTask extends AbstractAcsTask {
                 }
                 point_table.update(point2, "point_code = '" + point_code2 + "'");
             }
-
-            JSONObject workorder = WQL
-                    .getWO("SEND_MATERIAL_TASK")
-                    .addParam("flag", "7")
-                    .addParam("vd_id", task.getString("group_id"))
-                    .process()
-                    .uniqueResult(0);
-
-            JSONObject workorder_update = new JSONObject();
-            workorder_update.put("real_qty", workorder.getIntValue("real_qty") + workorder.getIntValue("qty"));
-            workorder_update.put("qualified_qty", workorder.getIntValue("qualified_qty") + workorder.getIntValue("qty"));
-            TaskUtils.addACSUpdateColum(workorder_update);
-            WQLObject.getWQLObject("pdm_bd_workorder").update(workorder_update, "workorder_id = " + workorder.getString("workorder_id"));
         }
     }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/wql/SEND_MATERIAL_TASK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/wql/SEND_MATERIAL_TASK.wql
index 4d94fa2..f50924a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/wql/SEND_MATERIAL_TASK.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/wql/SEND_MATERIAL_TASK.wql
@@ -50,11 +50,9 @@
             WHERE
             	is_used = '1'
             	AND lock_type = '1'
-            	AND region_code = 'BCPHJ'
+            	AND point_status = '1'
+            	AND region_code = 'YQHJ'
             	AND point_type = '1'
-            	AND point_status = '0'
-            ORDER BY
-                point_code ASC
             ENDSELECT
 	    ENDQUERY
 	ENDIF
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/util/TaskUtils.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/util/TaskUtils.java
index d5518f2..53ab5e0 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/util/TaskUtils.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/util/TaskUtils.java
@@ -132,6 +132,12 @@ public class TaskUtils {
         return vehicle_code;
     }
 
+    public static void addACSCreateColum(JSONObject row) {
+        row.put("create_id", ACSSystem.id);
+        row.put("create_name", ACSSystem.nick_name);
+        row.put("create_time", DateUtil.now());
+    }
+
     public static void addACSUpdateColum(JSONObject row) {
         row.put("update_optid", ACSSystem.id);
         row.put("update_optname", ACSSystem.nick_name);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/util/wql/TASK_UTILS.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/util/wql/TASK_UTILS.wql
index 1e4d311..fe314b7 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/util/wql/TASK_UTILS.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/util/wql/TASK_UTILS.wql
@@ -45,7 +45,7 @@
             	vd.qty,
             	vd.weight AS vd_weight,
             	material.weight AS material_weight,
-            	material.material_code,
+            	material.material_number,
             	material.order_code
             FROM
             	st_ivt_vehicle_detail vd
@@ -60,7 +60,7 @@
         QUERY
             SELECT
             	workorder.unqualified_qty AS qty,
-            	material.material_code AS material_code,
+            	material.material_number AS material_number,
             	material.weight AS material_weight,
             	material.order_code,
                 device.region_code
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql
index 816cf5c..bada08e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql
@@ -50,10 +50,10 @@
 		PAGEQUERY
 			SELECT
                     point.*,
-                    material.material_code
+                    material.material_number
                 FROM
                     sch_base_point point
-                    LEFT JOIN st_ivt_vehicle_detail vd ON point.vehicle_type = vd.vehicle_type AND point.vehicle_code = vd.vehicle_code AND vd.is_delete = '0'
+                    LEFT JOIN st_ivt_vehicle_detail vd ON point.vd_id = vd.vd_id
                     LEFT JOIN md_me_materialbase material ON vd.material_id = material.material_id
                 WHERE
                     1 = 1
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql
index aa46e8b..7df36fc 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql
@@ -56,7 +56,7 @@
                     point1.region_name AS point1_region_name,
                     point2.point_name AS point2_name,
                     point2.region_name AS point2_region_name,
-                    material.material_code,
+                    material.material_number,
                     dd.label AS task_status_name
                 FROM
                     sch_base_task task
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls
index 471100b..27e8d3f 100644
Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls differ
diff --git a/lms/nladmin-system/src/main/resources/config/application-prod.yml b/lms/nladmin-system/src/main/resources/config/application-prod.yml
index 14d60b1..527a6ba 100644
--- a/lms/nladmin-system/src/main/resources/config/application-prod.yml
+++ b/lms/nladmin-system/src/main/resources/config/application-prod.yml
@@ -6,7 +6,7 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.4.220}:${DB_PORT:3306}/${DB_NAME:lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.4.220}:${DB_PORT:3306}/${DB_NAME:lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
       username: ${DB_USER:root}
       password: ${DB_PWD:123456}
       # 初始连接数
diff --git a/lms/nladmin-system/src/main/resources/config/application.yml b/lms/nladmin-system/src/main/resources/config/application.yml
index 6f01423..942ceff 100644
--- a/lms/nladmin-system/src/main/resources/config/application.yml
+++ b/lms/nladmin-system/src/main/resources/config/application.yml
@@ -2,7 +2,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: dev
+    active: prod
   jackson:
     time-zone: GMT+8
   data:
diff --git a/lms/nladmin-system/src/test/java/org/nl/test/PointTest.java b/lms/nladmin-system/src/test/java/org/nl/test/PointTest.java
index 3d46780..bc597c3 100644
--- a/lms/nladmin-system/src/test/java/org/nl/test/PointTest.java
+++ b/lms/nladmin-system/src/test/java/org/nl/test/PointTest.java
@@ -22,14 +22,14 @@ public class PointTest {
         JSONObject point = new JSONObject();
         WQLObject point_table = WQLObject.getWQLObject("sch_base_point");
         String now = DateUtil.now();
-        for (int i = 1; i < 10; i++) {
+        for (int i = 1; i <= 24; i++) {
             point.put("point_id", IdUtil.getSnowflake(1L, 1L).nextId());
-            point.put("point_code", "YJ" + String.format("%02d", i + 1) + "SL01");
-            point.put("point_name", "压机" + (i + 1) + "上料位");
-            point.put("region_id", "1643438714497667072");
-            point.put("region_code", "YZ");
-            point.put("region_name", "压制区");
-            point.put("point_type", "2");
+            point.put("point_code", "YHHW" + String.format("%02d", i));
+            point.put("point_name", "窑后货位" + i);
+            point.put("region_id", 1695713466955993088L);
+            point.put("region_code", "YHHJ");
+            point.put("region_name", "窑后货架");
+            point.put("point_type", "1");
             point.put("lock_type", "1");
             point.put("create_id", 1);
             point.put("create_name", "管理员");
diff --git a/lms/nladmin-ui/src/views/generator/index.vue b/lms/nladmin-ui/src/views/generator/index.vue
index 8bdf5a8..b67f670 100644
--- a/lms/nladmin-ui/src/views/generator/index.vue
+++ b/lms/nladmin-ui/src/views/generator/index.vue
@@ -25,7 +25,7 @@
       <el-table-column type="selection" width="55" />
       <el-table-column show-overflow-tooltip prop="tableName" label="表名" />
       <el-table-column show-overflow-tooltip prop="engine" label="数据库引擎" />
-      <el-table-column show-overflow-tooltip prop="coding" label="字符编码集" />
+      <el-table-column show-overflow-tooltip prop="coding" label="字符号集" />
       <el-table-column show-overflow-tooltip prop="remark" label="备注" />
       <el-table-column prop="createTime" label="创建日期">
         <template slot-scope="scope">
diff --git a/lms/nladmin-ui/src/views/system/dept/index.vue b/lms/nladmin-ui/src/views/system/dept/index.vue
index bf20d9e..c36b1cd 100644
--- a/lms/nladmin-ui/src/views/system/dept/index.vue
+++ b/lms/nladmin-ui/src/views/system/dept/index.vue
@@ -38,7 +38,7 @@
       width="500px"
     >
       <el-form ref="form" inline :model="form" :rules="rules" size="mini" label-width="80px">
-        <el-form-item label="部门编码" prop="code">
+        <el-form-item label="部门号" prop="code">
           <el-input v-model="form.code" style="width: 370px;" />
         </el-form-item>
         <el-form-item label="部门名称" prop="name">
@@ -99,7 +99,7 @@
       @selection-change="crud.selectionChangeHandler"
     >
       <el-table-column :selectable="checkboxT" type="selection" width="55" />
-<!--      <el-table-column label="编码" prop="code" />-->
+      <!--      <el-table-column label="号" prop="code" />-->
       <el-table-column label="名称" prop="name" />
       <el-table-column label="排序" prop="deptSort" />
       <el-table-column label="状态" align="center" prop="enabled">
@@ -173,7 +173,7 @@ export default {
       depts: [],
       rules: {
         code: [
-          { required: true, message: '请输入编码', trigger: 'blur' }
+          { required: true, message: '请输入号', trigger: 'blur' }
         ],
         name: [
           { required: true, message: '请输入名称', trigger: 'blur' }
diff --git a/lms/nladmin-ui/src/views/system/grid/index.vue b/lms/nladmin-ui/src/views/system/grid/index.vue
index 00fd6e4..35bd973 100644
--- a/lms/nladmin-ui/src/views/system/grid/index.vue
+++ b/lms/nladmin-ui/src/views/system/grid/index.vue
@@ -40,7 +40,7 @@
     >
       <el-table-column type="selection" width="55" />
       <el-table-column v-if="false" prop="id" label="id" />
-      <el-table-column prop="code" label="编码" />
+      <el-table-column prop="code" label="号" />
       <el-table-column prop="name" label="名称" />
       <el-table-column prop="remark" label="备注" />
       <el-table-column prop="is_active" label="启用" width="75px">
@@ -70,7 +70,7 @@
       width="500px"
     >
       <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-        <el-form-item label="编码" prop="code">
+        <el-form-item label="号" prop="code">
           <el-input v-model="form.code" style="width: 370px;" />
         </el-form-item>
         <el-form-item label="名字" prop="name">
@@ -111,12 +111,12 @@
           border
         >
           <el-table-column type="index" label="序号" min-width="50" />
-          <el-table-column label="编码" prop="code" min-width="120">
+          <el-table-column label="号" prop="code" min-width="120">
             <template slot-scope="scope">
               <el-form-item
                 :prop="'gridFieldData.'+ scope.$index + '.code'"
                 :rules="[
-                  { required: true, message: '编码不能为空!', trigger: 'blur' }
+                  { required: true, message: '号不能为空!', trigger: 'blur' }
                 ]"
               >
                 <el-input v-model="scope.row.code" style="text-align: center" />
diff --git a/lms/nladmin-ui/src/views/system/logicflow/image/index.vue b/lms/nladmin-ui/src/views/system/logicflow/image/index.vue
index 02431a0..df6ceb8 100644
--- a/lms/nladmin-ui/src/views/system/logicflow/image/index.vue
+++ b/lms/nladmin-ui/src/views/system/logicflow/image/index.vue
@@ -196,7 +196,7 @@ export default {
           { required: true, message: '创建时间不能为空', trigger: 'blur' }
         ],
         image_code: [
-          { required: true, message: '图标编码不能为空', trigger: 'blur' }
+          { required: true, message: '图标号不能为空', trigger: 'blur' }
         ]
       },
       fileList: [],
diff --git a/lms/nladmin-ui/src/views/system/logicflow/index.vue b/lms/nladmin-ui/src/views/system/logicflow/index.vue
index 2204632..91fedc8 100644
--- a/lms/nladmin-ui/src/views/system/logicflow/index.vue
+++ b/lms/nladmin-ui/src/views/system/logicflow/index.vue
@@ -16,7 +16,7 @@
           <el-form-item v-if="false" label="舞台标识" prop="stage_uuid">
             <el-input v-model="form.stage_uuid" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="舞台编码" prop="stage_code">
+          <el-form-item label="舞台号" prop="stage_code">
             <el-input v-model="form.stage_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="舞台名字" prop="stage_name">
@@ -39,7 +39,7 @@
       >
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="false" prop="stage_uuid" label="舞台标识" />
-        <el-table-column prop="stage_code" label="舞台编码" />
+        <el-table-column prop="stage_code" label="舞台号" />
         <el-table-column prop="stage_name" label="舞台名字" />
         <el-table-column prop="stage_data" label="舞台数据" show-overflow-tooltip />
         <el-table-column prop="create_by" label="创建者" />
@@ -107,7 +107,7 @@ export default {
       },
       rules: {
         stage_code: [
-          { required: true, message: '舞台编码不能为空', trigger: 'blur' }
+          { required: true, message: '舞台号不能为空', trigger: 'blur' }
         ],
         stage_name: [
           { required: true, message: '舞台名字不能为空', trigger: 'blur' }
diff --git a/lms/nladmin-ui/src/views/system/monitor/device/XJDeviceMonitor.vue b/lms/nladmin-ui/src/views/system/monitor/device/XJDeviceMonitor.vue
index f6a8a16..ba57667 100644
--- a/lms/nladmin-ui/src/views/system/monitor/device/XJDeviceMonitor.vue
+++ b/lms/nladmin-ui/src/views/system/monitor/device/XJDeviceMonitor.vue
@@ -19,7 +19,7 @@
     </el-row>
     <el-card class="box-card" shadow="never">
       <el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="80px">
-        <el-form-item label="设备编码">
+        <el-form-item label="设备号">
           <el-input v-model="device_code" placeholder="自动生产" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="设备名称" prop="dtl_count">
diff --git a/lms/nladmin-ui/src/views/system/monitor/device/index.vue b/lms/nladmin-ui/src/views/system/monitor/device/index.vue
index 904947a..55208a7 100644
--- a/lms/nladmin-ui/src/views/system/monitor/device/index.vue
+++ b/lms/nladmin-ui/src/views/system/monitor/device/index.vue
@@ -8,7 +8,6 @@
 
 <script>
 import crudStage from '@/api/logicflow/stage'
-import paramCrud from '@/api/system/param'
 import '@logicflow/core/dist/style/index.css'
 import '@logicflow/extension/lib/style/index.css'
 
@@ -102,7 +101,7 @@ export default {
       this.initStageData()
     },
     initStageData() {
-      // 获取舞台编码
+      // 获取舞台号
       this.getValueByCode(this.stageParam).then(res => {
         if (res.value !== undefined) {
           crudStage.getNewStageDataByCode(res.value).then(res => {
diff --git a/lms/nladmin-ui/src/views/system/param/index.vue b/lms/nladmin-ui/src/views/system/param/index.vue
index 6e92c65..a4f3433 100644
--- a/lms/nladmin-ui/src/views/system/param/index.vue
+++ b/lms/nladmin-ui/src/views/system/param/index.vue
@@ -13,7 +13,7 @@
         width="500px"
       >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-          <el-form-item label="编码" prop="code">
+          <el-form-item label="号" prop="code">
             <el-input v-model="form.code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="名字" prop="name">
@@ -42,7 +42,7 @@
       >
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="false" prop="id" label="id" />
-        <el-table-column prop="code" label="编码" min-width="130" show-overflow-tooltip />
+        <el-table-column prop="code" label="号" min-width="130" show-overflow-tooltip />
         <el-table-column prop="name" label="名称" min-width="120" show-overflow-tooltip />
         <el-table-column prop="value" label="值" min-width="270" show-overflow-tooltip />
         <el-table-column prop="remark" label="备注" />
@@ -64,7 +64,6 @@
 <script>
 import crudParam from '@/api/system/param'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
@@ -83,7 +82,7 @@ const defaultForm = {
 }
 export default {
   name: 'Param',
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: { pagination, crudOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({ title: '系统参数', url: 'api/param', idField: 'id', sort: 'id,desc', crudMethod: { ...crudParam },
diff --git a/lms/nladmin-ui/src/views/tools/codeGen/codeDetail.vue b/lms/nladmin-ui/src/views/tools/codeGen/codeDetail.vue
index aec6166..07e79a2 100644
--- a/lms/nladmin-ui/src/views/tools/codeGen/codeDetail.vue
+++ b/lms/nladmin-ui/src/views/tools/codeGen/codeDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div v-if="query.dictName === ''">
-      <div class="my-code">点击编码查看详情</div>
+      <div class="my-code">点击号查看详情</div>
     </div>
     <div v-else>
       <!--工具栏-->
@@ -12,7 +12,7 @@
             v-model="query.label"
             clearable
             size="mini"
-            placeholder="输入编码标签查询"
+            placeholder="输入号标签查询"
             style="width: 200px;"
             class="filter-item"
             @keyup.enter.native="toQuery"
@@ -30,7 +30,7 @@
         width="500px"
       >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-          <el-form-item label="编码类型" prop="type">
+          <el-form-item label="号类型" prop="type">
             <el-select v-model="form.type" placeholder="请选择" @change="changeType">
               <el-option
                 v-for="item in options"
@@ -88,7 +88,7 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column label="所属编码">
+        <el-table-column label="所属号">
           {{ query.dictName }}
         </el-table-column>
         <el-table-column prop="type" label="类型" :formatter="typeFormate" />
@@ -138,7 +138,7 @@ export default {
   cruds() {
     return [
       CRUD({
-        title: '编码详情', url: 'api/codeDetail', query: { dictName: '' }, sort: ['sort_num,asc'],
+        title: '号详情', url: 'api/codeDetail', query: { dictName: '' }, sort: ['sort_num,asc'],
         crudMethod: { ...crudCodeDetail },
         optShow: {
           add: true,
@@ -172,7 +172,7 @@ export default {
       dictId: null,
       rules: {
         type: [
-          { required: true, message: '请输入编码标签', trigger: 'blur' }
+          { required: true, message: '请输入号标签', trigger: 'blur' }
         ],
         init_value: [
           { required: true, message: '请输入初始值', trigger: 'blur' }
diff --git a/lms/nladmin-ui/src/views/tools/codeGen/index.vue b/lms/nladmin-ui/src/views/tools/codeGen/index.vue
index 3cb875b..77a7aa3 100644
--- a/lms/nladmin-ui/src/views/tools/codeGen/index.vue
+++ b/lms/nladmin-ui/src/views/tools/codeGen/index.vue
@@ -3,7 +3,7 @@
     <!--表单组件-->
     <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible="crud.status.cu > 0" :title="crud.status.title" width="500px">
       <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-        <el-form-item label="编码" prop="name">
+        <el-form-item label="号" prop="name">
           <el-input v-model="form.code" style="width: 370px;" />
         </el-form-item>
         <el-form-item label="名称">
@@ -23,7 +23,7 @@
           <div class="head-container">
             <div v-if="crud.props.searchToggle">
               <!-- 搜索 -->
-              <el-input v-model="query.blurry" clearable size="mini" placeholder="输入编码或者名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+              <el-input v-model="query.blurry" clearable size="mini" placeholder="输入号或者名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
               <rrOperation />
             </div>
             <crudOperation :permission="permission" />
@@ -31,7 +31,7 @@
           <!--表格渲染-->
           <el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row style="width: 100%;" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
             <el-table-column type="selection" width="55" />
-            <el-table-column show-overflow-tooltip prop="code" width="80" label="编码" />
+            <el-table-column show-overflow-tooltip prop="code" width="80" label="号" />
             <el-table-column show-overflow-tooltip prop="name" width="100" label="名称" />
             <el-table-column show-overflow-tooltip prop="demo" width="150" label="测试值" />
             <el-table-column show-overflow-tooltip prop="remark" label="备注" />
@@ -52,7 +52,7 @@
       <el-col :xs="24" :sm="24" :md="14" :lg="13" :xl="13">
         <el-card class="box-card">
           <div slot="header" class="clearfix">
-            <span>编码详情</span>
+            <span>号详情</span>
             <el-button
               v-if="checkPermission(['admin','genCode:add']) && this.$refs.codeGenDetail && this.$refs.codeGenDetail.query.dictName"
               class="filter-item"
@@ -88,7 +88,7 @@ export default {
   components: { crudOperation, pagination, rrOperation, udOperation, codeGenDetail },
   cruds() {
     return [
-      CRUD({ title: '编码', url: 'api/genCode', crudMethod: { ...crudDict }, sort: ['create_time,desc'],
+      CRUD({ title: '号', url: 'api/genCode', crudMethod: { ...crudDict }, sort: ['create_time,desc'],
         optShow: {
           add: true,
           edit: true,
@@ -101,12 +101,12 @@ export default {
   data() {
     return {
       queryTypeOptions: [
-        { key: 'code', display_name: '编码' },
+        { key: 'code', display_name: '号' },
         { key: 'name', display_name: '名称' }
       ],
       rules: {
         code: [
-          { required: true, message: '请输入编码', trigger: 'blur' }
+          { required: true, message: '请输入号', trigger: 'blur' }
         ]
       },
       permission: {
diff --git a/lms/nladmin-ui/src/views/wms/basedata/bom/index.vue b/lms/nladmin-ui/src/views/wms/basedata/bom/index.vue
deleted file mode 100644
index 0edbccb..0000000
--- a/lms/nladmin-ui/src/views/wms/basedata/bom/index.vue
+++ /dev/null
@@ -1,287 +0,0 @@
-<template>
-  <div v-loading.fullscreen.lock="fullscreenLoading" class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <el-form
-          :inline="true"
-          class="demo-form-inline"
-          label-position="right"
-          label-width="90px"
-          label-suffix="："
-        >
-          <el-form-item label="物料编码">
-            <el-input
-              v-model="query.name"
-              clearable
-              placeholder="物料编码"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <rrOperation />
-        </el-form>
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog
-        :close-on-click-modal="false"
-        :before-close="crud.cancelCU"
-        :visible.sync="crud.status.cu > 0"
-        :title="crud.status.title"
-        width="600px"
-      >
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px" label-suffix="：">
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="BOM编码" prop="material_code">
-                <el-input :disabled="crud.status.edit" v-model="form.material_code" clearable style="width: 300px" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="困料时间" prop="standing_time">
-                <el-input v-model="form.standing_time" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">分钟</i></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="超时时间" prop="threshold_time">
-                <el-input v-model="form.threshold_time" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">分钟</i></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="info" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table
-        ref="table"
-        v-loading="crud.loading"
-        :data="crud.data"
-        size="mini"
-        style="width: 100%;"
-        @selection-change="crud.selectionChangeHandler"
-      >
-        <el-table-column prop="material_code" label="BOM编码" :min-width="flexWidth('material_code',crud.data,'BOM编码')" />
-        <el-table-column prop="standing_time" label="困料时间" :min-width="flexWidth('standing_time',crud.data,'困料时间')" />
-        <el-table-column prop="threshold_time" label="超时时间" :min-width="flexWidth('threshold_time',crud.data,'超时时间')" />
-        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
-        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
-        <el-table-column prop="update_optname" label="修改人" :min-width="flexWidth('update_optname',crud.data,'修改人')" />
-        <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
-        <el-table-column
-          v-permission="[]"
-          label="操作"
-          fixed="right"
-          width="120px"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <udOperation
-              :is-visiable-del="false"
-              :data="scope.row"
-              :permission="permission"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-  </div>
-</template>
-
-<script>
-import crudMaterialbase from '@/api/wms/basedata/materialbase'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-import { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import crudClassstandard from '@/api/wms/basedata/classstandard'
-import crudMdPbMeasureunit from '@/api/wms/basedata/mdPbMeasureunit'
-
-const defaultForm = {
-  material_id: null,
-  ass_unit_id: null,
-  material_code: null,
-  material_name: null,
-  standing_time: null,
-  threshold_time: null,
-  a: null,
-  b: null,
-  h: null,
-  w: null,
-  product_code: null,
-  create_id: null,
-  create_name: null,
-  create_time: null,
-  update_optid: null,
-  update_optname: null,
-  update_time: null,
-  weight: null,
-  material_type: '2'
-}
-export default {
-  name: 'BOM',
-  // 数据字典
-  dicts: ['is_used'],
-  components: { pagination, crudOperation, rrOperation, udOperation },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({
-      title: 'BOM',
-      optShow: { add: false, reset: true },
-      url: 'api/Materialbase',
-      idField: 'material_id',
-      sort: 'material_id,desc',
-      crudMethod: { ...crudMaterialbase },
-      query: {
-        material_type: '2'
-      }
-    })
-  },
-  data() {
-    return {
-      classes1: [],
-      classes2: [],
-      classes3: [],
-      fullscreenLoading: false,
-      measure_unit: [],
-      productSeries: [],
-      permission: {},
-      rules: {
-        material_code: [
-          { required: true, message: '物料编码不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  created() {
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    },
-    [CRUD.HOOK.beforeToCU](crud, form) {
-      crudMdPbMeasureunit.getUnit().then(res => {
-        this.measure_unit = res.content
-      })
-      // 物料标识为空，新增
-      if (!form.material_type_id) {
-        form.material_type_id = null // 必须为null，否则会出现unknown
-      } else { // 更新
-        this.getSubTypes('02', form.material_type_id)
-      }
-      // 物料系列为空，新增
-      if (!form.product_series) {
-        form.product_series = null // 必须为null，否则会出现unknown
-      } else { // 更新
-        this.getSubTypes('03', form.product_series)
-      }
-    },
-    getSubTypes(type, id) {
-      const that = this
-      crudClassstandard.getClassSuperior(id).then(res => {
-        const data = res.content
-        that.buildTree(data)
-        if (type === '02') {
-          that.classes2 = data
-        }
-        if (type === '03') {
-          that.classes3 = data
-        }
-      })
-    },
-    synchronize() {
-      this.fullscreenLoading = true
-      crudMaterialbase.synchronize(this.crud.query).then(res => {
-        this.fullscreenLoading = false
-        this.crud.notify('同步成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
-      }).catch(() => {
-        this.fullscreenLoading = false
-      })
-    },
-    queryClassId() {
-      const param = {
-        'class_idStr': this.class_idStr
-      }
-      crudClassstandard.queryClassById(param).then(res => {
-        this.classes = res.content.map(obj => {
-          if (obj.hasChildren) {
-            obj.children = null
-          }
-          return obj
-        })
-      })
-    },
-    buildTree(classes) {
-      classes.forEach(data => {
-        if (data.children) {
-          this.buildTree(data.children)
-        }
-        if (data.hasChildren && !data.children) {
-          data.children = null // 重点代码
-        }
-      })
-    },
-    // 改变状态
-    changeEnabled(data, val) {
-      this.$confirm('此操作将 "' + this.dict.label.is_used[val] + '" ' + data.material_name + ', 是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        crudMaterialbase.edit(data).then(res => {
-          this.crud.notify(this.dict.label.is_used[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        }).catch(() => {
-          if (data.is_used === '0') {
-            data.is_used = '1'
-            return
-          }
-          if (data.is_used === '1') {
-            data.is_used = '0'
-          }
-        })
-      }).catch(() => {
-        if (data.is_used === '0') {
-          data.is_used = '1'
-          return
-        }
-        if (data.is_used === '1') {
-          data.is_used = '0'
-        }
-      })
-    },
-    // 获取子节点数据
-    loadChildNodes({ action, parentNode, callback }) {
-      if (action === LOAD_CHILDREN_OPTIONS) {
-        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
-          parentNode.children = res.content.map(function(obj) {
-            if (obj.hasChildren) {
-              obj.children = null
-            }
-            return obj
-          })
-          setTimeout(() => {
-            callback()
-          }, 100)
-        })
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/lms/nladmin-ui/src/views/wms/basedata/class/index.vue b/lms/nladmin-ui/src/views/wms/basedata/class/index.vue
index fcc5820..ca675fa 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/class/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/class/index.vue
@@ -55,7 +55,7 @@
         width="500px"
       >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-          <el-form-item label="分类编码" prop="class_code">
+          <el-form-item label="分类号" prop="class_code">
             <el-input v-model="form.class_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="分类名称" prop="class_name">
@@ -98,7 +98,7 @@
         @select-all="crud.selectAllChange"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column prop="class_code" label="分类编码" />
+        <el-table-column prop="class_code" label="分类号" />
         <el-table-column prop="class_name" label="分类名称" />
         <el-table-column prop="class_desc" label="分类简要描述" />
         <el-table-column prop="update_optname" label="修改人" />
@@ -226,7 +226,7 @@ export default {
   },
   methods: {
     getClassNames() {
-      crudClassstandard.getClassName().then((res) => { // 获取分类名称，查询根据分类编码查找对应分支树
+      crudClassstandard.getClassName().then((res) => { // 获取分类名称，查询根据分类号查找对应分支树
         this.classNames = res
       })
     },
diff --git a/lms/nladmin-ui/src/views/wms/basedata/customer/index.vue b/lms/nladmin-ui/src/views/wms/basedata/customer/index.vue
index f2bf67a..da68ba6 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/customer/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/customer/index.vue
@@ -7,7 +7,7 @@
         clearable
         style="width: 300px"
         size="mini"
-        placeholder="输入客户编码或客户名称"
+        placeholder="输入客户号或客户名称"
         prefix-icon="el-icon-search"
         class="filter-item"
       />
@@ -25,7 +25,7 @@
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
           <el-row :gutter="20">
             <el-col :span="8">
-              <el-form-item label="客户编码" prop="cust_code">
+              <el-form-item label="客户号" prop="cust_code">
                 <el-input v-model="form.cust_code" style="width: 200px;" />
               </el-form-item>
             </el-col>
@@ -64,7 +64,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="邮政编码">
+              <el-form-item label="邮政号">
                 <el-input v-model="form.zip_code" style="width: 200px;" />
               </el-form-item>
             </el-col>
@@ -123,7 +123,7 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column prop="cust_code" label="客户编码" />
+        <el-table-column prop="cust_code" label="客户号" />
         <el-table-column prop="cust_name" label="客户名称 " />
         <el-table-column prop="corp_tele_no" label="公司电话" />
         <el-table-column prop="corp_address" label="公司地址" />
@@ -226,7 +226,7 @@ export default {
           { required: true, message: '客户标识不能为空', trigger: 'blur' }
         ],
         cust_code: [
-          { required: true, message: '客户编码不能为空', trigger: 'blur' }
+          { required: true, message: '客户号不能为空', trigger: 'blur' }
         ],
         cust_name: [
           { required: true, message: '客户名称 不能为空', trigger: 'blur' }
diff --git a/lms/nladmin-ui/src/views/wms/basedata/material/detail/index.vue b/lms/nladmin-ui/src/views/wms/basedata/material/detail/index.vue
deleted file mode 100644
index d7eb51a..0000000
--- a/lms/nladmin-ui/src/views/wms/basedata/material/detail/index.vue
+++ /dev/null
@@ -1,207 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog
-        :close-on-click-modal="false"
-        :before-close="crud.cancelCU"
-        :visible.sync="crud.status.cu > 0"
-        :title="crud.status.title"
-        width="600px"
-      >
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px" label-suffix="：">
-          <el-form-item label="物料编码" prop="material_code">
-            <el-input v-model="form.material_code" :disabled="crud.status.edit" placeholder="物料编码" style="width: 300px;" />
-          </el-form-item>
-          <el-form-item label="物料名称" prop="material_name">
-            <el-input v-model="form.material_name" placeholder="物料名称" style="width: 300px;" />
-          </el-form-item>
-          <el-form-item label="炉型" prop="furnace">
-            <el-input v-model="form.furnace" placeholder="炉型" style="width: 300px;" />
-          </el-form-item>
-          <el-form-item label="物料砖类型" prop="material_brick_type">
-            <el-input v-model="form.material_brick_type" placeholder="物料砖类型" style="width: 300px;" />
-          </el-form-item>
-          <el-form-item label="BOM编码" prop="bom_code">
-            <el-input v-model="form.bom_code" :disabled="crud.status.edit" placeholder="BOM编码" style="width: 300px;" />
-          </el-form-item>
-          <el-form-item label="订单编码" prop="order_code">
-            <el-input v-model="form.order_code" :disabled="crud.status.edit" placeholder="订单编码" style="width: 300px;" />
-          </el-form-item>
-          <el-form-item label="客户编码" prop="customer_code">
-            <el-input v-model="form.customer_code" :disabled="crud.status.edit" placeholder="客户编码" style="width: 300px;" />
-          </el-form-item>
-          <el-form-item label="牌号" prop="product_grade">
-            <el-input v-model="form.product_grade" placeholder="牌" style="width: 300px;" />
-          </el-form-item>
-          <el-form-item label="砖型" prop="brick_type">
-            <el-input v-model="form.brick_type" :disabled="crud.status.edit" placeholder="砖型" style="width: 300px;" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="info" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table
-        ref="table"
-        v-loading="crud.loading"
-        :data="crud.data"
-        size="mini"
-        style="width: 100%;"
-      >
-        <el-table-column
-          prop="material_code"
-          label="物料编码"
-          :min-width="flexWidth('material_code',crud.data,'物料编码')"
-        />
-        <el-table-column
-          prop="material_name"
-          label="物料名称"
-          :min-width="flexWidth('material_name',crud.data,'物料名称')"
-        />
-        <el-table-column
-          prop="furnace"
-          label="炉型"
-          :min-width="flexWidth('furnace_name',crud.data,'炉型')"
-        />
-        <el-table-column
-          prop="material_brick_type"
-          label="物料砖类型"
-          :min-width="flexWidth('material_brick_type_name',crud.data,'物料砖类型')"
-        />
-        <el-table-column
-          prop="bom_code"
-          label="BOM编码"
-          :min-width="flexWidth('bom_code',crud.data,'BOM编码')"
-        />
-        <el-table-column
-          prop="order_code"
-          label="订单编码"
-          :min-width="flexWidth('order_code',crud.data,'订单编码')"
-        />
-        <el-table-column
-          prop="customer_code"
-          label="客户编码"
-          :min-width="flexWidth('customer_code',crud.data,'客户编码')"
-        />
-        <el-table-column
-          prop="product_grade"
-          label="牌号"
-          :min-width="flexWidth('product_grade_name',crud.data,'牌号')"
-        />
-        <el-table-column prop="brick_type" label="砖型" :min-width="flexWidth('brick_type',crud.data,'砖型')" />
-        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
-        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
-        <el-table-column prop="update_optname" label="修改人" :min-width="flexWidth('update_optname',crud.data,'创建人')" />
-        <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'创建人')" />
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <udOperation
-              :is-visiable-del="false"
-              :data="scope.row"
-              :permission="permission"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-  </div>
-</template>
-
-<script>
-import crudMaterialDetail from '@/api/wms/basedata/materialDetail'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-
-const defaultForm = {
-  material_id: null,
-  material_code: null,
-  material_name: null,
-  furnace: null,
-  material_brick_type: null,
-  bom_code: null,
-  order_code: null,
-  customer_code: null,
-  product_grade: null,
-  brick_type: null,
-  create_id: null,
-  create_name: null,
-  create_time: null,
-  update_optid: null,
-  update_optname: null,
-  update_time: null,
-  is_delete: '0'
-}
-export default {
-  name: 'MaterialDetail',
-  dicts: ['furnace', 'material_brick_type', 'product_grade'],
-  components: { pagination, crudOperation, udOperation },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({
-      title: '物料详情',
-      url: 'api/materialDetail',
-      idField: 'material_id',
-      sort: 'material_id,desc',
-      crudMethod: { ...crudMaterialDetail },
-      optShow: {
-        add: false,
-        edit: false,
-        del: false,
-        download: false,
-        reset: true
-      }
-    })
-  },
-  data() {
-    return {
-      permission: {},
-      rules: {
-        material_code: [
-          { required: true, message: '物料编码不能为空', trigger: 'blur' }
-        ],
-        furnace: [
-          { required: true, message: '炉型不能为空', trigger: 'blur' }
-        ],
-        material_brick_type: [
-          { required: true, message: '物料砖类型不能为空', trigger: 'blur' }
-        ],
-        bom_code: [
-          { required: true, message: 'BOM编码不能为空', trigger: 'blur' }
-        ],
-        order_code: [
-          { required: true, message: '订单编码不能为空', trigger: 'blur' }
-        ],
-        customer_code: [
-          { required: true, message: '客户编码不能为空', trigger: 'blur' }
-        ],
-        product_grade: [
-          { required: true, message: '牌号不能为空', trigger: 'blur' }
-        ],
-        brick_type: [
-          { required: true, message: '砖型不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/lms/nladmin-ui/src/views/wms/basedata/material/index.vue b/lms/nladmin-ui/src/views/wms/basedata/material/index.vue
index 3b105e6..af210b2 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/material/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/material/index.vue
@@ -10,27 +10,19 @@
           label-width="90px"
           label-suffix="："
         >
-          <el-form-item label="物料编码">
+          <el-form-item label="物料号">
             <el-input
-              v-model="query.name"
+              v-model="query.material_number"
               clearable
-              placeholder="物料编码"
+              placeholder="物料号"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="订单编码">
+          <el-form-item label="物料名称">
             <el-input
-              v-model="query.order_code"
+              v-model="query.material_name"
               clearable
-              placeholder="订单编码"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="部位">
-            <el-input
-              v-model="query.product_grade"
-              clearable
-              placeholder="部位"
+              placeholder="物料名称"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
@@ -60,106 +52,57 @@
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px" label-suffix="：">
           <el-row>
             <el-col :span="12">
-              <el-form-item label="物料编码" prop="material_code">
-                <el-input v-model="form.material_code" :disabled="crud.status.edit" clearable style="width: 300px" />
+              <el-form-item label="物料号" prop="material_number">
+                <el-input v-model="form.material_number" :disabled="crud.status.edit" clearable style="width: 300px" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="订单编码" prop="order_code">
-                <el-input v-model="form.order_code" :disabled="crud.status.edit" style="width: 300px" />
+              <el-form-item label="物料名称" prop="material_name">
+                <el-input v-model="form.material_name" clearable style="width: 300px" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="部位" prop="product_grade">
-                <el-input v-model="form.product_grade" :disabled="crud.status.edit" style="width: 300px" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="炉型" prop="furnace">
-                <el-input v-model="form.furnace" :disabled="crud.status.edit" style="width: 300px" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="砖型" prop="brick_type">
-                <el-input v-model="form.brick_type" :disabled="crud.status.edit" style="width: 300px" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="类别" prop="material_brick_type">
-                <el-input v-model="form.material_brick_type" :disabled="crud.status.edit" style="width: 300px" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="订单单重" prop="weight">
-                <el-input v-model="form.weight" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">千克</i></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="订单数量" prop="aux_qty">
-                <el-input v-model="form.aux_qty" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">块</i></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="订单重量" prop="qty">
-                <el-input v-model="form.qty" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">千克</i></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="困料时间" prop="standing_time">
-                <el-input v-model="form.standing_time" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">分钟</i></el-input>
+              <el-form-item label="困料时间" prop="stand_time">
+                <el-input v-model="form.stand_time" type="number" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">分钟</i></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="超时时间" prop="threshold_time">
-                <el-input v-model="form.threshold_time" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">分钟</i></el-input>
+                <el-input v-model="form.threshold_time" type="number" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">分钟</i></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="产品编号" prop="product_code">
-                <el-input v-model="form.product_code" type="number" style="width: 300px" />
+                <el-input v-model="form.product_code" type="number" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 300px" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="长边长度" prop="a">
-                <el-input v-model="form.a" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">毫米</i></el-input>
+                <el-input v-model="form.a" type="number" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">毫米</i></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="短边长度" prop="b">
-                <el-input v-model="form.b" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">毫米</i></el-input>
+                <el-input v-model="form.b" type="number" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">毫米</i></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="梯形高度" prop="h">
-                <el-input v-model="form.h" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">毫米</i></el-input>
+                <el-input v-model="form.h" type="number" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">毫米</i></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -185,21 +128,9 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
-        <el-table-column prop="order_code" label="订单编码" :min-width="flexWidth('order_code',crud.data,'订单编码')" />
-        <el-table-column prop="product_grade" label="部位" :min-width="flexWidth('product_grade',crud.data,'部位')" />
-        <el-table-column prop="furnace" label="炉型" :min-width="flexWidth('furnace',crud.data,'炉型')" />
-        <el-table-column prop="brick_type" label="砖型" :min-width="flexWidth('brick_type',crud.data,'砖型')" />
-        <el-table-column prop="material_brick_type" label="类别" :min-width="flexWidth('material_brick_type',crud.data,'类别')" />
-        <el-table-column prop="weight" label="订单单重" :min-width="flexWidth('weight',crud.data,'订单单重')" />
-        <el-table-column prop="aux_qty" label="订单数量" :min-width="flexWidth('aux_qty',crud.data,'订单数量')" />
-        <el-table-column prop="qty" label="订单重量" :min-width="flexWidth('qty',crud.data,'订单重量')" />
-        <el-table-column prop="current_aux_qty" label="完成数量" :min-width="flexWidth('current_aux_qty',crud.data,'完成数量')" />
-        <el-table-column prop="unqualified_qty" label="废砖数量" :min-width="flexWidth('unqualified_qty',crud.data,'废砖数量')" />
-        <el-table-column prop="current_qty" label="完成总重" :min-width="flexWidth('current_qty',crud.data,'完成总重')" />
-        <el-table-column prop="surplus_aux_qty" label="剩余数量" :min-width="flexWidth('surplus_aux_qty',crud.data,'剩余数量')" />
-        <el-table-column prop="surplus_qty" label="剩余重量" :min-width="flexWidth('surplus_qty',crud.data,'剩余重量')" />
-        <el-table-column prop="standing_time" label="困料时间" :min-width="flexWidth('standing_time',crud.data,'困料时间')" />
+        <el-table-column prop="material_number" label="物料号" :min-width="flexWidth('material_number',crud.data,'物料号')" />
+        <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
+        <el-table-column prop="stand_time" label="困料时间" :min-width="flexWidth('stand_time',crud.data,'困料时间')" />
         <el-table-column prop="threshold_time" label="超时时间" :min-width="flexWidth('threshold_time',crud.data,'超时时间')" />
         <el-table-column prop="product_code" label="产品编号" :min-width="flexWidth('product_code',crud.data,'产品编号')" />
         <el-table-column prop="a" label="长边长度" :min-width="flexWidth('a',crud.data,'长边长度')" />
@@ -245,10 +176,9 @@ import crudMdPbMeasureunit from '@/api/wms/basedata/mdPbMeasureunit'
 
 const defaultForm = {
   material_id: null,
-  ass_unit_id: null,
-  material_code: null,
+  material_number: null,
   material_name: null,
-  standing_time: null,
+  stand_time: null,
   threshold_time: null,
   a: null,
   b: null,
@@ -260,16 +190,7 @@ const defaultForm = {
   create_time: null,
   update_optid: null,
   update_optname: null,
-  update_time: null,
-  weight: null,
-  material_type: '1',
-  order_code: null,
-  product_grade: null,
-  material_brick_type: null,
-  furnace: null,
-  qty: 0,
-  aux_qty: 0,
-  brick_type: null
+  update_time: null
 }
 export default {
   name: 'Materialbase',
@@ -300,8 +221,8 @@ export default {
       productSeries: [],
       permission: {},
       rules: {
-        material_code: [
-          { required: true, message: '物料编码不能为空', trigger: 'blur' }
+        material_number: [
+          { required: true, message: '物料号不能为空', trigger: 'blur' }
         ]
       }
     }
diff --git a/lms/nladmin-ui/src/views/wms/basedata/measure/index.vue b/lms/nladmin-ui/src/views/wms/basedata/measure/index.vue
index 6622c32..3e76ab7 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/measure/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/measure/index.vue
@@ -7,7 +7,7 @@
         clearable
         style="width: 300px"
         size="mini"
-        placeholder="输入单位编码或单位名称"
+        placeholder="输入单位号或单位名称"
         prefix-icon="el-icon-search"
         class="filter-item"
       />
@@ -17,7 +17,7 @@
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-          <el-form-item label="编码" prop="unit_code">
+          <el-form-item label="号" prop="unit_code">
             <el-input v-model="form.unit_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="名称" prop="unit_name">
@@ -42,7 +42,7 @@
       </el-dialog>
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column prop="unit_code" label="编码" />
+        <el-table-column prop="unit_code" label="号" />
         <el-table-column prop="unit_name" label="名称" />
         <el-table-column prop="qty_precision" label="数据精度" />
         <el-table-column prop="update_optname" label="修改者" />
diff --git a/lms/nladmin-ui/src/views/wms/basedata/supp/index.vue b/lms/nladmin-ui/src/views/wms/basedata/supp/index.vue
index a8760bf..f040e51 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/supp/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/supp/index.vue
@@ -7,7 +7,7 @@
         clearable
         style="width: 300px"
         size="mini"
-        placeholder="输入供应商编码或名称"
+        placeholder="输入供应商号或名称"
         prefix-icon="el-icon-search"
         class="filter-item"
       />
@@ -25,7 +25,7 @@
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="130px">
           <el-row :gutter="20">
             <el-col :span="8">
-              <el-form-item label="供应商编码" prop="supp_code">
+              <el-form-item label="供应商号" prop="supp_code">
                 <el-input v-model="form.supp_code" style="width: 200px;" />
               </el-form-item>
             </el-col>
@@ -69,7 +69,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="邮政编码">
+              <el-form-item label="邮政号">
                 <el-input v-model="form.zip_code" style="width: 200px;" />
               </el-form-item>
             </el-col>
@@ -133,7 +133,7 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column prop="supp_code" label="供应商编码" />
+        <el-table-column prop="supp_code" label="供应商号" />
         <el-table-column prop="supp_name" label="供应商名称 " />
         <el-table-column prop="corp_address" label="公司地址" />
         <el-table-column prop="corp_tele_no" label="公司电话" />
diff --git a/lms/nladmin-ui/src/views/wms/basedata/vehicle/group/index.vue b/lms/nladmin-ui/src/views/wms/basedata/vehicle/group/index.vue
index d2d6f90..8035d8f 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/vehicle/group/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/vehicle/group/index.vue
@@ -10,20 +10,20 @@
           label-width="90px"
           label-suffix=":"
         >
-          <el-form-item label="载具编码">
+          <el-form-item label="载具号">
             <el-input
               v-model="query.vehicle_code"
               clearable
               size="mini"
-              placeholder="请输入载具编码"
+              placeholder="请输入载具号"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <rrOperation/>
+          <rrOperation />
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission"/>
+      <crudOperation :permission="permission" />
       <!--表单组件-->
       <el-dialog
         :close-on-click-modal="false"
@@ -50,17 +50,17 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="载具编码" prop="vehicle_code">
-            <el-input v-model="form.vehicle_code" style="width: 370px;"/>
+          <el-form-item label="载具号" prop="vehicle_code">
+            <el-input v-model="form.vehicle_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="数量" prop="qty">
-            <el-input v-model="form.qty" style="width: 370px;"/>
+            <el-input v-model="form.qty" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="重量" prop="weight">
-            <el-input v-model="form.weight" style="width: 370px;"/>
+            <el-input v-model="form.weight" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="点位编码">
-            <el-input v-model="form.point_code" style="width: 370px;"/>
+          <el-form-item label="点位号">
+            <el-input v-model="form.point_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="是否满垛" prop="is_full">
             <el-radio v-model="form.is_full" label="0">否</el-radio>
@@ -85,7 +85,7 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="selection" width="55"/>
+        <el-table-column type="selection" width="55" />
         <el-table-column
           prop="vehicle_type"
           label="载具类型"
@@ -97,12 +97,12 @@
         </el-table-column>
         <el-table-column
           prop="vehicle_code"
-          label="载具编码"
-          :min-width="flexWidth('vehicle_code',crud.data,'载具编码')"
+          label="载具号"
+          :min-width="flexWidth('vehicle_code',crud.data,'载具号')"
         />
-        <el-table-column prop="qty" label="数量" :min-width="flexWidth('qty',crud.data,'数量')"/>
-        <el-table-column prop="weight" label="重量" :min-width="flexWidth('weight',crud.data,'重量')"/>
-<!--        <el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')"/>-->
+        <el-table-column prop="qty" label="数量" :min-width="flexWidth('qty',crud.data,'数量')" />
+        <el-table-column prop="weight" label="重量" :min-width="flexWidth('weight',crud.data,'重量')" />
+        <!--        <el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')"/>-->
         <el-table-column prop="is_full" label="是否满垛" :min-width="flexWidth('is_full',crud.data,'是否满垛')">
           <template slot-scope="scope">
             {{ scope.row.is_full == '1' ? '是' : '否' }}
@@ -143,7 +143,7 @@
         </el-table-column>
       </el-table>
       <!--分页组件-->
-      <pagination/>
+      <pagination />
     </div>
   </div>
 </template>
diff --git a/lms/nladmin-ui/src/views/wms/basedata/vehicle/index.vue b/lms/nladmin-ui/src/views/wms/basedata/vehicle/index.vue
index e197c92..aaedf9c 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/vehicle/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/vehicle/index.vue
@@ -11,7 +11,7 @@
           label-width="80px"
           label-suffix=":"
         >
-          <el-form-item label="载具编码">
+          <el-form-item label="载具号">
             <el-input
               v-model="query.vehicle_code"
               clearable
@@ -59,11 +59,11 @@
               />
             </el-select>
           </el-form-item>
-          <rrOperation/>
+          <rrOperation />
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission"/>
+      <crudOperation :permission="permission" />
       <!--表单组件-->
       <el-dialog
         :close-on-click-modal="false"
@@ -74,7 +74,7 @@
       >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px" label-suffix=":">
           <el-row>
-            <el-form-item label="载具编码" prop="vehicle_code">
+            <el-form-item label="载具号" prop="vehicle_code">
               <el-input
                 v-model="form.vehicle_code"
                 placeholder="请输入"
@@ -143,8 +143,8 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="selection" width="55"/>
-        <el-table-column prop="vehicle_code" label="载具编码"/>
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="vehicle_code" label="载具号" />
         <el-table-column prop="vehicle_type" label="载具类型">
           <template slot-scope="scope">
             {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
@@ -155,8 +155,8 @@
             {{ dict.label.vehicle_status[scope.row.vehicle_status] }}
           </template>
         </el-table-column>
-        <el-table-column prop="create_name" label="创建人"/>
-        <el-table-column prop="create_time" label="创建时间"/>
+        <el-table-column prop="create_name" label="创建人" />
+        <el-table-column prop="create_time" label="创建时间" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
@@ -167,7 +167,7 @@
         </el-table-column>
       </el-table>
       <!--分页组件-->
-      <pagination/>
+      <pagination />
     </div>
   </div>
 </template>
@@ -219,7 +219,7 @@ export default {
       permission: {},
       rules: {
         vehicle_code: [
-          { required: true, message: '载具编码不能为空', trigger: 'blur' }
+          { required: true, message: '载具号不能为空', trigger: 'blur' }
         ],
         vehicle_type: [
           { required: true, message: '载具类型不能为空', trigger: 'blur' }
diff --git a/lms/nladmin-ui/src/views/wms/pdm/device/index.vue b/lms/nladmin-ui/src/views/wms/pdm/device/index.vue
index 7f36884..9e34361 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/device/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/device/index.vue
@@ -11,12 +11,12 @@
           label-width="90px"
           label-suffix="："
         >
-          <el-form-item label="编码名称">
+          <el-form-item label="号名称">
             <el-input
               v-model="query.search"
               clearable
               size="mini"
-              placeholder="编码名称"
+              placeholder="号名称"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
@@ -34,7 +34,7 @@
         width="600px"
       >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px" label-suffix="：">
-          <el-form-item label="设备编码" prop="device_code">
+          <el-form-item label="设备号" prop="device_code">
             <el-input v-model="form.device_code" :disabled="crud.status.edit" style="width: 300px" />
           </el-form-item>
           <el-form-item label="设备名称" prop="device_name">
@@ -77,7 +77,7 @@
             <el-radio v-model="form.is_workorder" label="1">是</el-radio>
             <el-radio v-model="form.is_workorder" label="0">否</el-radio>
           </el-form-item>
-          <el-form-item label="外部编码">
+          <el-form-item label="外部号">
             <el-input v-model="form.extend_code" style="width: 300px" />
           </el-form-item>
           <el-form-item label="备注">
@@ -101,8 +101,8 @@
         <el-table-column type="selection" width="55" />
         <el-table-column
           prop="device_code"
-          label="设备编码"
-          :min-width="flexWidth('device_code',crud.data,'设备编码')"
+          label="设备号"
+          :min-width="flexWidth('device_code',crud.data,'设备号')"
         />
         <el-table-column
           prop="device_name"
@@ -203,7 +203,7 @@ export default {
       permission: {},
       rules: {
         device_code: [
-          { required: true, message: '设备编码不能为空', trigger: 'blur' }
+          { required: true, message: '设备号不能为空', trigger: 'blur' }
         ],
         device_name: [
           { required: true, message: '设备名称不能为空', trigger: 'blur' }
diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/OutMaterDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/OutMaterDialog.vue
index 758b298..32ec33e 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/OutMaterDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/OutMaterDialog.vue
@@ -20,7 +20,7 @@
           v-model="query.search"
           clearable
           size="mini"
-          placeholder="编码、名称"
+          placeholder="号、名称"
           @keyup.enter.native="crud.toQuery"
         />
       </el-form-item>
@@ -47,7 +47,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column prop="material_code" label="物料编码" min-width="150" show-overflow-tooltip />
+      <el-table-column prop="material_number" label="物料号" min-width="150" show-overflow-tooltip />
       <el-table-column prop="material_name" label="物料名称" min-width="100" show-overflow-tooltip />
       <el-table-column prop="material_spec" label="规格" min-width="100" show-overflow-tooltip />
       <el-table-column prop="net_weight" label="物料净重" min-width="100" show-overflow-tooltip />
diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/ViewDialog.vue
index 9619c79..d8c139a 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/ViewDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/ViewDialog.vue
@@ -9,7 +9,7 @@
   >
     <el-card class="box-card" shadow="never">
       <el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="180px">
-        <el-form-item label="工单编码">
+        <el-form-item label="工单号">
           <el-input v-model="form.produceorder_code" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="工单类型">
@@ -44,13 +44,13 @@
         <el-form-item v-if="false" label="物料标识">
           <el-input v-model="form.material_id" style="width: 200px;" />
         </el-form-item>
-        <el-form-item label="物料编码">
+        <el-form-item label="物料号">
           <el-input
-            v-model="form.material_code"
+            v-model="form.material_number"
             style="width: 200px;"
             clearable
             @focus="materialShow=true"
-            @clear="form.material_id='',form.material_code='',form.material_name='',form.material_spec=''"
+            @clear="form.material_id='',form.material_number='',form.material_name='',form.material_spec=''"
           />
         </el-form-item>
         <el-form-item label="物料名称">
@@ -158,7 +158,7 @@
       :highlight-current-row="true"
       :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
     >
-      <el-table-column prop="device_code" label="设备编码" align="center" />
+      <el-table-column prop="device_code" label="设备号" align="center" />
       <el-table-column prop="device_name" label="设备名称" align="center" min-width="200" show-overflow-tooltip />
       <el-table-column prop="produce_qty" label="生产数量" align="center" />
       <el-table-column prop="init_qty" label="期初数量" align="center" />
@@ -215,7 +215,7 @@ export default {
         plan_qty: null,
         real_qty: null,
         material_id: null,
-        material_code: null,
+        material_number: null,
         material_weight: null,
         planproducestart_date: null,
         planproduceend_date: null,
diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/fj/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/fj/index.vue
index f79bfc6..34e9b23 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/fj/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/fj/index.vue
@@ -20,11 +20,11 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="物料编码">
+          <el-form-item label="物料号">
             <el-input
               v-model="query.material"
               clearable
-              placeholder="物料编码"
+              placeholder="物料号"
               style="width: 200px;"
               @keyup.enter.native="crud.toQuery"
             />
@@ -114,14 +114,14 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="物料编码" prop="material_code">
+              <el-form-item label="物料号" prop="material_number">
                 <el-input
-                  v-model="form.material_code"
+                  v-model="form.material_number"
                   :disabled="crud.status.edit"
                   style="width: 300px"
                   clearable
                   @focus="materialShow=true"
-                  @clear="form.material_id=''; form.material_code=''; form.material_name=''"
+                  @clear="form.material_id=''; form.material_number=''; form.material_name=''"
                 />
               </el-form-item>
             </el-col>
@@ -136,29 +136,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item
-                label="木托盘类型"
-                prop="vehicle_type"
-              >
-                <el-select
-                  v-model="form.vehicle_type"
-                  :disabled="crud.status.edit"
-                  style="width: 300px"
-                  filterable
-                  placeholder="请选择"
-                >
-                  <el-option
-                    v-for="item in dict.wood_vehicle_type"
-                    :key="item.id"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="计划生产日期" prop="plan_date">
@@ -199,8 +176,8 @@
         <el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识" />
         <el-table-column
           prop="workorder_code"
-          label="工单编码"
-          :min-width="flexWidth('workorder_code',crud.data,'工单编码')"
+          label="工单号"
+          :min-width="flexWidth('workorder_code',crud.data,'工单号')"
         >
           <!--          <template slot-scope="scope">-->
           <!--            <el-link type="warning" @click="toView(scope.row)">{{ scope.row.produceorder_code }}</el-link>-->
@@ -217,19 +194,10 @@
         </el-table-column>
         <el-table-column prop="device_name" label="设备" :min-width="flexWidth('device_name',crud.data,'设备')" />
         <el-table-column
-          prop="material_code"
-          label="物料编码"
-          :min-width="flexWidth('material_code',crud.data,'物料编码')"
+          prop="material_number"
+          label="物料号"
+          :min-width="flexWidth('material_number',crud.data,'物料号')"
         />
-        <el-table-column
-          prop="vehicle_type"
-          label="载具类型"
-          :min-width="flexWidth('vehicle_type',crud.data,'类型一木托盘')"
-        >
-          <template slot-scope="scope">
-            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
-          </template>
-        </el-table-column>
         <el-table-column prop="plan_qty" label="计划数量" :min-width="flexWidth('plan_qty',crud.data,'计划数量')" />
         <el-table-column prop="plan_date" label="计划生产日期" :min-width="flexWidth('plan_date',crud.data,'计划生产日期')" />
         <el-table-column prop="is_urgent" label="是否加急" :min-width="flexWidth('is_urgent',crud.data,'是否加急')">
@@ -365,7 +333,7 @@ const defaultForm = {
   plan_qty: null,
   real_qty: null,
   material_id: null,
-  material_code: null,
+  material_number: null,
   material_weight: null,
   vehicle_type: '3',
   planproducestart_date: null,
@@ -394,7 +362,7 @@ const defaultForm = {
   is_new: '1',
   is_package: '1',
   warn_time: '0',
-  standing_time: '0',
+  stand_time: '0',
   is_urgent: '0',
   is_pri: '0',
   ext_code: null,
@@ -441,8 +409,8 @@ export default {
         plan_qty: [
           { required: true, message: '计划数量不能为空', trigger: 'blur' }
         ],
-        material_code: [
-          { required: true, message: '物料编码不能为空', trigger: 'change' }
+        material_number: [
+          { required: true, message: '物料号不能为空', trigger: 'change' }
         ],
         vehicle_type: [
           { required: true, message: '木托盘类型不能为空', trigger: 'blur' }
@@ -515,7 +483,7 @@ export default {
     // 新增编辑给form表单物料相关信息赋值
     setMaterValue(row) {
       this.form.material_id = row.material_id
-      this.form.material_code = row.material_code
+      this.form.material_number = row.material_number
     },
     tableChanged(row) {
       this.form.device_code = row.device_code
@@ -525,7 +493,7 @@ export default {
     },
     setBOMValue(row) {
       this.form.material_id = row.material_id
-      this.form.material_code = row.material_code
+      this.form.material_number = row.material_number
     },
     // 下发
     submits(row) {
diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/hl/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/hl/index.vue
index 6d4fa58..2bd9be9 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/hl/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/hl/index.vue
@@ -20,11 +20,11 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="物料编码">
+          <el-form-item label="物料号">
             <el-input
               v-model="query.material"
               clearable
-              placeholder="物料编码"
+              placeholder="物料号"
               style="width: 200px;"
               @keyup.enter.native="crud.toQuery"
             />
@@ -114,14 +114,14 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="物料编码" prop="material_code">
+              <el-form-item label="物料号" prop="material_number">
                 <el-input
-                  v-model="form.material_code"
+                  v-model="form.material_number"
                   :disabled="form.order_status > '1'"
                   style="width: 300px"
                   clearable
                   @focus="materialShow=true"
-                  @clear="form.material_id=''; form.material_code=''; form.material_name=''"
+                  @clear="form.material_id=''; form.material_number=''; form.material_name=''"
                 />
               </el-form-item>
             </el-col>
@@ -179,7 +179,7 @@
       >
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识" />
-        <el-table-column prop="workorder_code" label="工单编码" :min-width="flexWidth('workorder_code',crud.data,'工单编码')">
+        <el-table-column prop="workorder_code" label="工单号" :min-width="flexWidth('workorder_code',crud.data,'工单号')">
           <!--          <template slot-scope="scope">-->
           <!--            <el-link type="warning" @click="toView(scope.row)">{{ scope.row.produceorder_code }}</el-link>-->
           <!--          </template>-->
@@ -190,7 +190,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="device_name" label="设备" :min-width="flexWidth('device_name',crud.data,'设备')" />
-        <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
+        <el-table-column prop="material_number" label="物料号" :min-width="flexWidth('material_number',crud.data,'物料号')" />
         <el-table-column prop="plan_qty" label="计划重量" :min-width="flexWidth('plan_qty',crud.data,'计划数量/重量')" />
         <el-table-column prop="plan_date" label="计划生产日期" :min-width="flexWidth('plan_date',crud.data,'计划生产日期')" />
         <el-table-column prop="is_urgent" label="是否加急" :min-width="flexWidth('is_urgent',crud.data,'是否加急')">
@@ -198,11 +198,6 @@
             {{ dict.label.true_or_false[scope.row.is_urgent] }}
           </template>
         </el-table-column>
-        <el-table-column prop="is_new" label="是否正品料" :min-width="flexWidth('is_new',crud.data,'是否正品料')">
-          <template slot-scope="scope">
-            {{ dict.label.true_or_false[scope.row.is_new] }}
-          </template>
-        </el-table-column>
         <el-table-column prop="realproducestart_date" label="实际开始时间" :min-width="flexWidth('realproducestart_date',crud.data,'实际开始时间')" />
         <el-table-column prop="realproduceend_date" label="实际结束时间" :min-width="flexWidth('realproduceend_date',crud.data,'实际结束时间')" />
         <el-table-column prop="real_qty" label="实际生产重量" :min-width="flexWidth('real_qty',crud.data,'实际生产重量')" />
@@ -274,7 +269,7 @@ const defaultForm = {
   plan_qty: null,
   real_qty: null,
   material_id: null,
-  material_code: null,
+  material_number: null,
   material_weight: null,
   vehicle_type: '1',
   planproducestart_date: null,
@@ -303,7 +298,7 @@ const defaultForm = {
   is_new: '1',
   is_package: '1',
   warn_time: '0',
-  standing_time: '0',
+  stand_time: '0',
   is_urgent: '0',
   is_pri: '0',
   ext_code: null,
@@ -350,8 +345,8 @@ export default {
         plan_qty: [
           { required: true, message: '计划数量不能为空', trigger: 'blur' }
         ],
-        material_code: [
-          { required: true, message: '物料编码不能为空', trigger: 'change' }
+        material_number: [
+          { required: true, message: '物料号不能为空', trigger: 'change' }
         ],
         vehicle_type: [
           { required: true, message: '木托盘类型不能为空', trigger: 'blur' }
@@ -430,7 +425,7 @@ export default {
     },
     setMaterValue(row) {
       this.form.material_id = row.material_id
-      this.form.material_code = row.material_code
+      this.form.material_number = row.material_number
     },
     // 下发
     submits(row) {
diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
index 8e6610a..3ce0d5a 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
@@ -20,11 +20,11 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="物料编码">
+          <el-form-item label="物料号">
             <el-input
               v-model="query.material"
               clearable
-              placeholder="物料编码"
+              placeholder="物料号"
               style="width: 200px;"
               @keyup.enter.native="crud.toQuery"
             />
@@ -88,16 +88,6 @@
         >
           强制完成
         </el-button>
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="danger"
-          icon="el-icon-download"
-          size="mini"
-          @click="downloadExcel()"
-        >
-          导出Excel
-        </el-button>
       </crudOperation>
       <!--表单组件-->
       <el-dialog
@@ -124,14 +114,14 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="物料编码" prop="material_code">
+              <el-form-item label="物料号" prop="material_number">
                 <el-input
-                  v-model="form.material_code"
+                  v-model="form.material_number"
                   :disabled="crud.status.edit"
                   style="width: 300px"
                   clearable
                   @focus="materialShow=true"
-                  @clear="form.material_id=''; form.material_code=''; form.material_name=''"
+                  @clear="form.material_id=''; form.material_number=''; form.material_name=''"
                 />
               </el-form-item>
             </el-col>
@@ -139,13 +129,23 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="计划数量" prop="plan_qty">
-                <el-input v-model="form.plan_qty" :disabled="crud.status.edit" type="number" style="width: 300px"><i
+                <el-input v-model="form.plan_qty" oninput="value=value.replace(/[^0-9]/g,'')" :disabled="crud.status.edit" type="number" style="width: 300px"><i
                   slot="suffix"
                   style="font-style:normal;margin-right: 10px;"
                 >块</i></el-input>
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="计划重量" prop="plan_weight">
+                <el-input v-model="form.plan_weight" oninput="value=value.replace(/[^0-9]/g,'')" :disabled="crud.status.edit" type="number" style="width: 300px"><i
+                  slot="suffix"
+                  style="font-style:normal;margin-right: 10px;"
+                >千克</i></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="计划生产日期" prop="plan_date">
@@ -194,8 +194,8 @@
         <el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识" />
         <el-table-column
           prop="workorder_code"
-          label="工单编码"
-          :min-width="flexWidth('workorder_code',crud.data,'工单编码')"
+          label="工单号"
+          :min-width="flexWidth('workorder_code',crud.data,'工单号')"
         >
           <!--          <template slot-scope="scope">-->
           <!--            <el-link type="warning" @click="toView(scope.row)">{{ scope.row.produceorder_code }}</el-link>-->
@@ -210,22 +210,14 @@
             {{ dict.label.pdm_workorder_status[scope.row.order_status] }}
           </template>
         </el-table-column>
-        <el-table-column prop="device_name" label="设备" :min-width="flexWidth('device_name',crud.data,'设备')" />
+        <el-table-column prop="device_name" label="生产设备" :min-width="flexWidth('device_name',crud.data,'生产设备')" />
         <el-table-column
-          prop="material_code"
-          label="物料编码"
-          :min-width="flexWidth('material_code',crud.data,'物料编码')"
+          prop="material_number"
+          label="物料号"
+          :min-width="flexWidth('material_number',crud.data,'物料号')"
         />
-        <el-table-column
-          prop="vehicle_type"
-          label="载具类型"
-          :min-width="flexWidth('vehicle_type',crud.data,'类型一木托盘')"
-        >
-          <template slot-scope="scope">
-            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
-          </template>
-        </el-table-column>
         <el-table-column prop="plan_qty" label="计划数量" :min-width="flexWidth('plan_qty',crud.data,'计划数量')" />
+        <el-table-column prop="plan_weight" label="计划重量" :min-width="flexWidth('plan_weight',crud.data,'计划重量')" />
         <el-table-column prop="plan_date" label="计划生产日期" :min-width="flexWidth('plan_date',crud.data,'计划生产日期')" />
         <el-table-column prop="is_urgent" label="是否加急" :min-width="flexWidth('is_urgent',crud.data,'是否加急')">
           <template slot-scope="scope">
@@ -258,6 +250,8 @@
           label="不合格数量"
           :min-width="flexWidth('unqualified_qty',crud.data,'不合格数量')"
         />
+        <el-table-column prop="real_weight" label="实际生产重量" :min-width="flexWidth('real_weight',crud.data,'实际生产重量')" />
+        <el-table-column prop="avg_piece_weight" label="平均单重" :min-width="flexWidth('avg_piece_weight',crud.data,'平均单重')" />
         <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
         <el-table-column
           prop="create_time"
@@ -367,9 +361,9 @@ const defaultForm = {
   plan_qty: null,
   real_qty: null,
   material_id: null,
-  material_code: null,
+  material_number: null,
   material_weight: null,
-  vehicle_type: '3',
+  vehicle_type: '2',
   planproducestart_date: null,
   planproduceend_date: null,
   realproducestart_date: null,
@@ -396,14 +390,15 @@ const defaultForm = {
   is_new: '1',
   is_package: '1',
   warn_time: '0',
-  standing_time: '0',
+  stand_time: '0',
   is_urgent: '0',
   is_pri: '0',
   ext_code: null,
   qualified_qty: '0',
   unqualified_qty: '0',
   region_code: null,
-  plan_date: null
+  plan_date: null,
+  plan_weight: null
 }
 export default {
   name: 'Produceshiftorder',
@@ -443,8 +438,8 @@ export default {
         plan_qty: [
           { required: true, message: '计划数量不能为空', trigger: 'blur' }
         ],
-        material_code: [
-          { required: true, message: '物料编码不能为空', trigger: 'change' }
+        material_number: [
+          { required: true, message: '物料号不能为空', trigger: 'change' }
         ],
         vehicle_type: [
           { required: true, message: '木托盘类型不能为空', trigger: 'blur' }
@@ -460,6 +455,9 @@ export default {
         ],
         plan_date: [
           { required: true, message: '计划生产日期不能为空', trigger: 'blur' }
+        ],
+        plan_weight: [
+          { required: true, message: '计划重量不能为空', trigger: 'blur' }
         ]
       }
     }
@@ -517,7 +515,7 @@ export default {
     // 新增编辑给form表单物料相关信息赋值
     setMaterValue(row) {
       this.form.material_id = row.material_id
-      this.form.material_code = row.material_code
+      this.form.material_number = row.material_number
     },
     tableChanged(row) {
       this.form.device_code = row.device_code
@@ -527,7 +525,7 @@ export default {
     },
     setBOMValue(row) {
       this.form.material_id = row.material_id
-      this.form.material_code = row.material_code
+      this.form.material_number = row.material_number
     },
     // 下发
     submits(row) {
diff --git a/lms/nladmin-ui/src/views/wms/pub/BOMDialog.vue b/lms/nladmin-ui/src/views/wms/pub/BOMDialog.vue
index 9e0a48b..ff3f867 100644
--- a/lms/nladmin-ui/src/views/wms/pub/BOMDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pub/BOMDialog.vue
@@ -15,11 +15,11 @@
       label-width="90px"
       label-suffix="："
     >
-      <el-form-item label="BOM编码">
+      <el-form-item label="BOM号">
         <el-input
           v-model="query.name"
           clearable
-          placeholder="BOM编码"
+          placeholder="BOM号"
           @keyup.enter.native="crud.toQuery"
         />
       </el-form-item>
@@ -45,8 +45,8 @@
           <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
         </template>
       </el-table-column>
-      <el-table-column prop="material_code" label="BOM编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
-      <el-table-column prop="standing_time" label="静置时间" :min-width="flexWidth('standing_time',crud.data,'静置时间')" />
+      <el-table-column prop="material_number" label="BOM号" :min-width="flexWidth('material_number',crud.data,'物料号')" />
+      <el-table-column prop="stand_time" label="静置时间" :min-width="flexWidth('stand_time',crud.data,'静置时间')" />
       <el-table-column prop="threshold_time" label="阈值时间" :min-width="flexWidth('threshold_time',crud.data,'阈值时间')" />
     </el-table>
     <!--分页组件-->
diff --git a/lms/nladmin-ui/src/views/wms/pub/DeviceDialog.vue b/lms/nladmin-ui/src/views/wms/pub/DeviceDialog.vue
index d9a4445..0dda6df 100644
--- a/lms/nladmin-ui/src/views/wms/pub/DeviceDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pub/DeviceDialog.vue
@@ -15,11 +15,11 @@
       label-width="90px"
       label-suffix="："
     >
-      <el-form-item label="编码/名称">
+      <el-form-item label="号/名称">
         <el-input
           v-model="query.search"
           clearable
-          placeholder="编码/名称"
+          placeholder="号/名称"
           @keyup.enter.native="crud.toQuery"
         />
       </el-form-item>
@@ -45,7 +45,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column prop="device_code" label="设备编码" :min-width="flexWidth('device_code',crud.data,'设备编码')" />
+      <el-table-column prop="device_code" label="设备号" :min-width="flexWidth('device_code',crud.data,'设备号')" />
       <el-table-column prop="device_name" label="设备名称" :min-width="flexWidth('device_name',crud.data,'设备名称')" />
       <el-table-column prop="device_model" label="设备型号" :min-width="flexWidth('device_model',crud.data,'设备型号')">
         <template slot-scope="scope">
@@ -53,7 +53,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="region_name" label="所属区域" :min-width="flexWidth('region_name',crud.data,'所属区域')" />
-      <el-table-column prop="extend_code" label="外部编码" :min-width="flexWidth('extend_code',crud.data,'外部编码')" />
+      <el-table-column prop="extend_code" label="外部号" :min-width="flexWidth('extend_code',crud.data,'外部号')" />
     </el-table>
     <!--分页组件-->
     <pagination />
diff --git a/lms/nladmin-ui/src/views/wms/pub/MaterDialog.vue b/lms/nladmin-ui/src/views/wms/pub/MaterDialog.vue
index 1409ddd..0e5a226 100644
--- a/lms/nladmin-ui/src/views/wms/pub/MaterDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pub/MaterDialog.vue
@@ -15,30 +15,21 @@
       label-width="90px"
       label-suffix="："
     >
-      <el-form-item label="物料编码">
+      <el-form-item label="物料号">
         <el-input
-          v-model="query.name"
+          v-model="query.material_number"
           clearable
           style="width: 200px;"
-          placeholder="物料编码"
+          placeholder="物料号"
           @keyup.enter.native="crud.toQuery"
         />
       </el-form-item>
-      <el-form-item label="订单编码">
+      <el-form-item label="物料名称">
         <el-input
-          v-model="query.order_code"
+          v-model="query.material_name"
           clearable
           style="width: 200px;"
-          placeholder="订单编码"
-          @keyup.enter.native="crud.toQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部位">
-        <el-input
-          v-model="query.product_grade"
-          clearable
-          style="width: 200px;"
-          placeholder="部位"
+          placeholder="物料号"
           @keyup.enter.native="crud.toQuery"
         />
       </el-form-item>
@@ -64,10 +55,8 @@
           <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
         </template>
       </el-table-column>
-      <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
-      <el-table-column prop="order_code" label="订单编码" :min-width="flexWidth('order_code',crud.data,'订单编码')" />
-      <el-table-column prop="product_grade" label="部位" :min-width="flexWidth('product_grade',crud.data,'部位')" />
-      <el-table-column prop="brick_type" label="砖型" :min-width="flexWidth('brick_type',crud.data,'砖型')" />
+      <el-table-column prop="material_number" label="物料号" :min-width="flexWidth('material_number',crud.data,'物料号')" />
+      <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
     </el-table>
     <!--分页组件-->
     <pagination />
diff --git a/lms/nladmin-ui/src/views/wms/pub/PointDialog.vue b/lms/nladmin-ui/src/views/wms/pub/PointDialog.vue
index 0916e1e..9ca97bc 100644
--- a/lms/nladmin-ui/src/views/wms/pub/PointDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pub/PointDialog.vue
@@ -12,7 +12,7 @@
       <el-col :span="22">
         <el-form :inline="true" class="demo-form-inline">
           <el-form-item :inline="true" label="模糊搜索:">
-            <el-input v-model="query.search" placeholder="请输入点位编码或名称" />
+            <el-input v-model="query.search" placeholder="请输入点位号或名称" />
           </el-form-item>
           <rrOperation />
         </el-form>
@@ -39,7 +39,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column prop="point_code" label="终点点位编码" show-overflow-tooltip />
+      <el-table-column prop="point_code" label="终点点位号" show-overflow-tooltip />
       <el-table-column prop="point_name" label="终点点位名称" show-overflow-tooltip />
       <el-table-column prop="region_name" label="所属区域" show-overflow-tooltip />
       <el-table-column prop="point_type" label="点位类型">
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/MaterialDialog.vue b/lms/nladmin-ui/src/views/wms/sch/point/MaterialDialog.vue
index b5f8400..64b2c43 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/MaterialDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/MaterialDialog.vue
@@ -47,13 +47,13 @@
           <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
         </template>
       </el-table-column>
-      <el-table-column prop="material_code" label="物料编码" width="160" />
+      <el-table-column prop="material_number" label="物料号" width="160" />
       <el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
       <el-table-column prop="material_spec" label="物料规格" width="140" />
       <el-table-column prop="material_model" label="物料型号" />
       <el-table-column prop="class_name" label="物料分类" width="140" />
       <el-table-column prop="unit_name" label="计量单位" />
-      <el-table-column prop="standing_time" label="静置时间（分钟）" width="130px" />
+      <el-table-column prop="stand_time" label="静置时间（分钟）" width="130px" />
       <el-table-column prop="product_series_name" label="系列" />
       <el-table-column prop="update_optname" label="修改人" />
       <el-table-column prop="update_time" label="修改时间" width="135" />
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
index d8321dc..3a6ab90 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
@@ -14,36 +14,36 @@
       </div>
 
       <el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
-        <el-form-item label="区域编码">
-          <el-input v-model="form.region_code" style="width: 200px;"/>
+        <el-form-item label="区域号">
+          <el-input v-model="form.region_code" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="区域名称">
-          <el-input v-model="form.region_name" style="width: 200px;"/>
+          <el-input v-model="form.region_name" style="width: 200px;" />
         </el-form-item>
 
-        <el-form-item label="点位编码">
-          <el-input v-model="form.point_code" style="width: 200px;"/>
+        <el-form-item label="点位号">
+          <el-input v-model="form.point_code" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="点位名称">
-          <el-input v-model="form.point_name" style="width: 200px;"/>
+          <el-input v-model="form.point_name" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="点位类型">
-          <el-input v-model="form.point_type_name" style="width: 200px;"/>
+          <el-input v-model="form.point_type_name" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="点位状态">
-          <el-input v-model="form.point_status_name" style="width: 200px;"/>
+          <el-input v-model="form.point_status_name" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="锁定类型">
-          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
+          <el-input v-model="form.lock_type_name" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="载具类型">
-          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
+          <el-input v-model="form.lock_type_name" style="width: 200px;" />
         </el-form-item>
-        <el-form-item label="载具编码">
-          <el-input v-model="form.vehicle_code" style="width: 200px;"/>
+        <el-form-item label="载具号">
+          <el-input v-model="form.vehicle_code" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="载具数量">
-          <el-input v-model="form.vehicle_qty" style="width: 200px;"/>
+          <el-input v-model="form.vehicle_qty" style="width: 200px;" />
         </el-form-item>
 
       </el-form>
@@ -56,30 +56,30 @@
       </div>
 
       <el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
-        <el-form-item label="物料编码">
-          <el-input v-model="form.region_code" style="width: 200px;"/>
+        <el-form-item label="物料号">
+          <el-input v-model="form.region_code" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="物料名称">
-          <el-input v-model="form.region_name" style="width: 200px;"/>
+          <el-input v-model="form.region_name" style="width: 200px;" />
         </el-form-item>
 
         <el-form-item label="物料规格">
-          <el-input v-model="form.point_code" style="width: 200px;"/>
+          <el-input v-model="form.point_code" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="物料批次">
-          <el-input v-model="form.point_name" style="width: 200px;"/>
+          <el-input v-model="form.point_name" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="库存量">
-          <el-input v-model="form.point_type_name" style="width: 200px;"/>
+          <el-input v-model="form.point_type_name" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="计量单位">
-          <el-input v-model="form.point_status_name" style="width: 200px;"/>
+          <el-input v-model="form.point_status_name" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="入库时间">
-          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
+          <el-input v-model="form.lock_type_name" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="静置时间(分)">
-          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
+          <el-input v-model="form.lock_type_name" style="width: 200px;" />
         </el-form-item>
       </el-form>
     </el-card>
@@ -91,30 +91,30 @@
       </div>
 
       <el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
-        <el-form-item label="物料编码">
-          <el-input v-model="form.region_code" style="width: 200px;"/>
+        <el-form-item label="物料号">
+          <el-input v-model="form.region_code" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="物料名称">
-          <el-input v-model="form.region_name" style="width: 200px;"/>
+          <el-input v-model="form.region_name" style="width: 200px;" />
         </el-form-item>
 
         <el-form-item label="物料规格">
-          <el-input v-model="form.point_code" style="width: 200px;"/>
+          <el-input v-model="form.point_code" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="物料批次">
-          <el-input v-model="form.point_name" style="width: 200px;"/>
+          <el-input v-model="form.point_name" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="库存量">
-          <el-input v-model="form.point_type_name" style="width: 200px;"/>
+          <el-input v-model="form.point_type_name" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="计量单位">
-          <el-input v-model="form.point_status_name" style="width: 200px;"/>
+          <el-input v-model="form.point_status_name" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="入库时间">
-          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
+          <el-input v-model="form.lock_type_name" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="静置时间(分)">
-          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
+          <el-input v-model="form.lock_type_name" style="width: 200px;" />
         </el-form-item>
       </el-form>
     </el-card>
@@ -126,30 +126,30 @@
       </div>
 
       <el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
-        <el-form-item label="物料编码">
-          <el-input v-model="form.region_code" style="width: 200px;"/>
+        <el-form-item label="物料号">
+          <el-input v-model="form.region_code" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="物料名称">
-          <el-input v-model="form.region_name" style="width: 200px;"/>
+          <el-input v-model="form.region_name" style="width: 200px;" />
         </el-form-item>
 
         <el-form-item label="物料规格">
-          <el-input v-model="form.point_code" style="width: 200px;"/>
+          <el-input v-model="form.point_code" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="物料批次">
-          <el-input v-model="form.point_name" style="width: 200px;"/>
+          <el-input v-model="form.point_name" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="库存量">
-          <el-input v-model="form.point_type_name" style="width: 200px;"/>
+          <el-input v-model="form.point_type_name" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="计量单位">
-          <el-input v-model="form.point_status_name" style="width: 200px;"/>
+          <el-input v-model="form.point_status_name" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="入库时间">
-          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
+          <el-input v-model="form.lock_type_name" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="静置时间(分)">
-          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
+          <el-input v-model="form.lock_type_name" style="width: 200px;" />
         </el-form-item>
       </el-form>
     </el-card>
@@ -169,15 +169,15 @@
         :highlight-current-row="true"
         :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
       >
-        <el-table-column prop="device_code" label="设备编码" align="center"/>
-        <el-table-column prop="device_name" label="设备名称" align="center" min-width="200" show-overflow-tooltip/>
-        <el-table-column prop="produce_qty" label="生产数量" align="center"/>
-        <el-table-column prop="init_qty" label="期初数量" align="center"/>
-        <el-table-column prop="finish_qty" label="期末数量" align="center"/>
-        <el-table-column prop="finishproduct_qty" label="完成数量" align="center"/>
-        <el-table-column prop="operatetime_start" label="开始时间" align="center" min-width="130" show-overflow-tooltip/>
-        <el-table-column prop="operatetime_end" label="结束时间" align="center" min-width="130" show-overflow-tooltip/>
-        <el-table-column prop="nick_name" label="操作人" align="center"/>
+        <el-table-column prop="device_code" label="设备号" align="center" />
+        <el-table-column prop="device_name" label="设备名称" align="center" min-width="200" show-overflow-tooltip />
+        <el-table-column prop="produce_qty" label="生产数量" align="center" />
+        <el-table-column prop="init_qty" label="期初数量" align="center" />
+        <el-table-column prop="finish_qty" label="期末数量" align="center" />
+        <el-table-column prop="finishproduct_qty" label="完成数量" align="center" />
+        <el-table-column prop="operatetime_start" label="开始时间" align="center" min-width="130" show-overflow-tooltip />
+        <el-table-column prop="operatetime_end" label="结束时间" align="center" min-width="130" show-overflow-tooltip />
+        <el-table-column prop="nick_name" label="操作人" align="center" />
       </el-table>
     </el-card>
     <!--<span slot="footer" class="dialog-footer">
@@ -217,7 +217,7 @@ export default {
         plan_qty: null,
         real_qty: null,
         material_id: null,
-        material_code: null,
+        material_number: null,
         material_weight: null,
         planproducestart_date: null,
         planproduceend_date: null,
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/WorkOrderDialog.vue b/lms/nladmin-ui/src/views/wms/sch/point/WorkOrderDialog.vue
index 77eb03f..e8da87b 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/WorkOrderDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/WorkOrderDialog.vue
@@ -47,10 +47,10 @@
           <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
         </template>
       </el-table-column>
-      <el-table-column prop="workorder_code" label="工单编号" width="120px"/>
+      <el-table-column prop="workorder_code" label="工单编号" width="120px" />
       <el-table-column v-if="false" prop="material_id" label="物料标识" />
       <el-table-column prop="device_name" label="设备" width="100" show-overflow-tooltip />
-      <el-table-column prop="material_code" label="物料编码" width="100" show-overflow-tooltip />
+      <el-table-column prop="material_number" label="物料号" width="100" show-overflow-tooltip />
       <el-table-column prop="material_name" label="物料名称" width="100" show-overflow-tooltip />
       <el-table-column prop="material_spec" label="物料规格" width="100" show-overflow-tooltip />
       <el-table-column prop="vehicle_type" label="载具类型" min-width="120" show-overflow-tooltip>
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
index 0715c97..ddd7ab0 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
@@ -10,11 +10,11 @@
           label-width="90px"
           label-suffix="："
         >
-          <el-form-item label="编码/名称">
+          <el-form-item label="号/名称">
             <el-input
               v-model="query.name"
               clearable
-              placeholder="编码/名称"
+              placeholder="号/名称"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
@@ -134,7 +134,7 @@
         width="600px"
       >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px" label-suffix="：">
-          <el-form-item label="点位编码" prop="point_code">
+          <el-form-item label="点位号" prop="point_code">
             <el-input v-model="form.point_code" :disabled="crud.status.edit" style="width: 300px" />
           </el-form-item>
           <el-form-item label="点位名称" prop="point_name">
@@ -218,8 +218,8 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item v-show="crud.status.edit" label="载具编码" prop="vehicle_code">
-            <el-input v-model="form.vehicle_code" placeholder="载具编码" clearable style="width: 300px" />
+          <el-form-item v-show="crud.status.edit" label="载具号" prop="vehicle_code">
+            <el-input v-model="form.vehicle_code" placeholder="载具号" clearable style="width: 300px" />
           </el-form-item>
           <el-form-item label="备注">
             <el-input v-model="form.remark" style="width: 300px" rows="2" type="textarea" />
@@ -240,7 +240,7 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
+        <el-table-column prop="point_code" label="点位号" :min-width="flexWidth('point_code',crud.data,'点位号')" />
         <el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
         <el-table-column prop="region_name" label="所属区域" :min-width="flexWidth('region_name',crud.data,'所属区域')" />
         <el-table-column prop="point_type_name" label="点位类型" :min-width="flexWidth('point_type_name',crud.data,'点位类型')" />
@@ -264,8 +264,8 @@
             {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
-        <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
+        <el-table-column prop="vehicle_code" label="载具号" :min-width="flexWidth('vehicle_code',crud.data,'载具号')" />
+        <el-table-column prop="material_number" label="物料号" :min-width="flexWidth('material_number',crud.data,'物料号')" />
         <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" show-overflow-tooltip />
         <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
         <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
@@ -310,7 +310,7 @@ const defaultForm = {
   point_code: null,
   point_name: null,
   point_type: null,
-  point_status: '0',
+  point_status: '1',
   lock_type: '1',
   vehicle_code: null,
   source_id: null,
@@ -365,7 +365,7 @@ export default {
       deviceList: [],
       rules: {
         point_code: [
-          { required: true, message: '点位编码不能为空', trigger: 'blur' }
+          { required: true, message: '点位号不能为空', trigger: 'blur' }
         ],
         point_name: [
           { required: true, message: '点位名称不能为空', trigger: 'blur' }
diff --git a/lms/nladmin-ui/src/views/wms/sch/region/index.vue b/lms/nladmin-ui/src/views/wms/sch/region/index.vue
index e130c0b..7be06b6 100644
--- a/lms/nladmin-ui/src/views/wms/sch/region/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/region/index.vue
@@ -11,11 +11,11 @@
           label-width="90px"
           label-suffix="："
         >
-          <el-form-item label="编码/名称">
+          <el-form-item label="号/名称">
             <el-input
               v-model="query.region_code"
               clearable
-              placeholder="编码/名称"
+              placeholder="号/名称"
               style="width: 180px;"
               @keyup.enter.native="crud.toQuery"
             />
@@ -34,7 +34,7 @@
         width="500px"
       >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px" label-suffix=":">
-          <el-form-item label="区域编码" prop="region_code">
+          <el-form-item label="区域号" prop="region_code">
             <el-input v-model="form.region_code" clearable style="width: 300px;" />
           </el-form-item>
           <el-form-item label="区域名称" prop="region_name">
@@ -62,7 +62,7 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column v-if="false" prop="region_id" label="区域标识" />
-        <el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')" />
+        <el-table-column prop="region_code" label="区域号" :min-width="flexWidth('region_code',crud.data,'区域号')" />
         <el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
         <el-table-column prop="point_type_explain" label="点位类型说明" :min-width="flexWidth('point_type_explain',crud.data,'点位类型说明')" />
         <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" show-overflow-tooltip />
@@ -129,7 +129,7 @@ export default {
       permission: {},
       rules: {
         region_code: [
-          { required: true, message: '区域编码不能为空', trigger: 'blur' }
+          { required: true, message: '区域号不能为空', trigger: 'blur' }
         ],
         region_name: [
           { required: true, message: '区域名称不能为空', trigger: 'blur' }
diff --git a/lms/nladmin-ui/src/views/wms/sch/task/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
index 75db173..3fddb72 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
@@ -10,19 +10,19 @@
           label-width="90px"
           label-suffix="："
         >
-          <el-form-item label="任务编码">
+          <el-form-item label="任务号">
             <el-input
               v-model="query.task_code"
               clearable
-              placeholder="任务编码"
+              placeholder="任务号"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="载具编码">
+          <el-form-item label="载具号">
             <el-input
               v-model="query.vehicle_code"
               clearable
-              placeholder="载具编码"
+              placeholder="载具号"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
@@ -81,9 +81,9 @@
         <el-table-column type="selection" width="50" />
         <el-table-column v-if="false" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
         <el-table-column v-if="false" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
-        <el-table-column prop="task_code" label="任务编码" :min-width="flexWidth('task_code',crud.data,'任务编码')" />
+        <el-table-column prop="task_code" label="任务号" :min-width="flexWidth('task_code',crud.data,'任务号')" />
         <el-table-column v-if="false" prop="task_type" label="任务类型" />
-        <el-table-column v-if="false" prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip >
+        <el-table-column v-if="false" prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ dict.label.acs_task_type[scope.row.acs_task_type] }}
           </template>
@@ -101,8 +101,8 @@
             {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
-        <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
+        <el-table-column prop="vehicle_code" label="载具号" :min-width="flexWidth('vehicle_code',crud.data,'载具号')" />
+        <el-table-column prop="material_number" label="物料号" :min-width="flexWidth('material_number',crud.data,'物料号')" />
         <!--<el-table-column prop="point_code3" label="点位3" min-width="100" show-overflow-tooltip />
         <el-table-column prop="point3_region_name" label="区域3" min-width="120" show-overflow-tooltip />-->
         <!--<el-table-column prop="point_code3" label="点位3" width="85" />
diff --git a/lms/nladmin-ui/src/views/wms/st/cppoint/cppInRegion.vue b/lms/nladmin-ui/src/views/wms/st/cppoint/cppInRegion.vue
index d2f4b28..48511b0 100644
--- a/lms/nladmin-ui/src/views/wms/st/cppoint/cppInRegion.vue
+++ b/lms/nladmin-ui/src/views/wms/st/cppoint/cppInRegion.vue
@@ -32,6 +32,7 @@
             >
               <el-option
                 v-for="item in dict.st_bill_status"
+                :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
@@ -65,7 +66,7 @@
           <el-form-item label="批次">
             <el-input v-model="form.pcsn" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="载具编码">
+          <el-form-item label="载具号">
             <el-input v-model="form.vehicle_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="数量">
@@ -74,10 +75,10 @@
           <el-form-item label="单据状态" prop="bill_status">
             <el-input v-model="form.bill_status" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="起始点位编码">
+          <el-form-item label="起始点位号">
             <el-input v-model="form.start_point_code" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="终点点位编码">
+          <el-form-item label="终点点位号">
             <el-input v-model="form.end_point_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="起始区域">
@@ -102,7 +103,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="pcsn" label="批次" />
-        <el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip />
+        <el-table-column prop="vehicle_code" label="载具号" show-overflow-tooltip />
         <el-table-column prop="qty" label="数量" :formatter="crud.formatNum3" />
         <el-table-column prop="bill_status" label="单据状态">
           <template slot-scope="scope">
diff --git a/lms/nladmin-ui/src/views/wms/st/cppoint/cppInventory.vue b/lms/nladmin-ui/src/views/wms/st/cppoint/cppInventory.vue
index 0a84d50..d6fd069 100644
--- a/lms/nladmin-ui/src/views/wms/st/cppoint/cppInventory.vue
+++ b/lms/nladmin-ui/src/views/wms/st/cppoint/cppInventory.vue
@@ -10,23 +10,23 @@
           label-width="90px"
           label-suffix=":"
         >
-          <el-form-item label="点位编码">
+          <el-form-item label="点位号">
             <el-input
               v-model="query.point_code"
               clearable
               size="mini"
               style="width: 185px;"
-              placeholder="点位编码"
+              placeholder="点位号"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="物料编码">
+          <el-form-item label="物料号">
             <el-input
-              v-model="query.material_code"
+              v-model="query.material_number"
               clearable
               size="mini"
               style="width: 185px;"
-              placeholder="物料编码"
+              placeholder="物料号"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
@@ -42,6 +42,7 @@
             >
               <el-option
                 v-for="item in pointStatusList"
+                :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
@@ -59,6 +60,7 @@
             >
               <el-option
                 v-for="item in dict.vehicle_type"
+                :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
@@ -106,6 +108,7 @@
             >
               <el-option
                 v-for="item in dict.d_lock_type"
+                :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
@@ -137,7 +140,7 @@
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" >
+      <crudOperation :permission="permission">
         <el-button
           slot="right"
           class="filter-item"
@@ -156,7 +159,8 @@
           type="primary"
           icon="el-icon-s-promotion"
           size="mini"
-          @click="changeShowTab">
+          @click="changeShowTab"
+        >
           编辑
         </el-button>
         <el-button
@@ -167,15 +171,16 @@
           icon="el-icon-s-promotion"
           size="mini"
           :disabled="crud.selections.length === 0"
-          @click="doEdit(crud.data)">
+          @click="doEdit(crud.data)"
+        >
           保存
         </el-button>
       </crudOperation>
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="550px">
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
-          <el-form-item label="点位编码" prop="standing_time">
-            <el-input v-model="form.point_code" style="width: 370px;" :disabled="true"/>
+          <el-form-item label="点位号" prop="stand_time">
+            <el-input v-model="form.point_code" style="width: 370px;" :disabled="true" />
           </el-form-item>
           <el-form-item label="托盘类型">
             <el-select
@@ -188,6 +193,7 @@
             >
               <el-option
                 v-for="item in dict.vehicle_type"
+                :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
@@ -204,6 +210,7 @@
             >
               <el-option
                 v-for="item in dict.d_lock_type"
+                :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
@@ -218,23 +225,23 @@
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="point_code" label="点位编码" min-width="100" show-overflow-tooltip/>
-        <el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip/>
+        <el-table-column prop="point_code" label="点位号" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip />
         <el-table-column prop="pcsn" label="批次" />
         <el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" width="100">
           <template slot-scope="scope">
-            <el-input type="text" v-model="scope.row.ivt_qty" v-show="!showTab" />
-            <span v-show="showTab">{{scope.row.ivt_qty}}</span>
+            <el-input v-show="!showTab" v-model="scope.row.ivt_qty" type="text" />
+            <span v-show="showTab">{{ scope.row.ivt_qty }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="material_code" label="物料编码" >
+        <el-table-column prop="material_number" label="物料号">
           <template slot-scope="scope">
-            <el-input type="text" v-model="scope.row.material_code" v-show="!showTab" />
-            <span v-show="showTab">{{scope.row.material_code}}</span>
+            <el-input v-show="!showTab" v-model="scope.row.material_number" type="text" />
+            <span v-show="showTab">{{ scope.row.material_number }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="material_name" label="物料名称" min-width="120"/>
-        <el-table-column prop="instorage_time" label="入库时间" min-width="150" show-overflow-tooltip/>
+        <el-table-column prop="material_name" label="物料名称" min-width="120" />
+        <el-table-column prop="instorage_time" label="入库时间" min-width="150" show-overflow-tooltip />
         <el-table-column prop="point_status_name" label="点位状态" width="120">
           <template slot-scope="scope">
             <el-select
@@ -246,11 +253,12 @@
             >
               <el-option
                 v-for="item in pointStatusList"
+                :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
             </el-select>
-            <span v-show="showTab">{{scope.row.point_status_name}}</span>
+            <span v-show="showTab">{{ scope.row.point_status_name }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="vehicle_type" label="托盘类型" min-width="100">
@@ -259,7 +267,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="remark" label="备注" />
-        <el-table-column prop="is_used" label="是否启用" >
+        <el-table-column prop="is_used" label="是否启用">
           <template slot-scope="scope">
             <el-switch
               v-show="!showTab"
@@ -275,14 +283,15 @@
         <el-table-column prop="lock_type" label="锁定类型" width="120">
           <template slot-scope="scope">
             <el-select
-              v-model="scope.row.lock_type"
               v-show="!showTab"
+              v-model="scope.row.lock_type"
               clearable
               filterable
               size="mini"
             >
               <el-option
                 v-for="item in dict.d_lock_type"
+                :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
diff --git a/lms/nladmin-ui/src/views/wms/st/cppoint/cppOutRegion.vue b/lms/nladmin-ui/src/views/wms/st/cppoint/cppOutRegion.vue
index 6f42bce..5383744 100644
--- a/lms/nladmin-ui/src/views/wms/st/cppoint/cppOutRegion.vue
+++ b/lms/nladmin-ui/src/views/wms/st/cppoint/cppOutRegion.vue
@@ -32,6 +32,7 @@
             >
               <el-option
                 v-for="item in dict.st_bill_status"
+                :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
@@ -52,7 +53,7 @@
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" >
+      <crudOperation :permission="permission">
         <el-button
           slot="right"
           class="filter-item"
@@ -77,7 +78,7 @@
           <el-form-item label="批次">
             <el-input v-model="form.pcsn" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="载具编码">
+          <el-form-item label="载具号">
             <el-input v-model="form.vehicle_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="数量">
@@ -86,10 +87,10 @@
           <el-form-item label="单据状态" prop="bill_status">
             <el-input v-model="form.bill_status" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="起始点位编码">
+          <el-form-item label="起始点位号">
             <el-input v-model="form.start_point_code" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="终点点位编码">
+          <el-form-item label="终点点位号">
             <el-input v-model="form.end_point_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="起始区域">
@@ -114,7 +115,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="pcsn" label="批次" />
-        <el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip />
+        <el-table-column prop="vehicle_code" label="载具号" show-overflow-tooltip />
         <el-table-column prop="qty" label="数量" :formatter="crud.formatNum3" />
         <el-table-column prop="bill_status" label="单据状态">
           <template slot-scope="scope">
diff --git a/lms/nladmin-ui/src/views/wms/st/ysa/inventory.vue b/lms/nladmin-ui/src/views/wms/st/ysa/inventory.vue
index 21b176e..b50d72f 100644
--- a/lms/nladmin-ui/src/views/wms/st/ysa/inventory.vue
+++ b/lms/nladmin-ui/src/views/wms/st/ysa/inventory.vue
@@ -10,23 +10,23 @@
           label-width="90px"
           label-suffix=":"
         >
-          <el-form-item label="点位编码">
+          <el-form-item label="点位号">
             <el-input
               v-model="query.point_code"
               clearable
               size="mini"
               style="width: 185px;"
-              placeholder="点位编码"
+              placeholder="点位号"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="物料编码">
+          <el-form-item label="物料号">
             <el-input
-              v-model="query.material_code"
+              v-model="query.material_number"
               clearable
               size="mini"
               style="width: 185px;"
-              placeholder="物料编码"
+              placeholder="物料号"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
@@ -42,6 +42,7 @@
             >
               <el-option
                 v-for="item in pointStatusList"
+                :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
@@ -59,6 +60,7 @@
             >
               <el-option
                 v-for="item in dict.vehicle_type"
+                :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
@@ -106,6 +108,7 @@
             >
               <el-option
                 v-for="item in dict.d_lock_type"
+                :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
@@ -144,7 +147,8 @@
           type="primary"
           icon="el-icon-s-promotion"
           size="mini"
-          @click="changeShowTab">
+          @click="changeShowTab"
+        >
           编辑
         </el-button>
         <el-button
@@ -155,14 +159,15 @@
           icon="el-icon-s-promotion"
           size="mini"
           :disabled="crud.selections.length === 0"
-          @click="doEdit(crud.data)">
+          @click="doEdit(crud.data)"
+        >
           保存
         </el-button>
       </crudOperation>
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="550px">
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
-          <el-form-item label="点位编码" prop="standing_time">
+          <el-form-item label="点位号" prop="stand_time">
             <el-input v-model="form.point_code" style="width: 370px;" :disabled="true" />
           </el-form-item>
           <el-form-item label="点位状态">
@@ -176,6 +181,7 @@
             >
               <el-option
                 v-for="item in pointStatusList"
+                :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
@@ -192,13 +198,14 @@
             >
               <el-option
                 v-for="item in dict.vehicle_type"
+                :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="静置时间(min)" prop="standing_time">
-            <el-input v-model="form.standing_time" style="width: 370px;" />
+          <el-form-item label="静置时间(min)" prop="stand_time">
+            <el-input v-model="form.stand_time" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="锁定类型">
             <el-select
@@ -211,6 +218,7 @@
             >
               <el-option
                 v-for="item in dict.d_lock_type"
+                :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
@@ -225,23 +233,23 @@
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="point_code" label="点位编码" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="point_code" label="点位号" min-width="100" show-overflow-tooltip />
         <el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip />
         <el-table-column prop="pcsn" label="批次" />
         <el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" width="100">
           <template slot-scope="scope">
-            <el-input type="text" v-model="scope.row.ivt_qty" v-show="!showTab" />
-            <span v-show="showTab">{{scope.row.ivt_qty}}</span>
+            <el-input v-show="!showTab" v-model="scope.row.ivt_qty" type="text" />
+            <span v-show="showTab">{{ scope.row.ivt_qty }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="material_code" label="物料编码" >
+        <el-table-column prop="material_number" label="物料号">
           <template slot-scope="scope">
-            <el-input type="text" v-model="scope.row.material_code" v-show="!showTab" />
-            <span v-show="showTab">{{scope.row.material_code}}</span>
+            <el-input v-show="!showTab" v-model="scope.row.material_number" type="text" />
+            <span v-show="showTab">{{ scope.row.material_number }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="material_name" label="物料名称" />
-        <el-table-column prop="instorage_time" label="入库时间" min-width="150" show-overflow-tooltip/>
+        <el-table-column prop="instorage_time" label="入库时间" min-width="150" show-overflow-tooltip />
         <el-table-column prop="point_status" label="点位状态" width="120">
           <template slot-scope="scope">
             <el-select
@@ -253,24 +261,26 @@
             >
               <el-option
                 v-for="item in pointStatusList"
+                :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
             </el-select>
-            <span v-show="showTab">{{scope.row.point_status_name}}</span>
+            <span v-show="showTab">{{ scope.row.point_status_name }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="lock_type" label="锁定类型" width="120">
           <template slot-scope="scope">
             <el-select
-              v-model="scope.row.lock_type"
               v-show="!showTab"
+              v-model="scope.row.lock_type"
               clearable
               filterable
               size="mini"
             >
               <el-option
                 v-for="item in dict.d_lock_type"
+                :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
@@ -302,6 +312,7 @@
             >
               <el-option
                 v-for="item in dict.vehicle_type"
+                :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
@@ -310,7 +321,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="vehicle_code" label="托盘号" />
-        <el-table-column prop="standing_time" label="静置时间(min)" min-width="120" />
+        <el-table-column prop="stand_time" label="静置时间(min)" min-width="120" />
       </el-table>
       <!--分页组件-->
       <pagination />
@@ -323,14 +334,13 @@ import crudStructivt from '../structivt'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import crudRegion from '@/api/wms/sch/region'
 
-const defaultForm = { point_id: null, point_code: null, pcsn: null, material_id: null, ivt_qty: null, qty_unit_id: null, instorage_time: null, ext_code: null, point_status: null, vehicle_type: null, standing_time: null, block_num: null, row_num: null, col_num: null, layer_num: null, remark: null, is_used: null, is_lock: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
+const defaultForm = { point_id: null, point_code: null, pcsn: null, material_id: null, ivt_qty: null, qty_unit_id: null, instorage_time: null, ext_code: null, point_status: null, vehicle_type: null, stand_time: null, block_num: null, row_num: null, col_num: null, layer_num: null, remark: null, is_used: null, is_lock: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
 export default {
   name: 'Inventory',
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: { pagination, crudOperation, rrOperation },
   dicts: ['vehicle_type', 'is_used', 'd_lock_type'],
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
diff --git a/lms/nladmin-ui/src/views/wms/st/ysa/ysqInRegion.vue b/lms/nladmin-ui/src/views/wms/st/ysa/ysqInRegion.vue
index 1ce028b..d7b2c28 100644
--- a/lms/nladmin-ui/src/views/wms/st/ysa/ysqInRegion.vue
+++ b/lms/nladmin-ui/src/views/wms/st/ysa/ysqInRegion.vue
@@ -32,6 +32,7 @@
             >
               <el-option
                 v-for="item in dict.st_bill_status"
+                :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
@@ -65,7 +66,7 @@
           <el-form-item label="批次">
             <el-input v-model="form.pcsn" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="载具编码">
+          <el-form-item label="载具号">
             <el-input v-model="form.vehicle_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="数量">
@@ -74,10 +75,10 @@
           <el-form-item label="单据状态" prop="bill_status">
             <el-input v-model="form.bill_status" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="起始点位编码">
+          <el-form-item label="起始点位号">
             <el-input v-model="form.start_point_code" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="终点点位编码">
+          <el-form-item label="终点点位号">
             <el-input v-model="form.end_point_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="起始区域">
@@ -102,7 +103,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="pcsn" label="批次" />
-        <el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip />
+        <el-table-column prop="vehicle_code" label="载具号" show-overflow-tooltip />
         <el-table-column prop="qty" label="数量" :formatter="crud.formatNum3" />
         <el-table-column prop="bill_status" label="单据状态">
           <template slot-scope="scope">
diff --git a/lms/nladmin-ui/src/views/wms/st/ysa/ysqOutRegion.vue b/lms/nladmin-ui/src/views/wms/st/ysa/ysqOutRegion.vue
index c71dbdd..43582fe 100644
--- a/lms/nladmin-ui/src/views/wms/st/ysa/ysqOutRegion.vue
+++ b/lms/nladmin-ui/src/views/wms/st/ysa/ysqOutRegion.vue
@@ -32,6 +32,7 @@
             >
               <el-option
                 v-for="item in dict.st_bill_status"
+                :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
@@ -65,7 +66,7 @@
           <el-form-item label="批次">
             <el-input v-model="form.pcsn" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="载具编码">
+          <el-form-item label="载具号">
             <el-input v-model="form.vehicle_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="数量">
@@ -74,10 +75,10 @@
           <el-form-item label="单据状态" prop="bill_status">
             <el-input v-model="form.bill_status" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="起始点位编码">
+          <el-form-item label="起始点位号">
             <el-input v-model="form.start_point_code" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="终点点位编码">
+          <el-form-item label="终点点位号">
             <el-input v-model="form.end_point_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="起始区域">
@@ -95,29 +96,29 @@
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="bill_code" label="单据编号" min-width="150"/>
-        <el-table-column prop="io_type" label="出入类型" >
+        <el-table-column prop="bill_code" label="单据编号" min-width="150" />
+        <el-table-column prop="io_type" label="出入类型">
           <template slot-scope="scope">
             {{ dict.label.io_type[scope.row.io_type] }}
           </template>
         </el-table-column>
         <el-table-column prop="pcsn" label="批次" />
-        <el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip/>
-        <el-table-column prop="qty" label="数量" :formatter="crud.formatNum3"/>
-        <el-table-column prop="bill_status" label="单据状态" >
+        <el-table-column prop="vehicle_code" label="载具号" show-overflow-tooltip />
+        <el-table-column prop="qty" label="数量" :formatter="crud.formatNum3" />
+        <el-table-column prop="bill_status" label="单据状态">
           <template slot-scope="scope">
             {{ dict.label.st_bill_status[scope.row.bill_status] }}
           </template>
         </el-table-column>
-        <el-table-column prop="start_point_code" label="起始点位编码" min-width="120"/>
-        <el-table-column prop="end_point_code" label="终点点位编码" min-width="120"/>
-<!--        <el-table-column prop="start_region_id" label="起始区域" />-->
-<!--        <el-table-column prop="end_region_id" label="终点区域" />-->
+        <el-table-column prop="start_point_code" label="起始点位号" min-width="120" />
+        <el-table-column prop="end_point_code" label="终点点位号" min-width="120" />
+        <!--        <el-table-column prop="start_region_id" label="起始区域" />-->
+        <!--        <el-table-column prop="end_region_id" label="终点区域" />-->
         <el-table-column prop="remark" label="备注" />
-        <el-table-column prop="update_optname" label="修改人姓名" min-width="100"/>
-        <el-table-column prop="update_time" label="修改时间" min-width="140"/>
-        <el-table-column prop="confirm_optname" label="确认人姓名" min-width="100"/>
-        <el-table-column prop="confirm_time" label="确认时间" min-width="140"/>
+        <el-table-column prop="update_optname" label="修改人姓名" min-width="100" />
+        <el-table-column prop="update_time" label="修改时间" min-width="140" />
+        <el-table-column prop="confirm_optname" label="确认人姓名" min-width="100" />
+        <el-table-column prop="confirm_time" label="确认时间" min-width="140" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
@@ -135,7 +136,7 @@
 
 <script>
 import crudBill from '@/views/wms/st/regionio'
-import CRUD, {crud, form, header, presenter} from '@crud/crud'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
@@ -174,7 +175,7 @@ export default {
         bill_status: [
           { required: true, message: '单据状态不能为空', trigger: 'blur' }
         ]
-      }    }
+      }}
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据