From fef3b0760b7394847f143151e8bdce238290e1dc Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期四, 18 八月 2022 12:36:32 +0800
Subject: [PATCH] Revert "#"
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 6974692..b2d00ce 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -19,6 +19,7 @@
import com.zy.common.utils.NodeUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.expression.spel.ast.NullLiteral;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -589,12 +590,14 @@
java.sql.Date requestTime = new java.sql.Date(date1.getTime());
// 鐢熸垚鍏ュ簱閫氱煡妗�
- Mat mat = matService.selectByMatnr(param.getPackName());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(param.getPackName() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
+// Mat mat = matService.selectByMatnr(param.getPackName());
+// if (Cools.isEmpty(mat)) {
+// throw new CoolException(param.getPackName() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+// }
WaitPakin waitPakin = new WaitPakin();
- waitPakin.sync(mat);
+// waitPakin.sync(mat);
+ waitPakin.setMatnr(param.getPackName());
+ waitPakin.setMaktx(param.getPackName());
waitPakin.setZpallet(param.getPackNo()); // Pack鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(1.0); // 鏁伴噺
@@ -603,6 +606,7 @@
waitPakin.setAppeTime(requestTime);
waitPakin.setModiUser(null);
waitPakin.setModiTime(requestTime);
+ waitPakin.setDeadWarn(param.getSettingTimes());
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -616,7 +620,7 @@
.eq("barcode", review.getBarcode())
.eq("user_Id", review.getUserId());
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()));
- if (locMast.getPackStatus()!=1) {
+ if (null == locMast ||locMast.getPackStatus()!=1) {
throw new CoolException("浜у搧鐘舵�佷笉鏄� 1:寰呮祴璇�");
}
TestMast testMast = testMastService.selectOne(wrapper);
@@ -662,6 +666,10 @@
if (!testMastService.update(testMast,wrapper)){
throw new CoolException("鏇存敼娴嬭瘯鐘舵�佸け璐�");
}
+ locMast.setPackStatus(3);
+ if (!locMastService.update(locMast, wrapper)){
+ throw new CoolException("鏇存敼浜у搧鐘舵�佸け璐�");
+ }
}else if (Cools.isEmpty(testMast.getStatus())){
throw new CoolException("鐘舵�佸紓甯�");
}else {
@@ -670,6 +678,7 @@
} else {
throw new CoolException("鐘舵�佸紓甯�");
}
+ //绉诲簱寮�濮嬶紝鏌ヨ鐩爣搴撲綅
LocMast targetLocNo = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("row1",2)
.eq("loc_sts","O")
--
Gitblit v1.9.1