#

luxiaotao1123

2021-01-12 3bdbc5fb15a14f341b0febc4fad8ce4f4fecef44

#

 src/main/java/com/zy/asrs/utils/VersionUtils.java

@@ -1,8 +1,10 @@
package com.zy.asrs.utils;

import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.WrkDetl;
import com.zy.common.model.LocTypeDto;

/**
 * Created by vincent on 2020/7/14
@@ -65,5 +67,16 @@
        locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
    }

    /**
     *  库位移转时类型检测
     **/
    public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto){
        // 如果源库位是高库位，目标库位是低库位
        if (dto.getLocType1() == 2 && loc.getLocType1() == 1) {
            return false;
        }
        return true;
    }


}

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

@@ -8,6 +8,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
@@ -140,9 +141,11 @@
                // 检测目标库位是否为空库位
                LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
                    locMast = shallowLoc;
                    crnNo = locMast.getCrnNo();
                    break;
                    if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) {
                        locMast = shallowLoc;
                        crnNo = locMast.getCrnNo();
                        break;
                    }
                }
            }
        }