From e3e268107c141f10e937761fa6bc94b74a9c9abc Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 24 九月 2025 15:49:11 +0800
Subject: [PATCH] 对接
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 48110f9..47d2487 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -78,7 +78,7 @@
@Override
@Transactional
- public void comb(CombParam param, Long userId) {
+ public void comb(CombParam param,Long userId,String fxId) {
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
@@ -102,15 +102,25 @@
Date now = new Date();
+ //杩涜鎵瑰彿绛涢�夛紝鎵瑰彿鍙兘鍞竴
Set<String> batchs=new HashSet<>();
+ List<String> strings=new ArrayList<>();
+
for(CombParam.CombMat mat : param.getCombMats()){
if(Cools.isEmpty(mat.getBatch())){
- throw new CoolException("鐗╂枡鎵瑰彿涓嶈兘涓虹┖");
+ continue;
}
batchs.add(mat.getBatch());
+ strings.add(mat.getBatch());
+ WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("batch", mat.getBatch()));
+ WrkDetl batch = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", mat.getBatch()));
+ LocDetl batch1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", mat.getBatch()));
+ if(!Cools.isEmpty(batch)||!Cools.isEmpty(batch1)||!Cools.isEmpty(waitPakin)){
+ throw new CoolException("璇ョ墿鏂欐壒鍙�"+mat.getBatch()+"宸插湪鍏ュ簱閫氱煡妗ｃ�佷换鍔℃槑缁嗗拰搴撳瓨涓瓨鍦�");
+ }
}
- if(batchs.size()<param.getCombMats().size()){
+ if(batchs.size()<strings.size()){
throw new CoolException("鏈夐噸澶嶇殑鐗╂枡鎵瑰彿");
}
int i =1;
@@ -151,6 +161,7 @@
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
waitPakin.setBrand(param.getCk());//浠撳簱
+ waitPakin.setInspect(param.isType()?1:0);
if(i==1){
// 0锛氫笉闇�瑕佽ˉ绌烘墭鐩�
// 1锛氬皬鎵樼洏
@@ -189,7 +200,7 @@
throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
}
// 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
+ if (!orderDetlService.increaseWorkQty2(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme(),fxId)) {
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
--
Gitblit v1.9.1