From e1d2dba6c9da4d5aca4854f8e23fb2eb3985d330 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Tue, 29 Oct 2024 11:11:54 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=88=91?= =?UTF-8?q?=E4=B9=90=E6=89=B9=E6=AC=A1=E4=BB=B6=E5=9B=9E=E4=BC=A0=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改我乐批次件回传是报错问题 --- .../com/logpm/factorydata/olo/mq/NodeDataPushListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mq/NodeDataPushListener.java b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mq/NodeDataPushListener.java index 00f2ee197..23b1a23a5 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mq/NodeDataPushListener.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mq/NodeDataPushListener.java @@ -73,7 +73,7 @@ public class NodeDataPushListener { if (CollUtil.isNotEmpty(content)) { FactoryNodeEnums factoryNode = NodeMappingEnums.getFactoryByNodeAndStatus(workNodeEnums, 1); // 1 先处理 批次件 OLO开头的包件 OLO2312064418-20231226010129-1-001 原始包件 2312064418 回传按原始包件回传 - content.stream().map(i -> { + content = content.stream().map(i -> { String packageCode = i.getPackageCode(); if (StrUtil.startWith(packageCode, "OLO")) { if (StrUtil.isNotEmpty(packageCode)) { @@ -82,7 +82,7 @@ public class NodeDataPushListener { } } return i; - }); + }).collect(Collectors.toList()); // 2 先查出 包件+订单 的所有发运分单号和发运单号 Set packageSet = content.stream().map(PushData::getPackageCode).collect(Collectors.toSet()); Set orderSet = content.stream().map(PushData::getOrderCode).collect(Collectors.toSet()); From 6c4e5429c7f00284b22b79b12785cdd54ec741a1 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 29 Oct 2024 11:40:38 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=A2=9E=E5=8A=A0=E5=8C=85=E4=BB=B6=E5=86=BB?= =?UTF-8?q?=E7=BB=93=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/mapper/DistributionStockArticleMapper.xml | 1 + 1 file changed, 1 insertion(+) 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 82052946f..72533e1ff 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 @@ -774,6 +774,7 @@ AND ldpll.order_package_loading_status != '20' AND ldpll.order_package_reservation_status != '20' AND ldpll.order_package_status != '70' + AND ldpll.order_package_freeze_status = '10' AND ldpll.conditions != 2 AND ldpll.warehouse_id = #{par.warehouseId} AND ldsa.type_service = #{par.typeService} From ee723cf8578cf4289de0958d8cff219954de55db Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Tue, 29 Oct 2024 15:02:02 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=88=91?= =?UTF-8?q?=E4=B9=90=E6=8E=A5=E6=94=B6=E8=AE=A2=E5=8D=95=E5=A4=84=E7=90=86?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改我乐接收订单由定时任务生成暂存单 --- .../logpm/factorydata/olo/job/AdvanceJob.java | 58 +++++++++++++++++++ .../olo/mq/FactoryOrderListener.java | 4 +- 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/job/AdvanceJob.java diff --git a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/job/AdvanceJob.java b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/job/AdvanceJob.java new file mode 100644 index 000000000..c6e780d69 --- /dev/null +++ b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/job/AdvanceJob.java @@ -0,0 +1,58 @@ +package com.logpm.factorydata.olo.job; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.logpm.factorydata.olo.entity.DeliveryNoteEntity; +import com.logpm.factorydata.olo.service.DeliveryNoteService; +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * 我乐定时生成暂存单 + * + * @author zhaoqiaobo + * @create 2024-04-02 + */ +@AllArgsConstructor +@Component +@Slf4j +public class AdvanceJob { + + private final DeliveryNoteService deliveryNoteService; + + /** + * 定时扫描数据库 + * 背景：我乐每天晚上凌晨1点拉取订单数据，然后存入我乐订单池。 + * 任务：1点半去定时生成暂存单 + * + * @param param + * @return + * @throws Exception + */ + @XxlJob("createAdvance") + public ReturnT createAdvance(String param) throws Exception { + // 指定天数生成暂存单或者系统自动处理 + DateTime time = DateUtil.date(); + if (StrUtil.isNotEmpty(param)) { + time = DateUtil.parseDate(param); + } + // 1 查询出当前拉取的数据 + // 大于等于 time 的开始 小于 time 的结束 + List list = deliveryNoteService.list(Wrappers.lambdaQuery().between(DeliveryNoteEntity::getCreateTime, DateUtil.beginOfDay(time), DateUtil.endOfDay(time))); + // 2 按订单和发货单分组作为一个暂存单 + if (CollUtil.isNotEmpty(list)) { + // 3 生成暂存单 + deliveryNoteService.buildAdvance(list); + } + return ReturnT.SUCCESS; + } + +} diff --git a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mq/FactoryOrderListener.java b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mq/FactoryOrderListener.java index 6261c84cd..ccad88250 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mq/FactoryOrderListener.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mq/FactoryOrderListener.java @@ -153,8 +153,8 @@ public class FactoryOrderListener { } if (CollUtil.isNotEmpty(entities)) { deliveryNoteService.saveBatch(entities); - // 处理暂存单 - deliveryNoteService.buildAdvance(entities); + // 处理暂存单 暂存单由定时任务定时生成 + // deliveryNoteService.buildAdvance(entities); FactoryOrderLogEntity logEntity1 = new FactoryOrderLogEntity(); logEntity1.setSaxStatus(SaxStatusEnums.SUCCESS.getCode()); logEntity1.setId(logId); From 1d6931ecbca183555649c3737d01020386d0eab1 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 29 Oct 2024 15:20:49 +0800 Subject: [PATCH 4/6] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IDistributionStockArticleClient.java | 3 +++ .../AftersalesAbnormalRecordServiceImpl.java | 2 +- .../feign/DistributionStockArticleClient.java | 5 ++++ .../impl/TrunklineAdvanceServiceImpl.java | 2 ++ .../impl/TrunklineCarsLoadServiceImpl.java | 24 +++++++++++++++++-- 5 files changed, 33 insertions(+), 3 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java index 13a9c469b..a50ff69ea 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java @@ -222,4 +222,7 @@ public interface IDistributionStockArticleClient { @PostMapping(API_PREFIX + "/findWaybillNoByOrderIds") List findWaybillNoByOrderIds(@RequestBody Set stockArticleIds); + + @PostMapping(API_PREFIX + "/updateEntity") + void updateEntity(@RequestBody DistributionStockArticleEntity stockArticleEntity); } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java index 961db016c..ecb5e7ed3 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java @@ -160,7 +160,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl loadScanQueryWrapper1 = new QueryWrapper<>(); +// loadScanQueryWrapper1.eq("load_id", loadId) +// .eq("scan_code", orderPackageCode) +// .eq("scan_status","2") +// .eq("unload_node_id", warehouseId); +// carsLoadScanEntity = trunklineCarsLoadScanService.getOne(loadScanQueryWrapper); +// } + + //判断是否有装车扫描记录 if (Objects.isNull(carsLoadScanEntity)) { //没有装车扫码记录 From 1aeb8d96329f254a3fc572f3dfcc45016a079ac7 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 29 Oct 2024 15:25:25 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix:=201.=E4=BF=AE=E6=94=B9=E5=95=86?= =?UTF-8?q?=E5=AE=B6=E6=95=B0=E6=8D=AE=E6=8E=A8=E9=80=81=E7=9A=84=E5=88=A4?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../receiver/BusinessPreOrderDataQueueHandler.java | 2 +- .../service/impl/TrunklineAdvanceServiceImpl.java | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java index 446f3f924..907a679b7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java @@ -59,7 +59,7 @@ public class BusinessPreOrderDataQueueHandler { if(tenant1.isSuccess() && tenant1.getData() != null ){ Tenant data = tenant1.getData(); - if(1==data.getTenantType()){ + if(2==data.getTenantType()){ log.info(">>>>>>>>> 当前作业对象 {} 未 商家对象",data.getTenantName() ); return ; } 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 7db37f96d..477728163 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 @@ -852,10 +852,13 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl Date: Tue, 29 Oct 2024 15:26:20 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix:=201.=E4=BF=AE=E6=94=B9=E5=95=86?= =?UTF-8?q?=E5=AE=B6=E6=95=B0=E6=8D=AE=E6=8E=A8=E9=80=81=E7=9A=84=E5=88=A4?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../receiver/BusinessPreOrderDataQueueHandler.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java index 907a679b7..ceb873c78 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java @@ -71,9 +71,6 @@ public class BusinessPreOrderDataQueueHandler { if (tenantList.isSuccess()) { List data = tenantList.getData(); data.forEach(tenant -> { - - - if (!ObjectUtil.isEmpty(tenant.getTenantType())) { if (2 == tenant.getTenantType()) { List basicdataClientEntitysTenantId = basicdataClientClient.findBasicdataClientEntitysTenantId(tenant.getTenantId()); @@ -93,7 +90,6 @@ public class BusinessPreOrderDataQueueHandler { if (list != null && !list.isEmpty()) { resoveData(tenant,distributionDeliveryListEntity, basicdataClientEntitysTenantId, list); } - } } }