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 | 24 ++++++++++++++++++------
1 files changed, 18 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 683ff79..b2d00ce 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -590,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); // 鏁伴噺
@@ -676,7 +678,17 @@
} else {
throw new CoolException("鐘舵�佸紓甯�");
}
-
+ //绉诲簱寮�濮嬶紝鏌ヨ鐩爣搴撲綅
+ LocMast targetLocNo = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1",2)
+ .eq("loc_sts","O")
+ .eq("fire_status", 0)
+ .eq("pack_status",0));
+ if (targetLocNo != null){
+ workService.locMove(review.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(review.getUserId()));
+ }else {
+ throw new CoolException("娌℃湁绌哄簱浣�");
+ }
return success;
}
--
Gitblit v1.9.1