自动化立体仓库 - WMS系统
#
zjj
2023-12-26 e81c1dcf8d2cd9a0095039670a1f34e28078fd97
#
16个文件已修改
424 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/LocMastMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/LocDetlService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/LocMastService.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/WrkMastService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/utils/VersionUtils.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/service/CommonService.java 285 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/web/WcsController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/LocDetlMapper.xml 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/LocMastMapper.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/WrkMastMapper.xml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -112,4 +112,5 @@
    List<WrkDetlLogAllViewParam> selectAllWrkDetlLogAllViewParamByMatnrE(Map<String, Object> map);
    Integer selectAllWrkDetlLogAllViewParamByMatnrCount(Map<String, Object> map);
    List<String> selectSameDetl(@Param("matnr") String matnr, @Param("batch") String batch, @Param("grade") String grade);
}
src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -36,4 +36,8 @@
    LocMast selectByLoc(String locNo);
    List<LocMast> selectAreaEmpty(Short locType1,Integer crnNo);
    List<LocMast> selectAllLocNotEmpty(@Param("groupLoc") List<String> groupOuterLoc);
}
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -22,4 +22,5 @@
    List<InOutCountDto> selectTop100();
    List<WrkMast> selectSameMatnrs(@Param("matnr") String matnr, @Param("batch") String batch, @Param("grade") String grade);
}
src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -87,4 +87,6 @@
    String selectLocNoF(String locNo);
    List<LocDetlAll> selectOwnerAllAnfme();
    List<String> getSameDetl(String matnr, String batch, String grade);
}
src/main/java/com/zy/asrs/service/LocMastService.java
@@ -25,7 +25,7 @@
     * @param locMast
     * @return
     */
    Boolean checkEmptyCount(LocMast locMast);
    Boolean checkEmptyCount(LocMast locMast, int quaOfBlank);
    /**
     * 当前库存明细是否为整托
@@ -51,4 +51,10 @@
    List<LocMast> selectNodeELocByLev(Integer lev);
    LocMast selectByLoc(String loc);
    LocMast findNearloc(String locNo);
    List<LocMast> selectAreaEmpty(Short locType1, Integer crnNo);
    boolean checkAllLocEmpty(List<String> groupLoc);
}
src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -27,4 +27,5 @@
    List<InOutCountDto> selectTop100();
    List<WrkMast> selectSameMatnrs(String matnr, String batch, String grade);
}
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -232,4 +232,8 @@
    public List<LocDetlAll> selectOwnerAllAnfme() {
        return this.baseMapper.selectOwnerAllAnfme();
    }
    @Override
    public List<String> getSameDetl(String matnr, String batch, String grade) {
        return this.baseMapper.selectSameDetl(matnr, batch, grade);
    }
}
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -7,6 +7,7 @@
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.RowLastnoService;
import com.zy.asrs.utils.Utils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -36,11 +37,11 @@
    }
    @Override
    public Boolean checkEmptyCount(LocMast locMast) {
    public Boolean checkEmptyCount(LocMast locMast, int quaOfBlank) {
        if (locMast == null) {
            return false;
        }
        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > quaOfBlank;
    }
    @Override
@@ -85,10 +86,39 @@
    }
    @Override
    public LocMast findNearloc(String locNo) {
        LocMast locMast = null;
        List<String> groupOuterLoc = Utils.getGroupLocNo(locNo, true);
        if (!Cools.isEmpty(groupOuterLoc)) {
            for (String loc : groupOuterLoc) {
                LocMast tmp = this.baseMapper.selectByLoc(loc);
                if (tmp == null) {
                    continue;
                }
                if (tmp.getLocSts().equals("O")) {
                    locMast = tmp;
                    break;
                }
            }
        }
        return locMast;
    }
    @Override
    public List<LocMast> selectByLocNo(List<String> locNo) {
        return this.baseMapper.selectByLocNo(locNo);
    }
    @Override
    public List<LocMast> selectAreaEmpty(Short locType1,Integer crnNo) {
        return this.baseMapper.selectAreaEmpty(locType1,crnNo);
    }
    @Override
    public boolean checkAllLocEmpty(List<String> groupOuterLoc) {
        List<LocMast> result = this.baseMapper.selectAllLocNotEmpty(groupOuterLoc);
        return result.size() <= 0;
    }
}
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -90,7 +90,7 @@
        // 检索库位
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs, locTypeDto, 0);
        StartupDto dto = commonService.getLocNo(1, 1, null, null,null,null,0, locTypeDto,0);
        // 生成工作号
        int workNo = dto.getWorkNo();
        // 生成工作档
@@ -374,7 +374,7 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null, locTypeDto, 0);
        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null,null,null,0, locTypeDto,0);
        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档
@@ -1041,14 +1041,14 @@
                Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
                targetLoc = locMastService.queryFreeLocMast(deepRow, locMast.getLocType1());
                // 因库位移转、需预留空库位
                if (!locMastService.checkEmptyCount(targetLoc)) {
                if (!locMastService.checkEmptyCount(targetLoc,10)) {
                    continue;
                }
            }
            if (Cools.isEmpty(targetLoc)) {
                targetLoc = locMastService.queryFreeLocMast(curRow, locMast.getLocType1());
                // 因库位移转、需预留空库位
                if (!locMastService.checkEmptyCount(targetLoc)) {
                if (!locMastService.checkEmptyCount(targetLoc,10)) {
                    continue;
                }
                // 目标库位 ===>> 浅库位, 则校验其深库位是否为 F D X
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -55,5 +55,10 @@
    public List<InOutCountDto> selectTop100() {
        return this.baseMapper.selectTop100();
    }
    @Override
    public List<WrkMast> selectSameMatnrs(String matnr, String batch, String grade) {
        return this.baseMapper.selectSameMatnrs(matnr, batch, grade);
    }
}
src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -10,6 +10,14 @@
 */
