|
|
|
|
@ -1043,46 +1043,58 @@
|
|
|
|
|
lddl.vehicle_name AS vehicleName, |
|
|
|
|
lddl.task_time AS taskTime, |
|
|
|
|
lddl.loading_time AS loadingTime, |
|
|
|
|
IF(ldr.reservation_num > 0,GROUP_CONCAT(ldsa.order_code),'') AS orderCode, |
|
|
|
|
lds.signee_name AS signeeName, |
|
|
|
|
ldr.warehouse_id AS warehouseId, |
|
|
|
|
<!-- ldr.warehouse_id AS warehouseId,--> |
|
|
|
|
ldr.consignee AS consigne, |
|
|
|
|
ldr.delivery_phone AS driverPhone, |
|
|
|
|
ldr.delivery_address AS deliveryAddress, |
|
|
|
|
ldr.warehouse_name AS warehouseName, |
|
|
|
|
GROUP_CONCAT(ldsa.order_code) AS orderCode, |
|
|
|
|
CASE |
|
|
|
|
ldr.delivery_type |
|
|
|
|
WHEN 1 THEN |
|
|
|
|
'商配' |
|
|
|
|
WHEN 2 THEN |
|
|
|
|
'市配' |
|
|
|
|
WHEN 3 THEN |
|
|
|
|
'自提' |
|
|
|
|
END AS deliveryTypeName, |
|
|
|
|
ldr.consignee AS consignee, |
|
|
|
|
ldr.delivery_phone AS deliveryPhone, |
|
|
|
|
ldr.delivery_address AS deliveryAddress, |
|
|
|
|
CASE ldr.delivery_type |
|
|
|
|
WHEN 1 THEN '商配' |
|
|
|
|
WHEN 2 THEN '市配' |
|
|
|
|
WHEN 3 THEN '自提' |
|
|
|
|
END deliveryTypeName, |
|
|
|
|
(ldr.reservation_num + ldr.reservation_stock_list_num ) AS totalNum, |
|
|
|
|
(COUNT(ldl.id) + COUNT(ldll.id) ) AS loadingNum, |
|
|
|
|
lds.received_quantity AS signingNum, |
|
|
|
|
((ldr.reservation_num + ldr.reservation_stock_list_num ) - (COUNT(ldl.id) + COUNT(ldll.id) )) AS unLoadingNum, |
|
|
|
|
((ldr.reservation_num + ldr.reservation_stock_list_num ) - lds.received_quantity) AS unsigneds, |
|
|
|
|
ldr.reservation_num + ldr.reservation_stock_list_num AS totalNum, |
|
|
|
|
lds.loaded_number AS packageLoadingNum, |
|
|
|
|
lds.loadedin_number AS inventoryLoadingNum, |
|
|
|
|
lds.received_quantity AS packageSigningNum, |
|
|
|
|
lds.receivedin_quantity AS inventorySigningNum, |
|
|
|
|
lds.signing_time AS signingTime, |
|
|
|
|
lds.sjsigning_time AS sjsigningTime, |
|
|
|
|
lds.signee_name AS signeeName, |
|
|
|
|
lds.examine_user_name AS examineUserName, |
|
|
|
|
CASE lddl.delivery_status |
|
|
|
|
WHEN 1 THEN '待配送' |
|
|
|
|
WHEN 2 THEN '配送中' |
|
|
|
|
WHEN 3 THEN '已完成' |
|
|
|
|
END deliveryStatusName, |
|
|
|
|
CASE lds.signing_status |
|
|
|
|
WHEN 1 THEN '文员待审核' |
|
|
|
|
WHEN 2 THEN '文员已审核' |
|
|
|
|
END signingStatusName, |
|
|
|
|
IF(lddl.kind = 1,ldds.driver_phone,lddt.driver_phone) AS driverPhone |
|
|
|
|
CASE |
|
|
|
|
lddl.delivery_status |
|
|
|
|
WHEN 1 THEN |
|
|
|
|
'待配送' |
|
|
|
|
WHEN 2 THEN |
|
|
|
|
'配送中' |
|
|
|
|
WHEN 3 THEN |
|
|
|
|
'已完成' |
|
|
|
|
END AS deliveryStatusName, |
|
|
|
|
CASE |
|
|
|
|
lds.signing_status |
|
|
|
|
WHEN 1 THEN |
|
|
|
|
'文员待审核' |
|
|
|
|
WHEN 2 THEN |
|
|
|
|
'文员已审核' |
|
|
|
|
END AS signingStatusName, |
|
|
|
|
IF |
|
|
|
|
( lddl.kind = 1, ldds.driver_phone, lddt.driver_phone ) AS deliveryPhone |
|
|
|
|
FROM |
|
|
|
|
logpm_distribution_signfor lds |
|
|
|
|
JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id |
|
|
|
|
JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id |
|
|
|
|
LEFT JOIN logpm_distribution_reservation_stockarticle ldrs on ldr.id = ldrs.reservation_id |
|
|
|
|
LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldrs.stock_article_id |
|
|
|
|
LEFT JOIN logpm_distribution_loadscan AS ldl ON ldr.id = ldl.reservation_id AND ldl.delivery_id = ldl.delivery_id |
|
|
|
|
LEFT JOIN logpm_distribution_loadscaninvn AS ldll ON ldr.id = ldll.reservation_id AND ldll.delivery_id = ldl.delivery_id |
|
|
|
|
LEFT JOIN logpm_distribution_delivery_self AS ldds ON ldds.delivery_id = lddl.id AND ldds.is_master = 2 |
|
|
|
|
LEFT JOIN logpm_distribution_delivery_tripartite AS lddt ON lddt.delivery_id = lddl.id |
|
|
|
|
left JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id |
|
|
|
|
left JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id |
|
|
|
|
LEFT JOIN logpm_distribution_reservation_stockarticle ldrs ON ldr.id = ldrs.reservation_id |
|
|
|
|
LEFT JOIN logpm_distribution_stock_article ldsa ON ldsa.id = ldrs.stock_article_id |
|
|
|
|
LEFT JOIN logpm_distribution_delivery_self ldds ON ldds.delivery_id = lddl.id |
|
|
|
|
AND ldds.is_master = 2 |
|
|
|
|
LEFT JOIN logpm_distribution_delivery_tripartite lddt ON lddt.delivery_id = lddl.id |
|
|
|
|
<where> |
|
|
|
|
lds.is_deleted = 0 |
|
|
|
|
<if test="param.mallName != null and param.mallName!=''"> |
|
|
|
|
@ -1140,7 +1152,12 @@
|
|
|
|
|
<if test="param.signingStatus != null and param.signingStatus!=''"> |
|
|
|
|
and lds.signing_status = #{param.signingStatus} |
|
|
|
|
</if> |
|
|
|
|
<if test="param.warehouseId != null and param.warehouseId!=''"> |
|
|
|
|
and ldr.warehouse_id = #{param.warehouseId} AND lddl.warehouse_id =#{param.warehouseId} |
|
|
|
|
</if> |
|
|
|
|
</where> |
|
|
|
|
GROUP BY |
|
|
|
|
ldr.id |
|
|
|
|
</select> |
|
|
|
|
<select id="selectPushOldPackage" resultType="com.logpm.oldproject.dto.SignPushDataUnitDTO"> |
|
|
|
|
SELECT |
|
|
|
|
|
