diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDeviceDriver.java
index 1affdce1e..7d5bc398c 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDeviceDriver.java
@@ -82,12 +82,12 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple
     public int error1 = 0;
     public int material = 0;
     public int consumption = 0;
-    public int voltageA = 0;
-    public int voltageB = 0;
-    public int voltageC = 0;
-    public int currentA = 0;
-    public int currentB = 0;
-    public int currentC = 0;
+    public float voltageA = 0;
+    public float voltageB = 0;
+    public float voltageC = 0;
+    public float currentA = 0;
+    public float currentB = 0;
+    public float currentC = 0;
 
     public int last_heartbeat = 0;
     public int last_mode = 0;
@@ -104,12 +104,12 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple
     public int last_error1 = 0;
     public int last_material = 0;
     public int last_consumption = 0;
-    public int last_voltageA = 0;
-    public int last_voltageB = 0;
-    public int last_voltageC = 0;
-    public int last_currentA = 0;
-    public int last_currentB = 0;
-    public int last_currentC = 0;
+    public float last_voltageA = 0;
+    public float last_voltageB = 0;
+    public float last_voltageC = 0;
+    public float last_currentA = 0;
+    public float last_currentB = 0;
+    public float last_currentC = 0;
 
     Boolean isonline = true;
 
@@ -133,6 +133,9 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple
         String message = null;
 
         device_code = this.getDeviceCode();
