#

Junjie

3 天以前 d82c353588cb3a9a080bccb65e06e44a5d9dcfb0

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

@@ -340,17 +340,12 @@
            // 获取路径
            List<StaDesc> staDescs = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
            StaDesc staDesc = staDescs.get(0);
            Integer crnStn = staDesc.getCrnStn();
            if (locMast.getCrnNo() == 1) {
                int finalCrnStn = 1016;
                if (locMast.getRow1() <= 3) {
                    finalCrnStn = 1013;
                }

                for (StaDesc desc : staDescs) {
                    if (desc.getCrnStn() == finalCrnStn) {
                        staDesc = desc;
                        break;
                    }
                    crnStn = 1013;
                }else {
                    crnStn = 1016;
                }
            }

@@ -378,7 +373,7 @@
            wrkMast.setIoType(ioType); // 入出库状态
            wrkMast.setIoPri(13D); // 优先级：13
            wrkMast.setCrnNo(locMast.getCrnNo());
            wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
            wrkMast.setSourceStaNo(crnStn); // 源站
            wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
            wrkMast.setSourceLocNo(dto.getLocNo()); // 源库位
            wrkMast.setFullPlt("Y"); // 满板：Y
@@ -470,7 +465,16 @@
        String orderNo = taskDto.getLocDtos().get(0).getOrderNo();
        OrderPakout orderPakout = orderPakOutService.selectByNo(orderNo);
        int ioType = orderPakout.getDocType() == 8 ? 107 : (taskDto.isAll() ? 101 : 103);
        StaDesc staDesc = staDescService.queryCrnStnAuto(ioType, locMast.getCrnNo(), staNo.getDevNo());
        StaDesc staDesc = staDescService.queryCrnStnAuto(ioType, locMast.getCrnNo(), staNo.getDevNo(),locMast.getRow1());
        Integer crnStn = staDesc.getCrnStn();
        if (locMast.getCrnNo() == 1) {
            if (locMast.getRow1() <= 3) {
                crnStn = 1013;
            }else {
                crnStn = 1016;
            }
        }

        // 生成工作号
        int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
        // 生成工作档
@@ -481,7 +485,7 @@
        wrkMast.setIoType(ioType); // 入出库状态
        wrkMast.setIoPri(13D); // 优先级：13
        wrkMast.setCrnNo(locMast.getCrnNo());
        wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
        wrkMast.setSourceStaNo(crnStn); // 源站
        wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
        wrkMast.setSourceLocNo(taskDto.getLocNo()); // 源库位
        wrkMast.setFullPlt("Y"); // 满板：Y
@@ -542,6 +546,7 @@
            wrkDetl.setStockNum(locDetl.getAnfme());//库存
            wrkDetl.setStockNum2(locDetl.getWeight());//辅库存
            wrkDetl.setKpCstmrName(orderPakout.getKpCstmrName());
            wrkDetl.setCstateid(locDetl.getCstateid());

            //计算辅数量
            Double weight = MatUtils.calcWeight(wrkDetl.getMatnr(), wrkDetl.getAnfme());
@@ -669,6 +674,14 @@
            if (Cools.isEmpty(sourceStaNo)) {
                throw new CoolException("检索源站失败");
            }
            if (locMast.getCrnNo() == 1) {
                if (locMast.getRow1() <= 3) {
                    sourceStaNo = 1013;
                }else {
                    sourceStaNo = 1016;
                }
            }

            Date now = new Date();
            // 保存工作档
            WrkMast wrkMast = new WrkMast();
@@ -731,6 +744,14 @@
            if (Cools.isEmpty(sourceStaNo)) {
                throw new CoolException("检索源站失败");
            }
            if (locMast.getCrnNo() == 1) {
                if (locMast.getRow1() <= 3) {
                    sourceStaNo = 1013;
                }else {
                    sourceStaNo = 1016;
                }
            }

            Date now = new Date();
            // 保存工作档