java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge branch 'dev' into pre-production

master
汤建军 6 months ago
parent
4cc0584cfe 547919a577
commit
fc15dee70e
1 changed files with 1 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml

3
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
Unescape View File

@ -320,7 +320,7 @@
newldrs.reservation_id = #{reservationId} ANd newldrs.stock_list_status != 2 AND newldrs.reservation_id = #{reservationId} ANd newldrs.stock_list_status != 2 AND
FIND_IN_SET(newldrs.stocklist_id,t.aaa)) FIND_IN_SET(newldrs.stocklist_id,t.aaa))
AS planNum, AS planNum,
GROUP_CONCAT(DISTINCT IF(ldslNew.source_type = 1,t1.allocation_ids,t2.allocation_ids)) AS allocations, GROUP_CONCAT(DISTINCT IF(ldslNew.source_type = 1,t1.allocation_ids,t2.allocation_ids)) AS allocations
FROM FROM
( (
SELECT SELECT
@ -342,7 +342,6 @@
) t ) t
LEFT JOIN logpm_distribution_stock_list ldslNew ON t.cargo_number = ldslNew.cargo_number and ldslNew.quantity_stock !=0 LEFT JOIN logpm_distribution_stock_list ldslNew ON t.cargo_number = ldslNew.cargo_number and ldslNew.quantity_stock !=0
LEFT JOIN logpm_distribution_stock ldss ON FIND_IN_SET(ldss.stock_list_id,t.aaa) LEFT JOIN logpm_distribution_stock ldss ON FIND_IN_SET(ldss.stock_list_id,t.aaa)
LEFT JOIN ( LEFT JOIN (
SELECT SELECT
ldpl.material_code, ldpl.material_code,

Write Preview
Loading…
Cancel
Save