From a9764ac6da99590b911b22597eefd246ba38ab25 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 31 十月 2024 13:15:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 5 +++--
1 files changed, 3 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 cd455a0..ddf7eb9 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -571,8 +571,8 @@
public List<LocDetlByTimeDTO> selectTimeLocDetl(TimeSelectParam param) {
ArrayList<LocDetlByTimeDTO> locDetlByTimeDTOS = new ArrayList<>();
EntityWrapper<WrkMastLog> wrkMastLogEntityWrapper = new EntityWrapper<>();
- wrkMastLogEntityWrapper.ge("appe_time",param.getStartTime());
- wrkMastLogEntityWrapper.le("appe_time",param.getEndTime());
+ wrkMastLogEntityWrapper.ge("modi_time",param.getStartTime());
+ wrkMastLogEntityWrapper.le("modi_time",param.getEndTime());
// wrkMastLogEntityWrapper.isNotNull("sheet_no");
wrkMastLogService.selectList(wrkMastLogEntityWrapper).forEach(wrkMastLog -> {
if (wrkMastLog.getWrkSts() == 5 || wrkMastLog.getWrkSts() == 15) {
@@ -593,6 +593,7 @@
locDetlByTimeDTO.setAnfme(wrkDetlLog.getAnfme());
locDetlByTimeDTO.setOrderNo(wrkDetlLog.getOrderNo());
locDetlByTimeDTO.setMark(wrkDetlLog.getManu());
+ locDetlByTimeDTO.setWorkNo(wrkDetlLog.getWrkNo().toString());
locDetlByTimeDTOS.add(locDetlByTimeDTO);
}
--
Gitblit v1.9.1