From 8ebc61c8453cda67166571bc1f8cbd5e019082ad Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 09 九月 2023 10:57:56 +0800
Subject: [PATCH] 接口修改

---
 src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index bf873fb..a8bf17a 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -122,10 +122,10 @@
                 checkOrderQty(order,combMat);
             }
 
-            DetlDto detlDto = new DetlDto(combMat.getMatnr(), combMat.getBatch(), combMat.getAnfme());
+            DetlDto detlDto = new DetlDto(combMat.getMatnr(), combMat.getBatch(), combMat.getAnfme(), combMat.getCsocode(), combMat.getIsoseq());
             //鍚屼竴鎵樼洏涓嬬浉鍚岀墿鏂欎俊鎭拰鎵瑰彿杞负涓�涓叆搴撻�氱煡妗�
             if (DetlDto.has(detlDtos, detlDto)) {
-                DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
+                DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(), detlDto.getCsocode(), detlDto.getIsoseq(),null);
                 assert one != null;
                 one.setAnfme(one.getAnfme() + detlDto.getAnfme());
             } else {
@@ -170,6 +170,13 @@
         waitPakin.setIoStatus("N");     // 鍏ュ嚭鐘舵��
         waitPakin.setAnfme(detlDto.getAnfme());  // 鏁伴噺
         waitPakin.setStatus("Y");    // 鐘舵��
+
+        ////閿�鍞鍗曞彿
+        waitPakin.setThreeCode(detlDto.getCsocode());
+        //閿�鍞鍗曡鍙�
+        waitPakin.setDeadTime(detlDto.getIsoseq());
+
+
         waitPakin.setAppeUser(userId);
         waitPakin.setAppeTime(now);
         waitPakin.setModiUser(userId);

--
Gitblit v1.9.1