From d604552b9a8a36c828c6ba650321618f8c32fe41 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Thu, 11 Jul 2024 10:12:37 +0800
Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E6=B7=BB=E5=8A=A0=E6=BF=80?=
 =?UTF-8?q?=E5=85=89=E4=B8=8B=E6=96=99=E5=AF=BC=E5=85=A5=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD,=E5=8D=95=E5=B7=A5=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=94=B9=E6=88=9012(=E7=94=B1=E5=8F=B3?=
 =?UTF-8?q?=E5=85=88=E5=8F=96)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/nl/common/enums/AcsTaskEnum.java   |  2 +-
 .../impl/IPdmProduceWorkorderServiceImpl.java        | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java
index d957514c..dd8b6fdc 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java
@@ -91,7 +91,7 @@ public enum AcsTaskEnum {
     AGV_SYSTEM_HR("3","海柔任务"),
 
     ACS_TASK_TYPE_NOBLE_DOUBLE_TASK("1","诺宝双工任务"),
-    ACS_TASK_TYPE_NOBLE_SINGLE_TASK("2","诺宝单工任务"),
+    ACS_TASK_TYPE_NOBLE_SINGLE_TASK("12","诺宝单工任务"),
     ACS_TASK_TYPE_NOBLE_SINGLE_ENTRY_TASK("3","诺宝单入-单任务"),
     ACS_TASK_TYPE_NOBLE_DOUBLE_ENTRY_TASK("4","诺宝双入-双任务"),
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java
index 863baad2..3e111ffe 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java
@@ -655,9 +655,8 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
                     }
                     if (j == 4) {
                         //设备 A1_TW_
-                        String s = col.replaceAll("-", "_");
-                        if (StringUtils.isNotEmpty(s)) {
-                            workorder.setDevice_code("A1_TW_" + s);
+                        if (StringUtils.isNotEmpty(col)) {
+                            workorder.setDevice_code(col);
                         }
                     }
                     if (j == 7) {
@@ -709,6 +708,13 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
                 errorMap.put("第" + (i + 1) + "行:", "工序名称:" + workorder.getWorkprocedure_id() + "不存在");
             } else {
                 workorder.setWorkprocedure_id(workprocedure.getWorkprocedure_id());
+                if (workorder.getWorkprocedure_id().equals("1535144427977314304")){
+                    workorder.setDevice_code("A1_TW_" + workorder.getDevice_code().replaceAll("-", "_"));
+                }else if (workorder.getWorkprocedure_id().equals("1535143737330634752")){
+                    workorder.setDevice_code("A1_JG_" + workorder.getDevice_code().replaceAll("-", "_"));
+                }else {
+                    errorMap.put("第" + (i + 1) + "行:", "工序名称:" + workorder.getWorkprocedure_id() + "对应设备不正确");
+                }
             }
             List<MdMeMaterialbase> mdMeMaterialbases = materialspecs.get(workorder.getMaterial_id());
             if (!CollectionUtils.isEmpty(mdMeMaterialbases)) {