#

luxiaotao1123

2020-06-13 56b2d09b5ec649b9748593092fba6b1b37641434

 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;
@@ -100,6 +106,7 @@
            for (List<Integer> node : shelves.nodes){
                if (node.contains(curRow)) {
                    crnNo = shelves.nodes.indexOf(node) + 1;
                    break;
                }
            }
            BasCrnp crnp = basCrnpService.selectById(crnNo);
@@ -119,7 +126,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);