|
|
@@ -168,6 +168,8 @@
|
|
|
RCON.CONSIGNEE_COMPANY_NAME "receiveName",
|
|
|
RS.SUPPLIER_NAME "sendName",
|
|
|
RM.MATERIAL_NAME "materialName",
|
|
|
+ TLR.INSERT_UPDATE_REMARK "materialRemark",
|
|
|
+ ASO.SALE_NUMBER "saleNumber",
|
|
|
CONCAT(CONCAT(RM.MATERIAL_SPECIFICATION, '('), CONCAT(RM.MATERIAL_MODEL, ')')) "materialCode"
|
|
|
from OMSTRUCK_ORDER OO
|
|
|
left join AMS_SALE_ORDER_MATERIAL ASOM
|
|
|
@@ -232,6 +234,24 @@
|
|
|
"capacityNumber" like '%${item}%'
|
|
|
</foreach>
|
|
|
</if>
|
|
|
+ <if test="receiveName != null">
|
|
|
+ and
|
|
|
+ <foreach collection="receiveName" item="item" open="(" separator="or" close=")">
|
|
|
+ "receiveName" like '%${item}%'
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
+ <if test="materialRemark != null">
|
|
|
+ and
|
|
|
+ <foreach collection="materialRemark" item="item" open="(" separator="or" close=")">
|
|
|
+ "materialRemark" like '%${item}%'
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
+ <if test="sendName != null">
|
|
|
+ and
|
|
|
+ <foreach collection="sendName" item="item" open="(" separator="or" close=")">
|
|
|
+ "sendName" like '%${item}%'
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
<if test="resultEntryGateTime != null">
|
|
|
and
|
|
|
<foreach collection="resultEntryGateTime" item="item" open="(" separator="or" close=")">
|
|
|
@@ -274,6 +294,12 @@
|
|
|
"resultGrossWeight" like '%${item}%'
|
|
|
</foreach>
|
|
|
</if>
|
|
|
+ <if test="materialName != null">
|
|
|
+ and
|
|
|
+ <foreach collection="materialName" item="item" open="(" separator="or" close=")">
|
|
|
+ "materialName" like '%${item}%'
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
<if test="resultNetWeight != null">
|
|
|
and
|
|
|
<foreach collection="resultNetWeight" item="item" open="(" separator="or" close=")">
|
HUJIANGUO