From 383c6139926563f02fba4432effbfc27f87d88c5 Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期三, 30 七月 2025 14:36:57 +0800
Subject: [PATCH] ERP对接

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 4f423d8..98861b1 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -247,7 +247,7 @@
         List<DetlDto> list = new ArrayList<>();
         List<DetlDto> orderDetails = param.getOrderDetails();
         for (DetlDto detail : orderDetails) {
-            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
+            DetlDto dto = new DetlDto(detail.getMatnr(),detail.getMaktx(), detail.getBatch(), detail.getAnfme());
             if (DetlDto.has(list, dto)) {
                 DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
                 assert detlDto != null;
@@ -259,10 +259,17 @@
         for (DetlDto detlDto : list) {
             Mat mat = matService.selectByMatnr(detlDto.getMatnr());
             if (Cools.isEmpty(mat)) {
-                throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+                Mat mat1=new Mat();
+                mat1.setTagId(1L);
+                mat1.setMatnr(detlDto.getMatnr());
+                mat1.setMaktx(detlDto.getMaktx());
+                mat1.setMatType(3);
+                matService.insert(mat1);
             }
             OrderDetl orderDetl = new OrderDetl();
-            orderDetl.sync(mat);
+//            orderDetl.sync(mat);
+            orderDetl.setMatnr(detlDto.getMatnr());
+            orderDetl.setMaktx(detlDto.getMaktx());
             orderDetl.setBatch(detlDto.getBatch());
             orderDetl.setAnfme(detlDto.getAnfme());
             orderDetl.setOrderId(order.getId());
@@ -286,8 +293,6 @@
         wrkMast.setIoType(101);
         wrkMast.setWrkSts(17L);
         wrkMast.setMemo("鎹℃枡杞叏鏉垮伐浣滄。");
-        wrkMastService.update(wrkMast, new EntityWrapper<WrkMast>()
-                .eq("wrk_no", wrkMast.getWrkNo()));
         List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
         List<LocDetl> locDetls = locDetlService.selectByLocNo(wrkMast.getSourceLocNo());
         for (LocDetl locDetl : locDetls) {
@@ -318,6 +323,8 @@
             }
         }
         locMastService.updateLocSts(wrkMast.getSourceLocNo(), "R");
+        wrkMastService.update(wrkMast, new EntityWrapper<WrkMast>()
+                .eq("wrk_no", wrkMast.getWrkNo()));
     }
 
 

--
Gitblit v1.9.1