#

zhou zhou

5 天以前 e0b041aca4e2ed0e0881e596c6cd1ec3dc63ddba

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

@@ -569,6 +569,7 @@
            wrkMast.setExitMk("N"); // 退出
            wrkMast.setEmptyMk("Y"); // 空板
            wrkMast.setLinkMis("N");
            wrkMast.setBarcode(locMast.getBarcode());//托盘条码
            wrkMast.setAppeUser(userId);
            wrkMast.setAppeTime(now);
            wrkMast.setModiUser(userId);
@@ -786,6 +787,7 @@
        }else if (wrkMast.getWrkSts() >= 106 && wrkMast.getWrkSts() <=108){
            wrkMast.setWrkSts(14L);
        }
        wrkMast.setPltType(0);
        Date now = new Date();
        wrkMast.setCrnStrTime(DateUtils.calculate(now, 1L, TimeUnit.SECONDS, true));
        wrkMast.setCrnEndTime(now);
@@ -1347,25 +1349,25 @@
                throw new CoolException("保存工作档失败，出库库位号：" + dto.getLocNo());
            }
            // 生成工作档明细
            for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
                if (detlDto.getCount() == null || detlDto.getCount() <= 0.0D) {
                    continue;
                }
                WrkDetl wrkDetl = new WrkDetl();
                wrkDetl.sync(detlDto.getLocDetl());
                wrkDetl.setOrderNo(""); // 手动出库不需要带出库存中的单据编号
                wrkDetl.setWrkNo(workNo);
                wrkDetl.setIoTime(now);
                Double anfme = ioType == 101 ? detlDto.getLocDetl().getAnfme() : detlDto.getCount();
                wrkDetl.setAnfme(anfme); // 数量
                wrkDetl.setAppeTime(now);
                wrkDetl.setAppeUser(userId);
                wrkDetl.setModiTime(now);
                wrkDetl.setModiUser(userId);
                if (!wrkDetlService.insert(wrkDetl)) {
                    throw new CoolException("保存工作档明细失败");
                }
            }
//            for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
//                if (detlDto.getCount() == null || detlDto.getCount() <= 0.0D) {
//                    continue;
//                }
//                WrkDetl wrkDetl = new WrkDetl();
//                wrkDetl.sync(detlDto.getLocDetl());
//                wrkDetl.setOrderNo(""); // 手动出库不需要带出库存中的单据编号
//                wrkDetl.setWrkNo(workNo);
//                wrkDetl.setIoTime(now);
//                Double anfme = ioType == 101 ? detlDto.getLocDetl().getAnfme() : detlDto.getCount();
//                wrkDetl.setAnfme(anfme); // 数量
//                wrkDetl.setAppeTime(now);
//                wrkDetl.setAppeUser(userId);
//                wrkDetl.setModiTime(now);
//                wrkDetl.setModiUser(userId);
//                if (!wrkDetlService.insert(wrkDetl)) {
//                    throw new CoolException("保存工作档明细失败");
//                }
//            }
            // 修改库位状态:   F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中
            locMast = locMastService.selectById(dto.getLocNo());
            if (locMast.getLocSts().equals("F")) {