#1

dubin

2025-11-12 9bc4c5f02cc53961725af9683b75899ac22a6720

#1

 src/main/java/com/zy/asrs/entity/LocMast.java

@@ -231,15 +231,15 @@
        if (null == this.locType2){ return null; }
        switch (this.locType2){
            case 4:
                return "第一种托盘";
                return "1500*1500*870";
            case 5:
                return "第二种托盘";
                return "1500*1500*1670";
            case 6:
                return "第三种托盘";
                return "2000*1500*2170";
            case 7:
                return "第四种托盘";
                return "2600*1500*660";
            case 8:
                return "第五种托盘";
                return "1300*1500*1460";
            default:
                return String.valueOf(this.locType2);
        }

 src/main/java/com/zy/asrs/mapper/LocMastMapper.java

@@ -47,7 +47,7 @@

    LocMast selectByBarcode(@Param("zpallet")String zpallet);

    LocMast queryLocToOne(Short locType2);
    LocMast queryLocToOne(Short locType1);

    LocMast queryLocToTwo(Short locType2);
}

 src/main/java/com/zy/asrs/service/LocMastService.java

@@ -53,7 +53,7 @@

    LocMast selectByBarcode(String zpallet);

    LocMast queryLocToOne(Short locType2);
    LocMast queryLocToOne(Short locType1);

    LocMast queryLocToTwo(Short locType2);
}

 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java

@@ -71,8 +71,8 @@
    }

    @Override
    public LocMast queryLocToOne(Short locType2) {
        return this.baseMapper.queryLocToOne(locType2);
    public LocMast queryLocToOne(Short locType1) {
        return this.baseMapper.queryLocToOne(locType1);
    }

    @Override

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -111,7 +111,7 @@
                            locDetl.setAppeTime(now);
                            locDetl.setModel(wrkDetl.getModel());

                            locDetl.setTemp1(wrkDetl.getZpallet().substring(0,1));//并板出库根据托盘类型去选择
                            locDetl.setTemp1(locMast.getLocType2().toString());//并板出库根据货物类型去选择

                            if (!locDetlService.insert(locDetl)) {
//                                exceptionHandle("全板入库 ===>> 添加库存明细失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
@@ -228,7 +228,7 @@
                            locDetl.setModiTime(now);
                            locDetl.setAppeTime(now);

                            locDetl.setTemp1(wrkDetl.getZpallet().substring(0,1));//并板出库根据托盘类型去选择
                            locDetl.setTemp1(locMast.getLocType2().toString());//并板出库根据货物类型去选择

                            if (!locDetlService.insert(locDetl)) {
//                                exceptionHandle("并板入库 ===>> 新增库存明细失败；[workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());

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

@@ -383,11 +383,12 @@
    public StartupDto getLocNoToOne(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
        //目标库位
        LocMast locMast = null;
            //1号巷道 3种托盘类型
        if (locTypeDto.getLocType2()==4||locTypeDto.getLocType2()==5||locTypeDto.getLocType2()==6){
            locMast=locMastService.queryLocToOne(locTypeDto.getLocType2());
        if (locTypeDto.getLocType2()==5||locTypeDto.getLocType2()==6){
            //1号巷道 3种货物类型
            locMast=locMastService.queryLocToOne(locTypeDto.getLocType1());

        }else if (locTypeDto.getLocType2()==7||locTypeDto.getLocType2()==8){
            //2号巷道 2种类型托盘
            //2号巷道 2种货物类型
            locMast=locMastService.queryLocToTwo(locTypeDto.getLocType2());
        }else {
            throw new CoolException("不存在该库位类型:"+locTypeDto.getLocType2());

 src/main/java/com/zy/common/web/WcsController.java

@@ -107,9 +107,7 @@
        sourceStaNo.setLocType1(param.getLocType1());
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);

        if (param.getBarcode().startsWith("4")){
            locTypeDto.setLocType2((short) 4);
        }else if (param.getBarcode().startsWith("5")){
        if (param.getBarcode().startsWith("5")){
            locTypeDto.setLocType2((short) 5);
        }else if (param.getBarcode().startsWith("6")){
            locTypeDto.setLocType2((short) 6);

 src/main/resources/mapper/LocMastMapper.xml

@@ -121,22 +121,16 @@
    </select>

    <select id="queryLocToOne" resultMap="BaseResultMap">
        select top 1 loc_no as locNo,crn_no as crnNo from asr_loc_mast
        select top 1 * from asr_loc_mast
        where loc_status = 'O' and row1 in (1,2)
        <if test="locType2 == 4">
            and lev1 = 1
        </if>
        <if test="locType2 == 5">
            and lev1 in(2,3)
        </if>
        <if test="locType2 == 6">
            and lev1 in(4,5)
        <if test="locType1 ! = null">
            and loc_type1 = #{locType1}
        </if>
        order by lev1 asc,bay1 asc
    </select>

    <select id="queryLocToTwo" resultMap="BaseResultMap">
        select top 1 loc_no as locNo,crn_no as crnNo from asr_loc_mast
        select top 1 * from asr_loc_mast
        where loc_status = 'O' and row1 in (3,4)
        <if test="locType2 == 7">
            and lev1 in(1,2)

 src/main/webapp/views/pakStore/clampDetlQuery.html

@@ -79,13 +79,13 @@
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <select name="temp1" type="text">
                <select name="temp1">
                    <option value="">请选择托盘类型</option>
                    <option value="4">第一种</option>
                    <option value="5">第二种</option>
                    <option value="6">第三种</option>
                    <option value="7">第四种</option>
                    <option value="8">第五种</option>
                    <option value="4">1500*1500*870</option>
                    <option value="5">1500*1500*1670</option>
                    <option value="6">2000*1500*2170</option>
                    <option value="7">2600*1500*660</option>
                    <option value="8">1300*1500*1460</option>
                </select>
            </div>
        </div>

 src/main/webapp/views/pakStore/emptyOut.html

@@ -98,11 +98,11 @@
        <div class="layui-input-inline">
            <select name="loc_type2">
                <option value="">请选择托盘类型</option>
                <option value="4">第一种</option>
                <option value="5">第二种</option>
                <option value="6">第三种</option>
                <option value="7">第四种</option>
                <option value="8">第五种</option>
                <option value="4">1500*1500*870</option>
                <option value="5">1500*1500*1670</option>
                <option value="6">2000*1500*2170</option>
                <option value="7">2600*1500*660</option>
                <option value="8">1300*1500*1460</option>
            </select>
        </div>
    </div>