|
|
@ -105,6 +105,9 @@ |
|
|
|
LEFT JOIN logpm_warehouse_warehouse AS warehouse ON goods_area.warehouse_id = warehouse.id |
|
|
|
LEFT JOIN logpm_warehouse_warehouse AS warehouse ON goods_area.warehouse_id = warehouse.id |
|
|
|
<where> |
|
|
|
<where> |
|
|
|
goods_allocation.is_deleted = 0 |
|
|
|
goods_allocation.is_deleted = 0 |
|
|
|
|
|
|
|
<if test="po.appEnableStatus!=null and po.appEnableStatus!=''"> |
|
|
|
|
|
|
|
and goods_allocation.enable_status = 1 |
|
|
|
|
|
|
|
</if> |
|
|
|
<if test="po.goodsAreaId!=null and po.goodsAreaId!=''"> |
|
|
|
<if test="po.goodsAreaId!=null and po.goodsAreaId!=''"> |
|
|
|
AND goods_allocation.goods_area_id=#{po.goodsAreaId} |
|
|
|
AND goods_allocation.goods_area_id=#{po.goodsAreaId} |
|
|
|
</if> |
|
|
|
</if> |
|
|
@ -123,8 +126,8 @@ |
|
|
|
<if test="po.layerNum != null and po.layerNum!= ''"> |
|
|
|
<if test="po.layerNum != null and po.layerNum!= ''"> |
|
|
|
and goods_allocation.layer_num = #{po.layerNum} |
|
|
|
and goods_allocation.layer_num = #{po.layerNum} |
|
|
|
</if> |
|
|
|
</if> |
|
|
|
<if test="po.goods_allocation_name != null and po.goods_allocation_name!= ''"> |
|
|
|
<if test="po.goodsAllocationName != null and po.goodsAllocationName!= ''"> |
|
|
|
and goods_allocation.goods_allocation_name like concat('%', #{po.goodsAllocationName},'%') |
|
|
|
and goods_allocation.qr_code like concat('%', #{po.goodsAllocationName},'%') |
|
|
|
</if> |
|
|
|
</if> |
|
|
|
<if test="po.goodsShelfId!=null and po.goodsShelfId!=''"> |
|
|
|
<if test="po.goodsShelfId!=null and po.goodsShelfId!=''"> |
|
|
|
AND goods_allocation.goods_shelf_id=#{po.goodsShelfId} |
|
|
|
AND goods_allocation.goods_shelf_id=#{po.goodsShelfId} |
|
|
|