Merge remote-tracking branch 'origin/sxlktasrs' into sxlktasrs

zwl

2023-10-07 af17595ea094b162d3b90279f140cbdb3da1c52b

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

@@ -105,6 +105,7 @@
        } else if (sourceStaNo > 299){
            whsType = 3;
        }

        // 目标堆垛机号
        int crnNo = whsType;
        if (!basCrnpService.checkSiteError(crnNo, true)){
@@ -246,6 +247,7 @@
            log.error("系统没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times);
            throw new CoolException("没有空库位");
        }

        String locNo = locMast.getLocNo();

        // 生成工作号