diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicemaintenanceitemsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicemaintenanceitemsServiceImpl.java
index e5be0e0d..7541c4b9 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicemaintenanceitemsServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicemaintenanceitemsServiceImpl.java
@@ -70,7 +70,7 @@ public class DevicemaintenanceitemsServiceImpl implements Devicemaintenanceitems
             String classIds = classstandardService.getAllChildIdStr(class_idStr);
             map.put("classIds", "");
         }
-        JSONObject json = WQL.getWO("QEM_BI_DEVICEMAINTAIN001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time DESC");
+        JSONObject json = WQL.getWO("QEM_BI_DEVICEMAINTAIN001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "maint_item_code DESC");
         return json;
     }
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicerepairitemsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicerepairitemsServiceImpl.java
index b30e9c09..3417cd1a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicerepairitemsServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicerepairitemsServiceImpl.java
@@ -65,7 +65,7 @@ public class DevicerepairitemsServiceImpl implements DevicerepairitemsService {
             map.put("classIds", "");
         }
 
-        JSONObject json = WQL.getWO("QEM_BI_DEVICEREPAIRITEMS01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time DESC");
+        JSONObject json = WQL.getWO("QEM_BI_DEVICEREPAIRITEMS01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "repair_item_code DESC");
         return json;
     }
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/rest/ProductProcessParamController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/rest/ProductProcessParamController.java
index 8260a41e..bcd77c29 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/rest/ProductProcessParamController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/rest/ProductProcessParamController.java
@@ -68,9 +68,9 @@ public class ProductProcessParamController {
     @Log("删除参数")
     @ApiOperation("删除参数")
     //@PreAuthorize("@el.check('WorkProcedure:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody String ids) {
-        productProcessParamService.deleteAll(ids);
+    @PostMapping("/del")
+    public ResponseEntity<Object> delete(@RequestBody Map map) {
+        productProcessParamService.deleteAll(map);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/ProductProcessParamService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/ProductProcessParamService.java
index bca07fd0..17421112 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/ProductProcessParamService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/ProductProcessParamService.java
@@ -48,5 +48,5 @@ public interface ProductProcessParamService {
     /**
      * 删除参数
      */
-    void deleteAll(String ids);
+    void deleteAll(Map whereJson);
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/ProductProcessParamServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/ProductProcessParamServiceImpl.java
index d7dfd67a..de6dc436 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/ProductProcessParamServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/ProductProcessParamServiceImpl.java
@@ -52,7 +52,7 @@ public class ProductProcessParamServiceImpl implements ProductProcessParamServic
 
         }
         WQLObject wo = WQLObject.getWQLObject("MD_ME_MaterialBase");
-        ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), where, "update_time desc");
+        ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), where, "material_code");
         final JSONObject json = rb.pageResult();
 
         //产品工序工艺参数表【PDM_BI_WorkProcedureParaProduct】
@@ -219,14 +219,11 @@ public class ProductProcessParamServiceImpl implements ProductProcessParamServic
     }
 
     @Override
