From c7f36f65a16f51f0f45ed1008d31fc6c4560541a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 22 十月 2024 14:36:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 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 c77280d..587c92e 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("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -566,24 +568,27 @@
EntityWrapper<WrkMastLog> wrkMastLogEntityWrapper = new EntityWrapper<>();
wrkMastLogEntityWrapper.ge("appe_time",param.getStartTime());
wrkMastLogEntityWrapper.le("appe_time",param.getEndTime());
- wrkMastLogEntityWrapper.isNotNull("sheet_no");
+// wrkMastLogEntityWrapper.isNotNull("sheet_no");
wrkMastLogService.selectList(wrkMastLogEntityWrapper).forEach(wrkMastLog -> {
List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>()
.eq("wrk_no", wrkMastLog.getWrkNo()).eq("zpallet", wrkMastLog.getBarcode()));
wrkDetlLogs.forEach(wrkDetlLog -> {
LocDetlByTimeDTO locDetlByTimeDTO = new LocDetlByTimeDTO();
- Order order = orderService.selectByNo(wrkMastLog.getSheetNo());
- if (!Cools.isEmpty(order)) {
- locDetlByTimeDTO.setDate(order.getOrderTime());
- locDetlByTimeDTO.setWarehouse(order.getItemName());
- locDetlByTimeDTO.setOrderType(order.getDocType().toString());
+ if (!Cools.isEmpty(wrkDetlLog.getOrderNo())){
+ Order order = orderService.selectByNo(wrkDetlLog.getOrderNo());
+ if (!Cools.isEmpty(order)) {
+ locDetlByTimeDTO.setDate(order.getOrderTime());
+ locDetlByTimeDTO.setWarehouse(order.getItemName());
+ locDetlByTimeDTO.setOrderType(order.getDocType().toString());
+ }
+ locDetlByTimeDTO.setMatnr(wrkDetlLog.getMatnr());
+ locDetlByTimeDTO.setLocNo(wrkMastLog.getIoType() <100? wrkMastLog.getLocNo(): wrkMastLog.getSourceLocNo());
+ locDetlByTimeDTO.setBatch(wrkDetlLog.getBatch());
+ locDetlByTimeDTO.setAnfme(wrkDetlLog.getAnfme());
+ locDetlByTimeDTO.setOrderNo(wrkDetlLog.getOrderNo());
+ locDetlByTimeDTOS.add(locDetlByTimeDTO);
}
- locDetlByTimeDTO.setMatnr(wrkDetlLog.getMatnr());
- locDetlByTimeDTO.setLocNo(wrkMastLog.getIoType() <100? wrkMastLog.getLocNo(): wrkMastLog.getSourceLocNo());
- locDetlByTimeDTO.setBatch(wrkDetlLog.getBatch());
- locDetlByTimeDTO.setAnfme(wrkDetlLog.getAnfme());
- locDetlByTimeDTO.setOrderNo(wrkMastLog.getSheetNo());
- locDetlByTimeDTOS.add(locDetlByTimeDTO);
+
});
});
--
Gitblit v1.9.1