wuweihua/BMS
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

回退代码去掉收货查询

Browse Source
This commit is contained in:
wuweihua
2026-11-06 10:46:58 +08:00
parent 7807534e5d
commit a2e986fa6a
3 changed files with 7 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms-back/bms-system/src/main/java/com/bms/price/oracle/TabOrderMonitorService.java
+2 -6
View File
@@ -1232,14 +1232,10 @@ public class TabOrderMonitorService
query.setOrderStatuses(cleaned.isEmpty() ? new ArrayList<Integer>(DEFAULT_ORDER_STATUSES) : cleaned);
}
/** Empty or anything other than 0/1 falls back to 1（已收货）. */
/** Always force BL_PICKUP=1; UI no longer exposes this filter. */
private static void normalizeBlPickup(TabOrderMonitorQuery query)
{
Integer blPickup = query.getBlPickup();
if (blPickup == null || (blPickup.intValue() != 0 && blPickup.intValue() != 1))
{
query.setBlPickup(Integer.valueOf(1));
}
query.setBlPickup(Integer.valueOf(1));
}
/**
bms-back/bms-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml
+2 -16
View File
@@ -66,14 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.endTime != null and query.endTime != ''">
AND o.PICKUP_DATE &lt;= TO_DATE(#{query.endTime}, 'YYYY-MM-DD HH24:MI:SS')
</if>
<choose>
<when test="query.blPickup != null">
AND o.BL_PICKUP = #{query.blPickup}
</when>
<!-- <otherwise>-->
<!-- AND o.BL_PICKUP = 1-->
<!-- </otherwise>-->
</choose>
AND o.BL_PICKUP = 1
<if test="query.orderStatuses != null and query.orderStatuses.size() > 0">
AND o.ORDER_STATUS IN
<foreach collection="query.orderStatuses" item="st" open="(" separator="," close=")">
@@ -281,14 +274,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<foreach collection="batch" item="bid" open="(" separator="," close=")">
#{bid}
</foreach>
<choose>
<when test="blPickup != null">
AND o.BL_PICKUP = #{blPickup}
</when>
<!-- <otherwise>-->
<!-- AND o.BL_PICKUP = 1-->
<!-- </otherwise>-->
</choose>
AND o.BL_PICKUP = 1
AND o.ORDER_STATUS IN (3, 4, 5, 6, 7, 8, 11)
<if test="customerCodes != null and customerCodes.size() > 0">
AND o.CUSTOMER_CODE IN