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 |   15 +++++++++++++--
 1 files changed, 13 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 5bd34d0..3d42664 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -114,11 +114,15 @@
             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());
+                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)) {
@@ -148,6 +152,7 @@
                 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());
@@ -185,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;
@@ -211,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