github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Hotfix: Add missing shipping invoice number checks anywhere necessary

pull/6221/head
Qiuyi LI 2023-07-31 16:43:14 +02:00
parent c0d33758c1
commit 72f433d7b5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml
View File

@ -258,7 +258,6 @@
JOIN shop as s JOIN shop as s
ON po.shop_id = s.id ON po.shop_id = s.id
WHERE po.shipping_invoice_number IS NULL WHERE po.shipping_invoice_number IS NULL
AND po.order_time IS NOT NULL
AND po.erp_status IN AND po.erp_status IN
<foreach <foreach
collection="erpStatuses" collection="erpStatuses"
@ -291,7 +290,6 @@
JOIN shop as s JOIN shop as s
ON po.shop_id = s.id ON po.shop_id = s.id
WHERE po.shipping_invoice_number IS NULL WHERE po.shipping_invoice_number IS NULL
AND po.order_time IS NOT NULL
AND po.erp_status IN AND po.erp_status IN
<foreach <foreach
collection="erpStatuses" collection="erpStatuses"
@ -487,6 +485,7 @@
#{warehouse} #{warehouse}
</foreach> </foreach>
AND po.shipping_time between #{startDate} AND #{endDate} AND po.shipping_time between #{startDate} AND #{endDate}
AND po.shipping_invoice_number IS NULL
AND po.erp_status = 3; AND po.erp_status = 3;
</select> </select>
<select id="fetchUninvoicedShippedOrderIDInShopsAndOrderTime" resultType="org.jeecg.modules.business.entity.PlatformOrder"> <select id="fetchUninvoicedShippedOrderIDInShopsAndOrderTime" resultType="org.jeecg.modules.business.entity.PlatformOrder">
@ -516,6 +515,7 @@
#{warehouse} #{warehouse}
</foreach> </foreach>
AND po.order_time between #{startDate} AND #{endDate} AND po.order_time between #{startDate} AND #{endDate}
AND po.shipping_invoice_number IS NULL
AND po.erp_status IN AND po.erp_status IN
<foreach <foreach
collection="erpStatuses" collection="erpStatuses"