#

zjj

2025-03-12 69790d0b03b7194e19287519026a0409626bea04

#

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -528,8 +528,12 @@
//        wrkMastLogEntityWrapper.isNotNull("sheet_no");
        wrkMastLogService.selectList(wrkMastLogEntityWrapper).forEach(wrkMastLog -> {
            if (wrkMastLog.getWrkSts() == 5 || wrkMastLog.getWrkSts() == 15) {
                List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>()
                        .eq("wrk_no", wrkMastLog.getWrkNo()).eq("zpallet", wrkMastLog.getBarcode()));
                EntityWrapper<WrkDetlLog> wrkDetlLogEntityWrapper = new EntityWrapper<>();
                wrkDetlLogEntityWrapper.eq("wrk_no", wrkMastLog.getWrkNo());
                if (wrkMastLog.getIoType() != 300 && wrkMastLog.getIoType() != 301){
                    wrkDetlLogEntityWrapper.eq("zpallet", wrkMastLog.getBarcode());
                }
                List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectList(wrkDetlLogEntityWrapper);
                wrkDetlLogs.forEach(wrkDetlLog -> {
                    if (wrkDetlLog.getOrderNo() != null && !wrkDetlLog.getOrderNo().isEmpty()) {
                        LocDetlByTimeDTO locDetlByTimeDTO = new LocDetlByTimeDTO();