#

zjj

2024-10-22 c20bd338ddf092a3d9be15d68652d20b9645437d

 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,28 @@
        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());
                    locDetlByTimeDTO.setMark(wrkDetlLog.getManu());
                    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);

            });

        });