diff --git a/blade-biz-common/src/main/java/org/springblade/common/utils/AddressUtil.java b/blade-biz-common/src/main/java/org/springblade/common/utils/AddressUtil.java
index 91d4f4eae..e10109969 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/utils/AddressUtil.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/utils/AddressUtil.java
@@ -18,11 +18,11 @@ import java.util.Map;
public class AddressUtil {
-// private static String KEY="<高德key>";
+// private static String KEY="49ae079d3b85e5c9cf29034e72e2d221";
// public static String GD_URL="http://restapi.amap.com/v3/geocode/geo?key=<高德地图KEY>&address=";
- public static String GD_URL="http://restapi.amap.com/v3/geocode/geo?key=af745167b52e6548d450cbbf2c6134eb&address=";
+ public static String GD_URL="http://restapi.amap.com/v3/geocode/geo?key=49ae079d3b85e5c9cf29034e72e2d221&address=";
public static String SUCCESS="10000";
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index afe23dd90..35e8e922a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
@@ -1194,9 +1194,84 @@
LEFT JOIN
logpm_distribution_signfor As lds ON lds.reservation_id = ldr.id
LEFT JOIN logpm_distribution_delivery_list AS lddl ON lds.delivery_id = lddl.id
- ) AS m ON ldsa.id = m.stock_article_id
- WHERE
- ldsa.id = '1749602880861630465'
+ ) AS m ON ldsa.id = m.stock_article_id AND t.reservation_id = m.reservation_id
+
+ ldsa.order_status in ('70','80')
+
+ AND ldsa.waybill_number like concat("%",#{param.waybillNumber},"%"})
+
+
+ AND ldsa.service_umber like concat("%",#{param.serviceNumber},"%"})
+
+
+ AND ldsa.order_code like concat("%",#{param.orderCode},"%"})
+
+
+ AND ldsa.warehouse like concat("%",#{param.warehouseName},"%"})
+
+
+ AND ldsa.mall_mame like concat("%",#{param.mallName},"%"})
+
+
+ AND ldsa.brand like concat("%",#{param.brand},"%"})
+
+
+ AND ldsa.consignee_person like concat("%",#{param.consigneePerson},"%"})
+
+
+ AND ldsa.consignee_unit like concat("%",#{param.consigneeUnit},"%"})
+
+
+ AND m.mssg like concat("%",#{param.deliveryListInfo},"%"})
+
+
+ AND m.driverName like concat("%",#{param.driverName},"%"})
+
+
+ AND m.examine_user_name like concat("%",#{param.examineUserNames},"%"})
+
+
+
+ AND t.msg like concat("%",#{param.reservationInfo},"%"})
+
+
+ AND ldsa.warehouse_id = #{param.warehouseId}
+
+
+ AND ldsa.warehouse_id IN
+
+ #{item}
+
+
+
+ AND ldsa.order_code in
+
+ #{item}
+
+
+
+ AND ldsa.waybill_number in
+
+ #{item}
+
+
+ and ldsa.warehouse_entry_time between #{param.startDate} and
+ #{param.entDate}
+
+ and DATE(ldsa.warehouse_entry_time) =
+ #{param.warehouseEntryTime}
+
+ and DATE(ldsa.create_time) =
+ #{param.createTime}
+
+ and DATE(m.signing_time) =
+ #{param.signinTime}
+
+
+
+
+
+
GROUP BY
ldsa.id
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index 696920a88..6ec5ad685 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
@@ -917,7 +917,6 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl list = distributionBillLadingScanService.list(Wrappers.query().lambda()
- .eq(DistributionBillLadingScanEntity::getBillLadingId, distrilbutionBillLadingEntity.getId())
- .eq(DistributionBillLadingScanEntity::getMaterialType, '1')
+// List list = distributionBillLadingScanService.list(Wrappers.query().lambda()
+// .eq(DistributionBillLadingScanEntity::getBillLadingId, distrilbutionBillLadingEntity.getId())
+// .eq(DistributionBillLadingScanEntity::getMaterialType, '1')
+// );
+ List listed = disStockListDetailService.list(Wrappers.query().lambda()
+ .eq(DisStockListDetailEntity::getReservationId, i.getBillLadingId())
+ .ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())
);
- i.setEsauInventoryNum(list.size());
+ if (Func.isNotEmpty(listed)){
+ int sum = listed.stream().filter(f -> InventoryStockUpStatusConstant.yibeihuo.getValue().equals(f.getStockStatus()) && Func.isNotEmpty(f.getStockPackageCode())).mapToInt(DisStockListDetailEntity::getNum).sum();
+ log.info(i.getDescriptionGoods()+">>>>>>>>>>>>>>自提客户备货库存数量:",sum);
+ if (sum>0){
+ i.setEsauInventoryNum(sum);
+ }else {
+ i.setEsauInventoryNum(-1);
+ }
+ }else {
+ i.setEsauInventoryNum(-1);
+ }
+
+
} else {
//没有备货完成
i.setEsauInventoryNum(-1);