pjb
2025-08-24 24d7a5efb26424da1a8bf5d87db87558a6bb3a79
src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -1772,7 +1772,7 @@
                WrkDetl wrkDetl1 = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
                if (wrkDetl1 != null) {
                    // 出库任务的四个出库站点,判断当前物料一批出库的时间 获取当前已完成 / 总数
                    if(wrkMast.getIoType() == 101 && (wrkMast.getStaNo() == 1024 ||wrkMast.getStaNo() == 1040 ||wrkMast.getStaNo() == 1043 ||wrkMast.getStaNo() == 1016) ) {
                    if(wrkMast.getIoType() == 101 && (wrkMast.getStaNo() == 1024 ||wrkMast.getStaNo() == 1031 ||wrkMast.getStaNo() == 1043 ||wrkMast.getStaNo() == 1016) ) {
                        int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 101).eq("io_time", wrkMast.getIoTime()));
                        int countHis = wrkMastMapper.selectCountHisByIoTypeAndIoTime(101, wrkMast.getIoTime());
                        matDto.setOutTotal(count+countHis);
@@ -1787,6 +1787,11 @@
                    matDto.setWeight(wrkDetl1.getWeight());
                    matDto.setGrossWeight(wrkDetl1.getManLength());
                    ledCommand.getMatDtos().add(matDto);
                } else {
                    // 入库空托盘,异常去异常口显示报警信息,给空工作明细
                    if(wrkMast.getIoType() == 3) {
                        ledCommand.getMatDtos().add(matDto);
                    }
                }
                // 订单
//                if(wrkDetl1 != null && !Cools.isEmpty(wrkDetl1.getOrderNo()))  {