From a5a600575d1c827bcd125d2f4cea374d72f5236a Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 23 五月 2023 09:55:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 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..416109c 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());
}
@@ -253,6 +253,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);
--
Gitblit v1.9.1