From fdb6c647f4b9bf1a9dae9349cfd64a5e533433d2 Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期四, 21 九月 2023 09:38:59 +0800
Subject: [PATCH] #补丁
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 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 6a86e25..5bd34d0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -105,6 +105,7 @@
}
Date now = new Date();
+ Integer matType = 0;
// 鏃犲崟缁勬墭
if (Cools.isEmpty(param.getOrderNo())) {
@@ -112,7 +113,7 @@
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
- elem.setBatch("");
+// elem.setBatch("");
DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getMemo(), elem.getCstmr());
if (Cools.isEmpty(detlDto.getBatch())){
@@ -137,7 +138,8 @@
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
- waitPakin.setBatch("");
+// waitPakin.setBatch("");
+ waitPakin.setBatch(detlDto.getBatch());
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
@@ -149,6 +151,16 @@
waitPakin.setMemo(detlDto.getMemo());
waitPakin.setFrozen(param.getFrozen()); // 鏄惁鍐荤粨
waitPakin.setManu(detlDto.getCstmr());
+ waitPakin.setMatType(mat.getMatType());//鐗╂枡绫诲瀷
+ if (Cools.isEmpty(mat.getMatType())){
+ throw new CoolException("鐗╂枡绫诲瀷寮傚父"+mat.getMatnr());
+ }else {
+ if (matType == 0){
+ matType = mat.getMatType();
+ }else if (!matType.equals(mat.getMatType())){
+ throw new CoolException("璇风粍鎵樺悓涓�绫诲瀷鐨勭墿鏂�");
+ }
+ }
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -199,6 +211,16 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setMatType(mat.getMatType());//鐗╂枡绫诲瀷
+// if (Cools.isEmpty(mat.getMatType())){
+// throw new CoolException("鐗╂枡绫诲瀷寮傚父"+mat.getMatnr());
+// }else {
+// if (matType == 0){
+// matType = mat.getMatType();
+// }else if (matType!=mat.getMatType()){
+// throw new CoolException("璇风粍鎵樺悓涓�绫诲瀷鐨勭墿鏂�");
+// }
+// }
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -502,6 +524,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