diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql
index d331cafd..3b06dc29 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql
@@ -15,8 +15,8 @@
 	#################################################
 	输入.flag					        TYPEAS s_string
 	输入.jockey_id					    TYPEAS s_string
-	输入.sale_id					        TYPEAS s_string
-	输入.produceorder_id					TYPEAS s_string
+	输入.sale_id					    TYPEAS s_string
+	输入.produceorder_id			    TYPEAS s_string
 	输入.workprocedure_code				TYPEAS s_string
 	输入.order_status					TYPEAS s_string
 	输入.shift_type_scode				TYPEAS s_string
@@ -75,7 +75,7 @@
                     ShiftOrder.workorder_status <> '5'
             ENDOPTION
             OPTION 输入.order_status <> ""
-                   find_in_set( ShiftOrder.workorder_status, 输入.order_status)
+                   find_in_set(ShiftOrder.workorder_status, 输入.order_status)
             ENDOPTION
             OPTION 输入.shift_type_scode <> ""
                     ShiftOrder.shift_type_scode = 输入.shift_type_scode
@@ -87,10 +87,10 @@
                     material.product_series in 输入.product_series
             ENDOPTION
              OPTION 输入.begin_time <> ""
-                     ShiftOrder.produce_date >= 输入.begin_time
+                     ShiftOrder.realproducestart_date >= 输入.begin_time
              ENDOPTION
              OPTION 输入.end_time <> ""
-                     ShiftOrder.produce_date <= 输入.end_time
+                     ShiftOrder.realproducestart_date <= 输入.end_time
              ENDOPTION
              OPTION 输入.sale_id <> ""
                     ShiftOrder.sale_id like 输入.sale_id
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls
index d3f24c68..1670c505 100644
Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls differ
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java
index 107866d4..1602e268 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java
@@ -125,19 +125,18 @@ public class RegionServiceImpl implements RegionService {
         /**
          * label,value
          */
-//        JSONArray res = new JSONArray();
-//        String point_status_explain = findByCode(region_id).getPoint_status_explain();
-//        if (ObjectUtil.isEmpty(point_status_explain)) return res;
-//        String[] explain = point_status_explain.split("，");
-//        for (int i = 0; i < explain.length; i++) {
-//            String[] status = explain[i].split("-");
-//            JSONObject point_status = new JSONObject();
-//            point_status.put("label", status[1]);
-//            point_status.put("value", status[0]);
-//            res.add(point_status);
-//        }
-//        return res;
-        return null;
+        JSONArray res = new JSONArray();
+        String point_status_explain = findByCode(region_code).getPoint_status_explain();
+        if (ObjectUtil.isEmpty(point_status_explain)) return res;
+        String[] explain = point_status_explain.split("，");
+        for (int i = 0; i < explain.length; i++) {
+            String[] status = explain[i].split("-");
+            JSONObject point_status = new JSONObject();
+            point_status.put("label", status[1]);
+            point_status.put("value", status[0]);
+            res.add(point_status);
+        }
+        return res;
     }
 
     /**
@@ -151,19 +150,18 @@ public class RegionServiceImpl implements RegionService {
         /**
          * label,value
          */
-//        JSONArray res = new JSONArray();
-//        String point_type_explain = findById(region_id).getPoint_type_explain();
-//        if (ObjectUtil.isEmpty(point_type_explain)) return res;
-//        String[] explain = point_type_explain.split("，");
-//        for (int i = 0; i < explain.length; i++) {
-//            String[] types = explain[i].split("-");
-//            JSONObject point_type = new JSONObject();
-//            point_type.put("label", types[1]);
-//            point_type.put("value", types[0]);
-//            res.add(point_type);
-//        }
-//        return res;
-        return null;
+        JSONArray res = new JSONArray();
+        String point_type_explain = findByCode(region_code).getPoint_type_explain();
+        if (ObjectUtil.isEmpty(point_type_explain)) return res;
+        String[] explain = point_type_explain.split("，");
+        for (int i = 0; i < explain.length; i++) {
+            String[] types = explain[i].split("-");
+            JSONObject point_type = new JSONObject();
+            point_type.put("label", types[1]);
+            point_type.put("value", types[0]);
+            res.add(point_type);
+        }
+        return res;
     }
 
 }
