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

BUG修复

master
汤建军 5 months ago
parent
67ab14c5d2
commit
f0920b746b
3 changed files with 26 additions and 22 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. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.xml
  2. 43
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
  3. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

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

@ -180,7 +180,6 @@
lddd.is_deleted = 0 lddd.is_deleted = 0
AND lddd.stock_list_id = #{stockListId} AND lddd.stock_list_id = #{stockListId}
AND lddd.inventory_status != 2 AND lddd.inventory_status != 2
AND IFNULL(SUM(ldsld.num),0) > 0
GROUP BY GROUP BY
ldbl.id ldbl.id
</select> </select>

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

@ -74,8 +74,8 @@
AND dbp2.packet_bar_status IN ( 1, 3 ) AND dbp2.packet_bar_status IN ( 1, 3 )
LEFT JOIN logpm_distribution_parcel_list ldpl2 ON dbp2.parce_list_id = ldpl2.id LEFT JOIN logpm_distribution_parcel_list ldpl2 ON dbp2.parce_list_id = ldpl2.id
<where> <where>
1=1 dbl2.is_deleted = 0
<if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)"> <if test="collect != null ">
and dbl2.warehouse_id in and dbl2.warehouse_id in
<foreach collection="collect" item="item" open="(" close=")" separator=","> <foreach collection="collect" item="item" open="(" close=")" separator=",">
#{item} #{item}
@ -126,16 +126,17 @@
dsa.storage_fee dsa.storage_fee
FROM FROM
logpm_distrilbution_bill_lading aaa logpm_distrilbution_bill_lading aaa
LEFT JOIN logpm_distrilbution_bill_stock lds ON lds.bill_lading_id = aaa.id AND lds.order status != 2 LEFT JOIN logpm_distrilbution_bill_stock lds ON lds.bill_lading_id = aaa.id AND lds.order_status != 2
LEFT JOIN logpm_distribution_stock_article dsa ON lds.stock_article_id = dsa.id LEFT JOIN logpm_distribution_stock_article dsa ON lds.stock_article_id = dsa.id
WHERE <where>
aaa.is_deleted = 0 aaa.is_deleted = 0
<if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)"> <if test="collect != null ">
and aaa.warehouse_id in and aaa.warehouse_id in
<foreach collection="collect" item="item" open="(" close=")" separator=","> <foreach collection="collect" item="item" open="(" close=")" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
</where>
GROUP BY GROUP BY
aaa.id aaa.id
) AS k ) AS k
@ -155,14 +156,16 @@
AND lddd.is_deleted = 0 AND lddd.is_deleted = 0
LEFT JOIN logpm_distribution_stock_list ldsl ON lddd.stock_list_id = ldsl.id LEFT JOIN logpm_distribution_stock_list ldsl ON lddd.stock_list_id = ldsl.id
LEFT JOIN logpm_basicdata_client lbc ON ldsl.market_id = lbc.id LEFT JOIN logpm_basicdata_client lbc ON ldsl.market_id = lbc.id
WHERE <where>
lddd.inventory_status != 2 lddd.inventory_status != 2
<if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)"> <if test="collect != null ">
and bbb.warehouse_id in and bbb.warehouse_id in
<foreach collection="collect" item="item" open="(" close=")" separator=","> <foreach collection="collect" item="item" open="(" close=")" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
</where>
GROUP BY GROUP BY
bbb.id bbb.id
) AS m ON m.id = k.id ) AS m ON m.id = k.id
@ -179,7 +182,7 @@
<if test="param.pickUpTimeStart != null"> <if test="param.pickUpTimeStart != null">
AND DATE_FORMAT(dbl.pick_up_time,'%y%m%d') BETWEEN DATE_FORMAT(#{param.pickUpTimeStart},'%y%m%d') AND DATE_FORMAT(#{param.pickUpTimeEnd},'%y%m%d') AND DATE_FORMAT(dbl.pick_up_time,'%y%m%d') BETWEEN DATE_FORMAT(#{param.pickUpTimeStart},'%y%m%d') AND DATE_FORMAT(#{param.pickUpTimeEnd},'%y%m%d')
</if> </if>
<if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)"> <if test="collect != null ">
and dbl.warehouse_id in and dbl.warehouse_id in
<foreach collection="collect" item="item" open="(" close=")" separator=","> <foreach collection="collect" item="item" open="(" close=")" separator=",">
#{item} #{item}

4
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
Unescape View File

@ -2561,7 +2561,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
IPage<DistrilbutionBillLadingVO> distrilbutionBillLadingVOIPage = null; IPage<DistrilbutionBillLadingVO> distrilbutionBillLadingVOIPage = null;
List<Long> collect = basicdataWarehouseClient.getWarehouseIds(); List<Long> collect = basicdataWarehouseClient.getWarehouseIds();
if (collect.isEmpty()) {
collect = null;
}
distrilbutionBillLadingVOIPage = baseMapper.pageList(page, distrilbutionBillLadingDTO, collect); distrilbutionBillLadingVOIPage = baseMapper.pageList(page, distrilbutionBillLadingDTO, collect);

Write Preview
Loading…
Cancel
Save