fix: 修复

lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java

@@ -105,9 +105,6 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
         dto.setCreate_id(currentUserId);
         dto.setCreate_name(nickName);
         dto.setUpdate_optid(currentUserId);
-        dto.setUpdate_optname(nickName);
-        dto.setUpdate_time(now);
-        dto.setCreate_time(now);
         JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
         wo.insert(json);
 

lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_STORAGE.wql

@@ -91,7 +91,7 @@
             		AND ve.is_delete = '0'
             	)
             WHERE
-            	point.region_code = 'CPHJ'
+                point.region_code = 'BCPHJ'
             ORDER BY
                 point.create_time DESC
             ENDSELECT

lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/Region.java

@@ -18,7 +18,7 @@ public enum Region {
     HL("混料区", "HL"),
     KLHJ("困料货架", "KLHJ"),
     YZ("压制区", "YZ"),
-    CPHJ("成品货架", "CPHJ"),
+    BCPHJ("半成品货架", "BCPHJ"),
     SZ("烧制区", "SZ"),
     FJ("分拣区", "FJ"),
     BTHC("半托缓存区", "BTHC"),

lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/wql/CALL_EMPTY_TASK.wql

@@ -49,7 +49,7 @@
             WHERE
             	point.is_used = '1'
             	AND point.lock_type = '1'
-            	AND point.region_code = 'CPHJ'
+            	AND point.region_code = 'BCPHJ'
             	AND point.point_status = '1'
             	AND point.vehicle_type = '2'
             	AND vd.is_delete = '0'

lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/wql/CALL_MATERIAL_TASK.wql

@@ -53,7 +53,7 @@
             WHERE
             	point.is_used = '1'
             	AND point.lock_type = '1'
-            	AND point.region_code = 'CPHJ'
+            	AND point.region_code = 'BCPHJ'
             	AND point.point_status = '1'
             	AND point.vehicle_type = '2'
             	AND vd.is_fire = '0'
@@ -92,7 +92,7 @@
             WHERE
                 point.is_used = '1'
                 AND point.lock_type = '1'
-                AND point.region_code = 'CPHJ'
+                AND point.region_code = 'BCPHJ'
                 AND point.point_status = '1'
                 AND point.vehicle_type = '2'
                 AND vd.is_fire = '1'

lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/wql/SEND_MATERIAL_TASK.wql

@@ -48,7 +48,7 @@
             WHERE
             	is_used = '1'
             	AND lock_type = '1'
-            	AND region_code = 'CPHJ'
+            	AND region_code = 'BCPHJ'
             	AND point_type = '1'
             	AND point_status = '0'
             ENDSELECT

lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue

@@ -109,6 +109,7 @@
             <el-col :span="12">
               <el-form-item label="物料编码" prop="material_code">
                 <el-input
+                  :disabled="crud.status.edit"
                   v-model="form.material_code"
                   style="width: 300px"
                   clearable
@@ -122,6 +123,7 @@
             <el-col :span="12">
               <el-form-item label="生产设备" prop="device_name">
                 <el-input
+                  :disabled="crud.status.edit"
                   v-model="form.device_name"
                   style="width: 300px"
                   clearable
@@ -134,14 +136,14 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="计划数量/重量" prop="plan_qty">
-                <el-input v-model="form.plan_qty" type="number" style="width: 300px" />
+                <el-input :disabled="crud.status.edit" v-model="form.plan_qty" type="number" style="width: 300px" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item v-show="typeof (form.region_code) === 'string' && form.region_code === 'FJ'" label="木托盘类型" prop="vehicle_type">
-                <el-select v-model="form.vehicle_type" style="width: 300px" filterable placeholder="请选择">
+                <el-select :disabled="crud.status.edit" v-model="form.vehicle_type" style="width: 300px" filterable placeholder="请选择">
                   <el-option
                     v-for="item in dict.wood_vehicle_type"
                     :key="item.id"
@@ -155,16 +157,16 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="是否加急" prop="is_urgent">
-                <el-radio v-model="form.is_urgent" label="1">是</el-radio>
+                <el-radio :disabled="crud.status.edit" v-model="form.is_urgent" label="1">是</el-radio>
-                <el-radio v-model="form.is_urgent" label="0">否</el-radio>
+                <el-radio :disabled="crud.status.edit" v-model="form.is_urgent" label="0">否</el-radio>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="是否优先包装" prop="is_pri">
-                <el-radio v-model="form.is_pri" label="1">是</el-radio>
+                <el-radio :disabled="crud.status.edit" v-model="form.is_pri" label="1">是</el-radio>
-                <el-radio v-model="form.is_pri" label="0">否</el-radio>
+                <el-radio :disabled="crud.status.edit" v-model="form.is_pri" label="0">否</el-radio>
               </el-form-item>
             </el-col>
           </el-row>