#

luxiaotao1123

2020-06-27 bf863779a389a07f62410f872eec63a4e4b1e6cc

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

@@ -7,13 +7,14 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * 双深式货架核心功能
 * 货架核心功能
 * Created by vincent on 2020/6/11
 */
@Service
@@ -62,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;
@@ -73,23 +80,24 @@
    /**
     * 检索库位号
     * @param whsType 类型 1:双深式货架
     * @param staDescId 路径ID
     * @param sourceStaNo 源站
     * @return locNo 检索到的库位号
     */
    public String getLocNo(Integer whsType, String sourceStaNo) {
    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo) {
        StartupDto startupDto = new StartupDto();
        RowLastno rowLastno = rowLastnoService.selectById(whsType);
        if (Cools.isEmpty(rowLastno)) {
            throw new CoolException("数据异常，请联系管理员");
        }
        String locNo = null;
        if (rowLastno.getWhsType() == 1){
            int curRow = rowLastno.getCurrentRow();
            int sRow = rowLastno.getsRow();
            int eRow = rowLastno.geteRow();
            int crn_qty = rowLastno.getCrnQty();

            int rowCount = eRow - sRow + 1;
            // 获取目标站所在货架排号
            Shelves shelves = new Shelves(8, crn_qty);
            Shelves shelves = new Shelves(rowCount, crn_qty);
            curRow = shelves.start(curRow);
            if (curRow < 0) {
                throw new CoolException("检索库位失败，请联系管理员");
@@ -99,36 +107,44 @@
            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("stnNo", sourceStaNo)
                    .eq("type_no", staDescId)
                    .eq("stn_no", sourceStaNo)
                    .eq("crn_no", crnNo);
            StaDesc staDesc = staDescService.selectOne(wrapper);
            if (Cools.isEmpty(staDesc)) {
                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) {
                // 查找库位 todo
                LocMast locMast = locMastService.queryFreeLocMast(curRow, 1);
                // 查找库位
                LocMast locMast = locMastService.queryFreeLocMast(curRow);
                if (Cools.isEmpty(locMast)) {
                    throw new CoolException("没有空库位");
                }
                String locNo = locMast.getLocNo();

                // 更新库位排号
                rowLastno.setCurrentRow(curRow);
                rowLastnoService.updateById(rowLastno);

                // 返回dto
                startupDto.setCrnNo(crnNo);
                startupDto.setShelves(shelves);
                startupDto.setSourceStaNo(sourceStaNo);
                startupDto.setStaNo(staNo.getDevNo());
                startupDto.setLocNo(locNo);
            } else {
                throw new CoolException("目标站不可用");
            }


            rowLastno.setCurrentRow(curRow);
            rowLastnoService.updateById(rowLastno);
        }
        return locNo;
        return startupDto;
    }

}