From c94a87065a12006c1b3251418a13a459b23aa7e4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 27 九月 2023 10:15:42 +0800
Subject: [PATCH] #库龄、库存异常分离
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 72 ++++++++++++++++++++++++++++++-----
1 files changed, 61 insertions(+), 11 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 595dc84..f7b7822 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -95,7 +95,17 @@
}
}
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
+// int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode())
+// .last(" wrk_no IN ( SELECT wrk_no FROM asr_wrk_mast WHERE wrk_sts != 15 )"));
+ if (wrkMast != null && wrkMast.getWrkSts()==18) countWrk = 0;
+ if (countLoc > 0 || countWrk > 0) {
+ throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
+ }
+
Date now = new Date();
+ Integer matType = 0;
// 鏃犲崟缁勬墭
if (Cools.isEmpty(param.getOrderNo())) {
@@ -103,12 +113,17 @@
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getMemo());
+// elem.setBatch("");
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getMemo(), elem.getCstmr(),elem.getOwner());
-// if (Cools.isEmpty(detlDto.getBatch())){
-// String batch = DateUtils.convert(new Date(),DateUtils.yyyyMMdd);
-// detlDto.setBatch(batch);
-// }
+ if (Cools.isEmpty(detlDto.getBatch())){
+ String batch = DateUtils.convert(new Date(),DateUtils.yyyyMMdd);
+ detlDto.setBatch(batch);
+ }
+
+ if (Cools.isEmpty(detlDto.getOwner())){
+ detlDto.setOwner(1L);
+ }
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
@@ -127,6 +142,7 @@
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
+// waitPakin.setBatch("");
waitPakin.setBatch(detlDto.getBatch());
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
@@ -136,8 +152,20 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setOwner(detlDto.getOwner());
waitPakin.setMemo(detlDto.getMemo());
waitPakin.setFrozen(param.getFrozen()); // 鏄惁鍐荤粨
+ waitPakin.setManu(detlDto.getCstmr());
+ waitPakin.setMatType(mat.getMatType());//鐗╂枡绫诲瀷
+ if (Cools.isEmpty(mat.getMatType())){
+ throw new CoolException("鐗╂枡绫诲瀷寮傚父"+mat.getMatnr());
+ }else {
+ if (matType == 0){
+ matType = mat.getMatType();
+ }else if (!matType.equals(mat.getMatType())){
+ throw new CoolException("璇风粍鎵樺悓涓�绫诲瀷鐨勭墿鏂�");
+ }
+ }
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -151,7 +179,7 @@
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
-
+ elem.setBatch("");
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
if (elem.getAnfme() > orderDetl.getEnableQty()) {
@@ -162,7 +190,12 @@
throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
}
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getOwner());
+
+ if (Cools.isEmpty(detlDto.getOwner())){
+ detlDto.setOwner(1L);
+ }
+
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
assert one != null;
@@ -179,7 +212,7 @@
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
waitPakin.setOrderNo(order.getOrderNo()); // 鍗曟嵁缂栧彿
- waitPakin.setBatch(detlDto.getBatch()); // 搴忓垪鐮�
+ waitPakin.setBatch(""); // 搴忓垪鐮�
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
@@ -188,6 +221,17 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setOwner(detlDto.getOwner());
+ waitPakin.setMatType(mat.getMatType());//鐗╂枡绫诲瀷
+// if (Cools.isEmpty(mat.getMatType())){
+// throw new CoolException("鐗╂枡绫诲瀷寮傚父"+mat.getMatnr());
+// }else {
+// if (matType == 0){
+// matType = mat.getMatType();
+// }else if (matType!=mat.getMatType()){
+// throw new CoolException("璇风粍鎵樺悓涓�绫诲瀷鐨勭墿鏂�");
+// }
+// }
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -198,7 +242,7 @@
}
@Override
@Transactional
- public void adjustNew(MobileAdjustParam param, Long userId) {
+ public void adjustNew(MobileAdjustParam param, Boolean re, Long userId) {
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
if (Cools.isEmpty(wrkMast)){
throw new CoolException("鎵樼洏鐮�:"+param.getBarcode()+" 鏃犳湁鏁堝伐浣滄。");
@@ -243,12 +287,15 @@
checkRecord.setConfirmQty(wrkDetl.getAnfme());
if (Cools.isEmpty(wrkDetlOld)){
wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setZpallet(wrkMast.getBarcode());
wrkDetlService.insert(wrkDetl);
recordRecordLog=recordRecordLog+"\n"+"鏂板涓�鏉℃槑缁�:"+"\t鍟嗗搧缂栧彿锛�"+wrkDetl.getMatnr()+"\t鎵瑰彿锛�"+wrkDetl.getBatch()+"\t鏁伴噺锛�"+wrkDetl.getAnfme();
adjDetl.setOriQty(0.0);
adjDetlService.insert(adjDetl);
checkRecord.setAnfme(0.0);
- checkRecordService.insert(checkRecord);
+ if (!re) {
+ checkRecordService.insert(checkRecord);
+ }
}else if (wrkDetlOld.getAnfme()!=wrkDetl.getAnfme()){
wrkDetlService.updateAnfme(wrkDetl.getAnfme(),wrkMast.getWrkNo(),wrkDetl.getMatnr(),wrkDetl.getBatch());
recordRecordLog=recordRecordLog+"\n"+"鏇存柊涓�鏉℃槑缁�:"+"\t鍟嗗搧缂栧彿锛�"+wrkDetl.getMatnr()+"\t鎵瑰彿锛�"+wrkDetl.getBatch()+"\t鍘熸暟閲忥細"+wrkDetlOld.getAnfme()+"\t鏂版暟閲忥細"+wrkDetl.getAnfme();
@@ -256,7 +303,9 @@
adjDetlService.insert(adjDetl);
checkRecord.setAnfme(wrkDetlOld.getAnfme());
- checkRecordService.insert(checkRecord);
+ if (!re) {
+ checkRecordService.insert(checkRecord);
+ }
}else if (wrkDetlOld.getAnfme()==wrkDetl.getAnfme()){
recordRecordLog=recordRecordLog+"\n"+"涓�鏉℃槑缁嗕繚鎸佷笉鍙�:"+"\t鍟嗗搧缂栧彿锛�"+wrkDetl.getMatnr()+"\t鎵瑰彿锛�"+wrkDetl.getBatch()+"\t鏁伴噺锛�"+wrkDetlOld.getAnfme();
continue;
@@ -486,6 +535,7 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setMatType(mat.getMatType());//鐗╂枡绫诲瀷
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
--
Gitblit v1.9.1