远场上传的文件解析调整+检验任务样品编号筛选

zss

2025-05-12 99cf848f87e2e06954d1ca101c9ff1879cf801c7

 inspect-server/src/main/resources/mapper/WarehouseCellMapper.xml

@@ -17,11 +17,15 @@
    </resultMap>

    <select id="getWarehouse" resultMap="WarehouseCellAndHistoryDto">
        select wc.id, wc.row, wc.col, i.id sampleId, i.sample, i.model, i.sample_code from warehouse_cell wc
        select wc.id, wc.row, wc.col, i.id sampleId, i.sample, i.model, i.sample_code
        from warehouse_cell wc
        left join ins_sample i on i.cell_id = wc.id
        where wc.state = 1
        and wc.shelf_id = #{shelfId}
        order by wc.id
            <if test="sampleCode!=null and sampleCode!=''">
                and i.sample_code=#{sampleCode}
            </if>
        order by wc.row ,wc.col, wc.id
    </select>

    <resultMap id="WarehouseCellAndHistoryDto" type="com.yuanchu.mom.dto.WarehouseCellAndSampleDto">