From 5f6dbe95bb56f30ccd7acb98282d486e5ed2afd8 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 26 六月 2025 17:33:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 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 5e1263d..038d47a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -23,10 +23,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
/**
* 绉诲姩绔湇鍔℃牳蹇冪被
@@ -115,7 +112,14 @@
combMat.setBatch("");
}
}
-
+ HashMap<String,Object> cM=new HashMap<>();
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ if (cM.get(combMat.getMatnr())==null){
+ cM.put(combMat.getMatnr(),combMat);
+ }else {
+ throw new CoolException("缁勬墭鏁版嵁涓瓨鍦ㄩ噸澶嶇殑鏁版嵁===>>缂栫爜锛�" + combMat.getMatnr()+"鎵瑰彿锛�"+combMat.getBatch());
+ }
+ }
@@ -259,7 +263,14 @@
combMat.setBatch("");
}
}
-
+ HashMap<String,Object> cM=new HashMap<>();
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ if (cM.get(combMat.getMatnr())==null){
+ cM.put(combMat.getMatnr(),combMat);
+ }else {
+ throw new CoolException("缁勬墭鏁版嵁涓瓨鍦ㄩ噸澶嶇殑鏁版嵁===>>缂栫爜锛�" + combMat.getMatnr()+"鎵瑰彿锛�"+combMat.getBatch());
+ }
+ }
@@ -422,6 +433,14 @@
for (CombParam.CombMat combMat : param.getCombMats()) {
if (combMat.getBatch() == null){
combMat.setBatch("");
+ }
+ }
+ HashMap<String,Object> cM=new HashMap<>();
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ if (cM.get(combMat.getMatnr())==null){
+ cM.put(combMat.getMatnr(),combMat);
+ }else {
+ throw new CoolException("缁勬墭鏁版嵁涓瓨鍦ㄩ噸澶嶇殑鏁版嵁===>>缂栫爜锛�" + combMat.getMatnr()+"鎵瑰彿锛�"+combMat.getBatch());
}
}
@@ -1327,6 +1346,9 @@
List<WrkDetl> wrkDetls = param.getWrkDetls();
for (WrkDetl wrkDetl : wrkDetls) {
+ if (wrkDetl.getAnfme()<=0){
+ continue;
+ }
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setZpallet(param.getBarcode());
wrkDetl.setMatnr("B"+wrkDetl.getMatnr());
--
Gitblit v1.9.1