#

luxiaotao1123

2022-06-01 7af8149430c4c73d805b94091a23ffb6417b339f

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

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
@@ -163,7 +164,25 @@
        // 如果没有相近物料，则按规则轮询货架
        if (null == locMast) {
            Shelves shelves = new Shelves(rowCount, crn_qty);
            if (whsType == 1) {
            if (whsType != 4) {
                int divides = (int) Arith.divides(1, curRow - 1, 16);
                curRow = (int) Arith.remainder(curRow, 16);
                if (curRow == 0) {
                    curRow = 16;
                }
                for (int i = 0; i < shelves.group; i ++) {
                    curRow = shelves.start(curRow);
                    if (curRow < 0) {
                        throw new CoolException("检索库位失败，请联系管理员");
                    }
                    Integer crnNo1 = shelves.get(curRow);
                    crnNo1 = crnNo1 + divides*4;
                    if (basCrnpService.checkSiteError(crnNo1, true)) {
                        crnNo = crnNo1;
                        break;
                    }
                }
            } else {
                for (int i = 0; i < shelves.group; i ++) {
                    curRow = shelves.start(curRow);
                    if (curRow < 0) {
@@ -296,11 +315,11 @@
            case 202:
                return 2;
            case 206:
            case 211:
            case 215:
            case 219:
            case 223:
            case 226:
//            case 211:
//            case 215:
//            case 219:
//            case 223:
            case 227:
                return 3;
            default:
                throw new CoolException("根据入库站获取库位排号分配失败，入库站：" + sourceStaNo);