From 6751d283289bd10d2ad97ddff65de64046d89c6b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 26 五月 2023 14:39:28 +0800
Subject: [PATCH] 地图显示行号
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 13 +++++++++----
1 files changed, 9 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 3d50451..27f4418 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -99,7 +99,7 @@
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.getWrkSts()==18) countWrk = 0;
+ if (wrkMast != null && wrkMast.getWrkSts()==18) countWrk = 0;
if (countLoc > 0 || countWrk > 0) {
throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
}
@@ -112,6 +112,7 @@
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
+ elem.setBatch("");
DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getMemo(), elem.getCstmr());
if (Cools.isEmpty(detlDto.getBatch())){
@@ -136,7 +137,7 @@
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
- waitPakin.setBatch(detlDto.getBatch());
+ waitPakin.setBatch("");
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
@@ -148,6 +149,7 @@
waitPakin.setMemo(detlDto.getMemo());
waitPakin.setFrozen(param.getFrozen()); // 鏄惁鍐荤粨
waitPakin.setManu(detlDto.getCstmr());
+ waitPakin.setMatType(mat.getMatType());//鐗╂枡绫诲瀷
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -161,7 +163,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()) {
@@ -189,7 +191,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()); // 鏁伴噺
@@ -198,6 +200,7 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setMatType(mat.getMatType());//鐗╂枡绫诲瀷
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -253,6 +256,7 @@
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);
@@ -500,6 +504,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