From 32099d29dca4874ed255a51206be7a46b7a2fe4c Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期二, 20 五月 2025 11:35:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 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 b8c8370..1860cc7 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()+combMat.getBatch())==null){
+ cM.put(combMat.getMatnr()+combMat.getBatch(),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()+combMat.getBatch())==null){
+ cM.put(combMat.getMatnr()+combMat.getBatch(),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()+combMat.getBatch())==null){
+ cM.put(combMat.getMatnr()+combMat.getBatch(),combMat);
+ }else {
+ throw new CoolException("缁勬墭鏁版嵁涓瓨鍦ㄩ噸澶嶇殑鏁版嵁===>>缂栫爜锛�" + combMat.getMatnr()+"鎵瑰彿锛�"+combMat.getBatch());
}
}
@@ -655,6 +674,10 @@
if (wrkMast.getWrkSts() != 14L) {
throw new CoolException("褰撳墠鎵樼洏鍑哄簱鏈畬鎴愶紒");
}
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("barcode", param.getBarcode()));
+ if (locMast.getFullPlt().equals("Y")) {
+ throw new CoolException("褰撳墠鎵樼洏宸叉弧锛�");
+ }
//璁剧疆闈瀗ull鎵瑰彿锛�
for (CombParam.CombMat combMat : param.getCombMats()) {
@@ -662,6 +685,13 @@
combMat.setBatch("");
}
}
+ if (param.getIsFull().equals("1")) {
+ wrkMast.setFullPlt("Y");
+ wrkMastService.updateById(wrkMast);
+ locMast.setFullPlt("Y");
+ locMastService.updateById(locMast);
+ }
+
Date now = new Date();
for (CombParam.CombMat combMat : param.getCombMats()) {
--
Gitblit v1.9.1