-    public void deleteAll(String ids) {
+    public void deleteAll(Map whereJson) {
+        String material_id = (String) whereJson.get("material_id");
+        String workprocedure_code = (String) whereJson.get("workprocedure_code");
         WQLObject wo = WQLObject.getWQLObject("PDM_BI_WorkProcedureParaProduct");
-        JSONArray jsonArr = wo.query("material_id = '" + ids + "'").getResultJSONArray(0);
-        for (int i = 0; i < jsonArr.size(); i++) {
-            JSONObject json = jsonArr.getJSONObject(i);
-            wo.delete(json);
-        }
-
+        wo.delete("material_id = '" + material_id + "' and workprocedure_code='"+workprocedure_code+"'");
     }
 
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StorattrServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StorattrServiceImpl.java
index 832bd83b..bb92496a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StorattrServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StorattrServiceImpl.java
@@ -93,6 +93,7 @@ public class StorattrServiceImpl implements StorattrService {
         dto.setUpdate_optname(nickName);
         dto.setUpdate_time(now);
         dto.setCreate_time(now);
+        dto.setSyscompanyid(dto.getSysdeptid());
 
         WQLObject wo = WQLObject.getWQLObject("st_ivt_bsrealstorattr");
         JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java
index c51a57d6..17cd5061 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java
@@ -57,6 +57,7 @@ public class StructattrServiceImpl implements StructattrService {
         map.put("stor_id", (String) whereJson.get("stor_id"));
         map.put("sect_id", (String) whereJson.get("sect_id"));
         map.put("sect_id", (String) whereJson.get("sect_id"));
+        map.put("lock", (String) whereJson.get("lock"));
         map.put("lock_type", (String) whereJson.get("lock_type"));
         map.put("is_used", (String) whereJson.get("is_used"));
         map.put("is_delete", (String) whereJson.get("is_delete"));
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql
index 8a69ffdb..c3fab260 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql
@@ -17,6 +17,7 @@
 	输入.search					            TYPEAS s_string
 	输入.stor_id					            TYPEAS s_string
 	输入.sect_id					            TYPEAS s_string
+    输入.lock					        TYPEAS s_string
     输入.lock_type					        TYPEAS s_string
     输入.storagevehicle_type					TYPEAS s_string
     输入.is_used					            TYPEAS s_string
@@ -84,7 +85,7 @@
                     OPTION 输入.is_delete <> ""
                            struct.is_delete = 输入.is_delete
                     ENDOPTION
-                    OPTION 输入.lock_type = "00"
+                    OPTION 输入.lock = "00"
                            (struct.storagevehicle_code is null or struct.storagevehicle_code = '')
                     ENDOPTION
 			ENDSELECT
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java
index 4fa6257a..3b3bfd44 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java
@@ -601,7 +601,7 @@ public class DailyplanServiceImpl implements DailyplanService {
             }
         }
 
-        //根据工作日和结束日期相同的天数进行更新开始日期dailyplan_id -> 1583321344530059264
+        //根据工作日和结束日期相同的天数进行更新开始日期
         ja_new = new JSONArray();
         for (int i = 0; i < ja_new2.size(); i++) {
             JSONObject jo = ja_new2.getJSONObject(i);
@@ -617,28 +617,31 @@ public class DailyplanServiceImpl implements DailyplanService {
             JSONObject jo = ja_new.getJSONObject(i);
             String planstart_date_old = jo.getString("planstart_date");
             String planstart_date = jo.getString("planstart_date");
+            //判断是否有同牌号同开始日期的日计划，直接更新为已经存在的日计划的开始、结束日期
             if(map.containsKey(planstart_date)){
                 JSONObject other = map.get(planstart_date);
                 jo.put("planstart_date",other.getString("planstart_date"));
                 jo.put("planend_date",other.getString("planend_date"));
                 MPS_BD_ProductDailyPlan.insert(jo);
             }else{
+                //更新开始日期为最近的一个工作日
+                JSONObject last_day = WQL.getWO("QPDM_PRODUCTPLANPROC")
+                        .addParam("flag", "7")
+                        .addParam("planstart_date", planstart_date)
+                        .addParam("device_id", jo.getString("device_id"))
+                        .process()
+                        .uniqueResult(0);
+                if(last_day ==null){
+                    throw new BadRequestException("未配置"+planstart_date+"后的工作日历！");
+                }
+                planstart_date = last_day.getString("factory_date");
+                int days = this.getDays(jo.getString("material_id"));
+                Date start_date = DateUtil.parse(planstart_date);
+                Date planend_date = DateUtil.offsetDay(start_date,days-1);
+
+                //判断结束日期不重复存在的一天
                 boolean flag = true;
                 while(flag){
-                    JSONObject last_day = WQL.getWO("QPDM_PRODUCTPLANPROC")
-                            .addParam("flag", "7")
-                            .addParam("planstart_date", planstart_date)
-                            .addParam("device_id", jo.getString("device_id"))
-                            .process()
-                            .uniqueResult(0);
-                    if(last_day ==null){
-                        throw new BadRequestException("未配置"+planstart_date+"后的工作日历！");
-                    }
-                    planstart_date = last_day.getString("factory_date");
-                    int days = this.getDays(jo.getString("material_id"));
-                    Date start_date = DateUtil.parse(planstart_date);
-                    Date planend_date = DateUtil.offsetDay(start_date,days-1);
-
                     String str_planend_date = DateUtil.formatDate(planend_date);
                     JSONObject last_planend_date = WQL.getWO("QPDM_PRODUCTPLANPROC")
                             .addParam("flag", "7")
@@ -649,24 +652,23 @@ public class DailyplanServiceImpl implements DailyplanService {
                     if(last_planend_date == null){
                         throw new BadRequestException("未配置"+str_planend_date.substring(0,10)+"后的工作日历！");
                     }
-                    jo.put("planend_date", last_planend_date.getString("factory_date"));
+                    String factory_date = last_planend_date.getString("factory_date");
                     JSONArray lasts = WQL.getWO("QPDM_PRODUCTPLANPROC")
                             .addParam("flag", "8")
                             .addParam("device_id", jo.getString("device_id"))
-                            .addParam("planend_date", jo.getString("planend_date"))
+                            .addParam("planend_date", factory_date)
                             .process()
                             .getResultJSONArray(0);
                     if(lasts.size()==0){
+                        jo.put("planend_date", factory_date);
                         jo.put("planstart_date",planstart_date);
                         map.put(planstart_date_old,jo);
                         MPS_BD_ProductDailyPlan.insert(jo);
                         flag = false;
                     }else{
-                        start_date = DateUtil.offsetDay(start_date,1);
-                        planstart_date = DateUtil.formatDate(start_date);
+                        planend_date = DateUtil.offsetDay(planend_date,1);
                     }
                 }
-
             }
         }
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskprocServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskprocServiceImpl.java
index 29d5afc1..96fea71a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskprocServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskprocServiceImpl.java
@@ -820,28 +820,31 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
                 JSONObject jo = ja_new.getJSONObject(i);
                 String planstart_date_old = jo.getString("planstart_date");
                 String planstart_date = jo.getString("planstart_date");
+                //判断是否有同牌号同开始日期的日计划，直接更新为已经存在的日计划的开始、结束日期
                 if(map.containsKey(planstart_date)){
                     JSONObject other = map.get(planstart_date);
                     jo.put("planstart_date",other.getString("planstart_date"));
                     jo.put("planend_date",other.getString("planend_date"));
                     MPS_BD_ProductDailyPlan.insert(jo);
                 }else{
+                    //更新开始日期为最近的一个工作日
+                    JSONObject last_day = WQL.getWO("QPDM_PRODUCTPLANPROC")
+                            .addParam("flag", "7")
+                            .addParam("planstart_date", planstart_date)
+                            .addParam("device_id", jo.getString("device_id"))
+                            .process()
+                            .uniqueResult(0);
+                    if(last_day ==null){
+                        throw new BadRequestException("未配置"+planstart_date+"后的工作日历！");
+                    }
+                    planstart_date = last_day.getString("factory_date");
+                    int days = this.getDays(jo.getString("material_id"));
+                    Date start_date = DateUtil.parse(planstart_date);
+                    Date planend_date = DateUtil.offsetDay(start_date,days-1);
+
+                    //判断结束日期不重复存在的一天
                     boolean flag = true;
                     while(flag){
-                        JSONObject last_day = WQL.getWO("QPDM_PRODUCTPLANPROC")
-                                .addParam("flag", "7")
-                                .addParam("planstart_date", planstart_date)
-                                .addParam("device_id", jo.getString("device_id"))
-                                .process()
-                                .uniqueResult(0);
-                        if(last_day ==null){
-                            throw new BadRequestException("未配置"+planstart_date+"后的工作日历！");
-                        }
-                        planstart_date = last_day.getString("factory_date");
-                        int days = this.getDays(jo.getString("material_id"));
-                        Date start_date = DateUtil.parse(planstart_date);
-                        Date planend_date = DateUtil.offsetDay(start_date,days-1);
-
                         String str_planend_date = DateUtil.formatDate(planend_date);
                         JSONObject last_planend_date = WQL.getWO("QPDM_PRODUCTPLANPROC")
                                 .addParam("flag", "7")
@@ -852,24 +855,23 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
                         if(last_planend_date == null){
                             throw new BadRequestException("未配置"+str_planend_date.substring(0,10)+"后的工作日历！");
                         }
-                        jo.put("planend_date", last_planend_date.getString("factory_date"));
+                        String factory_date = last_planend_date.getString("factory_date");
                         JSONArray lasts = WQL.getWO("QPDM_PRODUCTPLANPROC")
                                 .addParam("flag", "8")
                                 .addParam("device_id", jo.getString("device_id"))
-                                .addParam("planend_date", jo.getString("planend_date"))
+                                .addParam("planend_date", factory_date)
                                 .process()
                                 .getResultJSONArray(0);
                         if(lasts.size()==0){
+                            jo.put("planend_date", factory_date);
                             jo.put("planstart_date",planstart_date);
                             map.put(planstart_date_old,jo);
                             MPS_BD_ProductDailyPlan.insert(jo);
                             flag = false;
                         }else{
-                            start_date = DateUtil.offsetDay(start_date,1);
-                            planstart_date = DateUtil.formatDate(start_date);
+                            planend_date = DateUtil.offsetDay(planend_date,1);
                         }
                     }
-
                 }
             }
         });
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProductprocessrouteServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProductprocessrouteServiceImpl.java
index 4f3dcb3a..dfa142c1 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProductprocessrouteServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProductprocessrouteServiceImpl.java
@@ -48,8 +48,12 @@ public class ProductprocessrouteServiceImpl implements ProductprocessrouteServic
         if (StrUtil.isNotEmpty(material_code)) {
             map.put("material_code", "%" + material_code + "%");
         }
+        String processroute_code = MapUtil.getStr(whereJson, "processroute_code");
+        if (StrUtil.isNotEmpty(processroute_code)) {
+            map.put("processroute_code", "%" + processroute_code + "%");
+        }
 
-        JSONObject jo = WQL.getWO("QPDM_BI_PRODUCTROUTE01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time desc");
+        JSONObject jo = WQL.getWO("QPDM_BI_PRODUCTROUTE01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mb.material_code");
         return jo;
     }
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_BI_PRODUCTROUTE01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_BI_PRODUCTROUTE01.wql
index 2066d97c..dcc85253 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_BI_PRODUCTROUTE01.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_BI_PRODUCTROUTE01.wql
@@ -103,9 +103,9 @@
             WHERE
                 pp.is_delete = '0'
             OPTION 输入.processroute_code <> ""
