修改订单数据源的产品检测
This commit is contained in:
@@ -36,7 +36,7 @@ public class TabOrderMonitorQuery implements Serializable
|
|||||||
* 有单号时不再强制要求客户+提货时间。
|
* 有单号时不再强制要求客户+提货时间。
|
||||||
*/
|
*/
|
||||||
private List<String> orderIdentifiers;
|
private List<String> orderIdentifiers;
|
||||||
/** 上游产品代码 PRODUCT_CODE(产品比对点进订单号时使用) */
|
/** 上游产品代码 LINE_CODE(产品比对点进订单号时使用) */
|
||||||
private String productCode;
|
private String productCode;
|
||||||
/** 分批同步计费每批条数 */
|
/** 分批同步计费每批条数 */
|
||||||
private Integer batchSize;
|
private Integer batchSize;
|
||||||
|
|||||||
@@ -185,33 +185,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
</foreach>
|
</foreach>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<!-- Distinct product codes under the same filters (no pagination). -->
|
<!-- Distinct LINE_CODE under the same filters (product check; alias keeps Java keys stable). -->
|
||||||
<select id="selectTabOrderProductCodes" resultType="java.util.HashMap">
|
<select id="selectTabOrderProductCodes" resultType="java.util.HashMap">
|
||||||
SELECT o.CUSTOMER_CODE AS CUSTOMER_CODE,
|
SELECT o.CUSTOMER_CODE AS CUSTOMER_CODE,
|
||||||
o.PRODUCT_CODE AS PRODUCT_CODE,
|
o.LINE_CODE AS PRODUCT_CODE,
|
||||||
MAX(o.PRODUCT_NAME) AS PRODUCT_NAME,
|
MAX(o.LINE_NAME) AS PRODUCT_NAME,
|
||||||
COUNT(1) AS ORDER_COUNT
|
COUNT(1) AS ORDER_COUNT
|
||||||
FROM ${orderTable} o
|
FROM ${orderTable} o
|
||||||
WHERE
|
WHERE
|
||||||
<include refid="tabOrderMonitorWhere"/>
|
<include refid="tabOrderMonitorWhere"/>
|
||||||
AND o.PRODUCT_CODE IS NOT NULL
|
AND o.LINE_CODE IS NOT NULL
|
||||||
GROUP BY o.CUSTOMER_CODE, o.PRODUCT_CODE
|
GROUP BY o.CUSTOMER_CODE, o.LINE_CODE
|
||||||
ORDER BY o.CUSTOMER_CODE, o.PRODUCT_CODE
|
ORDER BY o.CUSTOMER_CODE, o.LINE_CODE
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<!-- Order numbers for one upstream product under the same filters. -->
|
<!-- Order numbers for one upstream LINE_CODE under the same filters. -->
|
||||||
<select id="selectTabOrderIdsByProduct" resultType="java.util.HashMap">
|
<select id="selectTabOrderIdsByProduct" resultType="java.util.HashMap">
|
||||||
SELECT o.ORDER_ID AS ORDER_ID,
|
SELECT o.ORDER_ID AS ORDER_ID,
|
||||||
o.ORG_ORDER_ID AS ORG_ORDER_ID,
|
o.ORG_ORDER_ID AS ORG_ORDER_ID,
|
||||||
o.TRANSFER_ORDER_ID AS TRANSFER_ORDER_ID,
|
o.TRANSFER_ORDER_ID AS TRANSFER_ORDER_ID,
|
||||||
o.CUSTOMER_CODE AS CUSTOMER_CODE,
|
o.CUSTOMER_CODE AS CUSTOMER_CODE,
|
||||||
o.PRODUCT_CODE AS PRODUCT_CODE,
|
o.LINE_CODE AS PRODUCT_CODE,
|
||||||
o.PRODUCT_NAME AS PRODUCT_NAME,
|
o.LINE_NAME AS PRODUCT_NAME,
|
||||||
o.PICKUP_DATE AS PICKUP_DATE
|
o.PICKUP_DATE AS PICKUP_DATE
|
||||||
FROM ${orderTable} o
|
FROM ${orderTable} o
|
||||||
WHERE
|
WHERE
|
||||||
<include refid="tabOrderMonitorWhere"/>
|
<include refid="tabOrderMonitorWhere"/>
|
||||||
AND o.PRODUCT_CODE = #{query.productCode}
|
AND o.LINE_CODE = #{query.productCode}
|
||||||
ORDER BY o.PICKUP_DATE DESC, o.ORDER_ID DESC
|
ORDER BY o.PICKUP_DATE DESC, o.ORDER_ID DESC
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user