From 8b53c881c10eadbaa6ad20cae28f8187a1dcbd32 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 25 Dec 2024 10:07:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(all):=20=E9=85=8D=E9=80=81=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 优化配送明细广播推送 --- ...ExpenseDispatchTrainDetailServiceImpl.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/ExpenseDispatchTrainDetailServiceImpl.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/ExpenseDispatchTrainDetailServiceImpl.java index 0c5f8072b..0279c0531 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/ExpenseDispatchTrainDetailServiceImpl.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/ExpenseDispatchTrainDetailServiceImpl.java @@ -41,6 +41,8 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -64,9 +66,28 @@ public class ExpenseDispatchTrainDetailServiceImpl extends BaseServiceImpl page = Condition.getPage(query); // 增加仓库权限 buildWarehouseAuth(query); + // 处理时间 + buildDate(query); return page.setRecords(baseMapper.selectExpenseDispatchTrainDetailPage(page, query)); } + private void buildDate(ExpenseDispatchTrainDetailQuery query) { + String deliveryDateStart = query.getDeliveryDateStart(); + if (StrUtil.isNotEmpty(deliveryDateStart)) { + DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + LocalDateTime dateTime = LocalDateTime.parse(deliveryDateStart, inputFormatter); + query.setDeliveryDateStart(dateTime.format(outputFormatter)); + } + String deliveryDateEnd = query.getDeliveryDateEnd(); + if (StrUtil.isNotEmpty(deliveryDateEnd)) { + DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + LocalDateTime dateTime = LocalDateTime.parse(deliveryDateEnd, inputFormatter); + query.setDeliveryDateEnd(dateTime.format(outputFormatter)); + } + } + private void buildWarehouseAuth(ExpenseDispatchTrainDetailQuery query) { if (StrUtil.isEmpty(query.getDestinationWarehouse())) { BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); @@ -129,6 +150,7 @@ public class ExpenseDispatchTrainDetailServiceImpl extends BaseServiceImpl list = baseMapper.selectExpenseDispatchTrainDetailPage(page, query); ExcelUtil.export(response, list, ExpenseDispatchTrainDetailVO.class); From 5ab86eb2918bd71978f2ba3da2dfe86175512fa3 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 25 Dec 2024 10:32:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=EF=BC=9A=201.=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=95=86=E5=AE=B6=E7=AB=AF=E6=95=B0=E6=8D=AE=E7=BC=BA=E5=B0=91?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trunkline/service/impl/TrunklineAdvanceServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java index 2c2230e2d..e49179184 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java @@ -1374,10 +1374,10 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl orderCodeSet = orderCodeMap.keySet(); //把advanceDetailEntities中所有元素的waybillId提取到一个Set中 - Set waybillIdSet = advanceDetailEntities.stream().map(TrunklineAdvanceDetailEntity::getWaybillId).collect(Collectors.toSet()); + Set waybillIdSet = advanceDetailEntities.stream().map(TrunklineAdvanceDetailEntity::getWaybillNo).collect(Collectors.toSet()); Map waybillEntityMap = new HashMap<>(); if (!waybillIdSet.isEmpty()) { - List waybillEntityList = warehouseWaybillClient.findListByWaybillIds(new ArrayList<>(waybillIdSet)); + List waybillEntityList = warehouseWaybillClient.findWaybillBilllByWaybillNos(new ArrayList<>(waybillIdSet)); //把waybillEntityList转化成以id为key的Map waybillEntityMap = waybillEntityList.stream().collect(Collectors.toMap(WarehouseWaybillEntity::getWaybillNo, Function.identity())); } From 3868ab567926b924a25e23fdf459393440649b96 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 25 Dec 2024 10:42:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=EF=BC=9A=201.=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=A4=87=E8=B4=A7=E6=9F=A5=E8=AF=A2=E8=B6=85=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/mapper/DistributionReservationMapper.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index b04df26c8..f29e6077a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -343,7 +343,6 @@ group by ldsl.cargo_number ) 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 ldss ON FIND_IN_SET(ldss.stock_list_id,t.aaa) LEFT JOIN ( SELECT ldpl.material_code,