-                (pp.processroute_code = 输入.processroute_code
+                (pp.processroute_code like 输入.processroute_code
                 OR
-                pp.processroute_name = 输入.processroute_code
+                pp.processroute_name like 输入.processroute_code
                 )
             ENDOPTION
             OPTION 输入.productprocess_status <> ""
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql
index 1c60dabf..7bc6eafd 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql
@@ -272,7 +272,7 @@
                        ProductDailyPlan.device_id = 输入.device_id
                 ENDOPTION
                 OPTION 输入.planend_date <> ""
-                       ProductDailyPlan.planend_date >= 输入.planend_date
+                       ProductDailyPlan.planend_date = 输入.planend_date
                 ENDOPTION
             ENDSELECT
         ENDQUERY
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormingmaterialServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormingmaterialServiceImpl.java
index b0b349b6..490edec5 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormingmaterialServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormingmaterialServiceImpl.java
@@ -53,7 +53,7 @@ public class FormingmaterialServiceImpl implements FormingmaterialService {
             map.put("classIds", classIds);
         }
 
-        JSONObject json = WQL.getWO("QMD_FORMING01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time DESC");
+        JSONObject json = WQL.getWO("QMD_FORMING01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "formingtype_code");
         return json;
     }
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/ProductbomServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/ProductbomServiceImpl.java
index 36c235d0..58dc44b6 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/ProductbomServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/ProductbomServiceImpl.java
@@ -55,7 +55,7 @@ public class ProductbomServiceImpl implements ProductbomService {
         map.put("flag", "1");
         map.put("old_mark", old_mark);
         map.put("is_used", is_used);
-        JSONObject json = WQL.getWO("QMD_PD_PRODUCTBOM01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "bom.update_time desc");
+        JSONObject json = WQL.getWO("QMD_PD_PRODUCTBOM01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "bom.material_code");
         return json;
     }
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/ProductmaterialsetServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/ProductmaterialsetServiceImpl.java
index 792e71c2..27ac3a4c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/ProductmaterialsetServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/ProductmaterialsetServiceImpl.java
@@ -56,7 +56,7 @@ public class ProductmaterialsetServiceImpl implements ProductmaterialsetService
         }
 
         map.put("set_type", set_type);
-        JSONObject json = WQL.getWO("QPD_PD_PRODUCTMATERIALSET01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mater.update_time desc");
+        JSONObject json = WQL.getWO("QPD_PD_PRODUCTMATERIALSET01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mater.material_code");
         return json;
     }
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java
index 1f0c5346..b6db5ae8 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java
@@ -39,6 +39,7 @@ public class PointServiceImpl implements PointService {
         map.put("flag", "1");
         map.put("area_type", whereJson.get("area_type"));
         map.put("ids", whereJson.get("ids"));
+        map.put("lock", (String) whereJson.get("lock"));
         map.put("lock_type", whereJson.get("lock_type"));
         map.put("point_status", whereJson.get("point_status"));
         map.put("is_used", whereJson.get("is_used"));
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql
index 682c50da..bccade75 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql
@@ -16,6 +16,7 @@
 	输入.flag					        TYPEAS s_string
 	输入.area_type					    TYPEAS s_string
 	输入.lock_type					    TYPEAS s_string
+	输入.lock					    TYPEAS s_string
 	输入.name				    	    TYPEAS s_string
 	输入.point_type			 	        TYPEAS s_string
 	输入.point_status			 	    TYPEAS s_string
@@ -94,6 +95,9 @@
                     OPTION 输入.lock_type <> ""
                             point.lock_type = 输入.lock_type
                     ENDOPTION
+                    OPTION 输入.lock = "00"
+                           (point.vehicle_code is null or point.vehicle_code = '')
+                    ENDOPTION
                     OPTION 输入.point_status <> ""
                             point.point_status = 输入.point_status
                     ENDOPTION
diff --git a/mes/qd/src/api/wms/basedata/pdm/productProcessParam.js b/mes/qd/src/api/wms/basedata/pdm/productProcessParam.js
index 52471286..be47059a 100644
--- a/mes/qd/src/api/wms/basedata/pdm/productProcessParam.js
+++ b/mes/qd/src/api/wms/basedata/pdm/productProcessParam.js
@@ -23,11 +23,11 @@ export function saveData(data) {
   })
 }
 
