完善

野心家

2025-06-21 288e45a990a5abf4ab50f820ed4e870e8314468e

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

@@ -201,15 +201,25 @@
        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;
            }
            assert ioType != null;
            // 获取库位
            LocMast locMast = locMastService.selectById(dto.getLocNo());
            if (Cools.isEmpty(locMast)){
                throw new CoolException("未找到库位");
            }
            if (locMast.getPackStatus()==2 ){
                throw new CoolException("产品在测试中，禁止出库");
            }

            Integer outSta = staNo.getDevNo();

            // 获取路径
            StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), staNo.getDevNo());
            StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
            // 生成工作号
            int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
            // 生成工作档
@@ -221,7 +231,7 @@
            wrkMast.setIoPri(13D); // 优先级：13
            wrkMast.setCrnNo(locMast.getCrnNo());
            wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
            wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
            wrkMast.setStaNo(104); // 目标站
            wrkMast.setSourceLocNo(dto.getLocNo()); // 源库位
            wrkMast.setFullPlt("Y"); // 满板：Y
            wrkMast.setPicking("N"); // 拣料
@@ -233,6 +243,7 @@
            wrkMast.setAppeTime(now);
            wrkMast.setModiUser(userId);
            wrkMast.setModiTime(now);
            wrkMast.setMemo(outSta+"");
            if (!wrkMastService.insert(wrkMast)) {
                throw new CoolException("保存工作档失败，出库库位号："+dto.getLocNo());
            }
@@ -503,9 +514,18 @@
        LocMast loc = locMastService.selectById(locNo);
        if (Cools.isEmpty(loc)){
            throw new CoolException("未找到库位");
        }
        if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
            throw new CoolException("移转库位属于不同堆垛机");
        }else if (sourceLoc.getPackStatus()==2){
            throw new CoolException("产品在测试中，禁止库位移栽");
//        }else if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
//            throw new CoolException("移转库位属于不同堆垛机");
        }else if(sourceLoc.getPackStatus()==3||sourceLoc.getPackStatus()==4){
            if(sourceLoc.getLocType1()==loc.getLocType1()){
                throw new CoolException("源库为与目标库位的库位类型相同");
            }
        }else if (sourceLoc.getPackStatus()==5){
            if(sourceLoc.getLocType1()!=loc.getLocType1()){
                throw new CoolException("源库为静置货物与目标库位的库位类型不相同");
            }
        }
        Date now = new Date();
        // 获取工作号
@@ -516,8 +536,8 @@
        wrkMast.setIoTime(now);
        wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
        wrkMast.setIoType(11); // 入出库状态： 11.库格移载
        wrkMast.setIoPri(10D);
        wrkMast.setCrnNo(sourceLoc.getCrnNo());
        wrkMast.setIoPri(sourceLoc.getPackStatus()==4? 9D:10D);
        wrkMast.setCrnNo(1);
        wrkMast.setSourceLocNo(sourceLocNo); // 源库位
        wrkMast.setLocNo(locNo); // 目标库位
        wrkMast.setFullPlt(Cools.isEmpty(locDetls)?"N":"Y"); // 满板：Y
@@ -783,10 +803,9 @@
                if (!Cools.isEmpty(waitPakin)) {
                    waitPakin.setIoStatus("N");
                    waitPakin.setLocNo("");
                    waitPakinService.update(waitPakin, new EntityWrapper<WaitPakin>()
                            .eq("order_no", waitPakin.getOrderNo())
                            .eq("matnr", waitPakin.getMatnr())
                            .eq("batch", waitPakin.getBatch()));
                    waitPakin.setZpallet("");
                    boolean  result = waitPakinService.update(waitPakin, new EntityWrapper<WaitPakin>()
                            .eq("zpallet", wrkMast.getBarcode()));
                }
            }
        }