#

yxFwq

2024-08-09 a36d1d0f890e342743d79d0274c143502dbc7dc6

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

@@ -282,7 +282,7 @@
            }else if (locMast.getLocSts().equals("F")){
                // 获取源站
                Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                        .eq("type_no", 110)
                        .eq("type_no", 101)
                        .eq("stn_no", param.getOutSite())
                        .eq("crn_no", locMast.getCrnNo());
                StaDesc staDesc = staDescService.selectOne(wrapper);
@@ -524,7 +524,8 @@
        for (OutLocDto dto : dtos) {
            // 判断入出库类型：101.全板出库 or 103.拣料出库
            if (ioWorkType == null) {
                ioType = dto.isAll() ? 101 : 103;
//                ioType = dto.isAll() ? 101 : 103;
                ioType = 101;
            } else if (ioWorkType.equals(IoWorkType.CHECK_OUT)) {
                ioType = 107;
            }
@@ -788,7 +789,7 @@
            wrkMast.setIoTime(now);
            wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
            wrkMast.setIoType(110); // 入出库状态： 110.空板出库
            wrkMast.setIoPri(10D);
            wrkMast.setIoPri(15D);
            wrkMast.setSourceStaNo(sourceStaNo); // 源站
            wrkMast.setStaNo(param.getOutSite()); // 目标站
            wrkMast.setCrnNo(locMast.getCrnNo());
@@ -1399,6 +1400,22 @@
        if (Cools.isEmpty(wrkMast)){
            throw new CoolException(workNo+"工作档不存在");
        }
        if (Cools.isEmpty(wrkMast.getLocNo()) && Cools.isEmpty(wrkMast.getSourceLocNo())){
            int devCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().eq("wrk_no", wrkMast.getWrkNo()));
            if (devCount!=0){
                throw new CoolException("取消失败，工作号："+wrkMast.getWrkNo()+"在输送线上运行中！！！");
            }
            try{
                wrkMastService.deleteById(wrkMast.getWrkNo());
                List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
                if (!wrkDetls.isEmpty()){
                    wrkDetlService.deleteById(wrkMast.getWrkNo());
                }
            }catch (Exception e){
                throw new CoolException("取消失败，异常"+e);
            }
            return;
        }
        String locNo = ""; // 待修改目标库位
        String locSts = ""; // 待修改目标库位状态
        // 入库取消（修改目标库位）