|
@@ -330,6 +330,9 @@
|
|
|
<if test="operationPointType!=null and operationPointType!=''">
|
|
<if test="operationPointType!=null and operationPointType!=''">
|
|
|
AND REGEXP_LIKE(OPERATION_POINT_TYPE, #{operationPointType})
|
|
AND REGEXP_LIKE(OPERATION_POINT_TYPE, #{operationPointType})
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="gridId!=null and gridId!=''">
|
|
|
|
|
+ AND OPERATION_POINT_ID = #{gridId}
|
|
|
|
|
+ </if>
|
|
|
<if test="warehouseType !=null and warehouseType!=''">
|
|
<if test="warehouseType !=null and warehouseType!=''">
|
|
|
AND REGEXP_LIKE(warehouse_type, #{warehouseType})
|
|
AND REGEXP_LIKE(warehouse_type, #{warehouseType})
|
|
|
</if>
|
|
</if>
|
|
@@ -2259,5 +2262,34 @@
|
|
|
</if>
|
|
</if>
|
|
|
)
|
|
)
|
|
|
</select>
|
|
</select>
|
|
|
|
|
+ <select id="getInventoryByLike" resultType="java.util.Map">
|
|
|
|
|
+ SELECT *
|
|
|
|
|
+ FROM (
|
|
|
|
|
+ SELECT DISTINCT
|
|
|
|
|
+ ROP.OPERATION_POINT_NAME ||'-'||RM.MATERIAL_NAME|| '-' || WGM.MODEL || WGM.INSERT_UPDATE_REMARK "label",
|
|
|
|
|
+ ROP.OPERATION_POINT_NAME "text",
|
|
|
|
|
+ WGM.GRID_MATERIAL_ID "id",
|
|
|
|
|
+ WGM.GRID_MATERIAL_ID "value",
|
|
|
|
|
+ WGM.GRID_MATERIAL_ID "gridMaterialId",
|
|
|
|
|
+ WGM.MATERIAL_ID "materialId",
|
|
|
|
|
+ WGM.MATERIAL_NUMBER "inventoryNumber",
|
|
|
|
|
+ WGM.GRID_ID "gridId",
|
|
|
|
|
+ RM.MATERIAL_NAME "materialName",
|
|
|
|
|
+ ROP.OPERATION_POINT_NAME "gridName",
|
|
|
|
|
+ WGM.MODEL "model",
|
|
|
|
|
+ NVL(WGM.ALTERNATE_FIELDS1,NVL(ROP .WAREHOUSE_TYPE,'其他')) "alter1"
|
|
|
|
|
+ FROM WMS_GRID_MATERIAL WGM
|
|
|
|
|
+ LEFT JOIN RMS_OPERATION_POINT ROP ON ROP.OPERATION_POINT_ID = WGM.GRID_ID
|
|
|
|
|
+ LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = WGM.MATERIAL_ID
|
|
|
|
|
+ )
|
|
|
|
|
+ <where>
|
|
|
|
|
+ <if test="index != null and index != ''">
|
|
|
|
|
+ regexp_like("label",#{index})
|
|
|
|
|
+ </if>
|
|
|
|
|
+ <if test="alter1 != null and alter1 != ''">
|
|
|
|
|
+ regexp_like("alter1",#{alter1})
|
|
|
|
|
+ </if>
|
|
|
|
|
+ </where>
|
|
|
|
|
+ </select>
|
|
|
|
|
|
|
|
</mapper>
|
|
</mapper>
|