From 851a69962e7febe20c70e57fe60ced663269a03c Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 26 九月 2023 15:07:59 +0800
Subject: [PATCH] #客户信息
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 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 e859f7c..3d42664 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -105,7 +105,7 @@
}
Date now = new Date();
- int matType = 0;
+ Integer matType = 0;
// 鏃犲崟缁勬墭
if (Cools.isEmpty(param.getOrderNo())) {
@@ -113,12 +113,16 @@
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
- elem.setBatch("");
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getMemo(), elem.getCstmr());
+// elem.setBatch("");
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getMemo(), elem.getCstmr(),elem.getOwner());
if (Cools.isEmpty(detlDto.getBatch())){
String batch = DateUtils.convert(new Date(),DateUtils.yyyyMMdd);
detlDto.setBatch(batch);
+ }
+
+ if (Cools.isEmpty(detlDto.getOwner())){
+ detlDto.setOwner(0L);
}
if (DetlDto.has(detlDtos, detlDto)) {
@@ -138,7 +142,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()); // 鏁伴噺
@@ -147,19 +152,20 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setOwner(detlDto.getOwner());
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!=mat.getMatType()){
-// throw new CoolException("璇风粍鎵樺悓涓�绫诲瀷鐨勭墿鏂�");
-// }
-// }
+ 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("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -184,7 +190,12 @@
throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
}
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getOwner());
+
+ if (Cools.isEmpty(detlDto.getOwner())){
+ detlDto.setOwner(0L);
+ }
+
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
assert one != null;
@@ -210,6 +221,7 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setOwner(detlDto.getOwner());
waitPakin.setMatType(mat.getMatType());//鐗╂枡绫诲瀷
// if (Cools.isEmpty(mat.getMatType())){
// throw new CoolException("鐗╂枡绫诲瀷寮傚父"+mat.getMatnr());
--
Gitblit v1.9.1