@@ -2176,6 +2176,14 @@
0,'未上报') like '%${item}%'
</foreach>
</if>
+ <if test="saleRemarkList != null">
+ and <foreach collection="saleRemarkList" item="item" open="(" separator="or" close=")">
+
+ </foreach>
+ </if>
+ <if test="consigneeSsoId != null">
+ and RC.CONSIGNEE_SSO_ID = #{consigneeSsoId}
order by ASO.SALE_ORDER_ID DESC, ASOM.SALE_ORDER_MATERIAL_ID DESC,OO.ORDER_ID DESC
)
</select>
@@ -1,5 +1,5 @@
## LOG4J配置
-log4j.rootCategory=INFO,file, RUNNING,errorfile
+log4j.rootCategory=INFO,file, RUNNING,errorfile,stdout
## 控制台输出
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout