From 0646a9d6eed0efe2b0bfc27e028d937efdfcd17f Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Fri, 31 Mar 2023 09:57:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E5=A4=8Dcode=E7=9A=84BUG=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E5=B7=A5=E5=BA=8F=E7=9A=84=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mps/service/impl/ProduceWorkorderServiceImpl.java  |  1 +
 .../org/nl/wms/pdm/service/impl/DeviceServiceImpl.java |  2 +-
 mes/qd/src/views/wms/mps/produce/index.vue             |  2 +-
 mes/qd/src/views/wms/pdm/device/index.vue              | 10 ++++++++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java
index 7ef86bd1..5cfc73ea 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java
@@ -148,6 +148,7 @@ public class ProduceWorkorderServiceImpl implements ProduceWorkorderService {
         String currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getCurrentNickName();
         dto.setWorkorder_id(IdUtil.getSnowflake(1, 1).nextIdStr());
+        dto.setCurrent_produce_person_id(currentUserId);
         dto.setCreate_id(currentUserId);
         dto.setCreate_name(nickName);
         dto.setUpdate_id(currentUserId);
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java
index 7547baf1..505c8f59 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java
@@ -100,7 +100,7 @@ public class DeviceServiceImpl implements DeviceService {
         String where = "is_delete = '0' and device_code = '" + dto.getDevice_code() + "'";
 
         JSONObject jsonObject = wo.query(where).uniqueResult(0);
-        if (ObjectUtil.isNotEmpty(jsonObject)) {
+        if (ObjectUtil.isNotEmpty(jsonObject) && !dto.getDevice_code().equals(jsonObject.getString("device_code"))) {
             throw new BadRequestException("编码已存在!");
         }
 
diff --git a/mes/qd/src/views/wms/mps/produce/index.vue b/mes/qd/src/views/wms/mps/produce/index.vue
index 69eeef52..be19958e 100644
--- a/mes/qd/src/views/wms/mps/produce/index.vue
+++ b/mes/qd/src/views/wms/mps/produce/index.vue
@@ -360,7 +360,7 @@
             {{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
           </template>
         </el-table-column>
-        <el-table-column prop="workprocedure_code" label="工序编码" />
+<!--        <el-table-column prop="workprocedure_code" label="工序编码" />-->
         <el-table-column prop="product_area" label="生产区域" />
         <el-table-column prop="plan_qty" label="计划数量" />
         <el-table-column prop="real_qty" label="实际数量" />
diff --git a/mes/qd/src/views/wms/pdm/device/index.vue b/mes/qd/src/views/wms/pdm/device/index.vue
index 94e765e4..2f3f7e78 100644
--- a/mes/qd/src/views/wms/pdm/device/index.vue
+++ b/mes/qd/src/views/wms/pdm/device/index.vue
@@ -110,6 +110,16 @@
               clearable
             />
           </el-form-item>
+          <el-form-item label="所属工序">
+            <el-select v-model="form.workprocedure_id" filterable clearable size="small" placeholder="所属工序" class="filter-item" style="width: 200px" @change="changeHeader(query.search, query.workprocedure_id)">
+              <el-option
+                v-for="item in workList"
+                :key="item.workprocedure_id"
+                :label="item.workprocedure_name"
+                :value="item.workprocedure_id"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="设备编码2">
             <el-input v-model="form.device_code2" style="width: 200px;" />
           </el-form-item>