public class VersionUtils {
    public static boolean checkLocType(LocMast loc, LocTypeDto dto){
        //库位类型必须和传入的库位信号一致
        if (loc.getLocType1().equals(dto.getLocType1())) {
            return true;
        }
        return false;
    }
    // 业务 ----------------------------------------------------------------------
src/main/java/com/zy/common/service/CommonService.java
@@ -92,73 +92,115 @@
     * @param whsType 类型 1:双深式货架
     * @param staDescId 路径工作类型
     * @param sourceStaNo 源站
     * @param matNos 商品编号集合
     * @return locNo 检索到的库位号
     */
    @Transactional
    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
//        whsType = getWhsType(sourceStaNo, times);
        StartupDto startupDto = new StartupDto();
        RowLastno rowLastno = rowLastnoService.selectById(whsType);
        if (Cools.isEmpty(rowLastno)) {
            throw new CoolException("数据异常,请联系管理员");
        }
        // ===============>>>> 开始执行
        int curRow = rowLastno.getCurrentRow();
        int sRow = rowLastno.getsRow();
        int eRow = rowLastno.geteRow();
        int crn_qty = rowLastno.getCrnQty();
        int rowCount = eRow - sRow + 1;
        // 目标堆垛机号
        int crnNo = 0;
    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
        // 目标库位
        LocMast locMast = null;
        // 靠近摆放规则 --- 同天同规格物料
        if (!Cools.isEmpty(matNos)) {
            List<String> locNos = locDetlService.getSameDetlToday(matNos.get(0), sRow, eRow);
            for (String locNo : locNos) {
                if (Utils.isShallowLoc(slaveProperties, locNo)) {
        // 靠近摆放规则 --- 空托
        locMast = getLocNoStep4(staDescId, locTypeDto, sourceStaNo);
        if (locMast != null) {
            //找到库位,返回dto
            return getLocNoStep6(staDescId, sourceStaNo, locMast);//返回dto
        }
        //库位规则
//        locMast = getLocNoStepRule(matnr, locTypeDto);
//        if (locMast != null) {
//            //找到库位,返回dto
//            return getLocNoStep6(staDescId, sourceStaNo, locMast);//返回dto
//        }
        // 靠近摆放规则 --- 相同订单号, 同天同规格物料
        locMast = getLocNoStep3(staDescId, matnr, batch, grade, locTypeDto,sourceStaNo);
        if (locMast != null) {
            //找到库位,返回dto
            return getLocNoStep6(staDescId, sourceStaNo, locMast);//返回dto
        }
        //搜索整个空库位组
        locMast = getLocNoStepSingle(locTypeDto,sourceStaNo);
        if (locMast != null) {
            //找到库位,返回dto
            return getLocNoStep6(staDescId, sourceStaNo, locMast);//返回dto
        }
        //找不到库位,抛出异常
        throw new CoolException("没有空库位");
    }
    // 搜索单品(整个库位组)
    private LocMast getLocNoStepSingle(LocTypeDto locTypeDto,Integer sourceStaNo) {
        LocMast locMast = null;
        StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("type_no", 1).eq("stn_no", sourceStaNo));
        //单品
        List<LocMast> locMasts = locMastService.selectAreaEmpty(locTypeDto.getLocType1(),staDesc.getCrnNo());//搜索货物
        for (LocMast mast : locMasts) {
            List<String> groupLoc = Utils.getGroupLocNo(mast.getLocNo(), true);
            if (!locMastService.checkAllLocEmpty(groupLoc)) {
                continue;
            }
            LocMast tmp = null;
            for (String loc : groupLoc) {
                LocMast locMast1 = locMastService.selectByLoc(loc);
                if (locMast1 == null) {
                    continue;
                }
                String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
                // 检测目标库位是否为空库位
                LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
                    if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) {
                        if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
                            locMast = shallowLoc;
                            crnNo = locMast.getCrnNo();
                            break;
                        }
                    }
                if (!locMast1.getLocSts().equals("O")) {
                    continue;
                }
                tmp = locMast1;
                break;
            }
            //预留空库位
            if (tmp != null && locMastService.checkEmptyCount(mast, 10)) {
                locMast = tmp;
                break;
            }
        }
        // 靠近摆放规则 --- 空托
        if (staDescId == 10) {
            StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("type_no", staDescId).eq("stn_no", sourceStaNo));
            if (Cools.isEmpty(staDesc)){
                throw new CoolException("空托入库站点路径不存在");
            }
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow).eq("crn_no",staDesc.getCrnNo()));
            if (locMasts.size() > 0) {
                for (LocMast loc : locMasts) {
                    if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
        return locMast;
    }
    // 靠近摆放规则 --- 相同订单号, 同天同规格物料
    private LocMast getLocNoStep3(Integer staDescId, String matnr, String batch, String grade, LocTypeDto locTypeDto,Integer sourceStaNo) {
        LocMast locMast = null;
        StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("type_no", 1).eq("stn_no", sourceStaNo));
        if (staDescId == 1) {
            //先判断工作档,查找主档IOType=1, wrkSts < 10的工作明细,料号相同的明细库位
            List<WrkMast> wrkMasts = wrkMastService.selectSameMatnrs(matnr, batch, grade);
            for (WrkMast wrkMast : wrkMasts) {
                LocMast locMast0 = locMastService.findNearloc(wrkMast.getLocNo());
                if (null != locMast0) {
                    if (!staDesc.getCrnNo().equals(locMast0.getCrnNo())){
                        continue;
                    }
                    String shallowLocNo = Utils.getShallowLoc(slaveProperties,  loc.getLocNo());
                    // 检测目标库位是否为空库位
                    LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                    if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
                        if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
                            locMast = shallowLoc;
                            crnNo = locMast.getCrnNo();
                    // 浅库位符合尺寸检测
                    if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
                        locMast = locMast0;
                    }
                }
            }
            if (Cools.isEmpty(locMast)) {
                //再判断库存明细档,料号相同的明细库位
                List<String> locNos = locDetlService.getSameDetl(matnr, batch, grade);
                for (String locNo : locNos) {
                    LocMast locMast0 = locMastService.findNearloc(locNo);
                    if (null != locMast0) {
                        if (!staDesc.getCrnNo().equals(locMast0.getCrnNo())){
                            continue;
                        }
                        // 浅库位符合尺寸检测
                        if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
                            locMast = locMast0;
                            break;
                        }
                    }
@@ -166,116 +208,77 @@
            }
        }
        // 如果没有相近物料,则按规则轮询货架
        if (null == locMast) {
            Shelves shelves = new Shelves(rowCount, crn_qty);
            int divides = (int) Arith.divides(1, curRow - 1, 4);
            curRow = (int) Arith.remainder(curRow, 4);
            if (curRow == 0) {
                curRow = 4;
            }
            for (int i = 0; i < shelves.group; i ++) {
                curRow = shelves.start(curRow);
                if (curRow < 0) {
                    throw new CoolException("检索库位失败,请联系管理员");
                }
                Integer crnNo1 = shelves.get(curRow);
//                crnNo1 = crnNo1 + divides*1;
                if (basCrnpService.checkSiteError(crnNo1, true)) {
                    crnNo = crnNo1;
//                    curRow = curRow + divides*4;
                    break;
                }
            }
        }
        return locMast;
    }
        if (crnNo == 0) {
            throw new CoolException("没有可用的堆垛机");
        }
    //返回dto
    private StartupDto getLocNoStep6(Integer staDescId, Integer sourceStaNo, LocMast locMast) {
        StartupDto startupDto = new StartupDto();
        // 获取目标站
        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                .eq("type_no", staDescId)
                .eq("stn_no", sourceStaNo)
                .eq("crn_no", crnNo);
                .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);
            log.error("入库路径不存在, staDescId={}, sourceStaNo={}", staDescId, sourceStaNo);
            throw new CoolException("入库路径不存在");
        }
        // 检测目标站
        BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
        if (!staNo.getAutoing().equals("Y")) {
            throw new CoolException("目标站"+staDesc.getCrnStn()+"不可用");
            throw new CoolException("目标站" + staDesc.getCrnStn() + "不可用");
        }
        // 更新库位排号
        rowLastno.setCurrentRow(curRow);
        rowLastnoService.updateById(rowLastno);
        // 开始查找库位 ==============================>>
        // 1.当检索库排为浅库位排时,优先寻找当前库排的深库位排
        if (locMast == null) {
            if (Utils.isShallowLoc(slaveProperties, curRow)) {
                Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
                locMast = locMastService.queryFreeLocMast(deepRow, locTypeDto.getLocType1());
                // todo:luxiaotao 如果用浅排找到的深库位,那么则需要判断这个深库位对应的浅库位是否有货(F、X、D)
                // 因库位移转、需预留空库位
                if (!locMastService.checkEmptyCount(locMast)) {
                    locMast = null;
                }
            }
            if (Cools.isEmpty(locMast)) {
                locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
                // 因库位移转、需预留空库位
                if (!locMastService.checkEmptyCount(locMast)) {
                    locMast = null;
                }
                // 目标库位 ===>> 浅库位, 则校验其深库位是否为 F D X
                if (null != locMast && Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) {
                    LocMast deepLoc = locMastService.selectById(Utils.getDeepLoc(slaveProperties, locMast.getLocNo()));
                    if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
                        locMast = null;
                    }
                }
                // 目标库位 ===>> 深库位, 则校验其浅库位是否为 O
                if (null != locMast && Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
                    LocMast shallowLoc = locMastService.selectById(Utils.getShallowLoc(slaveProperties, locMast.getLocNo()));
                    if (!shallowLoc.getLocSts().equals("O")) {
                        locMast = null;
                    }
                }
            }
        }
        // 2.库位当前所属尺寸无空库位时,调整尺寸参数,向上兼容检索库位
        if (Cools.isEmpty(locMast)) {
            // 当前巷道无空库位时,递归调整至下一巷道,检索全部巷道无果后,跳出递归
            if (times < rowCount) {
                times = times + 1;
                return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
            }
            // 轻货物找轻库位为空时,可以去找重库位仓
            if (locTypeDto.getLocType1() == 1) {
                locTypeDto.setLocType1((short) 2);
                return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
            }
            log.error("系统没有空库位!!! 尺寸规格: {}, 轮询次数:{}", JSON.toJSONString(locTypeDto), times);
            throw new CoolException("没有空库位");
        }
        String locNo = locMast.getLocNo();
        // 生成工作号
        int workNo = getWorkNo(0);
        // 返回dto
        startupDto.setWorkNo(workNo);
        startupDto.setCrnNo(crnNo);
        startupDto.setSourceStaNo(sourceStaNo);
        startupDto.setStaNo(staNo.getDevNo());
        startupDto.setLocNo(locNo);
        startupDto.setLocNo(locMast.getLocNo());
        startupDto.setCrnNo(locMast.getCrnNo());
        return startupDto;
    }
    // 靠近摆放规则 --- 空托
    private LocMast getLocNoStep4(Integer staDescId, LocTypeDto locTypeDto, Integer sourceStaNo) {
        LocMast locMast = null;
        // 靠近摆放规则 --- 空托
        if (staDescId == 10) {
            // 获取目标站
            Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                    .eq("type_no", staDescId)
                    .eq("stn_no", sourceStaNo);
            StaDesc staDesc = staDescService.selectOne(wrapper);
            if (staDesc == null) {
                throw new CoolException("入库路径不存在");
            }
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("loc_sts", "O")
                    .eq("crn_no", staDesc.getCrnNo())
                    .eq("loc_type1",locTypeDto.getLocType1())
                    .orderBy("lev1,bay1,row1"));
            if (!locMasts.isEmpty()) {
                for (LocMast loc : locMasts) {
                    LocMast locMast0 = locMastService.findNearloc(loc.getLocNo());
                    // 浅库位符合尺寸检测
                    if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
                        locMast = locMast0;
                    }
                }
            }
            if (locMast == null) {
                throw new CoolException("缺少空库位");
            }
        }
        return locMast;
    }
    public static String zerofill(String msg, Integer count) {
        if (msg.length() == count) {
src/main/java/com/zy/common/web/WcsController.java
@@ -116,7 +116,7 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(12, true);
        // 检索库位
        StartupDto dto = commonService.getLocNo(rowLastnoService.selectNextWhsType(), 10, 12, null, locTypeDto,0);
        StartupDto dto = commonService.getLocNo(1, 10, 12, null,null,null,0, locTypeDto,0);
        Date now = new Date();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
@@ -202,7 +202,7 @@
            }
        }
        StartupDto dto = commonService.getLocNo(integer, 1, devpNo, matNos, locTypeDto,0);
        StartupDto dto = commonService.getLocNo(1, 1, devpNo, null,null,null,0, locTypeDto,0);
        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档
