Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs

luxiaotao1123

2022-06-07 53e8b479c720d5bd5c8d279c3fd6eacb7fa1603b

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

@@ -179,6 +179,7 @@
                    crnNo1 = crnNo1 + divides*4;
                    if (basCrnpService.checkSiteError(crnNo1, true)) {
                        crnNo = crnNo1;
                        curRow = curRow + divides*16;
                        break;
                    }
                }
@@ -321,6 +322,10 @@
//            case 223:
            case 227:
                return 3;
            case 305:
            case 303:
            case 301:
                return 4;
            default:
                throw new CoolException("根据入库站获取库位排号分配失败，入库站：" + sourceStaNo);
        }