From b1c70484868ea41f8336bae6e6b02a7bad27dea5 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Fri, 19 May 2023 10:44:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/common/utils/CodeUtil.java    |  2 +-
 .../impl/PdmBdWorkorderServiceImpl.java       |  2 +
 .../src/views/wms/pdm/workerorder/index.vue   | 91 ++++++++++---------
 3 files changed, 49 insertions(+), 46 deletions(-)

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java
index 313ab23..56034c3 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java
@@ -7,7 +7,7 @@ import java.util.*;
 
 public class CodeUtil {
 
-    public  static  String getNewCode(String ruleCode){
+    public static String getNewCode(String ruleCode){
         String flag = "1";
         HashMap<String,String> map = new HashMap<>();
         map.put("flag",flag);
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/impl/PdmBdWorkorderServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/impl/PdmBdWorkorderServiceImpl.java
index 13a62e0..405f59e 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/impl/PdmBdWorkorderServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/impl/PdmBdWorkorderServiceImpl.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.exception.BadRequestException;
+import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.pdm.service.IPdmBdWorkorderService;
 import org.nl.wms.pdm.service.dao.PdmBdWorkorder;
@@ -46,6 +47,7 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
         String now = DateUtil.now();
 
         entity.setWorkorder_id(IdUtil.getSnowflake(1, 1).nextIdStr());
+        entity.setWorkorder_code(CodeUtil.getNewCode("PDM_SHIFTORDER"));
         entity.setCreate_id(currentUserId);
         entity.setCreate_name(nickName);
         entity.setCreate_time(now);
diff --git a/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
index e2fc104..404a218 100644
--- a/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
+++ b/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
@@ -57,15 +57,12 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="工单编号" prop="workorder_code">
-            <el-input v-model="form.workorder_code" style="width: 240px;" />
+          <el-form-item label="物料名称" prop="material_name">
+            <el-input v-model="form.material_name" style="width: 240px;" @focus="getMaterial" />
           </el-form-item>
           <el-form-item label="物料编码">
             <el-input v-model="form.material_code" style="width: 240px;" disabled />
           </el-form-item>
-          <el-form-item label="物料名称" prop="material_name">
-            <el-input v-model="form.material_name" style="width: 240px;" @focus="getMaterial" />
-          </el-form-item>
           <el-form-item label="物料规格">
             <el-input v-model="form.material_spec" style="width: 240px;" disabled />
           </el-form-item>
@@ -73,35 +70,9 @@
             <el-input-number
               v-model.number="form.plan_qty"
               :min="0"
-              :max="999"
               style="width: 240px;"
             />
           </el-form-item>
-          <el-form-item label="实际数量" prop="real_qty">
-            <el-input-number
-              v-model.number="form.real_qty"
-              :min="0"
-              :max="999"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="载具类型">
-            <el-select
-              v-model="form.vehicle_type"
-              clearable
-              size="mini"
-              placeholder="请选择"
-              class="filter-item"
-              style="width: 240px;"
-            >
-              <el-option
-                v-for="item in dict.vehicle_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-
           <el-form-item label="计划开始时间" prop="planproducestart_date">
             <el-date-picker
               v-model="form.planproducestart_date"
@@ -118,7 +89,7 @@
               placeholder="选择日期时间"
             />
           </el-form-item>
-          <el-form-item label="实际开始时间">
+          <el-form-item label="实际开始时间" v-if="crud.status.edit">
             <el-date-picker
               v-model="form.realproducestart_date"
               type="datetime"
@@ -126,7 +97,7 @@
               placeholder="选择日期时间"
             />
           </el-form-item>
-          <el-form-item label="实际结束时间">
+          <el-form-item label="实际结束时间" v-if="crud.status.edit">
             <el-date-picker
               v-model="form.realproduceend_date"
               type="datetime"
@@ -134,17 +105,6 @@
               placeholder="选择日期时间"
             />
           </el-form-item>
-          <el-form-item label="静置时间(分钟)" prop="standing_time">
-            <el-input-number
-              v-model.number="form.standing_time"
-              :min="0"
-              :max="999"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item v-if="false" label="工单类型" prop="workorder_type">
-            <el-input v-model="form.workorder_type" style="width: 240px;" />
-          </el-form-item>
           <el-form-item label="所属区域" prop="region_code">
             <el-select
               v-model="form.region_code"
@@ -189,6 +149,40 @@
           <el-form-item label="设备名称">
             <el-input v-model="form.point_name" style="width: 240px;" disabled />
           </el-form-item>
+          <el-form-item label="静置时间(分钟)" prop="standing_time">
+            <el-input-number
+              v-model.number="form.standing_time"
+              :min="0"
+              :max="999"
+              style="width: 240px;"
+            />
+          </el-form-item>
+          <el-form-item label="实际数量" prop="real_qty" v-if="crud.status.edit">
+            <el-input-number
+              v-model.number="form.real_qty"
+              :min="0"
+              style="width: 240px;"
+            />
+          </el-form-item>
+          <el-form-item label="载具类型">
+            <el-select
+              v-model="form.vehicle_type"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              style="width: 240px;"
+            >
+              <el-option
+                v-for="item in dict.vehicle_type"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="false" label="工单类型" prop="workorder_type">
+            <el-input v-model="form.workorder_type" style="width: 240px;" />
+          </el-form-item>
           <el-form-item label="是否自动搬运" prop="is_needmove">
             <el-radio-group v-model="form.is_needmove" style="width: 240px">
               <el-radio :label="true">是</el-radio>
@@ -214,8 +208,9 @@
         <el-table-column prop="workorder_code" label="工单编号" :min-width="flexWidth('workorder_code',crud.data,'工单编号')" />
         <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="material_id" label="物料标识" :min-width="flexWidth('material_id',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,'物料标识')" />
         <el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型')" />
         <el-table-column
           prop="planproducestart_date"
@@ -307,6 +302,9 @@ const defaultForm = {
   planproduceend_date: null,
   realproducestart_date: null,
   realproduceend_date: null,
+  material_spec: null,
+  material_code: null,
+  material_name: null,
   standing_time: null,
   point_code: null,
   point_name: null,
@@ -417,6 +415,9 @@ export default {
       this.form.material_code = row.material_code
     },
     setRegionName(data) {
+      // 清空
+      this.form.point_code = null
+      this.form.point_name = null
       this.regionCodeParam = data
       var region = this.regionList.find(item => item.region_code === data)
       this.form.region_name = region.region_name