Merge pull request 'demand: 定时扫描漏组批次逻辑调整' (#77) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/77
This commit is contained in:
commit
fa2406e3b1
@ -57,10 +57,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
w.product_type,
|
w.product_type,
|
||||||
w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight,
|
w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight,
|
||||||
w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark, m.manager, k.trans_manager,
|
w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark, m.manager, k.trans_manager,
|
||||||
(SELECT GROUP_CONCAT(s.name ORDER BY FIND_IN_SET(s.site_code, m.start_site_code))
|
(SELECT GROUP_CONCAT(s.site_name ORDER BY FIND_IN_SET(s.site_code, m.start_site_code))
|
||||||
FROM emis_site s
|
FROM emis_site s
|
||||||
WHERE FIND_IN_SET(s.site_code, m.start_site_code) AND s.del_flag = 0) as start_site_name,
|
WHERE FIND_IN_SET(s.site_code, m.start_site_code) AND s.del_flag = 0) as start_site_name,
|
||||||
(SELECT GROUP_CONCAT(s.name ORDER BY FIND_IN_SET(s.site_code, m.next_site_code))
|
(SELECT GROUP_CONCAT(s.site_name ORDER BY FIND_IN_SET(s.site_code, m.next_site_code))
|
||||||
FROM emis_site s
|
FROM emis_site s
|
||||||
WHERE FIND_IN_SET(s.site_code, m.next_site_code) AND s.del_flag = 0) as next_site_name,
|
WHERE FIND_IN_SET(s.site_code, m.next_site_code) AND s.del_flag = 0) as next_site_name,
|
||||||
(SELECT GROUP_CONCAT(s.name)
|
(SELECT GROUP_CONCAT(s.name)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user