+        if (device_code.equals("A1_HK_05_1")){
+            System.out.println("1");
+        }
         heartbeat = this.itemProtocol.getItem_heartbeat();
         mode = this.itemProtocol.getItem_mode();
         move = this.itemProtocol.getItem_move();
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/ItemProtocol.java
index 10ee502d2..dea3c7767 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/ItemProtocol.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/ItemProtocol.java
@@ -99,23 +99,23 @@ public class ItemProtocol {
     public int getItem_consumption(){
         return this.getOpcIntegerValue(item_consumption);
     } ;
-    public int getItem_voltageA(){
-        return this.getOpcIntegerValue(item_voltageA);
+    public float getItem_voltageA(){
+        return this.getOpcFloatValue(item_voltageA);
     } ;
-    public int getItem_voltageB(){
-        return this.getOpcIntegerValue(item_voltageB);
+    public float getItem_voltageB(){
+        return this.getOpcFloatValue(item_voltageB);
     } ;
-    public int getItem_voltageC(){
-        return this.getOpcIntegerValue(item_voltageC);
+    public float getItem_voltageC(){
+        return this.getOpcFloatValue(item_voltageC);
     } ;
-    public int getItem_currentA(){
-        return this.getOpcIntegerValue(item_currentA);
+    public float getItem_currentA(){
+        return this.getOpcFloatValue(item_currentA);
     } ;
-    public int getItem_currentB(){
-        return this.getOpcIntegerValue(item_currentB);
+    public float getItem_currentB(){
+        return this.getOpcFloatValue(item_currentB);
     } ;
-    public int getItem_currentC(){
-        return this.getOpcIntegerValue(item_currentC);
+    public float getItem_currentC(){
+        return this.getOpcFloatValue(item_currentC);
     } ;
 
     Boolean isonline;
@@ -132,6 +132,18 @@ public class ItemProtocol {
 
     }
 
+    public float getOpcFloatValue(String protocol) {
+        Float value = this.driver.getDoubleValue(protocol);
+        if (value == null) {
+            setIsonline(false);
+        } else {
+            setIsonline(true);
+            return value;
+        }
+        return 0;
+
+    }
+
     public static List<ItemDto> getReadableItemDtos() {
         ArrayList list = new ArrayList();
         list.add(new ItemDto(item_heartbeat, "心跳", "251"));
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java
index 8b3cf17b4..b955ff6ce 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java
@@ -61,6 +61,10 @@ public interface OpcDeviceDriver extends DeviceDriver {
         return (Integer) this.getValue(protocol);
     }
 
+    default Float getDoubleValue(String protocol) {
+        return (Float) this.getValue(protocol);
+    }
+
     default int[] getIntegeregerArrayValue(String protocol) {
         return (int[]) this.getOpcValueAccessor().getValue(this.getItem(protocol));
     }
diff --git a/lms/nladmin-system/src/main/java/org/nl/common/utils/SecurityUtils.java b/lms/nladmin-system/src/main/java/org/nl/common/utils/SecurityUtils.java
index ba78697cd..c89241c03 100644
--- a/lms/nladmin-system/src/main/java/org/nl/common/utils/SecurityUtils.java
+++ b/lms/nladmin-system/src/main/java/org/nl/common/utils/SecurityUtils.java
@@ -62,10 +62,10 @@ public class SecurityUtils {
     }
 
     /**
-     * 获取系统用户Id
-     *
-     * @return 系统用户Id
+     * 获取系统用户部门Id
+     * @return 用户部门现在1：n，该方法禁用
      */
+    @Deprecated
     public static Long getDeptId() {
 //        return getCurrentUser().getUser().getDept().getId();
         return 1L;
diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/CodeDetailServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/CodeDetailServiceImpl.java
index 074db0459..cd756556c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/CodeDetailServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/CodeDetailServiceImpl.java
@@ -48,8 +48,12 @@ public class CodeDetailServiceImpl implements CodeDetailService {
         json.put("code_rule_id",dict.get("id"));
         json.put("is_active","1");
         json.put("is_delete","0");
-        json.put("create_by", SecurityUtils.getCurrentUsername());
+        json.put("create_id", SecurityUtils.getCurrentUserId());
+        json.put("create_name", SecurityUtils.getCurrentNickName());
         json.put("create_time", now);
+        json.put("update_id", SecurityUtils.getCurrentUserId());
+        json.put("update_name", SecurityUtils.getCurrentNickName());
+        json.put("update_time", now);
         if(form.get("type").equals("02")){
             Date date = DateUtil.date();
             String format = (String) form.get("format");
@@ -69,7 +73,8 @@ public class CodeDetailServiceImpl implements CodeDetailService {
     public void update(JSONObject json) {
         String now = DateUtil.now();
         json.put("update_time",now);
-        json.put("update_by", SecurityUtils.getCurrentUsername());
+        json.put("update_id", SecurityUtils.getCurrentUserId());
+        json.put("update_name", SecurityUtils.getCurrentNickName());
         WQLObject.getWQLObject("sys_code_rule_detail").update(json);
     }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/system/wql/sys.xls b/lms/nladmin-system/src/main/java/org/nl/modules/system/wql/sys.xls
index 2240a75de..fdf223030 100644
Binary files a/lms/nladmin-system/src/main/java/org/nl/modules/system/wql/sys.xls and b/lms/nladmin-system/src/main/java/org/nl/modules/system/wql/sys.xls differ
diff --git a/lms/nladmin-system/src/main/java/org/nl/ssosql-1228.sql b/lms/nladmin-system/src/main/java/org/nl/ssosql-1228.sql
index 033e6f4bd..e83f33f8b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/ssosql-1228.sql
+++ b/lms/nladmin-system/src/main/java/org/nl/ssosql-1228.sql
@@ -120,210 +120,212 @@ CREATE TABLE `sys_dict` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8_bin COMMENT='字典表';
 
 
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('1','user_status','用户状态','激活','TRUE','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('2','user_status','用户状态','禁用','FALSE','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('3','dept_status','部门状态','启用','TRUE','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('4','dept_status','部门状态','停用','FALSE','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('5','job_status','岗位状态','启用','TRUE','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('6','job_status','岗位状态','停用','FALSE','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('7','sch_point_type','点位类型','点位','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('8','sch_point_type','点位类型','仓位','2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('9','sch_point_status','点位状态','空位','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('10','sch_point_status','点位状态','空载具','3','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('11','sch_point_status','点位状态','有箱有料','2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('12','d_lock_type','锁定类型','未锁定','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('13','d_lock_type','锁定类型','出入库锁','2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('14','is_used','是否启用','启用','1','0');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('15','is_used','是否启用','禁用','0','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('16','base_data','数据类别','物料','3','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('17','base_data','数据类别','供应商','4','4');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('18','base_data','数据类别','客户','5','5');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('19','st_stor_type','仓库性质','常温库','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('20','st_stor_type','仓库性质','冷冻库','2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('21','st_stor_type','仓库性质','冷藏库','3','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('22','st_sect_type','库区类型','主存区','0','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('23','st_sect_type','库区类型','暂存区','1','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('24','st_sect_type','库区类型','虚拟区','9','999');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('25','storagevehicle_type','载具类型','木托盘','0','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('26','storagevehicle_type','载具类型','铁托盘','1','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('27','IS_OR_NOT','是否','否','0','0');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('28','IS_OR_NOT','是否','是','1','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('29','ST_CREATE_MODE','创建方式','PC产生','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('30','ST_CREATE_MODE','创建方式','终端产生','2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('31','ST_CREATE_MODE','创建方式','外部接口产生','3','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('32','ST_PRIOR_LEVEL','库存优先等级','一级','1','999');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('33','ST_PRIOR_LEVEL','库存优先等级','二级','2','999');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('34','ST_PRIOR_LEVEL','库存优先等级','三级','3','999');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('35','sch_point_type','点位类型','共用','3','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('36','work_status','执行状态','未生成','0','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('37','work_status','执行状态','生成','1','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('38','work_status','执行状态','执行中','2','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('39','work_status','执行状态','完成','99','999');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('40','task_status','任务状态','生成','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('41','task_status','任务状态','确定起点','2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('42','task_status','任务状态','确定终点','3','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('43','task_status','任务状态','完成','7','7');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('44','SCH_TASK_TYPE','业务类型','入库','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('45','SCH_TASK_TYPE','业务类型','出库','2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('46','SCH_TASK_TYPE','业务类型','空盘入库','3','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('47','SCH_TASK_TYPE','业务类型','空盘出库','4','4');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('48','SCH_TASK_TYPE','业务类型','其他','5','5');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('49','is_usable','是否可用','可用','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('50','is_usable','是否可用','不可用','0','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('51','io_type','出入类型','入库','0','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('52','io_type','出入类型','出库','1','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('53','d_lock_type','锁定类型','空托盘出入库锁','3','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('54','d_lock_type','锁定类型','移库锁','4','4');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('55','d_lock_type','锁定类型','其它','99','99');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('56','work_status','执行状态','确认','3','999');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('57','base_data','数据类别','产品系列','7','7');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('58','task_finished_type','任务完成类型','自动','0','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('59','task_finished_type','任务完成类型','手动','1','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('60','ST_STOREMODE_TYPE','仓库类型','平库堆放','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('61','ST_STOREMODE_TYPE','仓库类型','多层货架','2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('62','ST_STOREMODE_TYPE','仓库类型','立库','3','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('63','ST_INV_TYPE','出入库单据类型','成品入库','1001','999');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('64','ST_INV_TYPE','出入库单据类型','半成品入库','1002','999');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('65','ST_INV_TYPE','出入库单据类型','成品出库','11001','999');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('66','ST_INV_TYPE','出入库单据类型','半成品出库','11002','999');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('67','st_bill_status','单据状态','生成','10','999');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('68','st_bill_status','单据状态','分配','20','999');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('69','st_bill_status','单据状态','下发','30','999');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('70','st_bill_status','单据状态','执行中','40','999');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('71','st_bill_status','单据状态','确认','50','999');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('72','task_status','任务状态','起点和终点都确认','4','4');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('73','task_status','任务状态','下发','5','5');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('74','task_status','任务状态','执行中','6','6');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('75','ST_QUALITY_SCODE','品质类型','待检品','0','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('76','ST_QUALITY_SCODE','品质类型','合格品','1','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('77','ST_QUALITY_SCODE','品质类型','不合格','2','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('78','device_point_type','设备点位类型','空料位','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('79','device_point_type','设备点位类型','满料位','2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('80','device_point_type','设备点位类型','上料位','3','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('81','product_area','生产区域','A1','A1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('82','product_area','生产区域','A2','A2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('83','product_area','生产区域','A3','A3','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('84','product_area','生产区域','A4','A4','4');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('85','point_location','点位位置','上','0','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('86','point_location','点位位置','下','1','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('87','product_status','生箔工序工单状态','开始','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('88','product_status','生箔工序工单状态','结束','9','99');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('89','sch_cool_ivt_status','冷却库存状态','未裹膜','1','10');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('90','sch_cool_ivt_status','冷却库存状态','已裹膜','2','20');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('91','sch_cool_ivt_status','冷却库存状态','已烘烤','4','40');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('92','sch_full_point_status','满轴位状态','空位','1','10');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('93','sch_full_point_status','满轴位状态','满轴','2','20');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('94','sch_empty_point_status','空轴位状态','空位','1','10');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('95','sch_empty_point_status','空轴位状态','空轴','2','20');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('96','order_type','分切订单类型','常规','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('97','order_type','分切订单类型','改制','2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('98','ware_house','来源卷位置','线边库/线边呆滞库','0','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('99','ware_house','来源卷位置','半成品暂存库','1','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('100','ware_house','来源卷位置','立库','2','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('101','paper_tube_or_frp','管件类型','纸管','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('102','paper_tube_or_frp','管件类型','FRP管','2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('103','delivery_point_status','分切输送线点位状态','空','1','10');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('104','delivery_point_status','分切输送线点位状态','空载具','2','20');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('105','delivery_point_status','分切输送线点位状态','有气涨轴','3','30');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('106','delivery_point_status','分切输送线点位状态','有子卷','4','40');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('107','ST_INV_IN_TYPE','入库单类型','生产入库','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('108','ST_INV_IN_TYPE','入库单类型','退货入库','2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('109','ST_INV_IN_TYPE','入库单类型','报废入库','3','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('110','ST_INV_IN_TYPE','入库单类型','手工入库','9','999');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('111','io_bill_status','出入单据状态','生成','10','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('112','io_bill_status','出入单据状态','提交','20','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('113','io_bill_status','出入单据状态','分配中','30','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('114','io_bill_status','出入单据状态','分配完','40','4');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('115','io_bill_status','出入单据状态','确认','50','5');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('116','io_bill_status','出入单据状态','完成','99','999');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('117','ST_INV_OUT_TYPE','出库单类型','发货出库','1001','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('118','ST_INV_OUT_TYPE','出库单类型','报废出库','1002','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('119','ST_INV_OUT_TYPE','出库单类型','改切出库','1003','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('120','ST_INV_OUT_TYPE','出库单类型','手工出库','1009','999');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('121','sub_package_relation','子卷包装关系状态','生成','0','10');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('122','sub_package_relation','子卷包装关系状态','包装','1','20');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('123','sub_package_relation','子卷包装关系状态','入库','2','30');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('124','sub_package_relation','子卷包装关系状态','出库','3','40');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('125','placement_type','仓位放置类型','双通','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('126','placement_type','仓位放置类型','左通','2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('127','placement_type','仓位放置类型','右通','3','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('128','product_status','生箔工序工单状态','空轴搬出','2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('129','product_status','生箔工序工单状态','确认下卷','3','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('130','product_status','生箔工序工单状态','下卷完成','4','4');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('131','sch_hot_point_status','烘烤区库存状态','空位','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('132','sch_hot_point_status','烘烤区库存状态','有料','2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('133','check_bill_status','盘点单据状态','生成','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('134','check_bill_status','盘点单据状态','审核','2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('135','check_bill_status','盘点单据状态','盘点中','3','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('136','check_bill_status','盘点单据状态','确认完成','99','999');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('137','ST_INV_TYPE_CK','盘点单业务类型','计划盘点','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('138','ST_INV_TYPE_CK','盘点单业务类型','临时盘点','2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('139','check_dtl_status','盘点单明细状态','生成','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('140','check_dtl_status','盘点单明细状态','盘点中','2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('141','check_dtl_status','盘点单明细状态','已盘点','3','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('142','check_dtl_status','盘点单明细状态','异常处理中','4','4');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('143','check_dtl_status','盘点单明细状态','异常处理完成','5','5');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('144','check_dtl_status','盘点单明细状态','确认完成','99','999');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('145','check_result','盘点结果','正常','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('146','check_result','盘点结果','盘亏','2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('147','check_result','盘点结果','盘盈','3','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('148','move_bill_status','移库单据状态','生成','10','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('149','move_bill_status','移库单据状态','提交','20','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('150','move_bill_status','移库单据状态','执行中','30','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('151','move_bill_status','移库单据状态','完成','99','999');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('152','ST_INV_TYPE_MV','移库类型','出库移库','21','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('153','ST_INV_TYPE_MV','移库类型','手工移库','29','999');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('154','cut_product_status','分切工单状态','开始','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('155','cut_product_status','分切工单状态','配送中','2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('156','cut_product_status','分切工单状态','配送完成','3','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('157','cut_product_status','分切工单状态','入站中','4','4');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('158','cut_product_status','分切工单状态','入站完成','5','5');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('159','cut_product_status','分切工单状态','出站中','6','6');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('160','cut_product_status','分切工单状态','结束','9','999');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('161','ST_INV_TYPE_CG','库存转单类型','备货转单','2001','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('162','ST_INV_TYPE_CG','库存转单类型','手动转单','2002','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('163','is_upload','是否回传','否','0','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('164','is_upload','是否回传','是','1','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('165','ST_INV_IN_TYPE','入库单类型','调拨入库','4','4');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('166','ST_INV_OUT_TYPE','出库单类型','调拨出库','1004','4');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('167','print_temple','客户对应打印模板','甘肃海亮模板','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('168','print_temple','客户对应打印模板','标准模板','2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('169','print_temple','客户对应打印模板','冬月能源模板','3','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('170','print_temple','客户对应打印模板','鑫川能源模板','4','4');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('171','print_temple','客户对应打印模板','正信电子模板','5','5');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('172','INANDOUT_BILL_TYPE','出入库单据类型','生产入库','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('173','INANDOUT_BILL_TYPE','出入库单据类型','退货入库','2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('174','INANDOUT_BILL_TYPE','出入库单据类型','报废入库','3','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('175','INANDOUT_BILL_TYPE','出入库单据类型','调拨入库','4','4');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('176','INANDOUT_BILL_TYPE','出入库单据类型','手工入库','9','5');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('177','INANDOUT_BILL_TYPE','出入库单据类型','发货出库','1001','6');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('178','INANDOUT_BILL_TYPE','出入库单据类型','报废出库','1002','7');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('179','INANDOUT_BILL_TYPE','出入库单据类型','改切出库','1003','8');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('180','INANDOUT_BILL_TYPE','出入库单据类型','调拨出库','1004','9');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('181','INANDOUT_BILL_TYPE','出入库单据类型','手工出库','1009','10');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('182','sch_cool_ivt_status','冷却库存状态','未检测','3','30');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('183','ST_INV_IN_TYPE','入库单类型','拆箱入库','5','5');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('184','ST_INV_OUT_TYPE','出库单类型','拆箱出库','1005','5');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('185','INANDOUT_BILL_TYPE','出入库单据类型','拆箱入库','5','11');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('186','INANDOUT_BILL_TYPE','出入库单据类型','拆箱出库','1005','12');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('187','INTERFACEBACK_TYPE','接口回传类型','CRM','3','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('188','INTERFACEBACK_TYPE','接口回传类型','ERP','2','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('189','INTERFACEBACK_TYPE','接口回传类型','MES','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('190','sch_point_type','点位类型','入箱','4','4');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('191','sch_point_type','点位类型','出箱','5','5');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('192','task_priority','任务优先级','10101','1','1');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('193','task_priority','任务优先级','10102','1','2');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('194','task_priority','任务优先级','10103','1','3');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('195','task_priority','任务优先级','10201','1','4');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('196','task_priority','任务优先级','10202','1','5');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('197','task_priority','任务优先级','10203','1','6');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('198','task_priority','任务优先级','10204','1','7');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('199','task_priority','任务优先级','10301','1','8');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('200','task_priority','任务优先级','10302','1','9');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('201','task_priority','任务优先级','10303','1','10');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('202','task_priority','任务优先级','10401','1','11');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('203','task_priority','任务优先级','10402','1','12');
-INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('204','task_priority','任务优先级','10403','1','13');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('1','user_status','用户状态','激活','true','1','2019/10/27 20:31','2019/10/27 20:31');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('2','user_status','用户状态','禁用','false','2','2019/10/27 20:31','2019/10/27 20:31');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('3','dept_status','部门状态','启用','true','1','2019/10/27 20:31','2019/10/27 20:31');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('4','dept_status','部门状态','停用','false','2','2019/10/27 20:31','2019/10/27 20:31');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('5','job_status','岗位状态','启用','true','1','2019/10/27 20:31','2019/10/27 20:31');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('6','job_status','岗位状态','停用','false','2','2019/10/27 20:31','2019/10/27 20:31');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('52','sch_point_type','点位类型','点位','1','1','2021/8/23 15:25','2022/11/1 10:18');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('53','sch_point_type','点位类型','仓位','2','2','2021/8/23 15:25','2022/11/1 10:18');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('54','sch_point_status','点位状态','空位','1','1','2021/8/23 15:31','2022/11/1 10:17');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('55','sch_point_status','点位状态','空载具','3','3','2021/8/23 15:32','2022/11/1 10:17');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('56','sch_point_status','点位状态','有箱有料','2','2','2021/8/23 15:32','2022/11/1 16:00');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('61','d_lock_type','锁定类型','未锁定','1','1','2021/8/24 9:27','2022/11/1 10:16');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('62','d_lock_type','锁定类型','出入库锁','2','2','2021/8/24 9:27','2022/11/1 10:17');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('63','is_used','是否启用','启用','1','0','2021/8/24 12:17','2021/12/6 15:47');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('64','is_used','是否启用','禁用','0','1','2021/8/24 12:17','2021/12/6 15:47');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('73','base_data','数据类别','物料','03','3','2021/12/7 18:07','2021/12/7 18:07');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('74','base_data','数据类别','供应商','04','4','2021/12/7 18:07','2021/12/7 18:07');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('75','base_data','数据类别','客户','05','5','2021/12/7 18:08','2021/12/7 18:08');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('96','st_stor_type','仓库性质','常温库','01','1','2021/12/8 17:09','2021/12/8 17:09');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('97','st_stor_type','仓库性质','冷冻库','02','2','2021/12/8 17:09','2021/12/8 17:09');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('98','st_stor_type','仓库性质','冷藏库','03','3','2021/12/8 17:09','2021/12/8 17:09');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('99','st_sect_type','库区类型','主存区','00','1','2021/12/9 9:24','2021/12/9 9:24');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('100','st_sect_type','库区类型','暂存区','01','2','2021/12/9 9:24','2021/12/9 9:24');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('101','st_sect_type','库区类型','虚拟区','09','999','2021/12/9 9:24','2021/12/9 9:24');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('103','storagevehicle_type','载具类型','木托盘','00','2','2021/12/9 9:33','2022/8/8 15:16');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('104','storagevehicle_type','载具类型','铁托盘','01','3','2021/12/9 9:33','2022/8/8 15:17');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('111','IS_OR_NOT','是否','否','0','0','2021/12/9 17:03','2021/12/9 17:03');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('112','IS_OR_NOT','是否','是','1','2','2021/12/9 17:03','2021/12/9 17:03');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('127','ST_CREATE_MODE','创建方式','PC产生','01','1','2021/12/13 10:44','2021/12/13 10:45');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('128','ST_CREATE_MODE','创建方式','终端产生','02','2','2021/12/13 10:44','2021/12/13 10:44');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('129','ST_CREATE_MODE','创建方式','外部接口产生','03','3','2021/12/13 10:45','2021/12/13 10:45');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('131','ST_PRIOR_LEVEL','库存优先等级','一级','01','999','2021/12/20 13:46','2021/12/20 13:46');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('132','ST_PRIOR_LEVEL','库存优先等级','二级','02','999','2021/12/20 13:46','2021/12/20 13:46');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('133','ST_PRIOR_LEVEL','库存优先等级','三级','03','999','2021/12/20 13:46','2021/12/20 13:46');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('155','sch_point_type','点位类型','共用','3','3','2021/12/21 16:08','2022/11/1 10:18');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('163','work_status','执行状态','未生成','00','1','2021/12/23 10:17','2021/12/23 10:17');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('164','work_status','执行状态','生成','01','2','2021/12/23 10:17','2021/12/23 10:17');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('165','work_status','执行状态','执行中','02','3','2021/12/23 10:18','2021/12/23 10:18');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('166','work_status','执行状态','完成','99','999','2021/12/23 10:18','2021/12/23 10:18');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('187','task_status','任务状态','生成','01','1','2021/12/26 17:13','2022/10/27 14:08');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('188','task_status','任务状态','确定起点','02','2','2021/12/26 17:13','2022/10/27 14:08');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('189','task_status','任务状态','确定终点','03','3','2021/12/26 17:14','2022/10/27 14:08');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('190','task_status','任务状态','完成','07','7','2021/12/26 17:14','2022/10/27 14:08');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('191','SCH_TASK_TYPE','业务类型','入库','01','1','2021/12/27 9:18','2021/12/27 9:18');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('192','SCH_TASK_TYPE','业务类型','出库','02','2','2021/12/27 9:18','2021/12/27 9:18');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('196','SCH_TASK_TYPE','业务类型','空盘入库','03','3','2021/12/27 9:19','2022/8/10 9:24');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('197','SCH_TASK_TYPE','业务类型','空盘出库','04','4','2021/12/27 9:19','2022/8/10 9:25');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('201','SCH_TASK_TYPE','业务类型','其他','05','5','2021/12/27 9:20','2022/8/10 9:25');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('226','is_usable','是否可用','可用','1','1','2021/12/28 17:32','2021/12/28 17:32');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('227','is_usable','是否可用','不可用','0','2','2021/12/28 17:32','2021/12/28 17:32');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('311','io_type','出入类型','入库','0','1','2022/2/11 14:18','2022/2/11 14:18');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('312','io_type','出入类型','出库','1','2','2022/2/11 14:18','2022/2/11 14:18');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('317','d_lock_type','锁定类型','空托盘出入库锁','3','3','2022/2/17 10:21','2022/11/1 10:17');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('318','d_lock_type','锁定类型','移库锁','4','4','2022/2/17 10:22','2022/11/1 10:17');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('321','d_lock_type','锁定类型','其它','99','99','2022/2/17 10:23','2022/11/1 10:17');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('328','work_status','执行状态','确认','03','999','2022/3/5 14:07','2022/3/5 14:07');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('364','base_data','数据类别','产品系列','07','7','2022/5/20 16:47','2022/5/20 16:47');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('383','task_finished_type','任务完成类型','自动','00','1','2022/5/23 15:52','2022/5/23 15:52');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('384','task_finished_type','任务完成类型','手动','01','2','2022/5/23 15:52','2022/5/23 15:52');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('385','ST_STOREMODE_TYPE','仓库类型','平库堆放','01','1','2022/5/23 16:49','2022/5/23 16:49');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('386','ST_STOREMODE_TYPE','仓库类型','多层货架','02','2','2022/5/23 16:49','2022/5/23 16:49');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('387','ST_STOREMODE_TYPE','仓库类型','立库','03','3','2022/5/23 16:49','2022/5/23 16:49');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('453','ST_INV_TYPE','出入库单据类型','成品入库','001001','999','2022/6/15 14:43','2022/6/15 14:43');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('454','ST_INV_TYPE','出入库单据类型','半成品入库','001002','999','2022/6/15 14:44','2022/6/15 14:44');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('455','ST_INV_TYPE','出入库单据类型','成品出库','011001','999','2022/6/15 14:44','2022/6/15 14:44');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('456','ST_INV_TYPE','出入库单据类型','半成品出库','011002','999','2022/6/15 14:44','2022/6/15 14:44');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('457','st_bill_status','单据状态','生成','10','999','2022/6/15 16:52','2022/6/15 16:52');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('458','st_bill_status','单据状态','分配','20','999','2022/6/15 16:52','2022/6/15 16:52');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('459','st_bill_status','单据状态','下发','30','999','2022/6/15 16:52','2022/6/15 16:52');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('460','st_bill_status','单据状态','执行中','40','999','2022/6/15 16:53','2022/6/15 16:53');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('461','st_bill_status','单据状态','确认','50','999','2022/6/15 16:53','2022/6/15 16:53');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('462','task_status','任务状态','起点和终点都确认','04','4','2022/6/16 16:03','2022/10/27 14:08');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('463','task_status','任务状态','下发','05','5','2022/6/16 16:03','2022/10/27 14:08');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('464','task_status','任务状态','执行中','06','6','2022/6/16 16:04','2022/10/27 14:08');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('477','ST_QUALITY_SCODE','品质类型','待检品','00','1','2022/8/11 16:38','2022/8/11 16:38');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('478','ST_QUALITY_SCODE','品质类型','合格品','01','2','2022/8/11 16:38','2022/8/11 16:38');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('479','ST_QUALITY_SCODE','品质类型','不合格','02','3','2022/8/11 16:38','2022/8/11 16:38');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('483','device_point_type','设备点位类型','空料位','1','1','2022/9/1 16:28','2022/9/1 16:28');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('484','device_point_type','设备点位类型','满料位','2','2','2022/9/1 16:28','2022/9/1 16:28');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('485','device_point_type','设备点位类型','上料位','3','3','2022/9/1 16:28','2022/9/1 16:28');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('489','product_area','生产区域','A1','A1','1','2022/9/19 18:45','2022/12/4 17:21');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('490','product_area','生产区域','A2','A2','2','2022/9/19 18:45','2022/12/4 17:21');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('491','product_area','生产区域','A3','A3','3','2022/9/19 18:45','2022/12/4 17:21');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('492','product_area','生产区域','A4','A4','4','2022/9/19 18:45','2022/12/4 17:21');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('493','point_location','点位位置','上','0','1','2022/9/20 15:03','2022/9/20 15:03');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('494','point_location','点位位置','下','1','2','2022/9/20 15:03','2022/9/20 15:03');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('495','product_status','生箔工序工单状态','开始','01','1','2022/10/9 9:06','2022/11/1 13:37');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('496','product_status','生箔工序工单状态','结束','09','99','2022/10/9 9:06','2022/11/1 13:38');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('497','sch_cool_ivt_status','冷却库存状态','未裹膜','01','10','2022/10/9 9:31','2022/10/9 9:49');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('498','sch_cool_ivt_status','冷却库存状态','已裹膜','02','20','2022/10/9 9:31','2022/12/13 15:23');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('499','sch_cool_ivt_status','冷却库存状态','已烘烤','04','40','2022/10/9 9:31','2022/12/13 15:24');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('500','sch_full_point_status','满轴位状态','空位','01','10','2022/10/9 10:13','2022/10/9 10:13');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('501','sch_full_point_status','满轴位状态','满轴','02','20','2022/10/9 10:13','2022/10/9 10:13');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('502','sch_empty_point_status','空轴位状态','空位','01','10','2022/10/9 10:17','2022/10/9 10:17');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('503','sch_empty_point_status','空轴位状态','空轴','02','20','2022/10/9 10:17','2022/10/9 15:36');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('504','order_type','分切订单类型','常规','1','1','2022/10/9 14:11','2022/10/9 14:11');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('505','order_type','分切订单类型','改制','2','2','2022/10/9 14:11','2022/10/9 14:11');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('508','ware_house','来源卷位置','线边库/线边呆滞库','0','1','2022/10/9 16:08','2022/10/9 16:08');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('509','ware_house','来源卷位置','半成品暂存库','1','2','2022/10/9 16:08','2022/10/9 16:08');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('510','ware_house','来源卷位置','立库','2','3','2022/10/9 16:08','2022/10/9 16:08');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('511','paper_tube_or_frp','管件类型','纸管','1','1','2022/10/9 16:14','2022/10/9 16:14');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('512','paper_tube_or_frp','管件类型','FRP管','2','2','2022/10/9 16:14','2022/10/9 16:14');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('513','delivery_point_status','分切输送线点位状态','空','01','10','2022/10/11 18:52','2022/10/11 18:52');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('514','delivery_point_status','分切输送线点位状态','空载具','02','20','2022/10/11 18:52','2022/10/11 18:52');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('515','delivery_point_status','分切输送线点位状态','有气涨轴','03','30','2022/10/11 18:52','2022/10/11 18:52');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('516','delivery_point_status','分切输送线点位状态','有子卷','04','40','2022/10/11 18:52','2022/10/11 18:52');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('517','ST_INV_IN_TYPE','入库单类型','生产入库','0001','1','2022/10/25 10:04','2022/10/25 10:04');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('518','ST_INV_IN_TYPE','入库单类型','退货入库','0002','2','2022/10/25 10:05','2022/10/25 10:05');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('519','ST_INV_IN_TYPE','入库单类型','报废入库','0003','3','2022/10/25 10:05','2022/10/25 10:05');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('520','ST_INV_IN_TYPE','入库单类型','手工入库','0009','999','2022/10/25 10:06','2022/10/25 10:06');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('521','io_bill_status','出入单据状态','生成','10','1','2022/10/25 16:33','2022/10/25 16:33');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('522','io_bill_status','出入单据状态','提交','20','2','2022/10/25 16:33','2022/10/25 16:33');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('523','io_bill_status','出入单据状态','分配中','30','3','2022/10/25 16:33','2022/10/25 16:33');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('524','io_bill_status','出入单据状态','分配完','40','4','2022/10/25 16:34','2022/10/25 16:34');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('525','io_bill_status','出入单据状态','确认','50','5','2022/10/25 16:34','2022/10/25 16:34');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('526','io_bill_status','出入单据状态','完成','99','999','2022/10/25 16:34','2022/10/25 16:34');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('527','ST_INV_OUT_TYPE','出库单类型','发货出库','1001','1','2022/10/27 11:00','2022/10/28 14:48');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('528','ST_INV_OUT_TYPE','出库单类型','报废出库','1002','2','2022/10/27 11:01','2022/10/28 14:48');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('529','ST_INV_OUT_TYPE','出库单类型','改切出库','1003','3','2022/10/27 11:01','2022/10/28 14:48');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('530','ST_INV_OUT_TYPE','出库单类型','手工出库','1009','999','2022/10/27 11:01','2022/10/28 14:48');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('531','sub_package_relation','子卷包装关系状态','生成','0','10','2022/10/28 13:22','2022/10/28 13:22');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('532','sub_package_relation','子卷包装关系状态','包装','1','20','2022/10/28 13:22','2022/10/28 13:22');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('533','sub_package_relation','子卷包装关系状态','入库','2','30','2022/10/28 13:22','2022/10/28 13:22');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('534','sub_package_relation','子卷包装关系状态','出库','3','40','2022/10/28 13:22','2022/10/28 13:22');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('535','placement_type','仓位放置类型','双通','01','1','2022/10/31 15:26','2022/10/31 15:26');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('536','placement_type','仓位放置类型','左通','02','2','2022/10/31 15:26','2022/10/31 15:26');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('537','placement_type','仓位放置类型','右通','03','3','2022/10/31 15:27','2022/10/31 15:27');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('538','product_status','生箔工序工单状态','空轴搬出','02','2','2022/11/1 13:37','2022/11/1 13:37');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('539','product_status','生箔工序工单状态','确认下卷','03','3','2022/11/1 13:37','2022/11/1 13:37');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('540','product_status','生箔工序工单状态','下卷完成','04','4','2022/11/1 13:37','2022/11/1 13:37');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('541','sch_hot_point_status','烘烤区库存状态','空位','01','1','2022/11/1 15:58','2022/11/1 15:58');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('542','sch_hot_point_status','烘烤区库存状态','有料','02','2','2022/11/1 15:58','2022/11/1 15:58');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('543','check_bill_status','盘点单据状态','生成','1','1','2022/11/7 14:08','2022/11/7 14:08');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('544','check_bill_status','盘点单据状态','审核','2','2','2022/11/7 14:08','2022/11/7 14:08');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('545','check_bill_status','盘点单据状态','盘点中','3','3','2022/11/7 14:08','2022/11/7 14:08');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('546','check_bill_status','盘点单据状态','确认完成','99','999','2022/11/7 14:08','2022/11/7 14:08');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('547','ST_INV_TYPE_CK','盘点单业务类型','计划盘点','1','1','2022/11/7 14:10','2022/11/7 14:10');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('548','ST_INV_TYPE_CK','盘点单业务类型','临时盘点','2','2','2022/11/7 14:10','2022/11/7 14:10');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('549','check_dtl_status','盘点单明细状态','生成','1','1','2022/11/7 15:14','2022/11/7 15:14');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('550','check_dtl_status','盘点单明细状态','盘点中','2','2','2022/11/7 15:14','2022/11/7 15:14');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('551','check_dtl_status','盘点单明细状态','已盘点','3','3','2022/11/7 15:15','2022/11/7 15:15');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('552','check_dtl_status','盘点单明细状态','异常处理中','4','4','2022/11/7 15:15','2022/11/7 15:15');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('553','check_dtl_status','盘点单明细状态','异常处理完成','5','5','2022/11/7 15:15','2022/11/7 15:15');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('554','check_dtl_status','盘点单明细状态','确认完成','99','999','2022/11/7 15:15','2022/11/7 15:15');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('555','check_result','盘点结果','正常','1','1','2022/11/7 16:31','2022/11/7 16:31');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('556','check_result','盘点结果','盘亏','2','2','2022/11/7 16:31','2022/11/7 16:31');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('557','check_result','盘点结果','盘盈','3','3','2022/11/7 16:31','2022/11/7 16:31');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('558','move_bill_status','移库单据状态','生成','10','1','2022/11/8 9:15','2022/11/8 9:15');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('559','move_bill_status','移库单据状态','提交','20','2','2022/11/8 9:15','2022/11/8 9:15');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('560','move_bill_status','移库单据状态','执行中','30','3','2022/11/8 9:16','2022/11/8 9:16');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('561','move_bill_status','移库单据状态','完成','99','999','2022/11/8 9:16','2022/11/8 9:16');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('562','ST_INV_TYPE_MV','移库类型','出库移库','21','1','2022/11/8 9:19','2022/11/8 9:20');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('563','ST_INV_TYPE_MV','移库类型','手工移库','29','999','2022/11/8 9:20','2022/11/8 9:20');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('564','cut_product_status','分切工单状态','开始','01','1','2022/11/11 14:42','2022/11/11 14:42');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('565','cut_product_status','分切工单状态','配送中','02','2','2022/11/11 14:42','2022/11/11 14:42');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('566','cut_product_status','分切工单状态','配送完成','03','3','2022/11/11 14:42','2022/11/11 14:43');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('567','cut_product_status','分切工单状态','入站中','04','4','2022/11/11 14:42','2022/11/11 14:42');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('568','cut_product_status','分切工单状态','入站完成','05','5','2022/11/11 14:43','2022/11/11 14:43');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('569','cut_product_status','分切工单状态','出站中','06','6','2022/11/11 14:43','2022/11/11 14:43');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('570','cut_product_status','分切工单状态','结束','09','999','2022/11/11 14:43','2022/11/11 14:43');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('571','ST_INV_TYPE_CG','库存转单类型','备货转单','2001','1','2022/11/19 23:30','2022/11/19 23:30');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('572','ST_INV_TYPE_CG','库存转单类型','手动转单','2002','2','2022/11/19 23:30','2022/11/19 23:30');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('573','is_upload','是否回传','否','0','1','2022/11/22 14:48','2022/11/22 14:48');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('574','is_upload','是否回传','是','1','2','2022/11/22 14:48','2022/11/22 14:48');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('575','ST_INV_IN_TYPE','入库单类型','调拨入库','0004','4','2022/12/1 9:10','2022/12/1 9:10');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('576','ST_INV_OUT_TYPE','出库单类型','调拨出库','1004','4','2022/12/1 9:11','2022/12/1 9:11');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('577','print_temple','客户对应打印模板','甘肃海亮模板','1','1','2022/12/2 20:13','2022/12/3 10:24');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('578','print_temple','客户对应打印模板','标准模板','2','2','2022/12/2 20:13','2022/12/3 10:25');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('579','print_temple','客户对应打印模板','冬月能源模板','3','3','2022/12/2 20:13','2022/12/3 10:25');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('580','print_temple','客户对应打印模板','鑫川能源模板','4','4','2022/12/2 20:13','2022/12/3 10:25');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('581','print_temple','客户对应打印模板','正信电子模板','5','5','2022/12/2 20:13','2022/12/3 10:26');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('582','INANDOUT_BILL_TYPE','出入库单据类型','生产入库','0001','1','2022/12/5 14:17','2022/12/5 14:17');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('583','INANDOUT_BILL_TYPE','出入库单据类型','退货入库','0002','2','2022/12/5 14:17','2022/12/5 14:17');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('584','INANDOUT_BILL_TYPE','出入库单据类型','报废入库','0003','3','2022/12/5 14:17','2022/12/5 14:17');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('585','INANDOUT_BILL_TYPE','出入库单据类型','调拨入库','0004','4','2022/12/5 14:17','2022/12/5 14:17');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('586','INANDOUT_BILL_TYPE','出入库单据类型','手工入库','0009','5','2022/12/5 14:18','2022/12/5 14:18');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('587','INANDOUT_BILL_TYPE','出入库单据类型','发货出库','1001','6','2022/12/5 14:18','2022/12/5 14:18');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('588','INANDOUT_BILL_TYPE','出入库单据类型','报废出库','1002','7','2022/12/5 14:19','2022/12/5 14:19');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('589','INANDOUT_BILL_TYPE','出入库单据类型','改切出库','1003','8','2022/12/5 14:19','2022/12/5 14:19');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('590','INANDOUT_BILL_TYPE','出入库单据类型','调拨出库','1004','9','2022/12/5 14:19','2022/12/5 14:19');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('591','INANDOUT_BILL_TYPE','出入库单据类型','手工出库','1009','10','2022/12/5 14:19','2022/12/5 14:25');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('592','sch_cool_ivt_status','冷却库存状态','未检测','03','30','2022/12/8 15:44','2022/12/8 15:44');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('593','ST_INV_IN_TYPE','入库单类型','拆箱入库','0005','5','2022/12/9 14:55','2022/12/10 10:37');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('594','ST_INV_OUT_TYPE','出库单类型','拆箱出库','1005','5','2022/12/9 14:55','2022/12/10 10:37');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('595','INANDOUT_BILL_TYPE','出入库单据类型','拆箱入库','0005','11','2022/12/9 14:56','2022/12/10 10:35');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('596','INANDOUT_BILL_TYPE','出入库单据类型','拆箱出库','1005','12','2022/12/9 14:56','2022/12/10 10:35');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('600','INTERFACEBACK_TYPE','接口回传类型','CRM','3','3','2022/12/9 15:19','2022/12/9 15:19');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('601','INTERFACEBACK_TYPE','接口回传类型','ERP','2','2','2022/12/9 15:19','2022/12/9 15:19');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('602','INTERFACEBACK_TYPE','接口回传类型','MES','1','1','2022/12/9 15:19','2022/12/9 15:19');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('603','sch_point_type','点位类型','入箱','4','4','2022/12/12 16:01','2022/12/12 16:01');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('604','sch_point_type','点位类型','出箱','5','5','2022/12/12 16:01','2022/12/12 16:01');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('605','task_priority','任务优先级','10101','1','1','2022/12/13 14:27','2022/12/13 14:27');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('606','task_priority','任务优先级','10102','1','2','2022/12/13 14:28','2022/12/13 14:28');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('607','task_priority','任务优先级','10103','1','3','2022/12/13 14:28','2022/12/13 14:28');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('608','task_priority','任务优先级','10201','1','4','2022/12/13 14:28','2022/12/13 14:28');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('609','task_priority','任务优先级','10202','1','5','2022/12/13 14:29','2022/12/13 14:29');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('610','task_priority','任务优先级','10203','1','6','2022/12/13 14:29','2022/12/13 14:29');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('611','task_priority','任务优先级','10204','1','7','2022/12/13 14:32','2022/12/13 14:32');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('612','task_priority','任务优先级','10301','1','8','2022/12/13 14:32','2022/12/13 14:32');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('613','task_priority','任务优先级','10302','1','9','2022/12/13 14:32','2022/12/13 14:32');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('614','task_priority','任务优先级','10303','1','10','2022/12/13 14:32','2022/12/13 14:32');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('615','task_priority','任务优先级','10401','1','11','2022/12/13 14:33','2022/12/13 14:33');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('616','task_priority','任务优先级','10402','1','12','2022/12/13 14:33','2022/12/13 14:33');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('617','task_priority','任务优先级','10403','1','13','2022/12/13 14:33','2022/12/13 14:33');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('618','task_priority','任务优先级','10404','1','14','2022/12/13 14:33','2022/12/13 14:33');
+INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`,`create_time`,`update_time`) values('619','task_priority','任务优先级','10405','1','15','2022/12/13 14:34','2022/12/13 14:34');
 -- 插入系统数据
      INSERT INTO `sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('205', 'system_type', '所属系统', 'LMS系统', '1', NULL, NULL, '1324783485328', NULL, NULL, NULL, NULL, NULL, '1', '管理员', '2022-12-19 09:21:26');
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java b/lms/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java
index 46ae74a78..45bc1d652 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java
@@ -17,11 +17,13 @@ package org.nl.system.controller.user;
 
 import cn.dev33.satoken.secure.SaSecureUtil;
 import cn.dev33.satoken.stp.StpUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.SecurityUtils;
@@ -99,22 +101,12 @@ public class UserController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
-   /* @ApiOperation("修改密码")
+    @ApiOperation("修改密码")
     @PostMapping(value = "/updatePass")
-    public ResponseEntity<Object> updatePass(@RequestBody UserPassVo passVo) throws Exception {
-        // 解密，得到字符密码
-        String oldPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getOldPass());
-        String newPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getNewPass());
-        User user = userService.findByName(SecurityUtils.getCurrentUsername());
-        if (!SaSecureUtil.md5BySalt(user.getPassword(), "salt").equals(SaSecureUtil.md5BySalt(oldPass, "salt"))) {
-            throw new BadRequestException("修改失败，旧密码错误");
-        }
-        if (!SaSecureUtil.md5BySalt(user.getPassword(), "salt").equals(SaSecureUtil.md5BySalt(newPass, "salt"))) {
-            throw new BadRequestException("新密码不能与旧密码相同");
-        }
-        userService.updatePass(user.getUsername(),SaSecureUtil.md5BySalt(newPass, "salt"));
+    public ResponseEntity<Object> updatePass(@RequestBody JSONObject passVo) throws Exception {
+        userService.updatePass(passVo);
         return new ResponseEntity<>(HttpStatus.OK);
-    }*/
+    }
 
     @ApiOperation("修改头像")
     @PostMapping(value = "/updateAvatar")
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/user/ISysUserService.java b/lms/nladmin-system/src/main/java/org/nl/system/service/user/ISysUserService.java
index 9888ec0e2..e753abd87 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/service/user/ISysUserService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/user/ISysUserService.java
@@ -1,5 +1,6 @@
 package org.nl.system.service.user;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
@@ -39,4 +40,10 @@ public interface ISysUserService extends IService<SysUser> {
     void insertDataPermission(UserDataPermissionDto userDataPermissionDto);
 
     List<String> getUserIdByDeptId(String deptId);
+
+    /**
+     * 修改密码
+     * @param passVo:oldPass/newPass
+     */
+   void updatePass(JSONObject passVo);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java
index adcb7c588..b7f5d2c45 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java
@@ -3,6 +3,7 @@ package org.nl.system.service.user.impl;
 import cn.dev33.satoken.secure.SaSecureUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
@@ -11,12 +12,16 @@ import lombok.SneakyThrows;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.beanutils.Converter;
+import org.apache.commons.lang3.StringUtils;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.config.FileProperties;
+import org.nl.modules.common.config.RsaProperties;
+import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.common.utils.FileUtil;
+import org.nl.modules.common.utils.RsaUtils;
 import org.nl.system.service.dept.ISysDeptService;
 import org.nl.system.service.role.ISysRoleService;
 import org.nl.system.service.user.ISysUserService;
@@ -130,6 +135,9 @@ public class ISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> imp
         }catch (Exception ex){
             throw new RuntimeException();
         }
+        if ("123456".equals(sysUser.getPassword())){
+            sysUser.setPassword(SaSecureUtil.md5BySalt("123456", "salt"));
+        }
         sysUser.setUpdateTime(new Date());
         sysUser.setUpdateId(SecurityUtils.getCurrentUserId());
         this.updateById(sysUser);
@@ -167,4 +175,27 @@ public class ISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> imp
     public List<String> getUserIdByDeptId(String deptId) {
         return sysUserMapper.getUserIdByDeptId(deptId);
     }
+
+    @Override
+    @SneakyThrows
+    public void updatePass(JSONObject passVo) {
+        if (passVo==null){
+            throw new BadRequestException("请求参数不能为空");
+        }
+        String oldPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getString("oldPass"));
+        String newPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getString("newPass"));
+        // 解密，得到字符密码
+        if (StringUtils.isEmpty(oldPass)||StringUtils.isEmpty(newPass)){
+            throw new BadRequestException("密码不能为空");
+        }
+        SysUser user = this.getOne(new QueryWrapper<SysUser>().eq("username", SecurityUtils.getCurrentUsername()));
+        if (!user.getPassword().equals(SaSecureUtil.md5BySalt(oldPass, "salt"))) {
+            throw new BadRequestException("修改失败，旧密码错误");
+        }
+        if (oldPass.equals(newPass)) {
+            throw new BadRequestException("新密码不能与旧密码相同");
+        }
+        user.setPassword(SaSecureUtil.md5BySalt(newPass, "salt"));
+        this.updateById(user);
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java
index 4cd4a1373..37b8155d8 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java
@@ -13,10 +13,13 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.modules.common.exception.BadRequestException;
+import org.nl.modules.common.utils.StringUtils;
 import org.nl.modules.system.service.impl.GenCodeServiceImpl;
 import org.nl.modules.system.util.CodeUtil;
 import org.nl.common.utils.SecurityUtils;
+import org.nl.wms.basedata.master.service.ClassstandardService;
 import org.nl.wms.basedata.master.service.StoragevehicleinfoService;
+import org.nl.wms.basedata.master.service.dto.ClassstandardDto;
 import org.nl.wms.basedata.master.service.dto.StoragevehicleinfoDto;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
@@ -39,18 +42,24 @@ import java.util.Map;
 @Slf4j
 public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService {
 
+    private final ClassstandardService classstandardService;
+
     @Override
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
         WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
+        HashMap<String, Object> map = new HashMap();
 
         String storagevehicle_code_begin = (String) whereJson.get("storagevehicle_code_begin");
         String storagevehicle_code_end = (String) whereJson.get("storagevehicle_code_end");
-        String storagevehicle_type = (String) whereJson.get("storagevehicle_type");
 
-        HashMap<String, Object> map = new HashMap();
+        if (StrUtil.isNotEmpty((String) whereJson.get("storagevehicle_type"))) {
+            ClassstandardDto dto = classstandardService.findById((String) whereJson.get("storagevehicle_type"));
+            String storagevehicle_type = classstandardService.getChildIdStr(dto.getClass_id().toString());
+            map.put("storagevehicle_type", storagevehicle_type);
+
+        }
         map.put("storagevehicle_code_begin", storagevehicle_code_begin);
         map.put("storagevehicle_code_end", storagevehicle_code_end);
-        map.put("storagevehicle_type", storagevehicle_type);
         map.put("flag", "1");
         JSONObject json = WQL.getWO("QMD_PB_STORAGEVEHICLEINFO").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "s.storagevehicle_code ASC");
         JSONArray content = json.getJSONArray("content");
@@ -89,7 +98,7 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService
     public StoragevehicleinfoDto findByCode(String code) {
         WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo");
         JSONObject json = wo.query("storagevehicle_code ='" + code + "'").uniqueResult(0);
-        if (ObjectUtil.isEmpty(json)){
+        if (ObjectUtil.isEmpty(json)) {
             throw new BadRequestException("请输入正确的载具号！");
         }
         final StoragevehicleinfoDto obj = json.toJavaObject(StoragevehicleinfoDto.class);
@@ -108,16 +117,20 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService
         String nickName = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
 
-        String storagevehicle_type = (String) map.get("storagevehicle_type");
+        String storagevehicle_type = ((String) map.get("storagevehicle_type"));
+        JSONObject class_jo = WQLObject.getWQLObject("md_pb_classstandard").query("class_id = '" + storagevehicle_type + "'").uniqueResult(0);
+        String class_code = class_jo.getString("class_code").substring(0, 4);
+        ;
         String code = "";
-        switch (storagevehicle_type) {
-            case "00":
-                code = "VEHICCLE_CODE_MTP";
-                break;
-            case "01":
-                code = "VEHICCLE_CODE_TTP";
+        switch (class_code) {
+            case "0001":
+                //气涨轴编码
+                code = "VEHICCLE_CODE_QZZ";
                 break;
         }
+        if (StrUtil.isEmpty(code)) {
+            throw new BadRequestException("请选择正确的载具类型！");
+        }
         JSONArray resultCodeArr = new JSONArray();
         int num = MapUtil.getInt(map, "num");
         for (int i = 0; i < num; i++) {
@@ -131,7 +144,7 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService
             dto.setUpdate_optname(nickName);
             dto.setUpdate_time(now);
             dto.setCreate_time(now);
-            dto.setStoragevehicle_type((String) map.get("storagevehicle_type"));
+            dto.setStoragevehicle_type(class_jo.getString("class_code"));
             JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
             wo.insert(json);
             resultCodeArr.add(dto.getStoragevehicle_code());
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEEXT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEEXT.wql
index 24bcbf2b4..40b5d14b8 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEEXT.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEEXT.wql
@@ -65,7 +65,7 @@
             FROM
             	md_pb_storagevehicleinfo info
             	LEFT JOIN md_pb_storagevehicleext ext ON info.storagevehicle_id = ext.storagevehicle_id
-            	LEFT JOIN sys_dict_detail d ON info.storagevehicle_type = d.value and d.name = 'storagevehicle_type'
+            	LEFT JOIN sys_dict d ON info.storagevehicle_type = d.value and d.code = 'storagevehicle_type'
             	LEFT JOIN MD_ME_MaterialBase mdb ON ext.material_id = mdb.material_id
             	LEFT JOIN MD_ME_ProducMaterialExt mdp ON mdb.material_id = mdp.material_id
             	LEFT JOIN sch_base_point point ON info.storagevehicle_code = point.vehicle_code
@@ -102,9 +102,9 @@
 			    dict.label,
 			    dict.value
             FROM
-            	sys_dict_detail dict
+            	sys_dict dict
             	WHERE
-            	dict.name = 'storagevehicle_type'
+            	dict.code = 'storagevehicle_type'
             	AND dict.value in (30,31,32,33)
 			ENDSELECT
 		ENDPAGEQUERY
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEINFO.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEINFO.wql
index 4081d66bb..2b7e6c80a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEINFO.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEINFO.wql
@@ -16,7 +16,7 @@
 	输入.flag					        TYPEAS s_string
 	输入.storagevehicle_code_begin	    TYPEAS s_string
 	输入.storagevehicle_code_end	        TYPEAS s_string
-	输入.storagevehicle_type			    TYPEAS s_string
+	输入.storagevehicle_type			    TYPEAS f_string
 
 
 [临时表]
@@ -45,17 +45,17 @@
 		PAGEQUERY
 			SELECT
             	s.*,
-            	d.label AS storagevehicle_type_name,
-                mater.material_code,
-                mater.material_name,
-                point.point_code,
-                point.point_name
+            	mater.material_code,
+            	mater.material_name,
+            	point.point_code,
+            	point.point_name,
+            	class.class_name AS storagevehicle_type_name
             FROM
             	md_pb_storagevehicleinfo s
-            	LEFT JOIN sys_dict_detail d ON s.storagevehicle_type = d.value and d.dict_id = '32'
             	LEFT JOIN sch_base_point point ON point.vehicle_code = s.storagevehicle_code
             	LEFT JOIN ST_IVT_StructIvt ivt ON point.source_id = ivt.struct_id
             	LEFT JOIN md_me_materialbase mater ON mater.material_id = ivt.material_id
+            	LEFT JOIN md_pb_classstandard class ON class.class_code = s.storagevehicle_type
             	WHERE
                     s.is_delete = '0'
                     ENDOPTION
@@ -68,9 +68,8 @@
                             s.storagevehicle_code <= 输入.storagevehicle_code_end
                     ENDOPTION
 
-                    ENDOPTION
                     OPTION 输入.storagevehicle_type <> ""
-                            s.storagevehicle_type = 输入.storagevehicle_type
+                            class.class_id in 输入.storagevehicle_type
                     ENDOPTION
 			ENDSELECT
 		ENDPAGEQUERY
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEPOINT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEPOINT.wql
index a6009e248..9f2e6ee7c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEPOINT.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEPOINT.wql
@@ -52,7 +52,7 @@
             FROM
             	sch_base_point point
             	LEFT JOIN md_pb_storagevehiclepoint svp ON point.point_id = svp.point_id and svp.set_type <>'02'
-            	LEFT JOIN sys_dict_detail d ON svp.set_type = d.value and d.name = 'set_type'
+            	LEFT JOIN sys_dict d ON svp.set_type = d.value and d.code = 'set_type'
             	WHERE
                     point.is_delete = '0'
                     AND point.is_used = '1'
@@ -77,9 +77,9 @@
 			    dict.label,
 			    dict.value
             FROM
-            	sys_dict_detail dict
+            	sys_dict dict
             	WHERE
-            	dict.name = 'storagevehicle_type'
+            	dict.code = 'storagevehicle_type'
             	AND dict.value in (30,31,32,33)
 			ENDSELECT
 		ENDPAGEQUERY
@@ -91,9 +91,9 @@
 			    dict.label,
 			    dict.value
             FROM
-            	sys_dict_detail dict
+            	sys_dict dict
             	WHERE
-            	dict.name = 'sch_area_type'
+            	dict.code = 'sch_area_type'
             	AND dict.value in (25,26,32,28)
 			ENDSELECT
 		ENDQUERY
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_STORAGEVEHICLECLEANING.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_STORAGEVEHICLECLEANING.wql
index 15c96e759..c853ba49f 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_STORAGEVEHICLECLEANING.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_STORAGEVEHICLECLEANING.wql
@@ -55,7 +55,7 @@
             	md_pb_storagevehicleinfo info
             	LEFT JOIN md_pb_storagevehiclepoint svp ON info.storagevehicle_id = svp.storagevehicle_id and svp.set_type <>'01'
             	LEFT JOIN sch_base_point point ON point.point_id = svp.point_id
-            	LEFT JOIN sys_dict_detail d ON info.storagevehicle_type = d.value and d.name = 'storagevehicle_type'
+            	LEFT JOIN sys_dict d ON info.storagevehicle_type = d.value and d.code = 'storagevehicle_type'
             	WHERE
                     info.is_delete = '0'
                     AND info.is_used = '1'
@@ -99,9 +99,9 @@
                 dict.label,
                 dict.value
             FROM
-                sys_dict_detail dict
+                sys_dict dict
                 WHERE
-                dict.name = 'storagevehicle_type'
+                dict.code = 'storagevehicle_type'
                 AND dict.value in (30,31,32,33)
             ENDSELECT
         ENDPAGEQUERY
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMT_MATERIALPARAMETERS_001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMT_MATERIALPARAMETERS_001.wql
index e8709183a..82a29b700 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMT_MATERIALPARAMETERS_001.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMT_MATERIALPARAMETERS_001.wql
@@ -94,13 +94,13 @@
             LEFT JOIN md_me_stockmaterialext s ON m.material_id = s.material_id
             LEFT JOIN md_me_producmaterialext p ON m.material_id = p.material_id
             LEFT JOIN md_pb_classstandard b ON m.material_type_id = b.class_id
-            LEFT JOIN sys_dict_detail d1 ON d1.value = p.product_mode and d1.name = 'product_mode'
-            LEFT JOIN sys_dict_detail d2 ON d2.value = s.is_need_plan and d2.name = 'IS_OR_NOT'
-            LEFT JOIN sys_dict_detail d3 ON d3.value = s.is_report and d3.name = 'IS_OR_NOT'
-            LEFT JOIN sys_dict_detail d7 ON d7.value = p.is_report and d7.name = 'IS_OR_NOT'
-            LEFT JOIN sys_dict_detail d4 ON d4.value = p.is_auto_open and d4.name = 'IS_OR_NOT'
-            LEFT JOIN sys_dict_detail d5 ON d5.value = p.is_again_put and d5.name = 'IS_OR_NOT'
-            LEFT JOIN sys_dict_detail d6 ON d6.value = p.product_series and d6.name = 'product_series'
+            LEFT JOIN sys_dict d1 ON d1.value = p.product_mode and d1.code = 'product_mode'
+            LEFT JOIN sys_dict d2 ON d2.value = s.is_need_plan and d2.code = 'IS_OR_NOT'
+            LEFT JOIN sys_dict d3 ON d3.value = s.is_report and d3.code = 'IS_OR_NOT'
+            LEFT JOIN sys_dict d7 ON d7.value = p.is_report and d7.code = 'IS_OR_NOT'
+            LEFT JOIN sys_dict d4 ON d4.value = p.is_auto_open and d4.code = 'IS_OR_NOT'
+            LEFT JOIN sys_dict d5 ON d5.value = p.is_again_put and d5.code = 'IS_OR_NOT'
+            LEFT JOIN sys_dict d6 ON d6.value = p.product_series and d6.code = 'product_series'
             LEFT JOIN md_pb_measureunit u ON u.measure_unit_id = m.base_unit_id
             WHERE
                 m.is_delete = '0'
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STOR_ATTR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STOR_ATTR.wql
index d8ac5b012..55e0c09ad 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STOR_ATTR.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STOR_ATTR.wql
@@ -55,7 +55,7 @@
             	detail.label
             FROM
             	st_ivt_bsrealstorattr stor
-            	LEFT JOIN sys_dict_detail detail ON detail.value = stor.stor_type_scode AND detail.dict_id = '30'
+            	LEFT JOIN sys_dict detail ON detail.value = stor.stor_type_scode AND detail.code = 'st_stor_type'
             	WHERE
                     stor.is_delete = '0'
                     OPTION 输入.search <> ""
@@ -112,13 +112,14 @@
      IF 输入.flag = "3"
         PAGEQUERY
             SELECT
-            	sys_user.*,
-            	dept.name
+                sys_user.*,
+                dept.name
             FROM
-            	sys_user sys_user
-            	LEFT JOIN sys_dept dept ON dept.dept_id = sys_user.dept_id
+                sys_user sys_user
+                LEFT JOIN sys_user_dept sdept ON sdept.user_id = sys_user.user_id
+                LEFT JOIN sys_dept dept ON dept.dept_id = sdept.dept_id
             WHERE
-            	sys_user.enabled = '1'
+                sys_user.is_used = '1'
             OPTION 输入.blurry <> ""
                 (
                 username like 输入.blurry
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 eeb283675..03bdb3816 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
@@ -336,9 +336,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
     public JSONObject deviceApply(JSONObject whereJson) {
         String vehicle_code = whereJson.getString("vehicle_code");
         String type = whereJson.getString("type");
-        if (StrUtil.isEmpty(vehicle_code)) {
-            throw new BadRequestException("木箱码不能为空！");
-        }
         if (StrUtil.isEmpty(type)) {
             throw new BadRequestException("任务类型不能为空！");
         }
@@ -347,11 +344,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         result.put("status", HttpStatus.OK.value());
         result.put("message", "反馈成功!");
 
-        JSONObject sub_jo = WQLObject.getWQLObject("").query("package_box_sn = '" + vehicle_code + "'").uniqueResult(0);
-        if (ObjectUtil.isEmpty(sub_jo)) {
-            throw new BadRequestException("未查询到该木箱对应的包装关系！");
-        }
         if (type.equals("1")) {
+            if (StrUtil.isEmpty(vehicle_code)) {
+                throw new BadRequestException("木箱码不能为空！");
+            }
+            JSONObject sub_jo = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + vehicle_code + "'").uniqueResult(0);
+            if (ObjectUtil.isEmpty(sub_jo)) {
+                throw new BadRequestException("未查询到该木箱对应的包装关系！");
+            }
             //贴标申请
             String print_type = sub_jo.getString("print_type");
             if (StrUtil.isEmpty(print_type)) {
@@ -375,6 +375,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             print_jo.put("print_type", print_info.getString("print_id"));
             printService.customerPrint(print_jo);
         } else if (type.equals("2")) {
+            if (StrUtil.isEmpty(vehicle_code)) {
+                throw new BadRequestException("木箱码不能为空！");
+            }
+            JSONObject sub_jo = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + vehicle_code + "'").uniqueResult(0);
+            if (ObjectUtil.isEmpty(sub_jo)) {
+                throw new BadRequestException("未查询到该木箱对应的包装关系！");
+            }
             //捆扎申请
             String box_length = sub_jo.getString("box_length");
             String box_width = sub_jo.getString("box_width");
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
index 9a9d21719..57913953f 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
@@ -651,7 +651,6 @@ public class MesToLmsServiceImpl implements MesToLmsService {
      * @return
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public JSONObject childRollCutStartComp(JSONArray param) {
         log.info("childRollCutStartComp接口输入参数为：-------------------" + param.toString());
         JSONObject result = new JSONObject();
@@ -734,13 +733,15 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                         String point_code = "";
                         //分切机上只存在一个气涨轴，下一分切组存在两个气涨轴，执行一个进站
                         if (ObjectUtil.isEmpty(up_rows)) {
-                            point_code = down_point_code;
+                            point_code = up_point_code;
                         }
                         if (ObjectUtil.isEmpty(down_rows)) {
-                            point_code = up_point_code;
+                            point_code = down_point_code;
                         }
                         //查询当前输送线上可用的气涨轴
                         JSONObject del_row = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("resource_name = '"+ResourceName+"' AND split_group = '"+group_jo.getString("split_group")+"' AND (parent_container_name = '"+group_jo.getString("source_container_name")+"' OR parent_container_name = '"+group_jo.getString("source_container_name")+"') AND status = '03'").uniqueResult(0);
+                        JSONObject del_jo = WQLObject.getWQLObject("st_ivt_deliverypointivt").query("qzzno = '"+del_row.getString("qzzno")+"'").uniqueResult(0);
+                        del_row.put("delivery_code",del_jo.getString("point_code"));
                         JSONObject whereJson = new JSONObject();
                         whereJson.put("point_code",point_code);
                         whereJson.put("cut_rows",del_row);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
index 47aa611dc..69751c769 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
@@ -183,7 +183,7 @@ public class SapToLmsServiceImpl implements SapToLmsService {
                         jsonDtl.put("source_bill_code", json.getString("VGBEL-VGPOS"));
                         jsonDtl.put("vbeln", json.getString("VBELN")); // 来源交货单
                         jsonDtl.put("posnr", json.getString("POSNR")); // 来源交货单行
-                        jsonDtl.put("posnr", json.getString("POSNR")); // 幅宽
+                        jsonDtl.put("width", json.getString("HL02")); // 幅宽
                         tableData.add(jsonDtl);
                     }
                     if (StrUtil.equals(lfart, "ZLR")) {
@@ -258,6 +258,7 @@ public class SapToLmsServiceImpl implements SapToLmsService {
                         map.put("product_name", sub_jo.getString("product_name"));
                         map.put("vbeln", json.getString("VBELN"));
                         map.put("posnr", json.getString("POSNR"));
+                        map.put("width", json.getString("HL02"));
                         box_rows.add(map);
                     }
                 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_Personcorrdevice001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_Personcorrdevice001.wql
index 4bbf51706..edb5ac9a0 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_Personcorrdevice001.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_Personcorrdevice001.wql
@@ -54,7 +54,7 @@
                 		PDM_BI_PersonCorrDevice personDevice
                 		LEFT JOIN sys_user user ON personDevice.jockey_id = user.user_id
                 	WHERE
-                		user.enabled = '1'
+                		user.is_used = '1'
                 	GROUP BY
                 	personDevice.jockey_id
                 	) view_person
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/CasingController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/CasingController.java
index 11e021a8f..3048923bf 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/CasingController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/CasingController.java
@@ -42,6 +42,13 @@ public class CasingController {
         return new ResponseEntity<>(casingService.confirm(whereJson), HttpStatus.OK);
     }
 
+    @PostMapping("/outConfirm")
+    @Log("拔轴确认")
+    @ApiOperation("拔轴确认")
+    public ResponseEntity<Object> outConfirm(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(casingService.outConfirm(whereJson), HttpStatus.OK);
+    }
+
     @PostMapping("/queryDeviceByarea")
     @Log("查询设备")
     @ApiOperation("查询设备")
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/ShippingController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/ShippingController.java
index f06e434a1..1fd6409e5 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/ShippingController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/ShippingController.java
@@ -52,6 +52,13 @@ public class ShippingController {
         return new ResponseEntity<>(shippingService.returnVehicle(whereJson), HttpStatus.OK);
     }
 
+    @PostMapping("/acrossVehicle")
+    @Log("载具横移")
+    @ApiOperation("载具横移")
+    public ResponseEntity<Object> acrossVehicle(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(shippingService.acrossVehicle(whereJson), HttpStatus.OK);
+    }
+
     @PostMapping("/check")
     @Log("配送校验")
     @ApiOperation("配送校验")
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/CasingService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/CasingService.java
index a2540ee3e..361aaa866 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/CasingService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/CasingService.java
@@ -22,6 +22,14 @@ public interface CasingService {
      */
     JSONObject confirm(JSONObject whereJson);
 
+    /**
+     * 拔轴确认
+     *
+     * @param whereJson /
+     * @return JSONObject
+     */
+    JSONObject outConfirm(JSONObject whereJson);
+
     /**
      * 查询设备
      *
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/ShippingService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/ShippingService.java
index bd91fbadf..952a31e72 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/ShippingService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/ShippingService.java
@@ -33,6 +33,13 @@ public interface ShippingService {
      */
     JSONObject returnVehicle(JSONObject whereJson);
 
+    /**
+     * 载具横移
+     * @param whereJson /
+     * @return JSONObject
+     */
+    JSONObject acrossVehicle(JSONObject whereJson);
+
     /**
      * 配送校验
      * @param whereJson /
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
index 028cd649a..a6fb9e766 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
@@ -89,8 +89,8 @@ public class BakingServiceImpl implements BakingService {
                 jsonMap.put("flag", "1");
                 jsonMap.put("product_area", jsonPointZc.getString("product_area"));
                 //获取温度幅度
-                jsonMap.put("min_temperature", NumberUtil.sub(temperature, temperature_lose));
-                jsonMap.put("max_temperature", NumberUtil.add(temperature, temperature_lose));
+                jsonMap.put("min_temperature", (NumberUtil.sub(temperature, temperature_lose)).toString());
+                jsonMap.put("max_temperature", (NumberUtil.add(temperature, temperature_lose)).toString());
                 jsonMap.put("point_location", jsonPointZc.getString("point_location"));
                 JSONObject jsonHotIvt = WQL.getWO("PDA_BAKING_01").addParamMap(jsonMap).process().uniqueResult(0);
                 if (ObjectUtil.isEmpty(jsonHotIvt)) throw new BadRequestException("烘烤区没有合适温度的空位！");
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/CasingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/CasingServiceImpl.java
index 8cd81d060..ad7e9e020 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/CasingServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/CasingServiceImpl.java
@@ -12,6 +12,7 @@ import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.core.content.HttpContext;
+import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl;
 import org.nl.wms.ext.mes.service.LmsToMesService;
 import org.nl.wms.pda.mps.service.BakingService;
 import org.nl.wms.pda.mps.service.CasingService;
@@ -140,6 +141,51 @@ public class CasingServiceImpl implements CasingService {
         return result;
     }
 
+    @Override
+    public JSONObject outConfirm(JSONObject whereJson) {
+        String qzzno = whereJson.getString("qzzno");
+        String point_code = whereJson.getString("point_code");
+        if (StrUtil.isEmpty(qzzno)) {
+            throw new BadRequestException("气涨轴编码不能为空！");
+        }
+        if (StrUtil.isEmpty(point_code)) {
+            throw new BadRequestException("点位编码不能为空！");
+        }
+
+        JSONObject qzz_jo = WQLObject.getWQLObject("md_pb_storagevehicleinfo").query("storagevehicle_code = '"+qzzno+"' AND is_delete = '0'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(qzz_jo)){
+            throw new BadRequestException("该气涨轴不存在或被删除！");
+        }
+        if (qzz_jo.getString("is_used").equals("0")){
+            throw new BadRequestException("气涨轴未启用！");
+        }
+        String storagevehicle_type = qzz_jo.getString("storagevehicle_type");
+        String to_command = "";
+        if (storagevehicle_type.equals("000101")){
+            to_command = "1";
+        }
+        if (storagevehicle_type.equals("000102")){
+            to_command = "2";
+        }
+        if (StrUtil.isEmpty(to_command)){
+            throw new BadRequestException("未查询到该气涨轴对应的类型！");
+        }
+
+        JSONArray rows = new JSONArray();
+        JSONObject jo = new JSONObject();
+        jo.put("device_code",whereJson.getString("point_code"));
+        jo.put("code","to_command");
+        jo.put("value",to_command);
+        rows.add(jo);
+        new WmsToAcsServiceImpl().action(rows);
+
+
+        //下发ACS拔轴机构
+        JSONObject result = new JSONObject();
+        result.put("message", "下发成功！");
+        return result;
+    }
+
     @Override
     public JSONObject queryDeviceByarea(JSONObject whereJson) {
         String product_area = whereJson.getString("product_area");
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java
index 5c6d6cfb7..cfdaa928d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java
@@ -109,7 +109,7 @@ public class OutServiceImpl implements OutService {
             //查询该分切机邻近位置的空载具的输送线点位
             JSONObject empty_vehicle = WQL.getWO("PDA_02")
                     .addParam("sort_seq", cut_ivt.getString("sort_seq"))
-                    .addParam("sql_str", " ORDER BY abs(" + cut_ivt.getString("sort_seq") + "-sort_seq),point_code")
+                    .addParam("sql_str", " ORDER BY abs(" + cut_ivt.getString("sort_seq") + "-sort_seq),point_code desc")
                     .addParam("product_area", cut_ivt.getString("product_area"))
                     .addParam("point_location", cut_ivt.getString("point_location"))
                     .addParam("flag", "3").process().uniqueResult(0);
@@ -129,18 +129,9 @@ public class OutServiceImpl implements OutService {
             String ext_code = cut_ivt.getString("ext_code");
 
             //查询该机台编号已经配送完成，套轴完成但是未完成的分切计划
-            JSONObject slitting = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("resource_name = '" + ext_code + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND status = '03'").uniqueResult(0);
-
-            if (ObjectUtil.isEmpty(slitting)) {
-                throw new BadRequestException("该分切机没有下一分切组配送完成的气涨轴！");
-            }
-
-            String qzzno = slitting.getString("qzzno");
-
-            //查询该气涨轴所在输送线位置
-            JSONObject delivery_point = WQLObject.getWQLObject("ST_IVT_DeliveryPointIvt").query("qzzno = '" + qzzno + "' AND point_status = '03'").uniqueResult(0);
+            JSONObject delivery_point = WQL.getWO("PDA_02").addParam("ext_code",ext_code).addParam("flag","16").process().uniqueResult(0);
             if (ObjectUtil.isEmpty(delivery_point)) {
-                throw new BadRequestException("未查询到对应的输送线点位！");
+                throw new BadRequestException("输送线不存在该分切机已经配送完成的气涨轴！");
             }
 
             JSONObject jo = new JSONObject();
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java
index 92f48544d..cefffa712 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java
@@ -42,8 +42,8 @@ public class ShippingServiceImpl implements ShippingService {
         }
         JSONArray rows = WQL.getWO("PDA_02").addParamMap(map).process().getResultJSONArray(0);
         JSONObject jo = new JSONObject();
-        jo.put("data",rows);
-        jo.put("message","操作成功！");
+        jo.put("data", rows);
+        jo.put("message", "操作成功！");
         return jo;
     }
 
@@ -53,7 +53,7 @@ public class ShippingServiceImpl implements ShippingService {
         //查询离该分切计划包含机台最近的一个空载具
         JSONObject empty_vehicle = WQL.getWO("PDA_02")
                 .addParam("sort_seq", cut_jo.getString("sort_seq"))
-                .addParam("sql_str", " ORDER BY abs("+cut_jo.getString("sort_seq")+"-sort_seq),point_code")
+                .addParam("sql_str", " ORDER BY abs(" + cut_jo.getString("sort_seq") + "-sort_seq),point_code desc")
                 .addParam("product_area", cut_jo.getString("product_area"))
                 .addParam("point_location", cut_jo.getString("point_location"))
                 .addParam("flag", "3").process().uniqueResult(0);
@@ -63,15 +63,15 @@ public class ShippingServiceImpl implements ShippingService {
 
         //如果查询到给ACS下发一个输送线任务
         JSONObject form = new JSONObject();
-        form.put("point_code1",empty_vehicle.getString("point_code"));
+        form.put("point_code1", empty_vehicle.getString("point_code"));
         //查询该区域点位类型为出口的点位
-        JSONObject ss_jo = WQLObject.getWQLObject("sch_base_point").query("product_area = '"+cut_jo.getString("product_area")+"' AND point_type = '7'").uniqueResult(0);
-        form.put("point_code2",ss_jo.getString("point_code"));
-        form.put("task_type","010401");
+        JSONObject ss_jo = WQLObject.getWQLObject("sch_base_point").query("product_area = '" + cut_jo.getString("product_area") + "' AND point_type = '7'").uniqueResult(0);
+        form.put("point_code2", ss_jo.getString("point_code"));
+        form.put("task_type", "010401");
         cutConveyorTask.createTask(form);
 
         JSONObject jo = new JSONObject();
-        jo.put("message","操作成功！");
+        jo.put("message", "操作成功！");
         return jo;
     }
 
@@ -83,7 +83,7 @@ public class ShippingServiceImpl implements ShippingService {
             throw new BadRequestException("载具号不能为空！");
         }*/
 
-        if (rows.size()>2){
+        if (rows.size() > 2) {
             throw new BadRequestException("最多选择两个子卷进行操作！");
         }
 
@@ -96,30 +96,30 @@ public class ShippingServiceImpl implements ShippingService {
 
         //对子卷任务进行校验
         for (int i = 0; i < rows.size(); i++) {
-            JSONObject row =  rows.getJSONObject(i);
-            if (StrUtil.isEmpty(split_group)){
+            JSONObject row = rows.getJSONObject(i);
+            if (StrUtil.isEmpty(split_group)) {
                 split_group = row.getString("split_group");
                 resource_name = row.getString("resource_name");
                 order_type = row.getString("order_type");
-                if (order_type.equals("1")){
+                if (order_type.equals("1")) {
                     parent_container_name = row.getString("parent_container_name");
-                }else {
+                } else {
                     restruct_container_name = row.getString("restruct_container_name");
                     package_box_sn = row.getString("package_box_sn");
                 }
-            }else {
-                if (!split_group.equals(row.getString("split_group"))){
+            } else {
+                if (!split_group.equals(row.getString("split_group"))) {
                     throw new BadRequestException("两个子卷的分切组必须相同！");
                 }
-                if (!resource_name.equals(row.getString("resource_name"))){
+                if (!resource_name.equals(row.getString("resource_name"))) {
                     throw new BadRequestException("两个子卷的机台编号必须相同！");
                 }
-                if (order_type.equals("1")){
-                    if (!parent_container_name.equals(row.getString("parent_container_name"))){
+                if (order_type.equals("1")) {
+                    if (!parent_container_name.equals(row.getString("parent_container_name"))) {
                         throw new BadRequestException("两个子卷的母卷号必须相同！");
                     }
-                }else {
-                    if (!restruct_container_name.equals(row.getString("restruct_container_name")) || !package_box_sn.equals(row.getString("package_box_sn"))){
+                } else {
+                    if (!restruct_container_name.equals(row.getString("restruct_container_name")) || !package_box_sn.equals(row.getString("package_box_sn"))) {
                         throw new BadRequestException("两个子卷的改制子卷必须相同！");
                     }
                 }
@@ -127,7 +127,6 @@ public class ShippingServiceImpl implements ShippingService {
         }
 
 
-
         //通过气涨轴对应的分切计划来判断要送到哪个机台编号附近
         String qzzno = rows.getJSONObject(0).getString("qzzno");
 
@@ -140,100 +139,151 @@ public class ShippingServiceImpl implements ShippingService {
         }
         JSONObject plan_jo = WQL.getWO("PDA_02").addParamMap(map).process().uniqueResult(0);
 
-        JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("ext_code = '"+resource_name+"'").uniqueResult(0);
+        JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("ext_code = '" + resource_name + "'").uniqueResult(0);
         String product_area = cut_jo.getString("product_area");
         String point_location = cut_jo.getString("point_location");
 
         //判断当前输送线上是否超过最大负荷任务数量组3组
-        JSONArray cut_rows = WQL.getWO("PDA_02").addParam("flag","13").addParam("qzzno",qzzno).addParam("product_area",product_area).addParam("point_location",point_location).process().getResultJSONArray(0);
+        JSONArray cut_rows = WQL.getWO("PDA_02").addParam("flag", "13").addParam("qzzno", qzzno).addParam("product_area", product_area).addParam("point_location", point_location).process().getResultJSONArray(0);
 
-        if (cut_rows.size()>3){
-            if (point_location.equals("0")){
+        if (cut_rows.size() > 3) {
+            if (point_location.equals("0")) {
                 throw new BadRequestException("已超过上半段输送线最大负荷任务数，请等下一子卷送出再进行配送，并将该空载具送回！");
             }
-            if (point_location.equals("1")){
+            if (point_location.equals("1")) {
                 throw new BadRequestException("已超过下半段输送线最大负荷任务数，请等下一子卷送出再进行配送，并将该空载具送回！");
             }
         }
 
-        JSONObject vehicle_area = WQLObject.getWQLObject("md_pb_vehiclearea").query("product_area = '"+product_area+"' AND point_location = '"+point_location+"' AND vehicle_code = '"+vehicle_code+"'").uniqueResult(0);
+        JSONObject vehicle_area = WQLObject.getWQLObject("md_pb_vehiclearea").query("product_area = '" + product_area + "' AND point_location = '" + point_location + "' AND vehicle_code = '" + vehicle_code + "'").uniqueResult(0);
 
-        if (ObjectUtil.isEmpty(vehicle_area)){
+        if (ObjectUtil.isEmpty(vehicle_area)) {
             throw new BadRequestException("该气涨轴无法放在该载具上！");
         }
         //查询离该分切计划包含机台最近的一个空点位
         JSONObject empty_point = WQL.getWO("PDA_02")
-                .addParam("sql_str", " ORDER BY abs("+plan_jo.getString("sort_seq")+"-sort_seq),point_code")
+                .addParam("sql_str", " ORDER BY abs(" + plan_jo.getString("sort_seq") + "-sort_seq),point_code")
                 .addParam("product_area", plan_jo.getString("product_area"))
                 .addParam("point_location", plan_jo.getString("point_location"))
                 .addParam("flag", "4").process().uniqueResult(0);
 
-        if (ObjectUtil.isEmpty(empty_point)){
+        if (ObjectUtil.isEmpty(empty_point)) {
             throw new BadRequestException("未查询到可用的空点位！");
         }
 
         //下发输送线任务
         JSONObject form = new JSONObject();
-        JSONObject ss_jo = WQLObject.getWQLObject("sch_base_point").query("product_area = '"+plan_jo.getString("product_area")+"' AND point_type = '6'").uniqueResult(0);
-        form.put("point_code1",ss_jo.getString("point_code"));
-        form.put("point_code2",empty_point.getString("point_code"));
-        form.put("task_type","010402");
-        form.put("vehicle_code",plan_jo.getString("qzzno"));
+        JSONObject ss_jo = WQLObject.getWQLObject("sch_base_point").query("product_area = '" + plan_jo.getString("product_area") + "' AND point_type = '6'").uniqueResult(0);
+        form.put("point_code1", ss_jo.getString("point_code"));
+        form.put("point_code2", empty_point.getString("point_code"));
+        form.put("task_type", "010402");
+        form.put("vehicle_code", plan_jo.getString("qzzno"));
         cutConveyorTask.createTask(form);
 
         //更新该气涨轴对应的分切计划状态
         JSONArray plan_rows = WQL.getWO("PDA_02").addParamMap(map).process().getResultJSONArray(0);
         for (int i = 0; i < plan_rows.size(); i++) {
             JSONObject row = plan_rows.getJSONObject(i);
-            row.put("status","02");
+            row.put("status", "02");
             WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(row);
         }
 
         JSONObject jo = new JSONObject();
-        jo.put("message","操作成功！");
+        jo.put("message", "操作成功！");
         return jo;
     }
 
     @Override
     public JSONObject returnVehicle(JSONObject whereJson) {
         String point_code = whereJson.getString("point_code");
-        String vehicle_code =whereJson.getString("vehicle_code");
-        if (StrUtil.isEmpty(point_code)){
+        String vehicle_code = whereJson.getString("vehicle_code");
+        if (StrUtil.isEmpty(point_code)) {
             throw new BadRequestException("起点不能为空！");
         }
-        if (StrUtil.isEmpty(vehicle_code)){
+        if (StrUtil.isEmpty(vehicle_code)) {
             throw new BadRequestException("载具码不能为空！");
         }
 
         //判断起点是否存在
-        JSONObject start_jo = WQLObject.getWQLObject("sch_base_point").query("point_code = '"+point_code+"' AND is_delete = '0' AND is_used = '1'").uniqueResult(0);
-        if (ObjectUtil.isEmpty(start_jo)){
+        JSONObject start_jo = WQLObject.getWQLObject("sch_base_point").query("point_code = '" + point_code + "' AND is_delete = '0' AND is_used = '1'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(start_jo)) {
             throw new BadRequestException("未查询到对应点位！");
         }
-        if (!start_jo.getString("point_type").equals("6")){
+        if (!start_jo.getString("point_type").equals("6")) {
             throw new BadRequestException("请选择输送线入库口作为起点！");
         }
 
         //查询该载具码对应的区域位置
-        JSONObject vehicle_area = WQLObject.getWQLObject("md_pb_vehiclearea").query("vehicle_code = '"+vehicle_code+"'").uniqueResult(0);
-        if (ObjectUtil.isEmpty(vehicle_area)){
+        JSONObject vehicle_area = WQLObject.getWQLObject("md_pb_vehiclearea").query("vehicle_code = '" + vehicle_code + "'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(vehicle_area)) {
             throw new BadRequestException("未查询到该载具对应的区域位置！");
         }
 
         //根据起点判断区域查询对应的输送线空点位
-        JSONObject point_jo = WQL.getWO("PDA_02").addParam("flag","4").addParam("product_area",vehicle_area.getString("product_area")).addParam("point_location",vehicle_area.getString("point_location")).process().uniqueResult(0);
-        if (ObjectUtil.isEmpty(point_jo)){
+        JSONObject point_jo = WQL.getWO("PDA_02").addParam("flag", "4").addParam("product_area", vehicle_area.getString("product_area")).addParam("point_location", vehicle_area.getString("point_location")).process().uniqueResult(0);
+        if (ObjectUtil.isEmpty(point_jo)) {
             throw new BadRequestException("对应输送线不存在可用的空位！");
         }
         //下发输送线任务
         JSONObject form = new JSONObject();
-        form.put("point_code1",point_code);
-        form.put("point_code2",point_jo.getString("point_code"));
-        form.put("task_type","010402");
-        form.put("vehicle_code","");
+        form.put("point_code1", point_code);
+        form.put("point_code2", point_jo.getString("point_code"));
+        form.put("task_type", "010402");
+        form.put("vehicle_code", "");
         cutConveyorTask.createTask(form);
         JSONObject jo = new JSONObject();
-        jo.put("message","操作成功！");
+        jo.put("message", "操作成功！");
+        return jo;
+    }
+
+    @Override
+    public JSONObject acrossVehicle(JSONObject whereJson) {
+        String point_code = whereJson.getString("point_code");
+
+        if (StrUtil.isEmpty(point_code)){
+            throw new BadRequestException("输入点位不能为空！");
+        }
+
+        JSONObject del_jo = WQLObject.getWQLObject("st_ivt_deliverypointivt").query("point_code = '"+point_code+"'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(del_jo)){
+            throw new BadRequestException("未查询到相关的输送线点位！");
+        }
+        JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("(point_code1 = '"+point_code+"' OR point_code2 = '"+point_code+"') AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(task_jo)){
+            throw new BadRequestException("该点位存在未完成的任务，请先完成任务！");
+        }
+
+        String point_status = del_jo.getString("point_status");
+        if (point_status.equals("01")){
+            throw new BadRequestException("该点位上不存在载具！");
+        }
+
+        //判断输送进去的任务终点是否远离分切机，如果远离分切机且靠近分切机的点位上不存在载具且不存在任务进行载具横移
+        char dtl_type = point_code.charAt(point_code.length() - 1);
+        if (Integer.valueOf(String.valueOf(dtl_type)) % 2 == 0) {
+            String point_location = del_jo.getString("point_location");
+            String product_area = del_jo.getString("product_area");
+            String sort_seq = del_jo.getString("sort_seq");
+            JSONObject left_point = WQL.getWO("PDA_02")
+                    .addParam("point_location", point_location)
+                    .addParam("product_area", product_area)
+                    .addParam("sort_seq", sort_seq)
+                    .addParam("find_type", "2")
+                    .addParam("flag", "17").process().uniqueResult(0);
+            if (ObjectUtil.isNotEmpty(left_point)) {
+                //创建载具横移任务
+                String translate_code1 = point_code;
+                String translate_code2 = left_point.getString("point_code");
+                JSONObject tran_jo = new JSONObject();
+                tran_jo.put("point_code1",translate_code1);
+                tran_jo.put("point_code2",translate_code2);
+                tran_jo.put("vehicle_code",del_jo.getString("qzzno"));
+                tran_jo.put("task_type","010406");
+                cutConveyorTask.createTask(tran_jo);
+            }
+        }
+        JSONObject jo = new JSONObject();
+        jo.put("message", "操作成功！");
         return jo;
     }
 
@@ -242,38 +292,38 @@ public class ShippingServiceImpl implements ShippingService {
         String qzzno = whereJson.getString("qzzno");
         String vehicle_code = whereJson.getString("vehicle_code");
 
-        if (StrUtil.isEmpty(qzzno)){
+        if (StrUtil.isEmpty(qzzno)) {
             throw new BadRequestException("气涨轴不能为空！");
         }
-        JSONObject plan = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("qzzno = '"+qzzno+"'").uniqueResult(0);
-        if (ObjectUtil.isEmpty(plan)){
+        JSONObject plan = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("qzzno = '" + qzzno + "'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(plan)) {
             throw new BadRequestException("未查询到该气涨轴对应的分切计划！");
         }
         String resource_name = plan.getString("resource_name");
-        JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("ext_code = '"+resource_name+"'").uniqueResult(0);
+        JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("ext_code = '" + resource_name + "'").uniqueResult(0);
         String product_area = cut_jo.getString("product_area");
         String point_location = cut_jo.getString("point_location");
 
-        JSONObject vehicle_area = WQLObject.getWQLObject("md_pb_vehiclearea").query("product_area = '"+product_area+"' AND point_location = '"+point_location+"' AND vehicle_code = '"+vehicle_code+"'").uniqueResult(0);
+        JSONObject vehicle_area = WQLObject.getWQLObject("md_pb_vehiclearea").query("product_area = '" + product_area + "' AND point_location = '" + point_location + "' AND vehicle_code = '" + vehicle_code + "'").uniqueResult(0);
 
-        if (ObjectUtil.isEmpty(vehicle_area)){
+        if (ObjectUtil.isEmpty(vehicle_area)) {
             throw new BadRequestException("该气涨轴无法放在该载具上！");
         }
 
         //判断当前输送线上是否超过最大负荷任务数量组3组
-        JSONArray cut_rows = WQL.getWO("PDA_02").addParam("flag","13").addParam("qzzno",qzzno).addParam("product_area",product_area).addParam("point_location",point_location).process().getResultJSONArray(0);
+        JSONArray cut_rows = WQL.getWO("PDA_02").addParam("flag", "13").addParam("qzzno", qzzno).addParam("product_area", product_area).addParam("point_location", point_location).process().getResultJSONArray(0);
 
-        if (cut_rows.size()>3){
-            if (point_location.equals("0")){
+        if (cut_rows.size() > 3) {
+            if (point_location.equals("0")) {
                 throw new BadRequestException("已超过上半段输送线最大负荷任务数，请等下一子卷送出再进行配送，并将该空载具送回！");
             }
-            if (point_location.equals("1")){
+            if (point_location.equals("1")) {
                 throw new BadRequestException("已超过下半段输送线最大负荷任务数，请等下一子卷送出再进行配送，并将该空载具送回！");
             }
         }
 
         JSONObject jo = new JSONObject();
-        jo.put("message","校验无误，可以进行配送！");
+        jo.put("message", "校验无误，可以进行配送！");
         return jo;
     }
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql
index d90e3df95..3480c863f 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql
@@ -25,6 +25,8 @@
 	输入.container_name    			    TYPEAS s_string
 	输入.source_container_name    	    TYPEAS s_string
 	输入.resource_name    	            TYPEAS s_string
+	输入.ext_code    	                TYPEAS s_string
+	输入.find_type    	                TYPEAS s_string
 
 
 [临时表]
@@ -469,6 +471,62 @@
         ENDQUERY
      ENDIF
 
+    IF 输入.flag = "16"
+        QUERY
+            SELECT
+            	del.*
+            FROM
+            	pdm_bi_slittingproductionplan plan
+            	LEFT JOIN st_ivt_deliverypointivt del ON del.qzzno = plan.qzzno
+            WHERE
+                is_child_tz_ok = '1'
+            AND
+                is_child_ps_ok = '1'
+            AND
+                `status` = '03'
+            AND
+                del.point_status = '03'
+            OPTION 输入.ext_code <> ""
+                plan.resource_name = 输入.ext_code
+            ENDOPTION
+                order by del.point_code desc
+            ENDSELECT
+        ENDQUERY
+    ENDIF
+
+    IF 输入.flag = "17"
+        QUERY
+            SELECT
+            	*
+            FROM
+            	st_ivt_deliverypointivt ivt
+            WHERE
+                sort_seq = 输入.sort_seq
+            AND
+                product_area = 输入.product_area
+            AND
+                point_location = 输入.point_location
+            AND
+                point_code <> 输入.point_code
+            OPTION 输入.find_type = "1"
+                point_status <> '01'
+            ENDOPTION
+            OPTION 输入.find_type = "2"
+                point_status = '01'
+            ENDOPTION
+            AND NOT EXISTS (
+                SELECT
+                    *
+                FROM
+                    sch_base_task
+                WHERE
+                    ( point_code1 = ivt.point_code OR point_code2 = ivt.point_code )
+                    AND task_status < '07'
+                AND is_delete = '0'
+            )
+            ENDSELECT
+        ENDQUERY
+    ENDIF
 
 
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql
index 1248fb224..c7448df7d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql
@@ -119,9 +119,9 @@
             	label AS text,
             	value
             FROM
-            	sys_dict_detail
+            	sys_dict
             WHERE
-                name = 'product_area'
+                code = 'product_area'
 
 			ENDSELECT
 		ENDQUERY
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLIN.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLIN.wql
index b4434df28..cf6946479 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLIN.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLIN.wql
@@ -87,9 +87,9 @@
     			    label AS text,
     			    value
                 FROM
-                	sys_dict_detail
+                	sys_dict
                 WHERE
-                    dict_id = '115'
+                    code = 'sch_cool_ivt_status'
 
     			ENDSELECT
     		ENDQUERY
@@ -100,9 +100,9 @@
             SELECT
                 *
             FROM
-                sys_dict_detail
+                sys_dict
             WHERE
-                name = 'task_priority'
+                code = 'task_priority'
             AND
                 label = 输入.task_type
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLOUT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLOUT.wql
index b8ddec0c0..359cc8adf 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLOUT.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLOUT.wql
@@ -87,9 +87,9 @@
 			    value,
 			    label
             FROM
-            	sys_dict_detail
+            	sys_dict
             WHERE
-                name = 'product_area'
+                code = 'product_area'
 
 			ENDSELECT
 		ENDQUERY
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql
index b8fb5e38c..a02769a91 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql
@@ -149,9 +149,9 @@
 			    label AS text,
 			    value
             FROM
-            	sys_dict_detail
+            	sys_dict
             WHERE
-                name = 'ST_INV_OUT_TYPE'
+                code = 'ST_INV_OUT_TYPE'
 
 			ENDSELECT
 		ENDQUERY
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
index 0814e5756..3222490c5 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
@@ -38,8 +38,6 @@ import java.util.Map;
 public class TaskServiceImpl implements TaskService {
 
     private final ClassstandardService classstandardService;
-    private final RegionService regionService;
-    private final PointService pointService;
 
     @Override
     public Map<String, Object> queryAll(Map form, Pageable page) {
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql
index d4f4223a6..01f061771 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql
@@ -53,7 +53,7 @@
                 FROM
                     sch_base_point point
                     LEFT JOIN SCH_BASE_Region region ON point.region_id = region.region_id
-                    LEFT JOIN sys_dict_detail d3 ON point.lock_type = d3.value  and d3.name='d_lock_type'
+                    LEFT JOIN sys_dict d3 ON point.lock_type = d3.value  and d3.code='d_lock_type'
                 WHERE
                     point.is_delete = '0'
                     OPTION 输入.region_id <> ""
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql
index 4725b6026..62e51d31b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql
@@ -56,7 +56,7 @@
                 FROM
                     sch_base_task task
                     LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
-                    LEFT JOIN sys_dict_detail dict ON dict.`value` = task.task_status AND dict.`name` = 'task_status'
+                    LEFT JOIN sys_dict dict ON dict.`value` = task.task_status AND dict.`code` = 'task_status'
                 WHERE
                     task.is_delete = '0'
                     OPTION 输入.task_type <> ""
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java
index 497db460d..c8515f325 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java
@@ -96,13 +96,39 @@ public class CutConveyorTask extends AbstractAcsTask {
                 // 校验终点是否存在
                 JSONObject jsonIvt = ivtTab.query("point_code ='" + point_code1 + "'").uniqueResult(0);
                 if (ObjectUtil.isEmpty(jsonIvt)) {
-                    throw new BadRequestException("未找到可用点位:" + point_code2);
+                    throw new BadRequestException("未找到可用点位:" + point_code1);
                 }
 
                 // 更新分切输送库存状态
                 jsonIvt.put("point_status", "01");
                 jsonIvt.put("qzzno", "");
                 ivtTab.update(jsonIvt);
+
+                //判断输送出来的任务起点是否靠近分切机，如果靠近分切机且远离分切机的点位上存在载具且不存在任务进行载具横移
+                char dtl_type = point_code1.charAt(point_code1.length() - 1);
+                if (Integer.valueOf(String.valueOf(dtl_type)) % 2 != 0) {
+                    String point_location = jsonIvt.getString("point_location");
+                    String product_area = jsonIvt.getString("product_area");
+                    String sort_seq = jsonIvt.getString("sort_seq");
+                    JSONObject right_point = WQL.getWO("PDA_02")
+                            .addParam("point_location", point_location)
+                            .addParam("product_area", product_area)
+                            .addParam("sort_seq", sort_seq)
+                            .addParam("find_type", "1")
+                            .addParam("flag", "17").process().uniqueResult(0);
+                    if (ObjectUtil.isNotEmpty(right_point)) {
+                        //创建载具横移任务
+                        String translate_code1 = right_point.getString("point_code");
+                        String translate_code2 = point_code1;
+                        JSONObject tran_jo = new JSONObject();
+                        tran_jo.put("point_code1",translate_code1);
+                        tran_jo.put("point_code2",translate_code2);
+                        tran_jo.put("vehicle_code",jsonTask.getString("vehicle_code"));
+                        tran_jo.put("task_type","010406");
+                        this.createTask(tran_jo);
+
+                    }
+                }
             }
             if (jsonTask.getString("task_type").equals("010402")) {
                 // 校验终点是否存在
@@ -141,6 +167,44 @@ public class CutConveyorTask extends AbstractAcsTask {
                     }
                 }
 
+                //判断输送进去的任务终点是否远离分切机，如果远离分切机且靠近分切机的点位上不存在载具且不存在任务进行载具横移
+                char dtl_type = point_code2.charAt(point_code2.length() - 1);
+                if (Integer.valueOf(String.valueOf(dtl_type)) % 2 == 0) {
+                    String point_location = jsonIvt.getString("point_location");
+                    String product_area = jsonIvt.getString("product_area");
+                    String sort_seq = jsonIvt.getString("sort_seq");
+                    JSONObject left_point = WQL.getWO("PDA_02")
+                            .addParam("point_location", point_location)
+                            .addParam("product_area", product_area)
+                            .addParam("sort_seq", sort_seq)
+                            .addParam("find_type", "2")
+                            .addParam("flag", "17").process().uniqueResult(0);
+                    if (ObjectUtil.isNotEmpty(left_point)) {
+                        //创建载具横移任务
+                        String translate_code1 = point_code2;
+                        String translate_code2 = left_point.getString("point_code");
+                        JSONObject tran_jo = new JSONObject();
+                        tran_jo.put("point_code1",translate_code1);
+                        tran_jo.put("point_code2",translate_code2);
+                        tran_jo.put("vehicle_code",jsonTask.getString("vehicle_code"));
+                        tran_jo.put("task_type","010406");
+                        this.createTask(tran_jo);
+                    }
+                }
+            }
+            if (jsonTask.getString("task_type").equals("010406")){
+                JSONObject jsonIvt = ivtTab.query("point_code ='" + point_code1 + "'").uniqueResult(0);
+                JSONObject jsonIvt2 = ivtTab.query("point_code ='" + point_code2 + "'").uniqueResult(0);
+
+                String point_status = jsonIvt.getString("point_status");
+                String qzzno = jsonIvt.getString("qzzno");
+
+                jsonIvt2.put("point_status", point_status);
+                jsonIvt2.put("qzzno", qzzno);
+                ivtTab.update(jsonIvt2);
+                jsonIvt.put("point_status", "01");
+                jsonIvt.put("qzzno", "");
+                ivtTab.update(jsonIvt);
             }
         }
     }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java
index 5785c9f70..58e76689e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java
@@ -324,8 +324,7 @@ public class CutTrussTask extends AbstractAcsTask {
                 WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(plan_row);
             }
         }
-
-
+        this.immediateNotifyAcs(null);
         return json.getString("task_id");
     }
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java
index 5e7e7cce6..073a8fcfe 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java
@@ -294,7 +294,7 @@ public class InHotTask extends AbstractAcsTask {
             json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
             json.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
             json.put("task_type", "010203");
-            json.put("task_status", "01");
+            json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
             json.put("point_code1", form.getString("point_code1"));
             json.put("point_code2", form.getString("point_code2"));
             json.put("product_area", form.getString("product_area"));
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java
index 97b93d20b..99ec5d55b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java
@@ -44,6 +44,7 @@ public class OutTask extends AbstractAcsTask {
          */
         //任务表
         WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task");
+        WQLObject dis_tab = WQLObject.getWQLObject("ST_IVT_IOStorInvDis");
 
         JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0);
 
@@ -89,6 +90,11 @@ public class OutTask extends AbstractAcsTask {
                     resultList.add(dto);
                 }
             }
+            // 更新分配明细执行状态为：执行中
+            JSONObject paramMap = new JSONObject();
+            paramMap.put("work_status", "02");
+            dis_tab.update(paramMap,"task_id ='"+json.getString("task_id")+"'");
+
         }
         return resultList;
     }
@@ -124,7 +130,7 @@ public class OutTask extends AbstractAcsTask {
             String task_group_id = jsonTask.getString("task_group_id");
             if (ObjectUtil.isNotEmpty(task_group_id)) {
                 // 上一个任务组顺序号
-                String sort_seq_last = NumberUtil.sub(jsonTask.getString("sort_seq"), "1").toString();
+                String sort_seq_last = NumberUtil.add(jsonTask.getString("sort_seq"), "1").toString();
 
                 JSONObject jsonTaskLast = taskTab.query("task_group_id = '" + task_group_id + "' and sort_seq = '" + sort_seq_last + "' and task_status <> '07'").uniqueResult(0);
                 if (ObjectUtil.isNotEmpty(jsonTaskLast)) throw new BadRequestException("请先完成"+jsonTaskLast.getString("task_code")+"的任务！");
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java
index 68ec531a3..852405a5a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java
@@ -116,6 +116,11 @@ public interface CheckOutBillService {
      * @param whereJson /
      */
     void setPoint(JSONObject whereJson);
+    /**
+     * 设置一个站点
+     * @param whereJson /
+     */
+    void oneSetPoint(JSONObject whereJson);
     /**
      * 查询可分配库存
      * @param whereJson /
@@ -201,4 +206,10 @@ public interface CheckOutBillService {
     JSONArray queryBox(JSONObject whereJson);
 
     JSONArray getOutBillTask2(Map whereJson);
+
+    /**
+     * 删除任务
+     * @param whereJson /
+     */
+    void cancelTask(JSONObject whereJson);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
index 3757c4c73..cb43279ea 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
@@ -251,7 +251,7 @@
             FROM
             	st_ivt_iostorinvdisdtl disdtl
             	LEFT JOIN md_pb_bucketrecord bucket ON bucket.bucketunique = disdtl.bucketunique
-            	LEFT JOIN sys_dict_detail detail ON detail.`value` = bucket.storagevehicle_type
+            	LEFT JOIN sys_dict detail ON detail.`value` = bucket.storagevehicle_type
             	INNER JOIN sys_dict dict ON dict.dict_id = detail.dict_id
             	AND dict.`name` LIKE 'MD_BUCKET_TYPE%'
             	INNER JOIN md_me_materialbase mb ON mb.material_id = bucket.material_id
@@ -374,9 +374,7 @@
                     st_ivt_iostorinvdisdtl disdtl
                     INNER JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = disdtl.iostorinv_id
                     LEFT JOIN st_ivt_iostorinvdtl dtl ON dtl.iostorinvdtl_id = disdtl.iostorinvdtl_id
-                    LEFT JOIN sys_dict_detail detail ON detail.`value` = mst.bill_type
-                    LEFT JOIN sys_dict dict ON dict.dict_id = detail.dict_id
-                    AND dict.`name` LIKE 'ST_INV_TYPE%'
+                    LEFT JOIN sys_dict detail ON detail.`value` = mst.bill_type AND detail.code LIKE 'ST_INV_TYPE%'
                     INNER JOIN md_me_materialbase mb ON mb.material_id = disdtl.material_id
                     INNER JOIN md_pb_classstandard class ON class.class_id = mb.material_type_id
                 WHERE
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/ST_PUB_QUERY_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/ST_PUB_QUERY_01.wql
index c658d94a0..770e517fb 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/ST_PUB_QUERY_01.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/ST_PUB_QUERY_01.wql
@@ -112,33 +112,15 @@
     IF 输入.flag = "4"
         QUERY
             SELECT
-            	max(detail.VALUE) AS CODE,
-            	max(detail.label) AS NAME
+            	max(value) AS CODE,
+            	max(label) AS NAME
             FROM
-            	sys_dict_detail detail
-            LEFT JOIN sys_dict dict ON dict.dict_id = detail.dict_id
+                sys_dict
             WHERE
             	1 = 1
-            AND dict. NAME LIKE '%INV_TYPE%'
-            group by detail.VALUE
+            AND CODE LIKE '%INV_TYPE%'
+
+            group by value
             ENDSELECT
         ENDQUERY
-    ENDIF
-
-    IF 输入.flag = "5"
-            QUERY
-                SELECT
-                	    detail.VALUE,
-                        detail.label
-                    FROM
-                        sys_dict_detail detail
-                    inner JOIN sys_dict dict ON dict.dict_id = detail.dict_id and dict.dict_id='6'
-                    WHERE
-                        1 = 1
-                        OPTION 输入.ids <> ""
-                            detail.VALUE in (输入.ids)
-                        ENDOPTION
-                    order by detail.dict_sort
-                ENDSELECT
-            ENDQUERY
-    ENDIF
+    ENDIF
\ No newline at end of file
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java
index a8ae10b71..0256f86a9 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java
@@ -98,6 +98,13 @@ public class CheckOutBillController {
         checkOutBillService.allCancel(whereJson);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
+    @PostMapping("/cancelTask")
+    @Log("删除任务")
+    @ApiOperation("删除任务")
+    public ResponseEntity<Object> cancelTask(@RequestBody JSONObject whereJson) {
+        checkOutBillService.cancelTask(whereJson);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
     @PostMapping("/oneCancel")
     @Log("出库单全部取消")
     @ApiOperation("出库单全部取消")
@@ -124,6 +131,13 @@ public class CheckOutBillController {
         checkOutBillService.setPoint(whereJson);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
+    @PostMapping("/oneSetPoint")
+    @Log("设置一个站点")
+    @ApiOperation("设置检验站点")
+    public ResponseEntity<Object> oneSetPoint(@RequestBody JSONObject whereJson) {
+        checkOutBillService.oneSetPoint(whereJson);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
     @GetMapping("/getOutBillTask")
     @Log("查询出库单分配任务")
     @ApiOperation("查询出库单分配任务")
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
index 3acac5f49..6e884c29d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
@@ -87,6 +87,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         if (StrUtil.isNotEmpty(map.get("vbeln"))) {
             map.put("vbeln", "%" + map.get("vbeln") + "%");
         }
+        if (StrUtil.isNotEmpty(map.get("width"))) {
+            map.put("width", "%" + map.get("width") + "%");
+        }
         if (StrUtil.isNotEmpty(map.get("pcsn"))) {
             map.put("pcsn", "%" + map.get("pcsn") + "%");
         }
@@ -464,6 +467,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
             jsonDtl.put("unassign_qty", row.get("plan_qty"));
             jsonDtl.put("vbeln", row.getString("vbeln"));
             jsonDtl.put("posnr", row.getString("posnr"));
+            jsonDtl.put("width", row.getString("width"));
             WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").insert(jsonDtl);
             qty += jsonDtl.getDoubleValue("plan_qty");
 
@@ -592,6 +596,26 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         return jo;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void cancelTask(JSONObject whereJson) {
+        WQLObject disTab = WQLObject.getWQLObject("st_ivt_iostorinvdis"); // 分配表
+        WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); // 任务表
+
+        String task_id = whereJson.getString("task_id");
+        // 更新分配明细 任务状态、清空任务id
+        JSONObject paramMap = new JSONObject();
+        paramMap.put("task_id", "");
+        paramMap.put("work_status", "00");
+        paramMap.put("point_id", "");
+        disTab.update(paramMap,"task_id = '"+task_id+"'");
+
+        // 删除此任务
+        JSONObject paramMap2 = new JSONObject();
+        paramMap2.put("is_delete","1" );
+        taskTab.update(paramMap2,"task_id = '"+task_id+"'");
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(JSONObject whereJson) {
@@ -849,6 +873,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
                 jsonMap.put("flag", "1");
                 jsonMap.put("material_id", dtl.getString("material_id"));
                 jsonMap.put("pcsn", dtl.getString("pcsn"));
+                jsonMap.put("box_no", dtl.getString("box_no"));
                 jsonMap.put("sect_id", whereJson.getString("sect_id"));
                 jsonMap.put("stor_id", whereJson.getString("stor_id"));
 
@@ -1068,6 +1093,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
                 jsonMap.put("flag", "1");
                 jsonMap.put("material_id", dtl.getString("material_id"));
                 jsonMap.put("pcsn", dtl.getString("pcsn"));
+                jsonMap.put("box_no", dtl.getString("box_no"));
                 jsonMap.put("sect_id", whereJson.getString("sect_id"));
                 jsonMap.put("stor_id", whereJson.getString("stor_id"));
 
@@ -1655,6 +1681,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
                         table.add(jsonMoveDtl);
                         // 更新任务处理类
                         JSONObject jsonTaskMove = wo_Task.query("task_id = '" + move_task_id + "'").uniqueResult(0);
+                        jsonTaskMove.put("task_type", "010505");
                         jsonTaskMove.put("handle_class", HandMoveStorAcsTask.class.getName());
                         wo_Task.update(jsonTaskMove);
 
@@ -1774,6 +1801,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
                     table.add(jsonMoveDtl);
                     // 更新任务处理类
                     JSONObject jsonTaskMove = wo_Task.query("task_id = '" + move_task_id + "'").uniqueResult(0);
+                    jsonTaskMove.put("task_type", "010505");
                     jsonTaskMove.put("handle_class", HandMoveStorAcsTask.class.getName());
                     wo_Task.update(jsonTaskMove);
 
@@ -1787,7 +1815,772 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
             // 下发
             outTask.immediateNotifyAcs(null);
         }
+    }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void oneSetPoint(JSONObject whereJson) {
+        //出库分配表
+        WQLObject wo_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis");
+        //点位表
+        WQLObject wo_Point = WQLObject.getWQLObject("SCH_BASE_Point");
+        //任务表
+        WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task");
+        //出库主表
+        WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_IOStorInv");
+        //仓位表
+        WQLObject attrTab = WQLObject.getWQLObject("ST_IVT_StructAttr");
+        // 库存表
+        WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt");
+
+        String struct_id = whereJson.getString("struct_id");
+        String point_code = whereJson.getString("point_code"); // 终点
+        String iostorinv_id = whereJson.getString("iostorinv_id");
+
+        //查询主表信息
+        JSONObject jo_mst = wo_mst.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(jo_mst)) {
+            throw new BadRequestException("未查到相关出库单");
+        }
+
+        JSONObject jsonPoint2 = wo_Point.query("lock_type='1' and (vehicle_code='' or vehicle_code IS NULL) and point_code='" + point_code + "'").uniqueResult(0);
+        //如果终点站点被锁定或者有载具号，则不允许设置点位
+        if (ObjectUtil.isEmpty(jsonPoint2)) {
+            throw new BadRequestException("该站点被锁定或者有载具号，不允许设置！");
+        }
+
+        // 查询未生成和生成未下发的分配记录
+        JSONObject dis = WQL.getWO("QST_IVT_CHECKOUTBILL")
+                .addParam("flag", "5")
+                .addParam("iostorinvdtl_id", whereJson.getString("iostorinvdtl_id"))
+                .addParam("struct_id", struct_id)
+                .addParam("iostorinv_id", iostorinv_id)
+                .addParam("bill_status", "01")
+                .addParam("is_issued", "0")
+                .process()
+                .uniqueResult(0);
+        if (ObjectUtil.isEmpty(dis)) {
+            throw new BadRequestException("分配明细不存在或已执行、完成、！");
+        }
+
+        String task_status = dis.getString("task_status");
+        String task_id = dis.getString("task_id");
+
+        if (StrUtil.isNotEmpty(task_status) && "05,06,07".contains(task_status)) {
+            throw new BadRequestException("该任务已执行，不可重新设置站点！");
+        }
+
+        if (ObjectUtil.isNotEmpty(task_id)) {
+            //若任务不为空，则为变更出库目的站点
+            JSONObject task = wo_Task.query("task_id='" + task_id + "'").uniqueResult(0);
+            //更新任务
+            task.put("point_code2", jsonPoint2.getString("point_code"));
+            wo_Task.update(task);
+        } else {
+            /*
+             * 生成任务：
+             *  1.判断此条分配明细的 ‘仓位’在此主表下的分配明细是否有相同的 ‘仓位’
+             *  a.如果有：有则合并只生成一条任务
+             *  b.没有：则正常生成
+             *  2.判断此货位是否被挡住
+             *  a.挡住：判断哪边的货位比较少 ， 生成移库单
+             *  b.没挡住：正常生成
+             */
+            JSONObject jsonPoint1 = wo_Point.query("source_id = '" + dis.getString("struct_id") + "'").uniqueResult(0);
+            if (ObjectUtil.isEmpty(jsonPoint1)) throw new BadRequestException("起点点位不存在");
+
+            // 创建任务
+            JSONObject param = new JSONObject();
+            param.put("task_type", "010503");
+            param.put("vehicle_code", dis.getString("box_no"));
+            param.put("task_name", "task_name");
+            param.put("point_code1", jsonPoint1.getString("point_code"));
+            param.put("point_code2", jsonPoint2.getString("point_code"));
+            param.put("material_id", dis.getString("material_id"));
+            param.put("task_group_id", ""); // 任务组
+            param.put("sort_seq", ""); // 任务组顺序号
+
+            String create_task_id = outTask.createTask(param);
+
+            // 更新分配状态、任务标识、出库点位
+            JSONObject jsonTask = wo_Task.query("task_id = '" + create_task_id + "'").uniqueResult(0);
+            JSONObject jsonUpdateMap = new JSONObject();
+            jsonUpdateMap.put("work_status", "01");
+            jsonUpdateMap.put("task_id", jsonTask.getLong("task_id"));
+            jsonUpdateMap.put("point_id", jsonPoint2.getLong("point_id"));
+            wo_dis.update(jsonUpdateMap, "iostorinvdis_id = '" + dis.getString("iostorinvdis_id") + "'");
+
+            // 1.判断此条分配明细的 ‘仓位’在此主表下的分配明细是否有相同的 ‘仓位’
+            JSONArray disArr = wo_dis.query("struct_id = '" + dis.getString("struct_id") +
+                    "' and iostorinv_id = '" + dis.getString("iostorinv_id") +
+                    "' and iostorinvdis_id <> '" + dis.getString("iostorinvdis_id") +
+                    "' and work_status = '00'").getResultJSONArray(0);
+
+            // 依次更新相同仓位的分配明细状态、任务标识、出库点位
+            for (int i = 0; i < disArr.size(); i++) {
+                JSONObject jsonObject = disArr.getJSONObject(i);
+                jsonObject.put("work_status", "01");
+                jsonObject.put("task_id", jsonTask.getLong("task_id"));
+                jsonObject.put("point_id", jsonPoint2.getLong("point_id"));
+                wo_dis.update(jsonObject);
+            }
+
+            // 2.判断此货位是否被挡住
+            JSONObject jsonAttr = attrTab.query("struct_id = '" + dis.getString("struct_id") + "'").uniqueResult(0);
+
+            // 判断此仓位是‘双通’还是’单通‘
+            if (StrUtil.equals(jsonAttr.getString("placement_type"), "01")) {
+
+                JSONObject map = new JSONObject();
+                map.put("flag", "2");
+                map.put("struct_code", jsonAttr.getString("struct_code"));
+                map.put("sect_id", jsonAttr.getString("sect_id"));
+
+                // 判断左边是否被挡住
+                JSONObject jsonIsBlockL = WQL.getWO("ST_OUTIVT03").addParamMap(map).process().uniqueResult(0);
+                boolean left_verify = true;
+                if (ObjectUtil.isEmpty(jsonIsBlockL)) {
+                    left_verify = false;
+                  /*  String out_order_seq = NumberUtil.add(jsonAttr.getString("out_order_seq"), "1").toString();
+                    JSONObject json = attrTab.query("sect_id = '" + map.getString("sect_id")
+                            + "' and out_order_seq = '" + out_order_seq
+                            + "' and block_num = '" + jsonAttr.getString("block_num")
+                            + "' and row_num = '" + jsonAttr.getString("row_num") + "'").uniqueResult(0);
+                    if (ObjectUtil.isNotEmpty(json)) {
+                        jsonAttr.put("placement_type","02");
+                    }*/
+                    jsonAttr.put("placement_type","02");
+                } else {
+                    // 调用验证方法进行校验
+                    String out_order_seq = NumberUtil.add(jsonIsBlockL.getString("out_order_seq"), "1").toString();
+                    JSONObject jsonParam = attrTab.query("sect_id = '" + map.getString("sect_id")
+                            + "' and out_order_seq = '" + out_order_seq
+                            + "' and block_num = '" + jsonIsBlockL.getString("block_num")
+                            + "' and row_num = '" + jsonIsBlockL.getString("row_num") + "'").uniqueResult(0);
+
+                    jsonParam.put("iostorinv_id", dis.getString("iostorinv_id"));
+                    jsonParam.put("option", "2");
+                    left_verify = this.is_trueOrFalse(jsonParam);
+
+                    if (!left_verify) {
+                        jsonParam.put("option", "3");
+                        boolean left_verify2 = this.is_trueOrFalse(jsonParam);
+
+                        if (left_verify2) {
+                            jsonAttr.put("placement_type","02");
+                        }
+                    } else {
+                        jsonParam.put("option", "4");
+                        boolean left_verify2 = this.is_trueOrFalse(jsonParam);
+
+                        if (left_verify2) {
+                            jsonAttr.put("placement_type","02");
+                        }
+                    }
+                }
+
+                // 判断右边是否被挡住
+                map.put("flag", "1");
+                JSONObject jsonIsBlockR = WQL.getWO("ST_OUTIVT03").addParamMap(map).process().uniqueResult(0);
+                boolean right_verify = true;
+                if (ObjectUtil.isEmpty(jsonIsBlockR)) {
+                    right_verify = false;
+                   /* String out_order_seq = NumberUtil.sub(jsonAttr.getString("out_order_seq"), "1").toString();
+                    JSONObject json = attrTab.query("sect_id = '" + map.getString("sect_id")
+                            + "' and out_order_seq = '" + out_order_seq
+                            + "' and block_num = '" + jsonAttr.getString("block_num")
+                            + "' and row_num = '" + jsonAttr.getString("row_num") + "'").uniqueResult(0);
+                    if (ObjectUtil.isNotEmpty(json)) {
+                        jsonAttr.put("placement_type","03");
+                    }*/
+                    jsonAttr.put("placement_type","03");
+                } else {
+                    // 调用验证方法进行校验
+                    String out_order_seq = NumberUtil.sub(jsonIsBlockR.getString("out_order_seq"), "1").toString();
+                    JSONObject jsonParam = attrTab.query("sect_id = '" + map.getString("sect_id")
+                            + "' and out_order_seq = '" + out_order_seq
+                            + "' and block_num = '" + jsonIsBlockR.getString("block_num")
+                            + "' and row_num = '" + jsonIsBlockR.getString("row_num") + "'").uniqueResult(0);
+
+                    jsonParam.put("iostorinv_id", dis.getString("iostorinv_id"));
+                    jsonParam.put("option", "2");
+                    right_verify = this.is_trueOrFalse(jsonParam);
+
+                    if (!right_verify) {
+                        jsonParam.put("option", "3");
+                        boolean right_verify2 = this.is_trueOrFalse(jsonParam);
+
+                        if (right_verify2) {
+                            jsonAttr.put("placement_type","03");
+                        }
+                    } else {
+                        jsonParam.put("option", "4");
+                        boolean right_verify2 = this.is_trueOrFalse(jsonParam);
+
+                        if (right_verify2) {
+                            jsonAttr.put("placement_type","03");
+                        }
+                    }
+                }
+
+                if (left_verify && right_verify) {
+                    // 都被挡住判断哪边被挡住的货位少
+                    map.put("flag", "3");
+                    map.put("out_order_seq", jsonAttr.getString("out_order_seq"));
+                    JSONArray jsonIsBlockAll = WQL.getWO("ST_OUTIVT03").addParamMap(map).process().getResultJSONArray(0);
+
+                    int blockLeft = 0; // 左边个数
+                    int blockRigth = 0; // 右边个数
+                    for (int i = 0; i < jsonIsBlockAll.size(); i++) {
+                        JSONObject json = jsonIsBlockAll.getJSONObject(i);
+
+                        if (i == 0) blockRigth = json.getIntValue("num");
+                        if (i == 1) blockRigth = json.getIntValue("num");
+                    }
+
+                    // 更新第一个任务 任务组、任务顺序号
+                    jsonTask.put("task_group_id", IdUtil.getSnowflake(1, 1).nextId());
+                    jsonTask.put("sort_seq", 1);
+                    wo_Task.update(jsonTask);
+
+                    JSONArray jsonAllBlockPoint = new JSONArray();
+                    if (blockLeft > blockRigth) {
+                        // 从右边生成移库单
+                        map.put("flag", "4");
+                        map.put("block_num", jsonAttr.getString("block_num"));
+                        map.put("row_num", jsonAttr.getString("row_num"));
+
+                        jsonAllBlockPoint = WQL.getWO("ST_OUTIVT03").addParamMap(map).process().getResultJSONArray(0);
+
+                    } else {
+                        // 从左边生成移库单
+                        map.put("flag", "5");
+                        map.put("block_num", jsonAttr.getString("block_num"));
+                        map.put("row_num", jsonAttr.getString("row_num"));
+
+                        jsonAllBlockPoint = WQL.getWO("ST_OUTIVT03").addParamMap(map).process().getResultJSONArray(0);
+                    }
+
+                    for (int i = 0; i < jsonAllBlockPoint.size(); i++) {
+                        JSONObject json = jsonAllBlockPoint.getJSONObject(i);
+
+                        JSONObject mapParam = new JSONObject();// 生成移库单传入参数
+                        JSONArray table = new JSONArray(); // 明细参数
+                        mapParam.put("bill_status", "10");
+                        mapParam.put("bill_type", "21");
+                        mapParam.put("buss_type", "21");
+                        mapParam.put("biz_date", DateUtil.today());
+                        mapParam.put("stor_code", "CP01");
+                        mapParam.put("stor_id", "1582991156504039424");
+                        mapParam.put("stor_name", "成品仓库");
+                        mapParam.put("is_task", "1");
+
+                        // 查询移入货位
+                        JSONObject moveParam = new JSONObject();
+                        moveParam.put("box_no", json.getString("storagevehicle_code"));
+                        moveParam.put("sect_id", RegionTypeEnum.ZZ01.getId());
+                        JSONObject jsonMove = rawAssistIStorService.autoDis(moveParam);
+                        // 查询移出货位的库存物料
+                        JSONObject jsonMoveIvt = WQL.getWO("ST_OUTIVT03")
+                                .addParam("flag", "6")
+                                .addParam("struct_id", json.getString("struct_id"))
+                                .process().uniqueResult(0);
+
+                        // 移库单明细
+                        JSONObject jsonMoveDtl = new JSONObject();
+                        jsonMoveDtl.put("is_task", "2");
+                        jsonMoveDtl.put("turnout_sect_id", json.getLongValue("sect_id"));
+                        jsonMoveDtl.put("turnout_sect_code", json.getString("sect_code"));
+                        jsonMoveDtl.put("turnout_sect_name", json.getString("sect_name"));
+                        jsonMoveDtl.put("turnout_struct_id", json.getLongValue("struct_id"));
+                        jsonMoveDtl.put("turnout_struct_code", json.getString("struct_code"));
+                        jsonMoveDtl.put("turnout_struct_name", json.getString("struct_name"));
+                        jsonMoveDtl.put("material_id", jsonMoveIvt.getLongValue("material_id"));
+                        jsonMoveDtl.put("pcsn", jsonMoveIvt.getString("pcsn"));
+                        jsonMoveDtl.put("quality_scode", "01");
+                        jsonMoveDtl.put("qty_unit_id", jsonMoveIvt.getLongValue("qty_unit_id"));
+                        jsonMoveDtl.put("qty_unit_name", jsonMoveIvt.getString("unit_name"));
+                        jsonMoveDtl.put("qty", jsonMoveIvt.getDoubleValue("canuse_qty"));
+                        jsonMoveDtl.put("storagevehicle_code", json.getString("storagevehicle_code"));
+                        jsonMoveDtl.put("turnin_sect_id", jsonMove.getLongValue("sect_id"));
+                        jsonMoveDtl.put("turnin_sect_code", jsonMove.getString("sect_code"));
+                        jsonMoveDtl.put("turnin_sect_name", jsonMove.getString("sect_name"));
+                        jsonMoveDtl.put("turnin_struct_id", jsonMove.getLongValue("struct_id"));
+                        jsonMoveDtl.put("turnin_struct_code", jsonMove.getString("struct_code"));
+                        jsonMoveDtl.put("turnin_struct_name", jsonMove.getString("struct_name"));
+                        jsonMoveDtl.put("source_billdtl_id", dis.getLongValue("iostorinvdis_id"));
+
+                        // 生成任务
+                        JSONObject param2 = new JSONObject();
+                        param2.put("task_type", "010503");
+                        param2.put("vehicle_code", json.getString("storagevehicle_code"));
+                        param2.put("task_name", "task_name");
+                        param2.put("point_code1", json.getString("point_code"));
+                        param2.put("point_code2", jsonMove.getString("struct_code"));
+                        param2.put("task_group_id", jsonTask.getLongValue("task_group_id")); // 任务组
+                        param2.put("sort_seq", jsonTask.getIntValue("sort_seq") + i + 1); // 任务组顺序号
+                        String move_task_id = outTask.createTask(param2);
+
+                        // 回显移库明细任务id
+                        jsonMoveDtl.put("task_id", move_task_id);
+                        table.add(jsonMoveDtl);
+                        // 更新任务处理类
+                        JSONObject jsonTaskMove = wo_Task.query("task_id = '" + move_task_id + "'").uniqueResult(0);
+                        jsonTaskMove.put("task_type", "010505");
+                        jsonTaskMove.put("handle_class", HandMoveStorAcsTask.class.getName());
+                        wo_Task.update(jsonTaskMove);
+
+                        mapParam.put("tableData", table);
+                        // 调用移库单新增方法
+                        if (ObjectUtil.isNotEmpty(jsonAllBlockPoint)) {
+                            handMoveStorService.insertDtl2(mapParam);
+                        }
+                    }
+
+                } else {
+                    if (StrUtil.equals(jsonAttr.getString("placement_type"),"01")) {
+                        throw new BadRequestException("任务生成失败，请重新选择");
+                    }
+                    map.put("struct_code", jsonAttr.getString("struct_code"));
+                    map.put("sect_id", jsonAttr.getString("sect_id"));
+                    map.put("out_order_seq", jsonAttr.getString("out_order_seq"));
+                    map.put("block_num", jsonAttr.getString("block_num"));
+                    map.put("row_num", jsonAttr.getString("row_num"));
+
+                    JSONArray jsonAllBlockPoint = new JSONArray();
+                    if (StrUtil.equals(jsonAttr.getString("placement_type"), "02")) {
+                        // 02-左通
+                        map.put("flag", "2");
+                        // 判断左边是否被挡住
+                        JSONObject jsonIsBlockL2 = WQL.getWO("ST_OUTIVT03").addParamMap(map).process().uniqueResult(0);
+
+                        // 如果被挡住则进行校验
+                        boolean verify = true;
+                        if (ObjectUtil.isEmpty(jsonIsBlockL2)) {
+                            verify = false;
+                        } else {
+                            // 调用验证方法进行校验
+                            String out_order_seq = NumberUtil.add(jsonIsBlockL2.getString("out_order_seq"), "1").toString();
+                            JSONObject jsonParam = attrTab.query("sect_id = '" + map.getString("sect_id")
+                                    + "' and out_order_seq = '" + out_order_seq
+                                    + "' and block_num = '" + map.getString("block_num")
+                                    + "' and row_num = '" + map.getString("row_num") + "'").uniqueResult(0);
+
+                            jsonParam.put("iostorinv_id", dis.getString("iostorinv_id"));
+                            jsonParam.put("option", "1");
+                            verify = this.is_trueOrFalse(jsonParam);
+                        }
+
+                        if (verify) {
+                            // 更新第一个任务 任务组、任务顺序号
+                            jsonTask.put("task_group_id", IdUtil.getSnowflake(1, 1).nextId());
+                            jsonTask.put("sort_seq", 1);
+                            wo_Task.update(jsonTask);
+                            // 从左边生成移库单
+                            map.put("flag", "5");
+                            jsonAllBlockPoint = WQL.getWO("ST_OUTIVT03").addParamMap(map).process().getResultJSONArray(0);
+                        }
+                    }
+
+                    if (StrUtil.equals(jsonAttr.getString("placement_type"), "03")) {
+                        // 03-右通
+                        map.put("flag", "1");
+                        // 判断右边是否被挡住
+                        JSONObject jsonIsBlockR2 = WQL.getWO("ST_OUTIVT03").addParamMap(map).process().uniqueResult(0);
+
+                        // 如果被挡住则进行校验
+                        boolean verify = true;
+                        if (ObjectUtil.isEmpty(jsonIsBlockR2)) {
+                            verify = false;
+                        } else {
+                            // 调用验证方法进行校验
+                            String out_order_seq = NumberUtil.sub(jsonIsBlockR2.getString("out_order_seq"), "1").toString();
+                            JSONObject jsonParam = attrTab.query("sect_id = '" + map.getString("sect_id")
+                                    + "' and out_order_seq = '" + out_order_seq
+                                    + "' and block_num = '" + map.getString("block_num")
+                                    + "' and row_num = '" + map.getString("row_num") + "'").uniqueResult(0);
+
+                            jsonParam.put("iostorinv_id", dis.getString("iostorinv_id"));
+                            jsonParam.put("option", "1");
+                            verify = this.is_trueOrFalse(jsonParam);
+                        }
+
+                        if (verify) {
+                            // 更新第一个任务 任务组、任务顺序号
+                            jsonTask.put("task_group_id", IdUtil.getSnowflake(1, 1).nextId());
+                            jsonTask.put("sort_seq", 1);
+                            wo_Task.update(jsonTask);
+                            // 从右边生成移库单
+                            map.put("flag", "4");
+                            jsonAllBlockPoint = WQL.getWO("ST_OUTIVT03").addParamMap(map).process().getResultJSONArray(0);
+                        }
+                    }
+
+                    for (int i = 0; i < jsonAllBlockPoint.size(); i++) {
+                        JSONObject json = jsonAllBlockPoint.getJSONObject(i);
+
+                        JSONObject mapParam = new JSONObject();// 生成移库单传入参数
+                        JSONArray table = new JSONArray(); // 明细参数
+                        mapParam.put("bill_status", "10");
+                        mapParam.put("bill_type", "21");
+                        mapParam.put("buss_type", "21");
+                        mapParam.put("biz_date", DateUtil.today());
+                        mapParam.put("stor_code", "CP01");
+                        mapParam.put("stor_id", "1582991156504039424");
+                        mapParam.put("stor_name", "成品仓库");
+                        mapParam.put("is_task", "1");
+
+                        // 查询移入货位
+                        JSONObject moveParam = new JSONObject();
+                        moveParam.put("box_no", json.getString("storagevehicle_code"));
+                        moveParam.put("sect_id", RegionTypeEnum.ZZ01.getId());
+                        JSONObject jsonMove = rawAssistIStorService.autoDis(moveParam);
+                        // 查询移出货位的库存物料
+                        JSONObject jsonMoveIvt = WQL.getWO("ST_OUTIVT03")
+                                .addParam("flag", "6")
+                                .addParam("struct_id", json.getString("struct_id"))
+                                .process().uniqueResult(0);
+
+                        // 移库单明细
+                        JSONObject jsonMoveDtl = new JSONObject();
+                        jsonMoveDtl.put("is_task", "2");
+                        jsonMoveDtl.put("turnout_sect_id", json.getLongValue("sect_id"));
+                        jsonMoveDtl.put("turnout_sect_code", json.getString("sect_code"));
+                        jsonMoveDtl.put("turnout_sect_name", json.getString("sect_name"));
+                        jsonMoveDtl.put("turnout_struct_id", json.getLongValue("struct_id"));
+                        jsonMoveDtl.put("turnout_struct_code", json.getString("struct_code"));
+                        jsonMoveDtl.put("turnout_struct_name", json.getString("struct_name"));
+                        jsonMoveDtl.put("material_id", jsonMoveIvt.getLongValue("material_id"));
+                        jsonMoveDtl.put("pcsn", jsonMoveIvt.getString("pcsn"));
+                        jsonMoveDtl.put("quality_scode", "01");
+                        jsonMoveDtl.put("qty_unit_id", jsonMoveIvt.getLongValue("qty_unit_id"));
+                        jsonMoveDtl.put("qty_unit_name", jsonMoveIvt.getString("unit_name"));
+                        jsonMoveDtl.put("qty", jsonMoveIvt.getDoubleValue("canuse_qty"));
+                        jsonMoveDtl.put("storagevehicle_code", json.getString("storagevehicle_code"));
+                        jsonMoveDtl.put("turnin_sect_id", jsonMove.getLongValue("sect_id"));
+                        jsonMoveDtl.put("turnin_sect_code", jsonMove.getString("sect_code"));
+                        jsonMoveDtl.put("turnin_sect_name", jsonMove.getString("sect_name"));
+                        jsonMoveDtl.put("turnin_struct_id", jsonMove.getLongValue("struct_id"));
+                        jsonMoveDtl.put("turnin_struct_code", jsonMove.getString("struct_code"));
+                        jsonMoveDtl.put("turnin_struct_name", jsonMove.getString("struct_name"));
+                        jsonMoveDtl.put("source_billdtl_id", dis.getLongValue("iostorinvdis_id"));
+
+                        // 生成任务
+                        JSONObject param2 = new JSONObject();
+                        param2.put("task_type", "010503");
+                        param2.put("vehicle_code", json.getString("storagevehicle_code"));
+                        param2.put("task_name", "task_name");
+                        param2.put("point_code1", json.getString("point_code"));
+                        param2.put("point_code2", jsonMove.getString("struct_code"));
+                        param2.put("task_group_id", jsonTask.getLongValue("task_group_id")); // 任务组
+                        param2.put("sort_seq", jsonTask.getIntValue("sort_seq") + i + 1); // 任务组顺序号
+                        String move_task_id = outTask.createTask(param2);
+
+                        // 回显移库明细任务id
+                        jsonMoveDtl.put("task_id", move_task_id);
+                        table.add(jsonMoveDtl);
+                        // 更新任务处理类
+                        JSONObject jsonTaskMove = wo_Task.query("task_id = '" + move_task_id + "'").uniqueResult(0);
+                        jsonTaskMove.put("task_type", "010505");
+                        jsonTaskMove.put("handle_class", HandMoveStorAcsTask.class.getName());
+                        wo_Task.update(jsonTaskMove);
+
+                        mapParam.put("tableData", table);
+                        // 调用移库单新增方法
+                        if (ObjectUtil.isNotEmpty(jsonAllBlockPoint)) {
+                            handMoveStorService.insertDtl2(mapParam);
+                        }
+                    }
+                }
+            } else {
+                JSONObject map = new JSONObject();
+                map.put("struct_code", jsonAttr.getString("struct_code"));
+                map.put("sect_id", jsonAttr.getString("sect_id"));
+                map.put("out_order_seq", jsonAttr.getString("out_order_seq"));
+                map.put("block_num", jsonAttr.getString("block_num"));
+                map.put("row_num", jsonAttr.getString("row_num"));
+
+                JSONArray jsonAllBlockPoint = new JSONArray();
+                if (StrUtil.equals(jsonAttr.getString("placement_type"), "02")) {
+                    // 02-左通
+                    map.put("flag", "2");
+                    // 判断左边是否被挡住
+                    JSONObject jsonIsBlockL = WQL.getWO("ST_OUTIVT03").addParamMap(map).process().uniqueResult(0);
+
+                    // 如果被挡住则进行校验
+                    boolean verify = true;
+                    if (ObjectUtil.isEmpty(jsonIsBlockL)) {
+                        verify = false;
+                    } else {
+                        // 调用验证方法进行校验
+                        String out_order_seq = NumberUtil.add(jsonIsBlockL.getString("out_order_seq"), "1").toString();
+                        JSONObject jsonParam = attrTab.query("sect_id = '" + map.getString("sect_id")
+                                + "' and out_order_seq = '" + out_order_seq
+                                + "' and block_num = '" + map.getString("block_num")
+                                + "' and row_num = '" + map.getString("row_num") + "'").uniqueResult(0);
+
+                        jsonParam.put("iostorinv_id", dis.getString("iostorinv_id"));
+                        jsonParam.put("option", "1");
+                        verify = this.is_trueOrFalse(jsonParam);
+                    }
+
+                    if (verify) {
+                        // 更新第一个任务 任务组、任务顺序号
+                        jsonTask.put("task_group_id", IdUtil.getSnowflake(1, 1).nextId());
+                        jsonTask.put("sort_seq", 1);
+                        wo_Task.update(jsonTask);
+                        // 从左边生成移库单
+                        map.put("flag", "5");
+                        jsonAllBlockPoint = WQL.getWO("ST_OUTIVT03").addParamMap(map).process().getResultJSONArray(0);
+                    }
+                }
+
+                if (StrUtil.equals(jsonAttr.getString("placement_type"), "03")) {
+                    // 03-右通
+                    map.put("flag", "1");
+                    // 判断左边是否被挡住
+                    JSONObject jsonIsBlockR = WQL.getWO("ST_OUTIVT03").addParamMap(map).process().uniqueResult(0);
+
+                    // 如果被挡住则进行校验
+                    boolean verify = true;
+                    if (ObjectUtil.isEmpty(jsonIsBlockR)) {
+                        verify = false;
+                    } else {
+                        // 调用验证方法进行校验
+                        String out_order_seq = NumberUtil.sub(jsonIsBlockR.getString("out_order_seq"), "1").toString();
+                        JSONObject jsonParam = attrTab.query("sect_id = '" + map.getString("sect_id")
+                                + "' and out_order_seq = '" + out_order_seq
+                                + "' and block_num = '" + map.getString("block_num")
+                                + "' and row_num = '" + map.getString("row_num") + "'").uniqueResult(0);
+
+                        jsonParam.put("iostorinv_id", dis.getString("iostorinv_id"));
+                        jsonParam.put("option", "1");
+                        verify = this.is_trueOrFalse(jsonParam);
+                    }
+
+                    if (verify) {
+                        // 更新第一个任务 任务组、任务顺序号
+                        jsonTask.put("task_group_id", IdUtil.getSnowflake(1, 1).nextId());
+                        jsonTask.put("sort_seq", 1);
+                        wo_Task.update(jsonTask);
+                        // 从右边生成移库单
+                        map.put("flag", "4");
+                        jsonAllBlockPoint = WQL.getWO("ST_OUTIVT03").addParamMap(map).process().getResultJSONArray(0);
+                    }
+                }
+
+                for (int i = 0; i < jsonAllBlockPoint.size(); i++) {
+                    JSONObject json = jsonAllBlockPoint.getJSONObject(i);
+
+                    JSONObject mapParam = new JSONObject();// 生成移库单传入参数
+                    JSONArray table = new JSONArray(); // 明细参数
+                    mapParam.put("bill_status", "10");
+                    mapParam.put("bill_type", "21");
+                    mapParam.put("buss_type", "21");
+                    mapParam.put("biz_date", DateUtil.today());
+                    mapParam.put("stor_code", "CP01");
+                    mapParam.put("stor_id", "1582991156504039424");
+                    mapParam.put("stor_name", "成品仓库");
+                    mapParam.put("is_task", "1");
+
+                    // 查询移入货位
+                    JSONObject moveParam = new JSONObject();
+                    moveParam.put("box_no", json.getString("storagevehicle_code"));
+                    moveParam.put("sect_id", RegionTypeEnum.ZZ01.getId());
+                    JSONObject jsonMove = rawAssistIStorService.autoDis(moveParam);
+                    // 查询移出货位的库存物料
+                    JSONObject jsonMoveIvt = WQL.getWO("ST_OUTIVT03")
+                            .addParam("flag", "6")
+                            .addParam("struct_id", json.getString("struct_id"))
+                            .process().uniqueResult(0);
+
+                    // 移库单明细
+                    JSONObject jsonMoveDtl = new JSONObject();
+                    jsonMoveDtl.put("is_task", "2");
+                    jsonMoveDtl.put("turnout_sect_id", json.getLongValue("sect_id"));
+                    jsonMoveDtl.put("turnout_sect_code", json.getString("sect_code"));
+                    jsonMoveDtl.put("turnout_sect_name", json.getString("sect_name"));
+                    jsonMoveDtl.put("turnout_struct_id", json.getLongValue("struct_id"));
+                    jsonMoveDtl.put("turnout_struct_code", json.getString("struct_code"));
+                    jsonMoveDtl.put("turnout_struct_name", json.getString("struct_name"));
+                    jsonMoveDtl.put("material_id", jsonMoveIvt.getLongValue("material_id"));
+                    jsonMoveDtl.put("pcsn", jsonMoveIvt.getString("pcsn"));
+                    jsonMoveDtl.put("quality_scode", "01");
+                    jsonMoveDtl.put("qty_unit_id", jsonMoveIvt.getLongValue("qty_unit_id"));
+                    jsonMoveDtl.put("qty_unit_name", jsonMoveIvt.getString("unit_name"));
+                    jsonMoveDtl.put("qty", jsonMoveIvt.getDoubleValue("canuse_qty"));
+                    jsonMoveDtl.put("storagevehicle_code", json.getString("storagevehicle_code"));
+                    jsonMoveDtl.put("turnin_sect_id", jsonMove.getLongValue("sect_id"));
+                    jsonMoveDtl.put("turnin_sect_code", jsonMove.getString("sect_code"));
+                    jsonMoveDtl.put("turnin_sect_name", jsonMove.getString("sect_name"));
+                    jsonMoveDtl.put("turnin_struct_id", jsonMove.getLongValue("struct_id"));
+                    jsonMoveDtl.put("turnin_struct_code", jsonMove.getString("struct_code"));
+                    jsonMoveDtl.put("turnin_struct_name", jsonMove.getString("struct_name"));
+                    jsonMoveDtl.put("source_billdtl_id", dis.getLongValue("iostorinvdis_id"));
+
+                    // 生成任务
+                    JSONObject param2 = new JSONObject();
+                    param2.put("task_type", "010503");
+                    param2.put("vehicle_code", json.getString("storagevehicle_code"));
+                    param2.put("task_name", "task_name");
+                    param2.put("point_code1", json.getString("point_code"));
+                    param2.put("point_code2", jsonMove.getString("struct_code"));
+                    param2.put("task_group_id", jsonTask.getLongValue("task_group_id")); // 任务组
+                    param2.put("sort_seq", jsonTask.getIntValue("sort_seq") + i + 1); // 任务组顺序号
+                    String move_task_id = outTask.createTask(param2);
+
+                    // 回显移库明细任务id
+                    jsonMoveDtl.put("task_id", move_task_id);
+                    table.add(jsonMoveDtl);
+                    // 更新任务处理类
+                    JSONObject jsonTaskMove = wo_Task.query("task_id = '" + move_task_id + "'").uniqueResult(0);
+                    jsonTaskMove.put("task_type", "010505");
+                    jsonTaskMove.put("handle_class", HandMoveStorAcsTask.class.getName());
+                    wo_Task.update(jsonTaskMove);
+
+                    mapParam.put("tableData", table);
+                    // 调用移库单新增方法
+                    if (ObjectUtil.isNotEmpty(jsonAllBlockPoint)) {
+                        handMoveStorService.insertDtl2(mapParam);
+                    }
+                }
+            }
+            // 下发
+            outTask.immediateNotifyAcs(null);
+        }
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public boolean is_trueOrFalse(JSONObject json) {
+        /*
+         * 判断此货位在此出库单分配明细中是否存在：
+         * 1.如果存在：
+         *      1）判断此货位是否生成任务：生成：则没有任务组 = false，未生成：报错
+         * 2.如果不存在：则判断此货位是否被锁住
+         *      1）未锁住：生成移库单 = true
+         *      2）锁住：判断是否生成任务，生成：则不用生成移库单 = false；未生成则报错
+         */
+        WQLObject disTab = WQLObject.getWQLObject("st_ivt_iostorinvdis"); // 出入库分配明细表
+        WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); // 任务表
+
+        if (ObjectUtil.isEmpty(json)) {
+            // 如果为空说明未堵住
+            return false;
+        }
+
+        String struct_code = json.getString("struct_code");
+        String iostorinv_id = json.getString("iostorinv_id");
+
+        if (ObjectUtil.isEmpty(struct_code)) throw new BadRequestException("校验仓位不能为空");
+
+        boolean param = false;
+
+        if (StrUtil.equals(json.getString("option"), "1")) {
+            // 单通
+            // 判断此货位在此出库单中是否存在
+            JSONObject jsondis = disTab.query("iostorinv_id = '" + iostorinv_id + "' and struct_code = '" + struct_code + "'").uniqueResult(0);
+
+            if (ObjectUtil.isNotEmpty(jsondis)) {
+                // 存在：判断是否生成任务
+                if (!StrUtil.equals(jsondis.getString("work_status"),"00")) {
+                    param = false;
+                } else {
+                    throw new BadRequestException("此仓位不可生成任务，请按照顺序选择！");
+                }
+            } else {
+                // 不存在: 判断此货位是否被锁住
+                if (StrUtil.equals(json.getString("lock_type"), "1")) {
+                    // 未锁住：返回true
+                    param = true;
+                } else {
+                    // 锁住:判断是否生成任务，生成：则不用生成移库单 = false；未生成则报错
+                    JSONObject jsonTask1 = taskTab.query("point_code1 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0);
+                    JSONObject jsonTask2 = taskTab.query("point_code2 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0);
+
+                    if (ObjectUtil.isEmpty(jsonTask1) && ObjectUtil.isEmpty(jsonTask2)) {
+                        // 未生成任务
+                        throw new BadRequestException("挡住仓位"+struct_code+"已锁定但未生成任务，请按照顺序选择");
+                    } else {
+                        // 已生成
+                        param = false;
+                    }
+                }
+            }
+        } else if (StrUtil.equals(json.getString("option"), "2")){
+            // 双通
+            // 判断此货位在此出库单中是否存在
+            JSONObject jsondis = disTab.query("iostorinv_id = '" + iostorinv_id + "' and struct_code = '" + struct_code + "'").uniqueResult(0);
+
+            if (ObjectUtil.isNotEmpty(jsondis)) {
+                param = false;
+            } else {
+                // 不存在: 判断此货位是否被锁住
+                if (StrUtil.equals(json.getString("lock_type"), "1")) {
+                    // 未锁住：返回true
+                    param = true;
+                } else {
+                    // 锁住:判断是否生成任务，生成：则不用生成移库单 = false；未生成则报错
+                    JSONObject jsonTask1 = taskTab.query("point_code1 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0);
+                    JSONObject jsonTask2 = taskTab.query("point_code2 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0);
+
+                    if (ObjectUtil.isEmpty(jsonTask1) && ObjectUtil.isEmpty(jsonTask2)) {
+                        // 未生成任务
+                        param = true;
+                    } else {
+                        // 已生成
+                        param = false;
+                    }
+                }
+            }
+        } else if (StrUtil.equals(json.getString("option"), "3")) {
+            // 判断此货位在此出库单中是否存在
+            JSONObject jsondis = disTab.query("iostorinv_id = '" + iostorinv_id + "' and struct_code = '" + struct_code + "'").uniqueResult(0);
+
+            if (ObjectUtil.isNotEmpty(jsondis)) {
+                // 存在：判断是否生成任务
+                if (!StrUtil.equals(jsondis.getString("work_status"),"00")) {
+                    param = true;
+                } else {
+                    param = false;
+                }
+            } else {
+                // 不存在: 判断此货位是否被锁住
+                if (StrUtil.equals(json.getString("lock_type"), "1")) {
+                    // 未锁住：返回true
+                    param = false;
+                } else {
+                    // 锁住:判断是否生成任务，生成：则不用生成移库单 = false；未生成则报错
+                    JSONObject jsonTask1 = taskTab.query("point_code1 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0);
+                    JSONObject jsonTask2 = taskTab.query("point_code2 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0);
+
+                    if (ObjectUtil.isEmpty(jsonTask1) && ObjectUtil.isEmpty(jsonTask2)) {
+                        // 未生成任务
+                        param = false;
+                    } else {
+                        // 已生成
+                        param = true;
+                    }
+                }
+            }
+        } else if (StrUtil.equals(json.getString("option"), "4")) {
+            if (StrUtil.equals(json.getString("lock_type"), "1")) {
+                // 未锁住：返回true
+                param = true;
+            } else {
+                // 锁住:判断是否生成任务，生成：则不用生成移库单 = false；未生成则报错
+                JSONObject jsonTask1 = taskTab.query("point_code1 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0);
+                JSONObject jsonTask2 = taskTab.query("point_code2 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0);
+
+                if (ObjectUtil.isEmpty(jsonTask1) && ObjectUtil.isEmpty(jsonTask2)) {
+                    // 未生成任务
+                    param = true;
+                } else {
+                    // 已生成
+                    param = false;
+                }
+            }
+        }
+        return param;
     }
 
     @Override
@@ -2505,41 +3298,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         jsonTask.put("update_time",now);
         wo_Task.update(jsonTask);
 
-       /* ArrayList<AcsTaskDto> resultList = new ArrayList<>();
-
-        // 1.查询此任务是否有任务组
-        JSONObject jsonTask = wo_Task.query("task_id = '" + whereJson.getString("task_id") + "'").uniqueResult(0);
-        if (ObjectUtil.isEmpty(jsonTask.getString("task_group_id"))) {
-            AcsTaskDto dto = AcsTaskDto.builder()
-                    .ext_task_id(jsonTask.getString("task_id"))
-                    .task_code(jsonTask.getString("task_code"))
-                    .task_type(jsonTask.getString("acs_task_type"))
-                    .start_device_code(jsonTask.getString("point_code1"))
-                    .next_device_code(jsonTask.getString("point_code2"))
-                    .vehicle_code(jsonTask.getString("vehicle_code"))
-                    .priority(jsonTask.getString("priority"))
-                    .remark(jsonTask.getString("remark"))
-                    .build();
-            resultList.add(dto);
-        } else {
-            // 2.有任务组：按照执行顺序下发 大到小
-            JSONArray taskArr = wo_Task.query("task_group_id = '" + jsonTask.getString("task_group_id") + "' order by sort_seq DESC").getResultJSONArray(0);
-            for (int i = 0; i < taskArr.size(); i++) {
-                JSONObject json = taskArr.getJSONObject(i);
-
-                AcsTaskDto dto = AcsTaskDto.builder()
-                        .ext_task_id(json.getString("task_id"))
-                        .task_code(json.getString("task_code"))
-                        .task_type(json.getString("acs_task_type"))
-                        .start_device_code(json.getString("point_code1"))
-                        .next_device_code(json.getString("point_code2"))
-                        .vehicle_code(json.getString("vehicle_code"))
-                        .priority(json.getString("priority"))
-                        .remark(json.getString("remark"))
-                        .build();
-                resultList.add(dto);
-            }
-        }*/
     }
 
     @Override
@@ -2563,6 +3321,16 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
             throw new BadRequestException("查询不到操作的任务记录！");
         }
 
+        // 判断此任务是否有任务组
+        String task_group_id = task.getString("task_group_id");
+        if (ObjectUtil.isNotEmpty(task_group_id)) {
+            // 上一个任务组顺序号
+            String sort_seq_last = NumberUtil.add(task.getString("sort_seq"), "1").toString();
+
+            JSONObject jsonTaskLast = wo_Task.query("task_group_id = '" + task_group_id + "' and sort_seq = '" + sort_seq_last + "' and task_status <> '07'").uniqueResult(0);
+            if (ObjectUtil.isNotEmpty(jsonTaskLast)) throw new BadRequestException("请先完成"+jsonTaskLast.getString("task_code")+"的任务！");
+        }
+
         JSONObject dtljo = wo_dis.query("task_id='" + task_id + "'").uniqueResult(0);
         whereJson.put("iostorinv_id", dtljo.getString("iostorinv_id"));
 
@@ -2966,6 +3734,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         json.put("num", dtlArr.size());
         return json;
     }
+    
 
     @Override
     public JSONArray queryBox(JSONObject whereJson) {
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
index 63b23e576..4869294a4 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
@@ -50,6 +50,7 @@
     输入.cust_code                           TYPEAS s_string
     输入.package_box_sn                           TYPEAS s_string
     输入.is_upload                           TYPEAS s_string
+    输入.width                           TYPEAS s_string
     输入.in_stor_id                           TYPEAS f_string
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -121,6 +122,10 @@
                    dtl.vbeln like 输入.vbeln
                ENDOPTION
 
+                OPTION 输入.width <> ""
+                   dtl.width like 输入.width
+               ENDOPTION
+
                OPTION 输入.bill_type <> ""
                     ios.bill_type = 输入.bill_type
                ENDOPTION
@@ -163,9 +168,9 @@
                     	ST_IVT_IOStorInvDtl iosdtl
                     LEFT JOIN md_me_materialbase mb ON mb.material_id = iosdtl.material_id
                     LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = iosdtl.iostorinv_id
-                    LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = iosdtl.pcsn
+                    LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = iosdtl.pcsn AND sub.package_box_sn = iosdtl.box_no
                     WHERE
-                        sub.status = '2'
+                        1=1
                     OPTION 输入.iostorinv_id <> ""
                           iosdtl.iostorinv_id = 输入.iostorinv_id
                     ENDOPTION
@@ -393,7 +398,7 @@
                           dis.work_status <= 输入.bill_status
                     ENDOPTION
 
-                    order by attr.row_num,attr.out_order_seq ASC
+                    order by attr.layer_num ASC,attr.row_num ASC,attr.col_num ASC
                     ENDSELECT
                 ENDQUERY
         ENDIF
@@ -527,7 +532,7 @@
             	LEFT JOIN md_me_materialbase mater ON mater.material_id = ivt.material_id
             	LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id
             	LEFT JOIN ST_IVT_StructAttr attr ON attr.struct_id = ivt.struct_id
-            	LEFT JOIN PDM_BI_SubPackageRelation sub ON ivt.pcsn = sub.container_name AND sub.status = '2'
+            	LEFT JOIN PDM_BI_SubPackageRelation sub ON ivt.pcsn = sub.container_name AND sub.status = '2' AND attr.storagevehicle_code = sub.package_box_sn
             WHERE
                 attr.is_delete = '0'
                 AND attr.is_used = '1'
@@ -629,13 +634,15 @@
                 task.task_code,
                 task.task_type,
                 task.task_status,
-                sub.sap_pcsn
+                sub.sap_pcsn,
+                md.class_name task_type_name
               FROM
                 st_ivt_iostorinvdis dis
                 LEFT JOIN md_me_materialbase mater ON dis.material_id = mater.material_id
                 LEFT JOIN sch_base_point point ON dis.point_id = point.point_id
                 LEFT JOIN sch_base_task task ON dis.task_id = task.task_id
                 LEFT JOIN pdm_bi_subpackagerelation sub ON dis.pcsn = sub.container_name
+                LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
                 WHERE
                 1=1
 
@@ -668,13 +675,15 @@
                 task.task_code,
                 task.task_type,
                 task.task_status,
-                sub.sap_pcsn
+                sub.sap_pcsn,
+                md.class_name task_type_name
               FROM
                 st_ivt_iostorinvdis dis
                 LEFT JOIN md_me_materialbase mater ON dis.material_id = mater.material_id
                 LEFT JOIN sch_base_point point ON dis.point_id = point.point_id
                 LEFT JOIN sch_base_task task ON dis.task_id = task.task_id
-                LEFT JOIN pdm_bi_subpackagerelation sub ON dis.pcsn = sub.container_name
+                LEFT JOIN pdm_bi_subpackagerelation sub ON dis.pcsn = sub.container_name AND sub.package_box_sn = dis.box_no
+                LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
                 WHERE
                 1=1
 
@@ -695,21 +704,6 @@
             ENDQUERY
     ENDIF
 
-    IF 输入.flag = "11"
-            QUERY
-              SELECT
-                detail.value AS code,
-                detail.label AS name
-              FROM
-                sys_dict_detail detail
-              INNER JOIN sys_dict dict ON detail.dict_id = dict.dict_id
-                WHERE
-                dict.name = 'ST_INV_TYPE_IO'
-                AND detail.name = 'IO_BUSS_TYPE'
-                ENDSELECT
-            ENDQUERY
-    ENDIF
-
     IF 输入.flag = "12"
             PAGEQUERY
                 SELECT
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql
index 1fd2d7823..3f85bd4c7 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql
@@ -24,6 +24,7 @@
 	输入.iostorinv_id					         TYPEAS s_string
 	输入.iostorinvdtl_id					         TYPEAS s_string
 	输入.stor_id					                 TYPEAS s_string
+	输入.box_no					                 TYPEAS s_string
 
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -73,6 +74,10 @@
                         ivt.material_id = 输入.material_id
                 ENDOPTION
 
+                OPTION 输入.box_no <> ""
+                        attr.storagevehicle_code = 输入.box_no
+                ENDOPTION
+
                 OPTION 输入.sale_order_name <> ""
                         sub.sale_order_name = 输入.sale_order_name
                 ENDOPTION
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT03.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT03.wql
index 1d63ceae9..8823e3a86 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT03.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT03.wql
@@ -84,7 +84,6 @@
                         st_ivt_structattr sa3
                     WHERE
                         IFNULL( sa3.storagevehicle_code, '' ) <> ''
-                        AND sa3.lock_type = '1'
                     ) c
                 WHERE
                     c.block_num = a.block_num
@@ -137,7 +136,6 @@
                			st_ivt_structattr sa2
                		WHERE
                			IFNULL( sa2.storagevehicle_code, '' ) <> ''
-               			AND sa2.lock_type = '1'
                		) b
                	WHERE
                		b.block_num = a.block_num
@@ -169,8 +167,8 @@
             AND b.row_num = sa.row_num
            WHERE
             sa.out_order_seq < 输入.out_order_seq
+            and sa.lock_type = '1'
             AND IFNULL( sa.storagevehicle_code, '' ) <> ''
-            AND sa.lock_type = '1'
 
              UNION
 
@@ -191,8 +189,8 @@
             AND b.row_num = sa.row_num
            WHERE
             sa.out_order_seq > 输入.out_order_seq
+            and sa.lock_type = '1'
             AND IFNULL( sa.storagevehicle_code, '' ) <> ''
-            AND sa.lock_type = '1'
 
 			ENDSELECT
 		ENDQUERY
diff --git a/lms/nladmin-ui/src/views/system/menu/dd/index.vue b/lms/nladmin-ui/src/views/system/menu/dd/index.vue
index da266f5f4..ccd6f4d71 100644
--- a/lms/nladmin-ui/src/views/system/menu/dd/index.vue
+++ b/lms/nladmin-ui/src/views/system/menu/dd/index.vue
@@ -67,10 +67,10 @@
             <el-radio-button label="0">否</el-radio-button>
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-show="form.type.toString() !== '2' && form.type.toString() !== '1' " label="菜单可见" prop="hidden">
+        <el-form-item v-show="form.type.toString() !== '2' && form.type.toString() !== '1' " label="菜单隐藏" prop="hidden">
           <el-radio-group v-model="form.hidden" size="mini">
-            <el-radio-button label="1">是</el-radio-button>
-            <el-radio-button label="0">否</el-radio-button>
+            <el-radio-button label=true>是</el-radio-button>
+            <el-radio-button label=false>否</el-radio-button>
           </el-radio-group>
         </el-form-item>
         <el-form-item v-if="form.type.toString() !== '2'" label="菜单标题" prop="title">
diff --git a/lms/nladmin-ui/src/views/system/menu/index.vue b/lms/nladmin-ui/src/views/system/menu/index.vue
index 91f85cf30..1f8c4dae5 100644
--- a/lms/nladmin-ui/src/views/system/menu/index.vue
+++ b/lms/nladmin-ui/src/views/system/menu/index.vue
@@ -79,10 +79,10 @@
             <el-radio-button label="0">否</el-radio-button>
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-show="form.type.toString() !== '2' && form.type.toString() !== '1' " label="菜单可见" prop="hidden">
+        <el-form-item v-show="form.type.toString() !== '2' && form.type.toString() !== '1' " label="菜单隐藏" prop="hidden">
           <el-radio-group v-model="form.hidden" size="mini">
-            <el-radio-button label="0">是</el-radio-button>
-            <el-radio-button label="1">否</el-radio-button>
+            <el-radio-button label=true>是</el-radio-button>
+            <el-radio-button label=false>否</el-radio-button>
           </el-radio-group>
         </el-form-item>
         <el-form-item v-if="form.type.toString() !== '2'" label="菜单标题" prop="title">
diff --git a/lms/nladmin-ui/src/views/system/user/center/updatePass.vue b/lms/nladmin-ui/src/views/system/user/center/updatePass.vue
index 79f04ce2c..9f76cc7b9 100644
--- a/lms/nladmin-ui/src/views/system/user/center/updatePass.vue
+++ b/lms/nladmin-ui/src/views/system/user/center/updatePass.vue
@@ -22,7 +22,7 @@
 
 <script>
 import store from '@/store'
-import { updatePass } from '@/views/system/user'
+import { updatePass } from '@/views/system/user/user'
 export default {
   data() {
     const confirmPass = (rule, value, callback) => {
diff --git a/lms/nladmin-ui/src/views/system/user/user.js b/lms/nladmin-ui/src/views/system/user/user.js
index 6cd91a559..ee918b1b1 100644
--- a/lms/nladmin-ui/src/views/system/user/user.js
+++ b/lms/nladmin-ui/src/views/system/user/user.js
@@ -57,5 +57,5 @@ export function updateEmail(form) {
   })
 }
 
-export default { add, edit, del }
+export default { add, edit, del, updatePass }
 
diff --git a/lms/nladmin-ui/src/views/wms/basedata/master/storagevehicleinfo/index.vue b/lms/nladmin-ui/src/views/wms/basedata/master/storagevehicleinfo/index.vue
index 327856bc6..6c5f6705c 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/master/storagevehicleinfo/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/master/storagevehicleinfo/index.vue
@@ -12,21 +12,13 @@
           label-suffix=":"
         >
           <el-form-item label="载具类型">
-            <el-select
+            <treeselect
               v-model="query.storagevehicle_type"
-              clearable
-              size="mini"
+              :load-options="loadChildNodes"
+              :options="classes1"
+              style="width: 220px"
               placeholder="请选择"
-              class="filter-item"
-              style="width: 180px;"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in dict.storagevehicle_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
+            />
           </el-form-item>
 
           <el-form-item label="载具号">
@@ -35,7 +27,7 @@
               clearable
               size="mini"
               placeholder="起始载具号"
-              style="width: 110px;"
+              style="width: 200px;"
               class="filter-item"
               @keyup.enter.native="crud.toQuery"
             />
@@ -45,12 +37,12 @@
               clearable
               size="mini"
               placeholder="结束载具号"
-              style="width: 110px;"
+              style="width: 200px;"
               class="filter-item"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <rrOperation />
+          <rrOperation/>
         </el-form>
 
       </div>
@@ -77,28 +69,17 @@
       >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
           <el-form-item label="载具类型" prop="storagevehicle_type">
-            <el-select
+            <treeselect
               v-model="form.storagevehicle_type"
-              clearable
-              size="mini"
+              :load-options="loadChildNodes"
+              :options="classes1"
+              style="width: 220px"
               placeholder="请选择"
-              class="filter-item"
-              style="width: 250px;"
-              @change="getVehicle"
-            >
-              <el-option
-                v-for="item in dict.storagevehicle_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
+            />
           </el-form-item>
           <br>
-          <el-form-item label="起始载具号" prop="storagevehicle_code">
-            <el-input v-model="form.storagevehicle_code" :disabled="true" style="width: 250px;" />
-          </el-form-item>
           <el-form-item label="载具数量" prop="num">
-            <el-input-number v-model="form.num" :precision="0" style="width: 150px;" />
+            <el-input-number v-model="form.num" :precision="0" style="width: 150px;"/>
           </el-form-item>
           <el-form-item label="是否启用">
             <el-radio v-model="form.is_used" label="0">否</el-radio>
@@ -120,17 +101,17 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="selection" width="55" />
-        <el-table-column v-if="false" prop="storagevehicle_id" label="载具标识" />
-        <el-table-column prop="storagevehicle_type_name" label="载具类型" />
-        <el-table-column prop="storagevehicle_code" label="载具编码" />
-        <el-table-column prop="storagevehicle_name" label="载具名称" />
-        <el-table-column prop="is_task" label="是否搬运中" :formatter="formatIsTask" />
-        <el-table-column prop="point_code" label="当前点位" width="120px" />
-        <el-table-column prop="start_point_code" label="起点" width="120px" />
-        <el-table-column prop="next_point_code" label="终点" width="120px" />
-        <el-table-column prop="material_code" label="物料编码" />
-        <el-table-column prop="material_name" label="物料名称" />
+        <el-table-column type="selection" width="55"/>
+        <el-table-column v-if="false" prop="storagevehicle_id" label="载具标识"/>
+        <el-table-column prop="storagevehicle_type_name" label="载具类型"/>
+        <el-table-column prop="storagevehicle_code" label="载具编码"/>
+        <el-table-column prop="storagevehicle_name" label="载具名称"/>
+<!--        <el-table-column prop="is_task" label="是否搬运中" :formatter="formatIsTask"/>-->
+        <!--<el-table-column prop="point_code" label="当前点位" width="120px"/>
+        <el-table-column prop="start_point_code" label="起点" width="120px"/>
+        <el-table-column prop="next_point_code" label="终点" width="120px"/>-->
+        <el-table-column prop="material_code" label="物料编码"/>
+        <el-table-column prop="material_name" label="物料名称"/>
         <el-table-column label="是否启用" align="center" prop="is_used">
           <template slot-scope="scope">
             <el-switch
@@ -141,8 +122,8 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="create_name" label="创建人" />
-        <el-table-column prop="create_time" label="创建时间" width="150px" />
+        <el-table-column prop="create_name" label="创建人"/>
+        <el-table-column prop="create_time" label="创建时间" width="150px"/>
         <el-table-column
           v-permission="['admin','storagevehicleinfo:edit','storagevehicleinfo:del']"
           label="操作"
@@ -160,7 +141,7 @@
         </el-table-column>
       </el-table>
       <!--分页组件-->
-      <pagination />
+      <pagination/>
     </div>
   </div>
 </template>
@@ -173,6 +154,9 @@ import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import { getLodop } from '@/assets/js/lodop/LodopFuncs'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import crudClassstandard from '@/views/wms/basedata/master/class/classstandard'
 
 const defaultForm = {
   storagevehicle_id: null,
@@ -201,7 +185,7 @@ const defaultForm = {
 export default {
   name: 'Storagevehicleinfo',
   dicts: ['storagevehicle_type'],
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -232,10 +216,8 @@ export default {
     return {
       resultCodeArr: [],
       permission: {},
+      classes1: [],
       rules: {
-        storagevehicle_code: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
         create_id: [
           { required: true, message: '不能为空', trigger: 'blur' }
         ],
@@ -264,6 +246,9 @@ export default {
       }
     }
   },
+  created() {
+    this.initClass1()
+  },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
@@ -294,6 +279,42 @@ export default {
     format_is_used(is_used) {
       return is_used === '1'
     },
+    initClass1() {
+      const param = {
+        parent_class_code: 'vehicle_type'
+      }
+      crudClassstandard.getClassType(param).then(res => {
+        const data = res.content
+        this.buildTree(data)
+        this.classes1 = data
+      })
+    },
+    buildTree(classes) {
+      classes.forEach(data => {
+        if (data.children) {
+          this.buildTree(data.children)
+        }
+        if (data.hasChildren && !data.children) {
+          data.children = null // 重点代码
+        }
+      })
+    },
+    // 获取子节点数据
+    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)
+        })
+      }
+    },
     print() {
       const _selectData = this.$refs.table.selection
       if (!_selectData || _selectData.length < 1) {
@@ -340,16 +361,6 @@ export default {
         this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
       })
     },
-    getVehicle(code) {
-      if (!code) {
-        this.crud.notify('请选择载具类型', CRUD.NOTIFICATION_TYPE.INFO)
-        this.form.storagevehicle_code = ''
-        return false
-      }
-      crudStoragevehicleinfo.getVehicle(code).then(res => {
-        this.form.storagevehicle_code = res.value
-      })
-    },
     formatIsTask(row) {
       if (row.is_task === '1') {
         return '是'
diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/userStor/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/userStor/index.vue
index 6e136b643..66207849c 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/st/userStor/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/userStor/index.vue
@@ -35,7 +35,7 @@
             @current-change="handleCurrentChange"
           >
             <el-table-column show-overflow-tooltip prop="username" label="用户名"/>
-            <el-table-column show-overflow-tooltip prop="nick_name" label="姓名"/>
+            <el-table-column show-overflow-tooltip prop="person_name" label="姓名"/>
             <el-table-column prop="name" label="部门"/>
             <!--<el-table-column show-overflow-tooltip prop="dept" label="部门">
               <template slot-scope="scope">
diff --git a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
index ec1831a40..d64639c27 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
@@ -183,7 +183,7 @@
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px">
           <el-row>
             <el-col :span="12">
-              <el-form-item label="木箱唯一码">
+              <el-form-item label="木箱唯一码" prop="package_box_sn">
                 <el-input v-model="form.package_box_sn" style="width: 300px;" />
               </el-form-item>
             </el-col>
@@ -308,7 +308,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="SAP批次">
+              <el-form-item label="SAP批次" prop="sap_pcsn">
                 <el-input v-model="form.sap_pcsn" style="width: 300px;" />
               </el-form-item>
             </el-col>
@@ -327,36 +327,36 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="长">
+              <el-form-item label="长" prop="box_length">
                 <el-input-number v-model="form.box_length" :max="10000" :min="0" :precision="2" :controls="false" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="宽">
+              <el-form-item label="宽" prop="box_width">
                 <el-input-number v-model="form.box_width" :max="10000" :min="0" :precision="2" :controls="false" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="高">
+              <el-form-item label="高" prop="box_high">
                 <el-input-number v-model="form.box_high" :max="10000" :min="0" :precision="2" :controls="false" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="销售订单及行号">
+              <el-form-item label="销售订单及行号" prop="sale_order_name">
                 <el-input v-model="form.sale_order_name" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="物料主数据厚度">
+              <el-form-item label="物料主数据厚度" prop="thickness_request">
                 <el-input v-model="form.thickness_request" :controls="false" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="要求幅宽">
+              <el-form-item label="要求幅宽" prop="width_standard">
                 <el-input v-model="form.width_standard" style="width: 300px;" />
               </el-form-item>
             </el-col>
@@ -479,6 +479,12 @@ export default {
         customer_description: [
           { required: true, message: '客户名称不能为空', trigger: 'blur' }
         ],
+        customer_name: [
+          { required: true, message: '客户编码不能为空', trigger: 'blur' }
+        ],
+        package_box_sn: [
+          { required: true, message: '木箱唯一码不能为空', trigger: 'blur' }
+        ],
         product_name: [
           { required: true, message: '产品编码不能为空', trigger: 'blur' }
         ],
@@ -509,6 +515,24 @@ export default {
         sale_order_name: [
           { required: true, message: '销售订单及行号不能为空', trigger: 'blur' }
         ],
+        width_standard: [
+          { required: true, message: '要求幅宽不能为空', trigger: 'blur' }
+        ],
+        thickness_request: [
+          { required: true, message: '物流主数据厚度不能为空', trigger: 'blur' }
+        ],
+        box_length: [
+          { required: true, message: '长不能为空', trigger: 'blur' }
+        ],
+        box_width: [
+          { required: true, message: '宽不能为空', trigger: 'blur' }
+        ],
+        box_high: [
+          { required: true, message: '高不能为空', trigger: 'blur' }
+        ],
+        sap_pcsn: [
+          { required: true, message: 'SAP批次不能为空', trigger: 'blur' }
+        ],
         is_un_plan_production: [
           { required: true, message: '计划外分切的子卷不能为空', trigger: 'blur' }
         ],
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
index 5318dd03f..bc3503e34 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
@@ -344,6 +344,10 @@ export default {
         this.form.out_stor_id = ''
       }
       if (this.form.bill_type === '1004') {
+        if (!this.form.out_stor_id) {
+          this.crud.notify('移入仓库不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
         if (this.form.out_stor_id === this.form.stor_id) {
           this.crud.notify('移出仓库和移入仓库不能一致！', CRUD.NOTIFICATION_TYPE.INFO)
           return false
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
index d42a36bc4..5e91c9572 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
@@ -108,7 +108,7 @@
         <el-table-column prop="bill_status" label="状态" align="center" width="110px" :formatter="bill_statusFormat" />
         <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" align="center" />
+        <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" align="center" width="140px" />
         <el-table-column show-overflow-tooltip prop="sap_pcsn" label="sap批次" align="center" />
         <el-table-column show-overflow-tooltip prop="plan_qty" label="重量" :formatter="crud.formatNum3" align="center" />
         <el-table-column show-overflow-tooltip prop="assign_qty" label="已分配重量" :formatter="crud.formatNum3" align="center" />
@@ -117,7 +117,7 @@
 <!--        <el-table-column prop="source_bill_type" label="源单类型" align="center" width="130px" :formatter="invtypeFormat" />-->
         <el-table-column show-overflow-tooltip prop="vbeln" label="交货单" align="center" />
         <el-table-column show-overflow-tooltip prop="source_bill_code" label="源单编号" align="center" />
-        <el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" />
+        <el-table-column show-overflow-tooltip prop="width" label="幅宽" align="center" width="100" />
       </el-table>
     </el-card>
     <div class="crud-opts2">
@@ -163,7 +163,7 @@
       <span class="crud-opts-right2">
         <!--左侧插槽-->
         <slot name="left" />
-        <el-button
+    <!--    <el-button
           slot="left"
           class="filter-item"
           type="warning"
@@ -173,6 +173,17 @@
           @click="setPoint()"
         >
           设置站点
+        </el-button>-->
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-check"
+          size="mini"
+          :disabled="button4"
+          @click="oneSetPoint"
+        >
+          设置站点
         </el-button>
       </span>
     </div>
@@ -493,21 +504,6 @@ export default {
         this.crud.notify('任务已生成！', CRUD.NOTIFICATION_TYPE.INFO)
         return
       }
-      // 根据此仓位的 ‘相同块、相同排、相同层’ 判断上一个任务是否生成
-      const tab = this.tabledis
-      for (let i = 0; i < tab.length; i++) {
-        const item = tab[i]
-        if (this.currentDis.block_num === item.block_num && this.currentDis.row_num === item.row_num && this.currentDis.layer_num === item.layer_num) {
-          const out_order_seq = parseInt(this.currentDis.out_order_seq) - 1
-          if (parseInt(item.out_order_seq) === out_order_seq) {
-            if (item.work_status === '00') {
-              this.crud.notify('请先生成上一个任务：' + item.struct_code, CRUD.NOTIFICATION_TYPE.INFO)
-              return
-            }
-          }
-        }
-      }
-
       if (this.currentDis.iostorinvdis_id !== null) {
         this.currentDis.point_code = this.form2.point_code
         checkoutbill.setPoint(this.currentDis).then(res => {
@@ -515,6 +511,29 @@ export default {
         })
       }
     },
+    oneSetPoint() {
+      if (this.form2.point_code === '') {
+        this.crud.notify('请先选择站点！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      if (this.currentDis.point_code) {
+        this.crud.notify('站点已设置！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      if (this.currentDis.work_status !== '00') {
+        this.crud.notify('任务已生成！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      if (this.currentDis.iostorinvdis_id !== null) {
+        this.currentDis.point_code = this.form2.point_code
+        checkoutbill.oneSetPoint(this.currentDis).then(res => {
+          this.queryTableDdis(this.currentDis.iostorinvdtl_id)
+          this.crud.notify('设置成功！', CRUD.NOTIFICATION_TYPE.INFO)
+        }).catch(() => {
+          this.currentDis.point_code = ''
+        })
+      }
+    },
     queryTableDtl() {
       checkoutbill.getOutBillDtl({ 'iostorinv_id': this.mstrow.iostorinv_id }).then(res => {
         this.tableDtl = res
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/TaskDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/TaskDialog.vue
index d6f0a5f0f..7d1c37665 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/TaskDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/TaskDialog.vue
@@ -82,7 +82,7 @@
         >
           标示完成
         </el-button>
-        <el-button
+ <!--       <el-button
           slot="left"
           class="filter-item"
           type="primary"
@@ -92,7 +92,7 @@
           @click="cancleTaskfinish"
         >
           取消完成
-        </el-button>
+        </el-button>-->
       </span>
     </div>
     <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
@@ -107,20 +107,20 @@
         :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
         @current-change="handleDisCurrentChange"
       >
-        <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
-        <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column show-overflow-tooltip prop="pcsn" label="子卷批次号" align="center" />
-        <el-table-column show-overflow-tooltip prop="sap_pcsn" label="sap批次号" align="center" />
-        <el-table-column show-overflow-tooltip prop="box_no" label="箱号" align="center" />
+        <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" width="130px" />
+        <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" width="130px" />
+        <el-table-column show-overflow-tooltip prop="pcsn" label="子卷批次号" align="center" width="140px" />
+        <el-table-column show-overflow-tooltip prop="sap_pcsn" label="sap批次号" align="center" width="120px" />
+        <el-table-column show-overflow-tooltip prop="box_no" label="箱号" align="center" width="250px" />
         <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
-        <el-table-column show-overflow-tooltip prop="struct_code" label="起始位置" align="center" />
-        <el-table-column show-overflow-tooltip prop="next_point_code" label="目的位置" align="center" />
+        <el-table-column show-overflow-tooltip prop="struct_code" label="起始位置" align="center" width="120px" />
+        <el-table-column show-overflow-tooltip prop="next_point_code" label="目的位置" align="center" width="120px" />
         <el-table-column show-overflow-tooltip prop="task_code" label="任务号" align="center" />
-        <el-table-column prop="task_type" label="任务类型" align="center" width="150px" :formatter="taskdtl_typeFormat" />
-        <el-table-column prop="task_status" label="状态" align="center" width="110px" :formatter="task_statusFormat" />
+        <el-table-column show-overflow-tooltip prop="task_type_name" label="任务类型" align="center" width="150px" />
+        <el-table-column show-overflow-tooltip prop="task_status" label="状态" align="center" width="120px" :formatter="task_statusFormat" min-width="150px" />
         <el-table-column align="center" label="操作" width="160" fixed="right">
           <template scope="scope">
-            <el-button :disabled="tabledisabled(scope.row)" type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.row)">删除</el-button>
+            <el-button type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -130,7 +130,7 @@
 
 <script>
 
-import { crud } from '@crud/crud'
+import CRUD, { crud } from '@crud/crud'
 import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
 
 export default {
@@ -199,9 +199,6 @@ export default {
     bill_statusFormat(row) {
       return this.dict.label.io_bill_status[row.bill_status]
     },
-    taskdtl_typeFormat(row) {
-      return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type]
-    },
     task_statusFormat(row) {
       return this.dict.label.task_status[row.task_status]
     },
@@ -213,8 +210,12 @@ export default {
       }
     },
     deleteRow(row) {
-      checkoutbill.allCancel(row).then(res => {
+      if (!'00,01'.includes(row.work_status)) {
+        return this.crud.notify('任务不可删除！', CRUD.NOTIFICATION_TYPE.INFO)
+      }
+      checkoutbill.cancelTask(row).then(res => {
         this.queryTableDtl()
+        this.crud.notify('任务删除成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
       })
     },
     issueTask() {
@@ -222,6 +223,7 @@ export default {
         this.fullscreenLoading = true
         checkoutbill.issueTask(this.currentDis).then(res => {
           this.queryTableDdis()
+          this.crud.notify('下发成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
           this.fullscreenLoading = false
         }).catch(() => {
           this.fullscreenLoading = false
@@ -233,6 +235,7 @@ export default {
         this.fullscreenLoading = true
         checkoutbill.finishTask(this.currentDis).then(res => {
           this.queryTableDdis()
+          this.crud.notify('操作成功成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
           this.fullscreenLoading = false
         }).catch(() => {
           this.fullscreenLoading = false
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
index f4f9a08e3..6f76fafca 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
@@ -113,11 +113,14 @@
         <el-table-column prop="pcsn" label="子卷号" width="150px" align="center" show-overflow-tooltip />
         <el-table-column prop="sap_pcsn" label="sap批次" width="120px" align="center" show-overflow-tooltip />
         <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
+        <el-table-column prop="assign_qty" :formatter="crud.formatNum3" label="已分配重量" align="center" width="100px" />
+        <el-table-column prop="unassign_qty" :formatter="crud.formatNum3" label="未分配重量" align="center" width="100px" />
         <el-table-column prop="qty_unit_name" label="单位" align="center" />
-        <el-table-column prop="source_bill_type" label="源单类型" align="center" width="130px" :formatter="invtypeFormat" />
+<!--        <el-table-column prop="source_bill_type" label="源单类型" align="center" width="130px" :formatter="invtypeFormat" />-->
         <el-table-column prop="source_bill_code" label="源单号" align="center" width="130px" />
         <el-table-column prop="vbeln" label="交货单号" align="center" width="120px" />
         <el-table-column prop="posnr" label="行号" align="center" width="70px" />
+        <el-table-column prop="width" label="幅宽" align="center" width="110px" />
         <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" />
       </el-table>
     </el-card>
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js b/lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js
index d024711b5..40d3e5c31 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js
@@ -100,6 +100,13 @@ export function setPoint(data) {
     data
   })
 }
+export function oneSetPoint(data) {
+  return request({
+    url: '/api/checkoutbill/oneSetPoint',
+    method: 'post',
+    data
+  })
+}
 export function getStructIvt(params) {
   return request({
     url: '/api/checkoutbill/getStructIvt',
@@ -197,4 +204,11 @@ export function getOutBillTask2(data) {
     data
   })
 }
-export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel }
+export function cancelTask(data) {
+  return request({
+    url: '/api/checkoutbill/cancelTask',
+    method: 'post',
+    data
+  })
+}
+export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, oneSetPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel, cancelTask }
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
index 424c59bd0..2f0e1acd6 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
@@ -38,7 +38,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="生成方式">
+    <!--      <el-form-item label="生成方式">
             <el-select
               v-model="query.create_mode"
               clearable
@@ -54,7 +54,7 @@
                 :value="item.value"
               />
             </el-select>
-          </el-form-item>
+          </el-form-item>-->
 
           <el-form-item label="单据状态">
             <el-select
@@ -128,6 +128,15 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="发货幅宽">
+            <el-input
+              v-model="query.width"
+              size="mini"
+              clearable
+              placeholder="幅宽"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item label="是否回传">
             <el-select
               v-model="query.is_upload"