Browse Source

fix:提交代码 修复线上报错的问题

dev
pref_mail@163.com 2 weeks ago
parent
commit
9b77609410
  1. 2
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java
  2. 2
      blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml

2
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java

@ -327,7 +327,7 @@ public interface IDistributionParcelListClient {
@PostMapping(API_PREFIX + "/findListZhaoBuDaoYuanYin")
List<DistributionParcelListEntity> findListZhaoBuDaoYuanYin(@RequestBody FindParamterDTO findParamterD);
@PostMapping(API_PREFIX + "/findListByOrderPackageCodeAndStatusAndNoWarehouseId")
@GetMapping(API_PREFIX + "/findListByOrderPackageCodeAndStatusAndNoWarehouseId")
List<DistributionParcelListEntity> findListByOrderPackageCodeAndStatusAndNoWarehouseId(@RequestParam String orderPackageCode, @RequestParam String number, @RequestParam Long warehouseId);
}

2
blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml

@ -218,6 +218,7 @@
logpm_distribution_delivery_list
<where>
is_deleted = 0
AND YEAR(create_time) = YEAR(CURDATE())
AND type IS NOT NULL
AND kind = 1
<if test="param.warehouseIds != null">
@ -258,6 +259,7 @@
LEFT JOIN logpm_distribution_signfor AS lds ON lds.reservation_id = ldr.id AND lds.is_deleted = 0
LEFT JOIN logpm_distribution_delivery_list AS lddl ON lds.delivery_id = lddl.id AND lddl.is_deleted = 0
<where>
YEAR(ldr.create_time) = YEAR(CURDATE()) and
ldr.reservation_status != 40
AND ldr.is_deleted = 0
AND ldr.delivery_type = #{type}

Loading…
Cancel
Save