From c20bd338ddf092a3d9be15d68652d20b9645437d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 22 十月 2024 15:08:00 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 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 9d21b0d..4d2e55b 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -138,6 +138,7 @@
             orderDetl.setThreeCode(detlDto.getOrderNo());
             orderDetl.setSuppCode(detlDto.getFromOrderNo());
             orderDetl.setMemo(detlDto.getMemo());
+            orderDetl.setManu(detlDto.getMark());
             if (!orderDetlService.insert(orderDetl)) {
                 throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�");
             }
@@ -276,6 +277,7 @@
             orderDetl.setThreeCode(detlDto.getOrderNo());
             orderDetl.setSuppCode(detlDto.getFromOrderNo());
             orderDetl.setMemo(detlDto.getMemo());
+            orderDetl.setManu(detlDto.getMark());
             if (!orderDetlService.insert(orderDetl)) {
                 throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�");
             }
@@ -573,7 +575,7 @@
             wrkDetlLogs.forEach(wrkDetlLog -> {
                 LocDetlByTimeDTO locDetlByTimeDTO = new LocDetlByTimeDTO();
                 if (!Cools.isEmpty(wrkDetlLog.getOrderNo())){
-                    Order order = orderService.selectByNo(wrkMastLog.getSheetNo());
+                    Order order = orderService.selectByNo(wrkDetlLog.getOrderNo());
                     if (!Cools.isEmpty(order)) {
                         locDetlByTimeDTO.setDate(order.getOrderTime());
                         locDetlByTimeDTO.setWarehouse(order.getItemName());
@@ -583,7 +585,8 @@
                     locDetlByTimeDTO.setLocNo(wrkMastLog.getIoType() <100? wrkMastLog.getLocNo(): wrkMastLog.getSourceLocNo());
                     locDetlByTimeDTO.setBatch(wrkDetlLog.getBatch());
                     locDetlByTimeDTO.setAnfme(wrkDetlLog.getAnfme());
-                    locDetlByTimeDTO.setOrderNo(wrkMastLog.getSheetNo());
+                    locDetlByTimeDTO.setOrderNo(wrkDetlLog.getOrderNo());
+                    locDetlByTimeDTO.setMark(wrkDetlLog.getManu());
                     locDetlByTimeDTOS.add(locDetlByTimeDTO);
                 }
 

--
Gitblit v1.9.1