From e3b9215ac5e9e2f430c3fe356549f18363d6dd6a Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 14 十一月 2023 09:05:30 +0800
Subject: [PATCH] # mat_type_in

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |    6 ++++--
 1 files changed, 4 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 dedb09b..0a50dce 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -154,6 +154,7 @@
                 waitPakin.setFrozen(param.getFrozen()); // 鏄惁鍐荤粨
                 waitPakin.setManu(detlDto.getCstmr());
                 waitPakin.setMatType(mat.getMatType());//鐗╂枡绫诲瀷
+                waitPakin.setMatTypeIn(param.getMatTypeIn());//寮哄埗鐗╂枡绫诲瀷
                 if (Cools.isEmpty(mat.getMatType())){
                     throw new CoolException("鐗╂枡绫诲瀷寮傚父"+mat.getMatnr());
                 }else {
@@ -176,7 +177,7 @@
             // 鐢熸垚鍏ュ簱閫氱煡妗�
             List<DetlDto> detlDtos = new ArrayList<>();
             param.getCombMats().forEach(elem -> {
-                elem.setBatch("");
+                //elem.setBatch("");
                 // 璁㈠崟鏄庣粏鏁伴噺鏍¢獙
                 OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
                 if (elem.getAnfme() > orderDetl.getEnableQty()) {
@@ -209,7 +210,7 @@
                 WaitPakin waitPakin = new WaitPakin();
                 waitPakin.sync(mat);
                 waitPakin.setOrderNo(order.getOrderNo());   // 鍗曟嵁缂栧彿
-                waitPakin.setBatch("");     // 搴忓垪鐮�
+                //waitPakin.setBatch("");     // 搴忓垪鐮�
                 waitPakin.setZpallet(param.getBarcode());   // 鎵樼洏鐮�
                 waitPakin.setIoStatus("N");     // 鍏ュ嚭鐘舵��
                 waitPakin.setAnfme(detlDto.getAnfme());  // 鏁伴噺
@@ -220,6 +221,7 @@
                 waitPakin.setModiTime(now);
                 waitPakin.setOwner(detlDto.getOwner());
                 waitPakin.setMatType(mat.getMatType());//鐗╂枡绫诲瀷
+                waitPakin.setMatTypeIn(param.getMatTypeIn()); //寮哄埗鐗╂枡绫诲瀷
 //                if (Cools.isEmpty(mat.getMatType())){
 //                    throw new CoolException("鐗╂枡绫诲瀷寮傚父"+mat.getMatnr());
 //                }else {

--
Gitblit v1.9.1