diff --git a/mes/qd/src/views/wms/pdm/device/index.vue b/mes/qd/src/views/wms/pdm/device/index.vue
index cc3dd46f..d60641d2 100644
--- a/mes/qd/src/views/wms/pdm/device/index.vue
+++ b/mes/qd/src/views/wms/pdm/device/index.vue
@@ -117,16 +117,16 @@
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
         <el-table-column prop="device_code" label="设备编码" width="100px" show-overflow-tooltip/>
-        <el-table-column prop="device_name" label="设备名称" />
+        <el-table-column prop="device_name" label="设备名称" :min-width="flexWidth('device_name',crud.data,'设备名称')"/>
         <el-table-column prop="product_area" label="生产区域" />
         <el-table-column prop="device_code2" label="设备编码2" />
-        <el-table-column prop="inupperlimit_qty" label="设备来料仓上限数" width="120px"/>
-        <el-table-column prop="inlowerlimit_qty" label="设备来料仓下限数" width="120px"/>
-        <el-table-column prop="outupperlimit_qty" label="设备产品仓上限数" width="120px"/>
-        <el-table-column prop="outlowerlimit_qty" label="设备产品仓下限数" width="120px"/>
-        <el-table-column prop="deviceinitinstor_qty" label="设备初始来料仓数" width="120px"/>
-        <el-table-column prop="deviceinstor_qty" label="设备实时来料仓数" width="120px"/>
-        <el-table-column prop="deviceoutstor_qty" label="设备实时产品仓数" width="120px"/>
+        <el-table-column prop="inupperlimit_qty" label="设备来料仓上限数" :min-width="flexWidth('inupperlimit_qty',crud.data,'设备来料仓上限数')"/>
+        <el-table-column prop="inlowerlimit_qty" label="设备来料仓下限数" :min-width="flexWidth('inlowerlimit_qty',crud.data,'设备来料仓下限数')"/>
+        <el-table-column prop="outupperlimit_qty" label="设备产品仓上限数" :min-width="flexWidth('outupperlimit_qty',crud.data,'设备产品仓上限数')"/>
+        <el-table-column prop="outlowerlimit_qty" label="设备产品仓下限数" :min-width="flexWidth('outlowerlimit_qty',crud.data,'设备产品仓下限数')"/>
+        <el-table-column prop="deviceinitinstor_qty" label="设备初始来料仓数" :min-width="flexWidth('deviceinitinstor_qty',crud.data,'设备初始来料仓数')"/>
+        <el-table-column prop="deviceinstor_qty" label="设备实时来料仓数" :min-width="flexWidth('deviceinstor_qty',crud.data,'设备实时来料仓数')"/>
+        <el-table-column prop="deviceoutstor_qty" label="设备实时产品仓数" :min-width="flexWidth('deviceoutstor_qty',crud.data,'设备实时产品仓数')"/>
         <el-table-column prop="is_artificial" label="是否人工" >
           <template slot-scope="scope">
             {{scope.row.is_artificial=='1'?'是':'否'}}
diff --git a/mes/qd/src/views/wms/sch/point/index.vue b/mes/qd/src/views/wms/sch/point/index.vue
index aeb97cea..0920084a 100644
--- a/mes/qd/src/views/wms/sch/point/index.vue
+++ b/mes/qd/src/views/wms/sch/point/index.vue
@@ -316,7 +316,6 @@
             <el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
           </el-form-item>
           <el-form-item label="已放载具类型" prop="vehicle_type">
-            <!--            <el-input v-model="" clearable style="width: 370px;" />-->
             <el-select v-model="form.vehicle_type" placeholder="请选择" clearable style="width: 370px;">
               <el-option
                 v-for="item in dict.storagevehicle_type"
@@ -585,7 +584,7 @@ export default {
       }).catch(() => {
       })
     },
-    getPointStatusAndTypeList(code, flag) {
+    getPointStatusAndTypeList(code, flag) { // 获取点位状态和类型
       if (code) {
         this.getPointStatusList(code, flag)
         this.getPointTypeList(code, flag)