From f3b2a3fe0bb45bf3f026c43a5c567e4d7acb9e8e Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Mon, 9 Sep 2024 16:37:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=93=E5=8D=B0=E5=94=9B=E5=A4=B4?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=B7=A5=E5=8D=95=E5=AF=B9=E5=BA=94=E7=9A=84?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java | 6 ++++++
 .../service/impl/PdmBdWorkorderServiceImpl.java          | 9 +++++++++
 lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue   | 1 +
 3 files changed, 16 insertions(+)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index 7a8d7d3..f3face8 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -515,6 +515,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         log.info("包装数据：{}", object);
         String custerNo = object.getString("custer_no");
         String orderNo = object.getString("order_no");
+        if (ObjectUtil.isEmpty(custerNo)) {
+            throw new BadRequestException("客户编码不能为空");
+        }
+        if (ObjectUtil.isEmpty(orderNo)) {
+            throw new BadRequestException("订单号不能为空");
+        }
         CusterDo custer;
         // 都是数据就是id，否则就是名称
         if (custerNo.matches("\\d+")) {
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java
index 08762ba..36ee965 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java
@@ -155,6 +155,15 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
         if (dto == null) {
             throw new BadRequestException("被删除或无权限，操作失败!");
         }
+        SchBasePoint point = pointService.getById(entity.getPoint_code());
+        if (GeneralDefinition.AREA_FJ.equals(entity.getRegion_code())
+                && !"6".equals(point.getPoint_type())) {
+            // 工单号和客户编码存放json
+            JSONObject res = new JSONObject();
+            res.put("order_no", entity.getOrder_no());
+            res.put("custer_no", entity.getCuster_no());
+            entity.setExt_data(res.toJSONString());
+        }
         // 使用最新的状态
         entity.setWorkorder_status(dto.getWorkorder_status());
         entity.setUpdate_id(GeneralDefinition.ACS_ID);
diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
index 3f6d951..666b803 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
@@ -607,6 +607,7 @@ export default {
         const ext = JSON.parse(extData)
         this.form.order_no = ext.order_no
         this.form.order_subnum = ext.custer_no
+        this.form.custer_no = ext.custer_no
       }
     },
     getWorkShopList() { // 获取车间列表