diff --git a/nladmin-system/nlsso-server/pom.xml b/nladmin-system/nlsso-server/pom.xml
index bd4b9c3..e10f83d 100644
--- a/nladmin-system/nlsso-server/pom.xml
+++ b/nladmin-system/nlsso-server/pom.xml
@@ -33,6 +33,12 @@
     </properties>
 
     <dependencies>
+<!--        https://onew.me/logback/2018/09/17/logback_win.html-->
+        <dependency>
+            <groupId>org.fusesource.jansi</groupId>
+            <artifactId>jansi</artifactId>
+            <version>1.17.1</version>
+        </dependency>
 
         <!--工具包-->
         <dependency>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java
index 0c9f528..6169122 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java
@@ -105,12 +105,13 @@ public class HNMLTask extends AbstractTask {
             groupEntity.setVehicle_type(taskObj.getVehicle_type());
             groupEntity.setPoint_code(endPoint);
             groupEntity.setPoint_name(endPointObj.getPoint_name());
-            groupEntity.setPcsn(IdUtil.simpleUUID());
+            groupEntity.setPcsn( DateUtil.format(DateUtil.date(), "yyyyMMdd"));
             groupEntity.setInstorage_time(DateUtil.now());
             groupEntity.setTask_code(taskObj.getTask_code());
             groupEntity.setGroup_status(GroupStatusEnum.IN_STORAGE.getType()); // 暂时不维护。
             groupEntity.setIs_delete(false);
             vehiclematerialgroupService.create(groupEntity);
+
             // 终点去除正在执行的任务, 设置载具编码、载具类型、载具数量
             if (ObjectUtil.isNotEmpty(endPointObj)) {
                 endPointObj.setIng_task_code("");
diff --git a/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
index 1cb6448..9b20d3a 100644
--- a/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
+++ b/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
@@ -109,7 +109,7 @@
               placeholder="选择日期时间"
             />
           </el-form-item>
-          <el-form-item label="所属区域" prop="region_code">
+          <el-form-item label="所属工序" prop="region_code">
             <el-select
               v-model="form.region_code"
               filterable
@@ -128,7 +128,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="区域名称">
+          <el-form-item label="工序名称">
             <el-input v-model="form.region_name" style="width: 240px;" disabled />
           </el-form-item>
           <el-form-item label="设备编码" prop="point_code">
@@ -210,8 +210,21 @@
       >
         <el-table-column type="selection" width="55" />
         <el-table-column prop="workorder_code" label="工单编号" :min-width="flexWidth('workorder_code',crud.data,'工单编号')" />
+        <el-table-column
+          prop="workorder_status"
+          label="工单状态"
+          :min-width="flexWidth('workorder_status',crud.data,'工单状态')"
+        >
+          <template slot-scope="scope">
+            {{ dict.label.pdm_workorder_status[scope.row.workorder_status] }}
+          </template>
+        </el-table-column>
         <el-table-column prop="plan_qty" label="计划数量" :min-width="flexWidth('plan_qty',crud.data,'计划数量')" />
         <el-table-column prop="real_qty" label="实际数量" :min-width="flexWidth('real_qty',crud.data,'实际数量')" />
+<!--        <el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')" />-->
+        <el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
+        <el-table-column prop="point_code" label="设备编码" :min-width="flexWidth('point_code',crud.data,'设备编码')" />
+        <el-table-column prop="point_name" label="设备名称" :min-width="flexWidth('point_name',crud.data,'设备名称')" />
         <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_name',crud.data,'物料标识')" />
         <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料标识')" />
         <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_name',crud.data,'物料标识')" />
@@ -241,31 +254,20 @@
           label="静置时间(分钟)"
           :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')"
         />
-        <el-table-column prop="point_code" label="设备编码" :min-width="flexWidth('point_code',crud.data,'设备编码')" />
-        <el-table-column prop="point_name" label="设备名称" :min-width="flexWidth('point_name',crud.data,'设备名称')" />
-        <el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')" />
-        <el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
-        <el-table-column
-          prop="workorder_status"
-          label="工单状态"
-          :min-width="flexWidth('workorder_status',crud.data,'工单状态')"
-        >
-          <template slot-scope="scope">
-            {{ dict.label.pdm_workorder_status[scope.row.workorder_status] }}
-          </template>
-        </el-table-column>
+
+
         <el-table-column prop="is_needmove" label="是否自动搬运" :min-width="flexWidth('is_needmove',crud.data,'是否自动搬运')">
           <template slot-scope="scope">
             {{ scope.row.is_needmove ? '是' : '否' }}
           </template>
         </el-table-column>
-        <el-table-column prop="workorder_type" label="工单类型" :min-width="flexWidth('workorder_type',crud.data,'工单类型')" />
-        <el-table-column
+<!--        <el-table-column prop="workorder_type" label="工单类型" :min-width="flexWidth('workorder_type',crud.data,'工单类型')" />-->
+        <!--<el-table-column
           prop="passback_status"
           label="回传MES状态"
           :min-width="flexWidth('passback_status',crud.data,'回传MES状态')"
-        />
-        <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
+        />-->
+<!--        <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />-->
         <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
         <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
         <el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
diff --git a/nladmin-ui/src/views/wms/sch/group/index.vue b/nladmin-ui/src/views/wms/sch/group/index.vue
index 5fb25a4..cc9f158 100644
--- a/nladmin-ui/src/views/wms/sch/group/index.vue
+++ b/nladmin-ui/src/views/wms/sch/group/index.vue
@@ -191,9 +191,9 @@
         <el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
         <!--        <el-table-column prop="child_vehicle_code" label="子载具编码" :min-width="flexWidth('child_vehicle_code',crud.data,'子载具编码')"/>-->
         <el-table-column prop="source_vehicle_code" label="来源载具" :min-width="flexWidth('source_vehicle_code',crud.data,'来源载具')" />
+        <el-table-column prop="region_name" label="所属区域" :min-width="flexWidth('region_name',crud.data,'所属区域')" />
         <el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
         <el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
-        <el-table-column prop="region_name" label="所属区域" :min-width="flexWidth('region_name',crud.data,'所属区域')" />
         <el-table-column prop="is_full" label="是否满托" :min-width="flexWidth('is_full',crud.data,'是否满托')">
           <template slot-scope="scope">
             {{scope.row.is_full?'是':'否'}}
diff --git a/nladmin-ui/src/views/wms/sch/point/index.vue b/nladmin-ui/src/views/wms/sch/point/index.vue
index f752820..56b26e8 100644
--- a/nladmin-ui/src/views/wms/sch/point/index.vue
+++ b/nladmin-ui/src/views/wms/sch/point/index.vue
@@ -136,7 +136,7 @@
       </crudOperation>
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="540px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;">
           <el-form-item v-if="false" label="点位标识" prop="point_id">
             <el-input v-model="form.point_id" style="width: 370px;" />
           </el-form-item>
@@ -173,7 +173,7 @@
           <el-form-item label="点位名称" prop="point_name">
             <el-input v-model="form.point_name" style="width: 370px;" />
           </el-form-item>
-          <el-form-item v-show="pointStatusDialogList.length > 0" label="点位状态" prop="point_status">
+          <el-form-item v-if="pointStatusDialogList.length > 0" label="点位状态" prop="point_status">
             <el-select
               v-model="form.point_status"
               size="mini"
@@ -207,18 +207,8 @@
           <el-form-item v-if="form.point_status !== '1'" label="载具编码" prop="vehicle_code">
             <el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="已放载具类型" prop="vehicle_type">
-            <el-select v-model="form.vehicle_type" placeholder="请选择">
-              <el-option
-                v-for="item in dict.vehicle_type"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
           <el-form-item label="可放载具类型" prop="can_vehicle_types">
-            <el-select v-model="form.can_vehicle_types" multiple placeholder="请选择">
+            <el-select v-model="form.can_vehicle_types" multiple placeholder="请选择" clearable style="width: 370px;">
               <el-option
                 v-for="item in dict.vehicle_type"
                 :key="item.value"
@@ -228,22 +218,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="载具数量" prop="vehicle_qty">
-            <el-input-number :controls="false" class="clear-number-input" v-model="form.vehicle_qty" :min="0" :precision="0" :max="99999" label="载具数量" size="mini" />
-          </el-form-item>
-          <el-form-item v-if="form.point_status === '3'" label="库存数" prop="ivt_qty">
-            <el-input-number :controls="false" class="clear-number-input" v-model="form.ivt_qty" type="number" :min="1" :precision="3" :max="99999" label="库存数" size="mini" />
-          </el-form-item>
-          <el-form-item v-if="form.point_status === '3'" label="物料来源">
-            <el-radio-group v-model="choose" size="mini">
-              <el-radio-button label="物料" />
-              <el-radio-button label="工单" />
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item v-if="false" label="物料名称" prop="vehicle_code">
-            <el-input suffix-icon="el-icon-date" v-model="form.material_id" clearable style="width: 370px;" @focus="getMaterial" />
-          </el-form-item>
-          <el-form-item v-if="form.point_status === '3'" label="物料名称" prop="vehicle_code">
-            <el-input v-model="form.material_name" clearable style="width: 370px;" @focus="getMaterial" />
+            <el-input-number style="width: 370px;" :controls="false" class="clear-number-input" v-model="form.vehicle_qty" :min="0" :precision="0" :max="99999" label="载具数量" size="mini" />
           </el-form-item>
           <el-form-item label="是否有工单">
             <el-radio v-for="item in dict.TrueOrFalse" :key="item.id" v-model="form.is_has_workder" :label="item.value">{{ item.label }}</el-radio>
@@ -402,9 +377,6 @@ export default {
         ],
         region_code: [
           { required: true, message: '区域类型不能为空', trigger: 'blur' }
-        ],
-        can_vehicle_types: [
-          { required: true, message: '载具存放类型不能为空', trigger: 'blur' }
         ]
       },
       workShopList: [],
diff --git a/nladmin-ui/src/views/wms/sch/region/index.vue b/nladmin-ui/src/views/wms/sch/region/index.vue
index 428894e..8a564ff 100644
--- a/nladmin-ui/src/views/wms/sch/region/index.vue
+++ b/nladmin-ui/src/views/wms/sch/region/index.vue
@@ -47,7 +47,7 @@
         :visible.sync="crud.status.cu > 0"
         :title="crud.status.title"
         width="520px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
+        <el-form style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
           <el-form-item label="所属车间">
             <el-select
               v-model="form.workshop_code"