#1

dubin

8 天以前 9268cd77b4e864b901a8b0bf965f441f2e8c4fbd

 src/main/java/com/zy/common/web/WcsController.java

@@ -51,6 +51,10 @@
    private  LocDetlService locDetlService;
    @Autowired
    private  BasCrnpService basCrnpService;
    @Autowired
    private WrkMastLogService wrkMastLogService;
    @Autowired
    private WrkDetlLogService wrkDetlLogService;

    @Value("${led.ip}")
    private String ledIp;
@@ -157,7 +161,7 @@

        StartupDto dto = commonService.getLocNo(1, devpNo, findLocNoAttributeVo, locTypeDto, barcode);
        if (dto == null) {
            throw new CoolException("找不到空库位");
            throw new CoolException("找不到空库位--->" + barcode);
        }
        int workNo = dto.getWorkNo();
        Date now = new Date();
@@ -237,7 +241,7 @@
            throw new CoolException("拣选盘点任务不存在");
        }

        if (wrkMastOut.getIoType() != 103 || wrkMastOut.getIoType() != 107) {
        if (wrkMastOut.getIoType() != 103 && wrkMastOut.getIoType() != 107) {
            throw new CoolException("任务类型不属于拣选、盘点");
        }

@@ -277,12 +281,24 @@
        // 操作人员数据
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);
        wrkMast.setIoTime(now);
        boolean res = wrkMastService.insert(wrkMast);
        if (!res) {
            throw new CoolException("保存工作档失败");
        }

        wrkDetlService.updateWorkNo(wrkMastOut.getWrkNo(), workNo);
        //保存工作主档
        if (!wrkMastLogService.save(wrkMastOut.getWrkNo())){
            throw new CoolException("保存工作主档失败，workNo=" + wrkMastOut.getWrkNo());
        }
        //保存工作明细档
        if (!wrkMastOut.getEmptyMk().equals("Y")) {
            if (!wrkDetlLogService.save(wrkMastOut.getWrkNo())){
                throw new CoolException("保存工作明细失败，workNo=" + wrkMastOut.getWrkNo());
            }
        }

        wrkDetlService.updateWorkNo(wrkMastOut.getWrkNo(), workNo,now);

        // 删除工作主档
        if (!wrkMastService.deleteById(wrkMastOut)) {
@@ -297,8 +313,8 @@
        }
        // 更新目标库位状态
        LocMast locMast = locMastService.selectById(dto.getLocNo());
        if (locMast.getLocSts().equals("O")) {
            locMast.setLocSts("S"); // S.入库预约
        if (locMast.getLocSts().equals("P")) {
            locMast.setLocSts("Q"); // S.入库预约
            locMast.setModiTime(now);
            if (!locMastService.updateById(locMast)) {
                throw new CoolException("改变库位状态失败");