From c73b0e2f40e0a143b5f815793de24b060816c664 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 02 七月 2025 10:24:36 +0800
Subject: [PATCH] 完善erp对接

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

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 789257b..a30255d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -331,7 +331,7 @@
                 if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                         eq("zpallet", param.getBarcode())
                         .eq("io_status", "N")
-                        .eq("matnr", elem.getMatnr()).eq("batch", elem.getBatch())) > 0) {
+                        .eq("matnr", elem.getMatnr()).eq("three_code",elem.getThreeCode()).eq("batch", elem.getBatch())) > 0) {
                     throw new CoolException(param.getBarcode() + "宸叉湁鐩稿悓鏁版嵁");
                 }
 
@@ -417,7 +417,7 @@
                 detlDto.setTemp1(codeDataParam.getQuality());
                 detlDto.setFromOrderNo(codeDataParam.getBarcode());
                 if (DetlDto.has(detlDtos, detlDto)) {
-                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
+                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(),detlDto.getFromOrderNo());
                     assert one != null;
                     one.setAnfme(one.getAnfme() + detlDto.getAnfme());
                 } else {

--
Gitblit v1.9.1