From 7e1e419cb28dfb57fd5efc940f0b43830deb0e57 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 10 Jan 2025 17:01:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasharing/service/impl/LogpmDataSearchServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java index 882e71a63..5afbb49ad 100644 --- a/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java +++ b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java @@ -412,6 +412,10 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService { nodeInfoVO.setOperateName("入库"); nodeInfoVO.setOperateWarehouseName(departureWarehouseName); List distributionParcelListEntities = groupedByWarehouse.get(departureWarehouseName); + if(distributionParcelListEntities==null || distributionParcelListEntities.isEmpty()){ + return null; + } + // 获取第一个时间 nodeInfoVO.setOperateTime(distributionParcelListEntities.get(0).getCreateTime()); nodeInfoVO.setOperateNumber(distributionParcelListEntities.size() + "/" + totalCount); From 361c3cdbd35bca4e601e22a416aee550548872da Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Fri, 10 Jan 2025 17:27:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(all):=20=E7=B4=A2=E8=8F=B2=E4=BA=9A?= =?UTF-8?q?=E5=B7=A5=E5=8E=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 增加华之韵物流对接 --- .../suofeiya/service/impl/FactoryDataServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/FactoryDataServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/FactoryDataServiceImpl.java index 60ff3d75d..78a6ee866 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/FactoryDataServiceImpl.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/FactoryDataServiceImpl.java @@ -122,6 +122,7 @@ public class FactoryDataServiceImpl implements FactoryDataService { orderInfoEntity.setDeliveryNoteId(vo.getId().toString()); orderInfoEntity.setTenantCode(AuthUtil.getTenantId()); orderInfoEntity.setOrderType(vo.getOrderType()); + orderInfoEntity.setOrderFull("N"); infoEntities.add(orderInfoEntity); } orderInfoService.saveBatch(infoEntities); From 6c7f13c2a71ed23e0f720fab373646eb419a647c Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 13 Jan 2025 09:22:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=85=8D=E9=80=81=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89=E8=A3=85?= =?UTF-8?q?=E8=BD=A6=E6=95=B0=E6=8D=AE=E7=9A=84=E6=97=B6=E5=80=99=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LogpmDataSearchServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java index 5afbb49ad..cd7aa7f4b 100644 --- a/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java +++ b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java @@ -317,13 +317,13 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService { if (signListByWaybillNumber != null && !signListByWaybillNumber.isEmpty()) { //统计装车数量load_num - int loadNum = signListByWaybillNumber.stream().mapToInt(QualityDeliverEntity::getLoadNum).sum(); + int loadNum = signListByWaybillNumber.stream().filter(t-> t.getLoadNum()!=null).mapToInt(QualityDeliverEntity::getLoadNum).sum(); // 计划配送数 plan_num - int planNum = signListByWaybillNumber.stream().mapToInt(QualityDeliverEntity::getPlanNum).sum(); + int planNum = signListByWaybillNumber.stream().filter(t-> t.getPlanNum()!=null).mapToInt(QualityDeliverEntity::getPlanNum).sum(); // 计算签收数量sign_num - int signNum = signListByWaybillNumber.stream().mapToInt(QualityDeliverEntity::getSignNum).sum(); + int signNum = signListByWaybillNumber.stream().filter(t-> t.getSignNum()!=null).mapToInt(QualityDeliverEntity::getSignNum).sum(); // 配送装车 QualityDeliverEntity qualityDeliverEntity = signListByWaybillNumber.get(0);