From eeadaf600bf7a2a753f3d3cfd945e3c51b1817d5 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 06 十二月 2024 14:27:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 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 b000233..46d3e6d 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -521,22 +521,24 @@
List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>()
.eq("wrk_no", wrkMastLog.getWrkNo()).eq("zpallet", wrkMastLog.getBarcode()));
wrkDetlLogs.forEach(wrkDetlLog -> {
- LocDetlByTimeDTO locDetlByTimeDTO = new LocDetlByTimeDTO();
- 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$());
+ if (wrkDetlLog.getOrderNo() != null && !wrkDetlLog.getOrderNo().isEmpty()) {
+ LocDetlByTimeDTO locDetlByTimeDTO = new LocDetlByTimeDTO();
+ 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$());
+ }
+ 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());
+ locDetlByTimeDTO.setMark(wrkDetlLog.getManu());
+ locDetlByTimeDTO.setWorkNo(wrkDetlLog.getWrkNo().toString());
+ 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(wrkDetlLog.getOrderNo());
- locDetlByTimeDTO.setMark(wrkDetlLog.getManu());
- locDetlByTimeDTO.setWorkNo(wrkDetlLog.getWrkNo().toString());
- locDetlByTimeDTOS.add(locDetlByTimeDTO);
}
});
--
Gitblit v1.9.1