-export function del(ids) {
+export function del(data) {
   return request({
-    url: 'api/productProcessParam/',
-    method: 'delete',
-    data: ids
+    url: 'api/productProcessParam/del',
+    method: 'post',
+    data
   })
 }
 
diff --git a/mes/qd/src/views/wms/basedata/master/storagevehicleinfo/index.vue b/mes/qd/src/views/wms/basedata/master/storagevehicleinfo/index.vue
index 3f615b86..2efeb391 100644
--- a/mes/qd/src/views/wms/basedata/master/storagevehicleinfo/index.vue
+++ b/mes/qd/src/views/wms/basedata/master/storagevehicleinfo/index.vue
@@ -121,27 +121,10 @@
         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 label="是否启用" align="center" prop="is_used">
-          <template slot-scope="scope">
-            <el-switch
-              :value="format_is_used(scope.row.is_used)"
-              active-color="#409EFF"
-              inactive-color="#F56C6C"
-              @change="changeEnabled(scope.row, scope.row.is_used)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column prop="create_name" label="创建人" />
-        <el-table-column prop="create_time" label="创建时间" />
         <el-table-column
           v-permission="['admin','storagevehicleinfo:edit','storagevehicleinfo:del']"
           label="操作"
-          width="50px"
+          min-width="90px"
           align="center"
           fixed="right"
         >
@@ -153,6 +136,22 @@
             />
           </template>
         </el-table-column>
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="storagevehicle_type_name" label="载具类型" min-width="120" />
+        <el-table-column prop="storagevehicle_code" label="载具编码" min-width="120" />
+        <el-table-column prop="storagevehicle_name" label="载具名称" min-width="120" />
+        <el-table-column label="是否启用" align="center" prop="is_used" min-width="120" >
+          <template slot-scope="scope">
+            <el-switch
+              :value="format_is_used(scope.row.is_used)"
+              active-color="#409EFF"
+              inactive-color="#F56C6C"
+              @change="changeEnabled(scope.row, scope.row.is_used)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column prop="create_name" label="创建人" min-width="120"  />
+        <el-table-column prop="create_time" label="创建时间" width="150" />
       </el-table>
       <!--分页组件-->
       <pagination />
diff --git a/mes/qd/src/views/wms/basedata/pdm/productProcessParam/index.vue b/mes/qd/src/views/wms/basedata/pdm/productProcessParam/index.vue
index cbe8778c..55344c0c 100644
--- a/mes/qd/src/views/wms/basedata/pdm/productProcessParam/index.vue
+++ b/mes/qd/src/views/wms/basedata/pdm/productProcessParam/index.vue
@@ -24,11 +24,11 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column prop="material_code" label="物料编码" min-width="100" show-overflow-tooltip fixed />
-        <el-table-column prop="material_name" label="物料名称" min-width="100" show-overflow-tooltip fixed />
+        <el-table-column prop="material_code" label="物料编码" min-width="130"  fixed />
+        <el-table-column prop="material_name" label="物料名称" min-width="100"  fixed />
 
         <template v-for="(col,index) in cols">
-          <el-table-column v-if="col.isVisiable" :prop="col.prop" :label="col.label" width="130px" show-overflow-tooltip />
+          <el-table-column v-if="col.isVisiable" :prop="col.prop" :label="col.label" width="130px"  />
         </template>
         <el-table-column v-permission="[]" label="操作" fixed="right" width="150px" align="center">
           <template slot-scope="scope">
@@ -40,7 +40,7 @@
               />
             </div>
             <div class="btn2">
-              <el-button slot="left" type="danger" icon="el-icon-delete" size="mini" @click="delid(scope.row)" />
+              <el-button slot="left" type="text" icon="el-icon-delete" size="mini" @click="delid(scope.row)" >删除</el-button>
             </div>
           </template>
         </el-table-column>
@@ -62,6 +62,7 @@ import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import SetDialog from '@/views/wms/basedata/pdm/productProcessParam/SetDialog'
+import crudBagrecord from '@/api/wms/basedata/master/bagrecord'
 
 export default {
   name: 'ProductProcessParam',
@@ -148,10 +149,17 @@ export default {
       return false
     },
     delid(row) {
-      const ids = row.material_id
-      crudProductProcessParam.del(ids).then(res => {
-        this.crud.toQuery()
-        this.crud.notify('删除成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      const msg = '是否确认删除？'
+      this.$confirm(msg, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        row.workprocedure_code = this.workprocedure_code
+        crudProductProcessParam.del(row).then(res => {
+          this.crud.toQuery()
+          this.crud.notify('删除成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        })
       })
     }
   }
diff --git a/mes/qd/src/views/wms/basedata/st/stor/index.vue b/mes/qd/src/views/wms/basedata/st/stor/index.vue
index bb2a0416..1606eda9 100644
--- a/mes/qd/src/views/wms/basedata/st/stor/index.vue
+++ b/mes/qd/src/views/wms/basedata/st/stor/index.vue
@@ -312,10 +312,10 @@ export default {
   methods: {
     // 新增与编辑前做的操作
     [CRUD.HOOK.afterToCU](crud, form) {
-      if (form.id == null) {
+      if (form.stor_id == null) {
         this.getDepts()
       } else {
-        this.getSupDepts(form.dept.id)
+        this.getSupDepts(form.sysdeptid)
       }
     },
     [CRUD.HOOK.beforeSubmit](crud, form) {
@@ -369,7 +369,9 @@ export default {
       })
     },
     getSupDepts(deptId) {
-      getDeptSuperior(deptId).then(res => {
+      const ids = []
+      ids.push(deptId)
+      getDeptSuperior(ids).then(res => {
         const date = res.content
         this.buildDepts(date)
         this.depts = date
@@ -408,6 +410,115 @@ export default {
 }
 </script>
 
-<style scoped>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep {
 
+  .vue-treeselect__menu {
+
+    overflow-x: auto !important;
+
+    width: 300px;
+
+    max-height: 300px !important;
+
+  }
+
+  .vue-treeselect__label {
+
+    overflow: unset;
+
+    text-overflow: unset;
+
+  }
+
+  .vue-treeselect__control {
+
+    height: 20px !important;
+
+  }
+
+  .vue-treeselect__multi-value-item-container,
+
+  .vue-treeselect--has-value .vue-treeselect__multi-value {
+
+    height: 30px;
+
+    line-height: 24px;
+
+    padding: 0;
+
+  }
+
+  .vue-treeselect__limit-tip,
+
+  .vue-treeselect--searchable.vue-treeselect--multi.vue-treeselect--has-value
+
+  .vue-treeselect__input-container {
+
+    padding-top: 0;
+
+  }
+
+  .vue-treeselect--has-value .vue-treeselect__multi-value {
+
+    // margin-bottom: 15px;
+
+  }
+
+  .vue-treeselect__placeholder,
+
+  .vue-treeselect__single-value {
+
+    height: 28px;
+
+    line-height: 32px;
+
+    font-size: small;
+
+    color: "#CCCFD6";
+
+
+  }
+
+  .vue-treeselect--has-value .vue-treeselect__input {
+
+    height: 18px !important;
+
+    line-height: 18px !important;
+
+  }
+
+  .vue-treeselect div,
+
+  .vue-treeselect span {
+
+    box-sizing: content-box;
+
+  }
+
+  // 选中后的溢出隐藏
+
+  .vue-treeselect__multi-value-label {
+
+    display: block;
+
+    width: 140px;
+
+    overflow: hidden;
+
+    white-space: nowrap;
+
+    text-overflow: ellipsis;
+
+  }
+
+  .vue-treeselect__value-container {
+
+    display: block;
+
+    height: 32px;
+
+  }
+
+}
 </style>
diff --git a/mes/qd/src/views/wms/pdm/base/productRoute/index.vue b/mes/qd/src/views/wms/pdm/base/productRoute/index.vue
index 723f1d5c..597c79d6 100644
--- a/mes/qd/src/views/wms/pdm/base/productRoute/index.vue
+++ b/mes/qd/src/views/wms/pdm/base/productRoute/index.vue
@@ -82,18 +82,18 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="55"/>
-        <el-table-column prop="status_name" label="工艺路线状态"/>
-        <el-table-column prop="processroute_code" label="工艺路线编码">
+        <el-table-column prop="status_name" min-width="120" label="工艺路线状态"/>
+        <el-table-column prop="processroute_code" min-width="120" label="工艺路线编码">
           <template slot-scope="scope">
             <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.processroute_code }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column prop="processroute_name" label="工艺路线名称"/>
-        <el-table-column prop="material_code" label="产品编码" min-width="120" show-overflow-tooltip/>
+        <el-table-column prop="processroute_name" label="工艺路线名称" min-width="120" />
+        <el-table-column prop="material_code" label="产品编码" min-width="140" />
         <el-table-column prop="create_name" label="创建人"/>
-        <el-table-column prop="create_time" label="创建时间" show-overflow-tooltip min-width="130"/>
+        <el-table-column prop="create_time" label="创建时间" min-width="140"/>
         <el-table-column prop="audit_optname" label="审核人"/>
-        <el-table-column prop="audit_time" label="审核时间" show-overflow-tooltip min-width="130"/>
+        <el-table-column prop="audit_time" label="审核时间" min-width="140"/>
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
diff --git a/mes/qd/src/views/wms/pub/PointDialog.vue b/mes/qd/src/views/wms/pub/PointDialog.vue
index a4c0fa20..aa32f0bb 100644
--- a/mes/qd/src/views/wms/pub/PointDialog.vue
+++ b/mes/qd/src/views/wms/pub/PointDialog.vue
@@ -144,7 +144,7 @@ export default {
     },
     open() {
       this.crud.query.ids = this.areaType
-      this.crud.query.lock_type = this.lock
+      this.crud.query.lock = this.lock
       checkoutbill.schAreaType({ ids: this.areaType }).then(res => {
         this.sch_area_type = res
       })
diff --git a/mes/qd/src/views/wms/pub/StructDialog.vue b/mes/qd/src/views/wms/pub/StructDialog.vue
index 0714c05a..e48f6db6 100644
--- a/mes/qd/src/views/wms/pub/StructDialog.vue
+++ b/mes/qd/src/views/wms/pub/StructDialog.vue
@@ -79,7 +79,7 @@ export default {
       url: 'api/structattr',
       idField: 'struct_id',
       sort: 'struct_id,desc',
-      query: { search: '', is_lock: '1', lock_type: '',sect_id: '', stor_id: '' },
+      query: { search: '', is_lock: '1', lock: '',sect_id: '', stor_id: '' },
       crudMethod: { ...crudStructattr }
     })
   },
@@ -128,7 +128,7 @@ export default {
       this.lock = '00'
     },
     [CRUD.HOOK.beforeRefresh]() {
-      this.query.lock_type = this.lock
+      this.query.lock = this.lock
       return true
     },
     open() {
@@ -152,7 +152,7 @@ export default {
         }
       }
       this.query.is_lock = '1'
-      this.query.lock_type = this.lock
+      this.query.lock = this.lock
       this.query.is_used = '1'
       this.crud.toQuery()
     },
diff --git a/mes/qd/src/views/wms/sb/inbill/StructDialog.vue b/mes/qd/src/views/wms/sb/inbill/StructDialog.vue
index 0714c05a..e48f6db6 100644
--- a/mes/qd/src/views/wms/sb/inbill/StructDialog.vue
+++ b/mes/qd/src/views/wms/sb/inbill/StructDialog.vue
@@ -79,7 +79,7 @@ export default {
       url: 'api/structattr',
       idField: 'struct_id',
       sort: 'struct_id,desc',
-      query: { search: '', is_lock: '1', lock_type: '',sect_id: '', stor_id: '' },
+      query: { search: '', is_lock: '1', lock: '',sect_id: '', stor_id: '' },
       crudMethod: { ...crudStructattr }
     })
   },
@@ -128,7 +128,7 @@ export default {
       this.lock = '00'
     },
     [CRUD.HOOK.beforeRefresh]() {
-      this.query.lock_type = this.lock
+      this.query.lock = this.lock
       return true
     },
     open() {
@@ -152,7 +152,7 @@ export default {
         }
       }
       this.query.is_lock = '1'
-      this.query.lock_type = this.lock
+      this.query.lock = this.lock
       this.query.is_used = '1'
       this.crud.toQuery()
     },
diff --git a/mes/qd/src/views/wms/st/core/inbill/rawassist/StructUpdateDialog.vue b/mes/qd/src/views/wms/st/core/inbill/rawassist/StructUpdateDialog.vue
index 22e201e1..c6b00cd2 100644
--- a/mes/qd/src/views/wms/st/core/inbill/rawassist/StructUpdateDialog.vue
+++ b/mes/qd/src/views/wms/st/core/inbill/rawassist/StructUpdateDialog.vue
@@ -187,7 +187,7 @@ export default {
   },
   methods: {
     [CRUD.HOOK.beforeRefresh]() {
-      this.crud.query.lock_type = '00'
+      this.crud.query.lock = '00'
     },
     open() {
       crudSectattr.getSect({ 'is_materialstore': '1', 'sect_type_attr': '00' }).then(res => {