空托出库默认优先级14

pang.jiabao

2 天以前 75cbc7ef747bc41e8f89d250e9e27742c7614da7

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

@@ -116,6 +116,8 @@
    private SlaveProperties slaveProperties;
    @Autowired
    private WaitPakinService waitPakinService;
    @Resource
    private OpenServiceImpl openService;

    @Override
    @Transactional
@@ -210,8 +212,13 @@
                one = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", paramLocDetl.getLocNo()));
            }
            if (null != one && !paramLocDetl.getMatnr().equals("空箱")) {
                if (!"合格".equals(one.getThreeCode())) {
                // 3077 3106 只有合格能出
                if((param.getOutSite() == 3077 || param.getOutSite() == 3106) && !"合格".equals(one.getThreeCode())) {
                    throw new CoolException(one.getModel() + "卷不合格:" + one.getThreeCode());
                }
                // 2041 只有待判能出
                if(param.getOutSite() == 2041 && null != one.getThreeCode()) {
                    throw new CoolException(one.getModel() + "卷不为待判:" + one.getThreeCode());
                }
                locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo()));
            } else {
@@ -978,7 +985,7 @@
            wrkMast.setIoTime(now);
            wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
            wrkMast.setIoType(110); // 入出库状态： 110.空板出库
            wrkMast.setIoPri(10D);
            wrkMast.setIoPri(14D);
            wrkMast.setSourceStaNo(sourceStaNo); // 源站
            wrkMast.setStaNo(param.getOutSite()); // 目标站
            wrkMast.setCrnNo(locMast.getCrnNo());
@@ -1271,7 +1278,7 @@
        if (Cools.isEmpty(wrkMast)) {
            throw new CoolException(workNo + "工作档不存在");
        }
        if (wrkMast.getWrkSts() == 5 || wrkMast.getWrkSts() == 14 || wrkMast.getWrkSts() == 15) {
        if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 5 || wrkMast.getWrkSts() == 14 || wrkMast.getWrkSts() == 15) {
            throw new CoolException("当前工作档已完成");
        }
        // 入库 + 库位转移
@@ -1279,6 +1286,8 @@
            wrkMast.setWrkSts(4L);
            // 出库
        } else if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107 && wrkMast.getIoType() != 109) {
            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(Integer.valueOf(workNo));
            openService.ckjgsbPushMes(wrkMast,wrkDetls);
            wrkMast.setWrkSts(14L);
        } else {
            throw new CoolException("当前工作类型或状态无法完成");