@@ -293,7 +293,7 @@
            }
        }
        // 检索库位
        StartupDto dto = commonService.getLocNo(integer, 10, devpNo, null, locTypeDto,0);
        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null,null,null,0, locTypeDto,0);
        int workNo = dto.getWorkNo();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
src/main/resources/mapper/LocDetlMapper.xml
@@ -808,5 +808,32 @@
        group by a.matnr,a.[year],a.[month],a.[day],a.kun,a.up_down
        ) t
    </select>
    <select id="selectSameDetl" resultType="java.lang.String">
        SELECT
        ld.loc_no
        FROM asr_loc_detl ld
        LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no
        LEFT JOIN (
        select
        loc_no,
        count(1) as count
        from asr_loc_detl
        where 1=1
        group by loc_no
        ) dual on dual.loc_no = lm.loc_no
        WHERE 1 = 1
        <if test="matnr != null and matnr != ''">
            AND ld.matnr = #{matnr}
        </if>
        <if test="batch != null and batch != ''">
            AND ld.batch = #{batch}
        </if>
        <if test="grade != null and grade != ''">
            AND ld.brand = #{grade}
        </if>
        AND (lm.loc_sts = 'F')
        AND dual.count = 1
        ORDER BY lm.modi_time ASC
    </select>
</mapper>
src/main/resources/mapper/LocMastMapper.xml
@@ -102,6 +102,20 @@
        select * from asr_loc_mast
        where loc_no = #{locNo}
    </select>
    <select id="selectAreaEmpty" resultMap="BaseResultMap">
        select * from asr_loc_mast
        where loc_sts in ('O')
          and loc_type1 = #{locType1}
          and crn_no = #{crnNo}
        ORDER BY lev1,bay1,row1
    </select>
    <select id="selectAllLocNotEmpty" resultMap="BaseResultMap">
        SELECT * FROM asr_loc_mast WHERE loc_sts != 'O' AND loc_no in
        <foreach collection="groupLoc" item="loc" index="index" open="(" close=")" separator=",">
            #{loc}
        </foreach>
    </select>
</mapper>
src/main/resources/mapper/WrkMastMapper.xml
@@ -80,5 +80,21 @@
    <select id="selectTop100" resultType="com.zy.asrs.entity.result.InOutCountDto">
        SELECT TOP 10 m.io_type as ioType,m.appe_time as appeTime, d.matnr, d.anfme FROM asr_wrk_detl_log d left join asr_wrk_mast_log m on d.wrk_no = m.wrk_no order by m.appe_time desc
    </select>
    <select id="selectSameMatnrs" resultMap="BaseResultMap">
        select loc_no from asr_wrk_mast m,asr_wrk_detl d
        where m.wrk_no=d.wrk_no
        and io_type=1
        and wrk_sts &lt; 11
        <if test="matnr != null and matnr != ''">
            and d.matnr = #{matnr}
        </if>
        <if test="batch != null and batch != ''">
            and d.batch = #{batch}
        </if>
        <if test="grade != null and grade != ''">
            and d.brand = #{grade}
        </if>
        ORDER BY m.wrk_no desc
    </select>
</mapper>