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

已签订单取消全模糊字段查询

dist.1.3.0
汤建军 10 months ago
parent
c8ca23d1f6
commit
042497608c
2 changed files with 25 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
  2. 15
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

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

@ -1223,41 +1223,41 @@
<where>
ldsa.order_status in ('70','80')
<if test="param.waybillNumber != null and param.waybillNumber != ''">
AND ldsa.waybill_number like concat("%",#{param.waybillNumber},"%")
AND ldsa.waybill_number like concat(#{param.waybillNumber},"%")
</if>
<if test="param.serviceNumber != null and param.serviceNumber != ''">
AND ldsa.service_number like concat("%",#{param.serviceNumber},"%")
AND ldsa.service_number like concat(#{param.serviceNumber},"%")
</if>
<if test="param.orderCode != null and param.orderCode != ''">
AND ldsa.order_code like concat("%",#{param.orderCode},"%")
AND ldsa.order_code like concat(#{param.orderCode},"%")
</if>
<if test="param.warehouseName != null and param.warehouseName != ''">
AND ldsa.warehouse like concat("%",#{param.warehouseName},"%")
AND ldsa.warehouse like concat(#{param.warehouseName},"%")
</if>
<if test="param.mallName != null and param.mallName != ''">
AND ldsa.mall_name like concat("%",#{param.mallName},"%")
AND ldsa.mall_name like concat(#{param.mallName},"%")
</if>
<if test="param.brand != null and param.brand != ''">
AND ldsa.brand like concat("%",#{param.brand},"%")
</if>
<if test="param.consigneePerson != null and param.consigneePerson != ''">
AND ldsa.consignee_person like concat("%",#{param.consigneePerson},"%")
AND ldsa.consignee_person like concat(#{param.consigneePerson},"%")
</if>
<if test="param.consigneeUnit != null and param.consigneeUnit != ''">
AND ldsa.consignee_unit like concat("%",#{param.consigneeUnit},"%")
AND ldsa.consignee_unit like concat(#{param.consigneeUnit},"%")
</if>
<if test="param.deliveryListInfo != null and param.deliveryListInfo != ''">
AND m.mssg like concat("%",#{param.deliveryListInfo},"%")
AND m.mssg like concat(#{param.deliveryListInfo},"%")
</if>
<if test="param.driverName != null and param.driverName != ''">
AND m.driverName like concat("%",#{param.driverName},"%")
AND m.driverName like concat(#{param.driverName},"%")
</if>
<if test="param.examineUserNames != null and param.examineUserNames != ''">
AND m.examine_user_name like concat("%",#{param.examineUserNames},"%")
AND m.examine_user_name like concat(#{param.examineUserNames},"%")
</if>
<if test="param.reservationInfo != null and param.reservationInfo != ''">
AND t.msg like concat("%",#{param.reservationInfo},"%")
AND t.msg like concat(#{param.reservationInfo},"%")
</if>
<if test="param.warehouseId != null and param.warehouseId != ''">
AND ldsa.warehouse_id = #{param.warehouseId}

15
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
Unescape View File

@ -6656,6 +6656,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
List<DistributionReservationStockarticleEntity> reservationStockarticleList = distributionReservationStockarticleService.list(queryWrapper);
List<Map<String, Object>> ls = new ArrayList<>();
BigDecimal totalPrice = BigDecimal.ZERO;
Integer all = 0;
for (int i = 0; i < reservationStockarticleList.size(); i++) {
DistributionReservationStockarticleEntity reservationStockarticleEntity = reservationStockarticleList.get(i);
Long stockArticleId = reservationStockarticleEntity.getStockArticleId();//订单id
@ -6697,11 +6698,22 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
numObj.put(key, num);
tn = tn + num.intValue();
}
orderMap.put("签收件数", signNum);
}
}
}
//查询签收数
List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
.eq(DistributionLoadscanEntity::getReservationId, reservationStockarticleEntity.getReservationId())
.eq(DistributionLoadscanEntity::getOrderId, reservationStockarticleEntity.getStockArticleId())
.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
);
int sum = 0 ;
if (!loadscanEntityList.isEmpty()){
sum = loadscanEntityList.stream().mapToInt(DistributionLoadscanEntity::getReceivedQuantity).sum();
}
all += sum;
orderMap.put("签收件数", sum);
orderMap.put("合计数量", tn);
orderMap.put("小计", sn);
orderMap.put("产品明细", numObj);
@ -6715,6 +6727,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
ls.add(orderMap);
}
total.put("到付运费", totalPrice);
total.put("签收件数", all);
map.put("明细", ls);
map.put("合计", total);
String popHtml = TemplateUtil.popTemplate("商配配配送单", map, html);

Write Preview
Loading…
Cancel
Save