#

luxiaotao1123

2021-11-19 720f154250c5a9aff4ac3cf6a28e001ad038d7e9

 src/main/java/com/zy/common/service/CommonService.java

@@ -105,12 +105,12 @@
    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, boolean emptyMk, List<String> matNos, LocTypeDto locTypeDto, LocTypeDto oldLocType, int times) {
        StartupDto startupDto = new StartupDto();
        // 生成工作号
        if (sourceStaNo == 103) {
            whsType = 1;
        } else if (sourceStaNo == 203) {
            whsType = 2;
        }
        int workNo = getWorkNo(0);
//        if (locTypeDto.getLocType3() == 1) { // 轻货信号
//            whsType = 2;    // 5 - 12 轻仓
//        } else if (locTypeDto.getLocType3() == 2) { // 重货信号
//            whsType = 1;    // 1 - 4 重仓
//        }
        RowLastno rowLastno = rowLastnoService.selectById(whsType);
        if (Cools.isEmpty(rowLastno)) {
            throw new CoolException("数据异常，请联系管理员");
@@ -192,15 +192,17 @@
                        if (curRow == 3 || curRow == 4) {
                            curRow = 3;
                        }
                        if (curRow == 5 || curRow == 6) {
                            curRow = 4;
                        }
                        if (curRow == 7 || curRow == 8) {
                            curRow = 5;
                        }
                        break;
                    }
                }
            } else if (whsType == 2) {
                if (curRow == sRow) {
                    curRow = eRow;
                } else {
                    curRow = sRow;
                }
                crnNo = whsType;
                basCrnpService.checkSiteStatus(crnNo, true);
            }
        }