#

Junjie

3 天以前 78067a1c03707766f3d6561c22e165af68ad36b9

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

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
@@ -212,20 +213,6 @@

        StartupDto startupDto = new StartupDto();

        // 获取目标站
//        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>().eq("type_no", staDescId).eq("stn_no", sourceStaNo).eq("crn_no", locMast.getCrnNo());
//        StaDesc staDesc = staDescService.selectOne(wrapper);
//        if (Cools.isEmpty(staDesc)) {
//            log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
//            throw new CoolException("入库路径不存在");
//        } else {
//            BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
//            if (!staNo.getAutoing().equals("Y")) {
//                log.error("目标站" + staDesc.getCrnStn() + "不可用");
//                throw new CoolException("目标站"+staDesc.getCrnStn()+"不可用");
//            }
//            startupDto.setStaNo(staNo.getDevNo());
//        }
        String locNo = locMast.getLocNo();
        // 生成工作号
        int workNo = getWorkNo(0);
@@ -513,4 +500,23 @@
        }
    }

    //移库任务获取空库位
    public String getLocTransferLocNo(String locNo){
        List<Integer> locGroupDesc = Utils.getLocGroupDesc(slaveProperties, locNo);
        //先找深库位
        List<LocMast> locMastList = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").in("row1", locGroupDesc));
        if (locMastList.isEmpty()) {
            //搜索浅库位
            List<Integer> locGroupAsc = Utils.getLocGroupAsc(slaveProperties, locNo);
            locMastList = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").in("row1", locGroupAsc));
        }

        if (locMastList.isEmpty()) {
            return null;
        }

        LocMast locMast = locMastList.get(0);
        return locMast.getLocNo();
    }

}