Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs

zyx

2023-10-04 d96ec5757e91204bc348757226299400012da2e0

Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs

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

@@ -111,7 +111,7 @@
                dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, mats, waitPakins);
                break;
            case 10://空托盘入库
                dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, null);
                dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
                break;
            case 103:// 拣料入库
            case 104:// 并板入库

 src/main/resources/mapper/WrkMastMapper.xml

@@ -97,7 +97,7 @@
    </select>

    <select id="selectOfPick" resultMap="BaseResultMap">
        select top 1 * from asr_wrk_mast where wrk_no=#{wrkNo} and wrk_sts=17 and io_type = #{ioType}
        select top 1 * from asr_wrk_mast where wrk_no=#{wrkNo} and wrk_sts=29 and io_type = #{ioType}
    </select>

    <select id="selectSameMatnrs" resultMap="BaseResultMap">