#

luxiaotao1123

2020-07-03 4011b25a1fd355f11a81d506ec55fcbd2ee95a39

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

@@ -14,7 +14,7 @@
import java.util.List;

/**
 * 双深式货架核心功能
 * 货架核心功能
 * Created by vincent on 2020/6/11
 */
@Service
@@ -63,9 +63,15 @@
                }
            }
            if (workNo > 0){
                // todo
                wrkLastno.setWrkNo(workNo);
                wrkLastnoService.updateById(wrkLastno);
            }
        }
        if (workNo == 0) {
            throw new CoolException("生成工作号失败，请联系管理员");
        } else {
            if (wrkMastService.selectById(workNo)!=null) {
                throw new CoolException("生成工作号" + workNo + "在工作档中已存在");
            }
        }
        return workNo;
@@ -74,10 +80,11 @@
    /**
     * 检索库位号
     * @param whsType 类型 1:双深式货架
     * @param staDescId 路径ID
     * @param sourceStaNo 源站
     * @return locNo 检索到的库位号
     */
    public StartupDto getLocNo(Integer whsType, Integer sourceStaNo) {
    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo) {
        StartupDto startupDto = new StartupDto();
        RowLastno rowLastno = rowLastnoService.selectById(whsType);
        if (Cools.isEmpty(rowLastno)) {
@@ -100,18 +107,13 @@
            for (List<Integer> node : shelves.nodes){
                if (node.contains(curRow)) {
                    crnNo = shelves.nodes.indexOf(node) + 1;
                    break;
                }
            }
            BasCrnp crnp = basCrnpService.selectById(crnNo);
            if (Cools.isEmpty(crnp)) {
                throw new CoolException("堆垛机编号错误");
            }
            if (!"Y".equals(crnp.getInEnable())) {
                throw new CoolException("当前堆垛机无法入库");
            }
            basCrnpService.checkSiteStatus(crnNo);
            // 获取目标站
            Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                    .eq("type_no", 1)
                    .eq("type_no", staDescId)
                    .eq("stn_no", sourceStaNo)
                    .eq("crn_no", crnNo);
            StaDesc staDesc = staDescService.selectOne(wrapper);
@@ -119,7 +121,7 @@
                throw new CoolException("入库路径不存在");
            }
            BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
            int inQty = staNo.getInQty();
            int inQty = staNo.getInQty()==null?0:staNo.getInQty();
            if (staNo.getInEnable().equals("Y") && staNo.getAutoing().equals("Y") && inQty<2) {
                // 查找库位
                LocMast locMast = locMastService.queryFreeLocMast(curRow);