From 4ce0a1b6c7712691a74f76890310f97c48215945 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 25 五月 2023 09:05:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 3741792..508937f 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -174,7 +174,7 @@
}
//2.鍏ュ簱瀹屾垚涓婃姤
CombParam combParam = new CombParam();
- combParam.setPackNo(wrkMast.getBarcode());
+ combParam.setPackNo(wrkDetls.get(0).getMatnr());
combParam.setLocNo(wrkMast.getLocNo());
if (locMast.getCrnNo()==1){
combParam.setPackSts(0);
@@ -346,6 +346,8 @@
locMast.setIoTime(now);
locMast.setModiTime(now);
locMast.setFireStatus(0);
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+
boolean sign =false;
if (locMast.getLocType1().equals(sourceLoc.getLocType1())){
@@ -377,10 +379,11 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
+
if (locMast.getCrnNo()==1 && sign){
//5.闈欑疆搴撲綅鍏ュ簱瀹屾垚涓婃姤
CombParam combParam = new CombParam();
- combParam.setPackNo(wrkMast.getBarcode());
+ combParam.setPackNo(locDetl.getMatnr());
combParam.setLocNo(wrkMast.getLocNo());
if (locMast.getPackStatus()==4){
combParam.setPackSts(2);
--
Gitblit v1.9.1