From 2e88527d5f8bb2dd42f581084f24cbb49ef7479e Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Mon, 31 Mar 2025 10:56:20 +0800 Subject: [PATCH 01/10] =?UTF-8?q?feat(all):=20=E9=87=91=E7=89=8C=E5=B7=A5?= =?UTF-8?q?=E5=8E=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 解决金牌工厂拉取的数据无包条的情况自动生成包条数据生成暂存单 --- .../factorydata/jinpai/job/AdvanceJob.java | 88 +++++++++++++++---- .../service/impl/MqWorkerServiceImpl.java | 2 + 2 files changed, 75 insertions(+), 15 deletions(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/job/AdvanceJob.java b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/job/AdvanceJob.java index db0de1e07..3b35b6c88 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/job/AdvanceJob.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/job/AdvanceJob.java @@ -1,9 +1,10 @@ package com.logpm.factorydata.jinpai.job; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.NumberUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.logpm.factorydata.base.feign.IFactoryDataBaseClient; -import com.logpm.factorydata.feign.IFactoryDataClient; import com.logpm.factorydata.jinpai.entity.DeliveryNoteEntity; import com.logpm.factorydata.jinpai.entity.OrderInfoEntity; import com.logpm.factorydata.jinpai.entity.PackageInfoEntity; @@ -14,9 +15,9 @@ 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.springblade.common.annotations.LogpmAsync; import org.springframework.stereotype.Component; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -62,21 +63,78 @@ public class AdvanceJob { // 将数据封装到packageInfoEntityMap中 其中omsExtOrderNo为key packageInfoEntityMap.computeIfAbsent(entity.getOmsExtOrderNo(), k -> new ArrayList<>()).add(entity); } - // 根据订单数据查询出所有订单明细和包件信息 - List deliveryNoteEntities = deliveryNoteService.list(Wrappers.lambdaQuery().in(DeliveryNoteEntity::getOrderId, deliveryNoteSet)); - if (CollUtil.isNotEmpty(deliveryNoteEntities)) { - for (DeliveryNoteEntity entity : deliveryNoteEntities) { - deliveryNoteEntityMap.put(entity.getOrderId(), entity); - } + } + List orders = orderInfoService.list(Wrappers.lambdaQuery().eq(OrderInfoEntity::getReserve1, "0")); + if (CollUtil.isNotEmpty(orders)) { + for (OrderInfoEntity order : orders) { + orderInfoSet.add(order.getOmsExtOrderNo()); + } + } + List orderInfoEntities = orderInfoService.list(Wrappers.lambdaQuery().in(OrderInfoEntity::getOmsExtOrderNo, orderInfoSet)); + if (CollUtil.isNotEmpty(orderInfoEntities)) { + for (OrderInfoEntity entity : orderInfoEntities) { + String omsExtOrderNo = entity.getOmsExtOrderNo(); + orderInfoEntityMap.put(omsExtOrderNo, entity); + deliveryNoteSet.add(entity.getOrderId()); } - List orderInfoEntities = orderInfoService.list(Wrappers.lambdaQuery().in(OrderInfoEntity::getOmsExtOrderNo, orderInfoSet)); - if (CollUtil.isNotEmpty(orderInfoEntities)) { - for (OrderInfoEntity entity : orderInfoEntities) { - orderInfoEntityMap.put(entity.getOmsExtOrderNo(), entity); + } + // 根据订单数据查询出所有订单明细和包件信息 + List deliveryNoteEntities = deliveryNoteService.list(Wrappers.lambdaQuery().in(DeliveryNoteEntity::getOrderId, deliveryNoteSet)); + if (CollUtil.isNotEmpty(deliveryNoteEntities)) { + for (DeliveryNoteEntity entity : deliveryNoteEntities) { + deliveryNoteEntityMap.put(entity.getOrderId(), entity); + } + } + // 处理无包条的情况 + if (CollUtil.isNotEmpty(orderInfoEntities)) { + for (OrderInfoEntity entity : orderInfoEntities) { + String omsExtOrderNo = entity.getOmsExtOrderNo(); + String goodsNumber = entity.getGoodsNumber(); + if (!packageInfoEntityMap.containsKey(omsExtOrderNo)) { + // 订单没有包件，生成包件 + if (StrUtil.isNotEmpty(goodsNumber)) { + Integer anInt = Convert.toInt(goodsNumber); + if (anInt > 0) { + // 创建包件 + List packageInfoEntities = new ArrayList<>(); + for (int i = 0; i < anInt; i++) { + PackageInfoEntity packageInfoEntity = new PackageInfoEntity(); + packageInfoEntity.setOrderId(entity.getOrderId()); + packageInfoEntity.setOmsExtOrderNo(omsExtOrderNo); + packageInfoEntity.setGoodsNum(entity.getGoodsNumber()); + packageInfoEntity.setBoxType1(entity.getGoodsType()); + packageInfoEntity.setBoxType2(entity.getGoodsType()); + packageInfoEntity.setBoxType3(entity.getGoodsType()); + packageInfoEntity.setExtBoxCode(deliveryNoteEntityMap.get(entity.getOrderId()).getOmsExtYsId() + omsExtOrderNo + "-" + i); + String goodsVolume = entity.getGoodsVolume(); + if (StrUtil.isNotEmpty(goodsVolume)) { + BigDecimal div = NumberUtil.div(Convert.toBigDecimal(goodsVolume), Convert.toBigDecimal(anInt), 4); + packageInfoEntity.setGoodsVolume(Convert.toStr(div)); + } + packageInfoEntities.add(packageInfoEntity); + } + packageInfoEntityMap.put(omsExtOrderNo, packageInfoEntities); + } + } } } - // 组装数据，然后生成暂存单 - deliveryNoteService.buildAdvancePull(packageInfoEntityMap, deliveryNoteEntityMap, orderInfoEntityMap); + } + // 组装数据，然后生成暂存单 + deliveryNoteService.buildAdvancePull(packageInfoEntityMap, deliveryNoteEntityMap, orderInfoEntityMap); + if (CollUtil.isNotEmpty(orderInfoEntities)) { + // 修改包件的发送状态 TODO 后面修改为暂存单消费完成之后回调更新状态 + List updatePackageList = new ArrayList<>(); + for (OrderInfoEntity entity : orderInfoEntities) { + OrderInfoEntity updateEntity = new OrderInfoEntity(); + updateEntity.setReserve1("1"); + updateEntity.setId(entity.getId()); + updatePackageList.add(updateEntity); + } + if (CollUtil.isNotEmpty(updatePackageList)) { + orderInfoService.updateBatchById(updatePackageList); + } + } + if (CollUtil.isNotEmpty(list)) { // 修改包件的发送状态 TODO 后面修改为暂存单消费完成之后回调更新状态 List updatePackageList = new ArrayList<>(); for (PackageInfoEntity entity : list) { diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/MqWorkerServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/MqWorkerServiceImpl.java index 135a76c19..af2edbd34 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/MqWorkerServiceImpl.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/MqWorkerServiceImpl.java @@ -307,6 +307,8 @@ public class MqWorkerServiceImpl implements MqWorkerService { OrderInfoEntity deliveryNoteEntity = new OrderInfoEntity(); BeanUtil.copyProperties(vo, deliveryNoteEntity); deliveryNoteEntity.setLogId(ObjectUtil.isNotEmpty(logEntity.getId()) ? logEntity.getId().toString() : null); + // 是否推送 + deliveryNoteEntity.setReserve1("0"); entities.add(deliveryNoteEntity); } if (CollUtil.isNotEmpty(entities)) { From 0018ad61bbbddd7a2c28a63a0f98e70b2d489a96 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Mon, 31 Mar 2025 13:48:53 +0800 Subject: [PATCH 02/10] =?UTF-8?q?feat(all):=202B=E9=85=8D=E9=80=81?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改列表页面总数不正确问题 --- .../java/com/logpm/report/mapper/TrunklinePickupMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/TrunklinePickupMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/TrunklinePickupMapper.xml index 7f3d9352d..9fb698e52 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/TrunklinePickupMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/TrunklinePickupMapper.xml @@ -248,7 +248,7 @@ @@ -1251,6 +1257,12 @@ and lww.settlement_status = #{param.settlementStatus} + + and lww.document_making_time >= #{param.startTime} + + + and lww.document_making_time <= #{param.endTime} + GROUP BY lww.id order by lww.create_time desc diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java index 5310cf3b3..05bfa2752 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java @@ -1096,6 +1096,9 @@ public class CarsLoadController { carsLoadService.unloadByLoadId(loadCarsDTO); try{ + //同步一次系统无编码数据 + carsLoadService.syncNoSystemData(loadId, myCurrentWarehouse.getId(), myCurrentWarehouse.getName()); + carsLoadService.sendStationArrivedEnter(loadCarsDTO); }catch (Exception e){ diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 104582ce5..3e036ed13 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -1516,8 +1516,6 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl Date: Mon, 31 Mar 2025 16:12:58 +0800 Subject: [PATCH 06/10] =?UTF-8?q?1.bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AftersalesAbnormalRecordServiceImpl.java | 10 ++ .../feign/DistributionStockArticleClient.java | 7 +- .../service/impl/OpenOrderServiceImpl.java | 9 ++ .../impl/TrunklineAdvanceServiceImpl.java | 19 +++ .../impl/TrunklineCarsLoadServiceImpl.java | 110 ++++++++++++++++++ .../impl/WarehouseTrayTypeServiceImpl.java | 11 +- .../impl/WarehouseWaybillServiceImpl.java | 16 ++- 7 files changed, 172 insertions(+), 10 deletions(-) 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 666606365..dae73affd 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 @@ -339,6 +339,16 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl updateScanZeroDetailEntityList = new ArrayList<>(); List addParcelNumberEntityList = new ArrayList<>(); List updateRecordZeroDetailList = new ArrayList<>(); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java index 3d51af06d..4975a2183 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java @@ -85,24 +85,23 @@ public class DistributionStockArticleClient implements IDistributionStockArticle if(exists){ String idStr = bladeRedis.get(key); if("1".equals(idStr)){ - throw new CustomerException(405,"订单"+orderCode+"正在更新，请重新扫描"); + return 1L; }else{ return Long.valueOf(idStr); } }else{ + bladeRedis.setEx(key,"1",30L); DistributionStockArticleEntity distributionStockArticle = distributionStockArticleService.findStockArticleByOrderCodeAndWarehouseId(orderCode, warehouseId); if(ObjectUtils.isNotEmpty(distributionStockArticle)){ bladeRedis.setEx(key,distributionStockArticle.getId(),30L); return distributionStockArticle.getId(); }else{ - bladeRedis.setEx(key,"1",30L); - boolean saveFlag = distributionStockArticleService.save(distributionStockArticleEntity); if(saveFlag){ bladeRedis.setEx(key,distributionStockArticle.getId(),30L); return distributionStockArticleEntity.getId(); }else{ - throw new CustomerException(405,"订单"+orderCode+"保存失败，请重新扫描"); + return 0L; } } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 181a5f8c0..4a47a2013 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -6193,6 +6193,15 @@ public class OpenOrderServiceImpl implements IOpenOrderService { if (Objects.isNull(orderId)) { log.warn("#################createStockArticle: 保存订单信息失败 orderCode={}", distributionStockArticleEntity.getOrderCode()); throw new CustomerException(405, "保存订单信息失败"); + }else{ + if(orderId.equals(0L)){ + log.warn("################createStockArticle: 订单信息保存失败 orderCode={} warehouseId={}",distributionStockArticleEntity.getOrderCode(),distributionStockArticleEntity.getWarehouseId()); + throw new CustomerException(405,"订单信息保存失败"); + } + if(orderId.equals(1L)){ + log.warn("################dealAbnocreateStockArticlermal: 订单信息正在更新 orderCode={} warehouseId={}",distributionStockArticleEntity.getOrderCode(),distributionStockArticleEntity.getWarehouseId()); + throw new CustomerException(405,"订单信息正在更新，请稍后重试"); + } } List wayBillDetailList = warehouseWaybillDetailClient.findByWaybillId(warehouseWaybill.getId()); 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 a629c136d..028f13378 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 @@ -233,6 +233,16 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl parcelListEntityList = distributionParcelListClient.findEntityVOListByOrderCode(orderCode, fromWarehouseId); @@ -5201,6 +5207,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl parcelListEntityList = distributionParcelListClient.findEntityVOListByOrderCode(orderCode, fromWarehouseId); @@ -5749,6 +5759,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl parcelListEntityList = distributionParcelListClient.findEntityListByOrderCode(orderCode, fromWarehouseId); List ls = new ArrayList<>(); for (DistributionParcelListEntity parcelListEntity : parcelListEntityList) { diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java index b4596610f..1f083ae81 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java @@ -4877,10 +4877,15 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl parcelNumberList = new ArrayList<>(); for (ProductDTO productDTO : products) { String productName = productDTO.getProductName(); From ac2a2b38e49d125a9ac8c43ddadddb8699cf5488 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 31 Mar 2025 17:23:21 +0800 Subject: [PATCH 07/10] =?UTF-8?q?1.=E4=B8=89=E6=96=B9=E4=B8=AD=E8=BD=AC?= =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=B9=BF=E6=92=AD=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/broadcast/FanoutConstants.java | 15 ++++ .../common/model/TripartiteVO.java | 50 +++++++++++ .../impl/TrunklineCarsLoadServiceImpl.java | 86 +++++++++++++++++++ 3 files changed, 151 insertions(+) create mode 100644 blade-biz-common/src/main/java/org/springblade/common/model/TripartiteVO.java diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java b/blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java index 6a041b053..13a14e86a 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java @@ -142,6 +142,21 @@ public abstract class FanoutConstants { } + /** + * 备货节点 + * + * @see org.springblade.common.model.StockUpVO + **/ + interface tripartite { + + String EXCHANGE = "fanout.trunkline.tripartite" + ModuleNameConstant.DEVAUTH; + + interface QUEUE { + String SIGN = "fanout.trunkline.tripartite.sign" + ModuleNameConstant.DEVAUTH; + } + } + + } diff --git a/blade-biz-common/src/main/java/org/springblade/common/model/TripartiteVO.java b/blade-biz-common/src/main/java/org/springblade/common/model/TripartiteVO.java new file mode 100644 index 000000000..8d5eb0584 --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/model/TripartiteVO.java @@ -0,0 +1,50 @@ +package org.springblade.common.model; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +@Data +public class TripartiteVO implements Serializable { + + /** 发车批次号 */ + private String carsNo ; + + /** 司机id */ + private Long driverId ; + /** 司机名称 */ + private String driverName ; + /** 司机电话 */ + private String driverMobile ; + /** 副驾id */ + private Long assistantId ; + /** 副驾i名称 */ + private String assistantName ; + /** 副驾i电话 */ + private String assistantMobile ; + + /** 车辆id */ + private Long carId ; + + /** 送货方式：1=自提，2=送货 */ + private String deliveryType ; + + /** 客户类型:1=商场,2=C端客户[多选] */ + private String customerType ; + + /** 承运商id */ + private Long carrierId ; + /** 承运商名称 */ + private String carrierName ; + /** 承运单号 */ + private String carrierOrderCode ; + /** 承运时间 */ + private Date carrierTime ; + /** 车牌号 */ + private String carNumber ; + + private List packageDataList; + +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 08f25ae25..9631e1f09 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -54,12 +54,19 @@ import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; import org.springblade.common.annotations.RepeatSubmit; import org.springblade.common.constant.*; +import org.springblade.common.constant.broadcast.FanoutConstants; import org.springblade.common.constant.carsload.CarsLoadLogTypeConstant; +import org.springblade.common.enums.BizOperationEnums; +import org.springblade.common.enums.PackageTypeEnums; import org.springblade.common.exception.CustomerException; +import org.springblade.common.model.NodeFanoutMsg; +import org.springblade.common.model.PackageData; +import org.springblade.common.model.TripartiteVO; import org.springblade.common.utils.CommonUtil; import org.springblade.common.utils.QRCodeUtil; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.redis.cache.BladeRedis; +import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.BeanUtil; @@ -9746,6 +9753,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl packageDataList = new ArrayList<>(); + List loadScanEntityList = trunklineCarsLoadScanService.findListByIds(loadScanIds); //把loadScanEntityList中所有元素通过type进行分组 Map> map = loadScanEntityList.stream().collect(Collectors.groupingBy(TrunklineCarsLoadScanEntity::getType)); @@ -9757,30 +9766,107 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl scanCodes = trunklineCarsLoadScanEntities.stream().map(TrunklineCarsLoadScanEntity::getScanCode).collect(Collectors.toList()); //TODO 暂时注释 // carsLoadAsyncService.sendReportPackageSignData(AuthUtil.getNickName(),AuthUtil.getUserId(),warehouseId,warehouseName,carsLoadEntity,scanCodes); + + + FindParamterDTO findParamterDTO = new FindParamterDTO(); + findParamterDTO.setOrderPackageCodeList(scanCodes); + findParamterDTO.setWarehouseId(warehouseId); + List parcelListEntityList = distributionParcelListClient.findListByOrderPackageCodeList(findParamterDTO); + parcelListEntityList.forEach(parcelListEntity -> { + PackageData packageData = new PackageData(); + packageData.setWaybillNumber(parcelListEntity.getWaybillNumber()); + packageData.setBrand(parcelListEntity.getBrandName()); + packageData.setPackageCode(parcelListEntity.getOrderPackageCode()); + packageData.setMaterialCode(parcelListEntity.getMaterialCode()); + packageData.setMaterialName(parcelListEntity.getMaterialName()); + packageData.setNumber(1); + packageData.setOrderCode(parcelListEntity.getOrderCode()); + packageData.setPackageType(PackageTypeEnums.CMP); + packageDataList.add(packageData); + }); + }else{ trunklineCarsLoadScanEntities.forEach(carsLoadScanEntity -> { Long scanId = carsLoadScanEntity.getId(); List zeroDetailVOList = scanZeroDetailService.findListByCarsLoadScanId(scanId); + + //把zeroDetailList中所有元素的packageId放入一个List + List packageIds = zeroDetailVOList.stream().map(TrunklineScanZeroDetailEntity::getPackageId).collect(Collectors.toList()); + List parcelListEntityList = distributionParcelListClient.findListByIds(packageIds); + //把parcelListEntityList转成以id为key的Map + Map parcelListMap = parcelListEntityList.stream().collect(Collectors.toMap(DistributionParcelListEntity::getId, Function.identity())); + List zeroDetailList = new ArrayList<>(); zeroDetailVOList.forEach(zeroDetailVO -> { TrunklineScanZeroDetailEntity entity = new TrunklineScanZeroDetailEntity(); BeanUtil.copy(zeroDetailVO, entity); zeroDetailList.add(entity); + Long packageId = zeroDetailVO.getPackageId(); + DistributionParcelListEntity parcelList = parcelListMap.get(packageId); + if(!Objects.isNull(parcelList)){ + PackageData packageData = new PackageData(); + packageData.setWaybillNumber(parcelList.getWaybillNumber()); + packageData.setBrand(parcelList.getBrandName()); + packageData.setProductId(zeroDetailVO.getGoodsId()); + packageData.setProductName(zeroDetailVO.getGoodsName()); + packageData.setNumber(zeroDetailVO.getUnloadNum()); + packageData.setOrderCode(parcelList.getOrderCode()); + packageData.setPackageType(PackageTypeEnums.LTL); + packageDataList.add(packageData); + } + + }); //TODO 暂时注释 // carsLoadAsyncService.sendReportZeroPackageSignData(AuthUtil.getUserId(), AuthUtil.getNickName(), warehouseId, warehouseName, zeroDetailList, carsLoadScanEntity, carsLoadEntity); + + + }); } }); + NodeFanoutMsg tripartiteVONodeFanoutMsg = buildNodeFanoutMessage(carsLoadEntity, packageDataList, warehouseId); + if(!Objects.isNull(tripartiteVONodeFanoutMsg)){ + rabbitTemplate.convertAndSend(FanoutConstants.trunkline.tripartite.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(tripartiteVONodeFanoutMsg)); + } return R.success("签收成功"); } + private NodeFanoutMsg buildNodeFanoutMessage(TrunklineCarsLoadEntity carsLoadEntity, List packageDataList,Long warehouseId) { + try { + BladeUser user = AuthUtil.getUser(); + NodeFanoutMsg nodeFanoutMsg = new NodeFanoutMsg(); + nodeFanoutMsg.setBizOperation(BizOperationEnums.ADD); + nodeFanoutMsg.setNode(WorkNodeEnums.SIGN_TRIPARTITE_TRANSFER_DEPART); + BasicdataWarehouseEntity entityWarehouse = basicdataWarehouseClient.getEntityWarehouseId(warehouseId); + if (entityWarehouse != null) { + nodeFanoutMsg.setWarehouse(entityWarehouse.getName()); + } + nodeFanoutMsg.setWarehouseId(warehouseId); + nodeFanoutMsg.setOperator(user.getNickName()); + nodeFanoutMsg.setOperatorTime(new Date()); + TripartiteVO tripartiteVO = new TripartiteVO(); + BeanUtil.copy(carsLoadEntity, tripartiteVO); +// ReservationVO reservationVO = distributionReservationService.getReservationVO(reservationEntity); + + tripartiteVO.setPackageDataList(packageDataList); + nodeFanoutMsg.setMain(tripartiteVO); + nodeFanoutMsg.setTenantId(AuthUtil.getTenantId()); + + return nodeFanoutMsg; + } catch (Exception e) { + log.warn("三方中转签收：发送三方中转签收节点消息失败", e); + } + return null; + + } + private void sendFactorySignTriparite(Long warehouseId, List orderPackageCodes, BasicdataWarehouseEntity warehouseEntity) { try { FindParamterDTO paramterDTO = new FindParamterDTO(); From 0b103514cd836453bc15df0aafa9872703851b98 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 31 Mar 2025 17:55:00 +0800 Subject: [PATCH 08/10] =?UTF-8?q?add:=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E5=BC=80=E5=8D=95=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/feign/DistributionStockArticleClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java index 4975a2183..1901109be 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java @@ -98,7 +98,7 @@ public class DistributionStockArticleClient implements IDistributionStockArticle }else{ boolean saveFlag = distributionStockArticleService.save(distributionStockArticleEntity); if(saveFlag){ - bladeRedis.setEx(key,distributionStockArticle.getId(),30L); + bladeRedis.setEx(key,distributionStockArticleEntity.getId(),30L); return distributionStockArticleEntity.getId(); }else{ return 0L; From 9be95291673f3469de8c4a44feb1dd39b56c81ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E9=BE=99?= Date: Mon, 31 Mar 2025 18:38:23 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=86=E5=8D=95?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionSplitOrderTaskController.java | 3 +- .../IDistributionSplitOrderTaskService.java | 3 +- ...DistributionSplitOrderTaskServiceImpl.java | 139 +++++++++++++----- .../vo/DistributionSplitOrderAllTaskVO.java | 11 ++ .../vo/DistributionSplitOrderTaskVO.java | 11 ++ 5 files changed, 126 insertions(+), 41 deletions(-) create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/vo/DistributionSplitOrderAllTaskVO.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/vo/DistributionSplitOrderTaskVO.java diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSplitOrderTaskController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSplitOrderTaskController.java index eabf84f66..92d184845 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSplitOrderTaskController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSplitOrderTaskController.java @@ -6,6 +6,7 @@ import com.logpm.distribution.dto.splitOrder.*; import com.logpm.distribution.entity.DistributionSplitOrderAllTaskEntity; import com.logpm.distribution.entity.DistributionSplitOrderTaskEntity; import com.logpm.distribution.service.IDistributionSplitOrderTaskService; +import com.logpm.distribution.vo.DistributionSplitOrderAllTaskVO; import com.logpm.distribution.vo.SplitPackageOrderVO; import lombok.AllArgsConstructor; import org.slf4j.Logger; @@ -30,7 +31,7 @@ public class DistributionSplitOrderTaskController { } @GetMapping("/all-task-list") - public R> allTaskList(Query query, DistributionSplitAllTaskSearchDTO distributionSplitAllTaskSearchDTO) { + public R> allTaskList(Query query, DistributionSplitAllTaskSearchDTO distributionSplitAllTaskSearchDTO) { return distributionSplitOrderTaskService.allTaskList(query, distributionSplitAllTaskSearchDTO); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSplitOrderTaskService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSplitOrderTaskService.java index 7de3e8547..07710ab16 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSplitOrderTaskService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSplitOrderTaskService.java @@ -6,6 +6,7 @@ import com.logpm.distribution.dto.splitOrder.DistributionSplitAllTaskSearchDTO; import com.logpm.distribution.dto.splitOrder.DistributionSplitTaskSearchDTO; import com.logpm.distribution.entity.DistributionSplitOrderAllTaskEntity; import com.logpm.distribution.entity.DistributionSplitOrderTaskEntity; +import com.logpm.distribution.vo.DistributionSplitOrderAllTaskVO; import com.logpm.distribution.vo.SplitPackageOrderVO; import org.springblade.core.mp.base.BaseService; import org.springblade.core.mp.support.Query; @@ -32,7 +33,7 @@ public interface IDistributionSplitOrderTaskService extends BaseService> allTaskList(Query query, DistributionSplitAllTaskSearchDTO distributionSplitAllTaskSearchDTO); + R> allTaskList(Query query, DistributionSplitAllTaskSearchDTO distributionSplitAllTaskSearchDTO); /** * 创建任务 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java index 22175185e..6cee439d7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java @@ -1,11 +1,13 @@ package com.logpm.distribution.service.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.SerializationUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; +import com.logpm.distribution.bean.Resp; import com.logpm.distribution.dto.splitOrder.DistributionSplitAllTaskSearchDTO; import com.logpm.distribution.dto.splitOrder.DistributionSplitTaskSearchDTO; import com.logpm.distribution.entity.DistributionParcelListEntity; @@ -21,6 +23,7 @@ import com.logpm.distribution.service.IDistributionSplitOrderDetailService; import com.logpm.distribution.service.IDistributionSplitOrderLogService; import com.logpm.distribution.service.IDistributionSplitOrderTaskService; import com.logpm.distribution.service.IDistributionStockArticleService; +import com.logpm.distribution.vo.DistributionSplitOrderAllTaskVO; import com.logpm.distribution.vo.SplitPackageOrderVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -37,15 +40,15 @@ import org.springblade.core.redis.lock.LockType; import org.springblade.core.redis.lock.RedisLockClient; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; +import org.springblade.system.entity.User; +import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import java.util.stream.Stream; @Service @AllArgsConstructor @@ -58,6 +61,7 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpllambdaQuery() - .in(DistributionParcelListEntity::getStockArticleId, stockArticleId) - .ne(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiqianshou.getValue()) - .eq(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.daiyuyue.getValue()) - .eq(DistributionParcelListEntity::getOrderPackageLoadingStatus, OrderPackageLoadingStatusConstant.weizhuancghe.getValue()) - .eq(DistributionParcelListEntity::getOrderPackageFreezeStatus, OrderPackageFreezeStatusConstant.weidongjie.getValue()) - .eq(DistributionParcelListEntity::getIsTransfer, 0) - ); - long packageAllCount = distributionParcelListService.count( - Wrappers.lambdaQuery() - .in(DistributionParcelListEntity::getStockArticleId, stockArticleId) - ); + long packageAllowCount = getSplitOrderAllowCount(stockArticleId); + long packageAllCount = getSplitOrderAllCount(stockArticleId); + if (packageAllowCount == 0 || packageAllCount == 1) { return R.fail("订单"+ distributionStockArticle.getOrderCode() +"包件数量不足，不允许拆单"); } + boolean exists = exists( + Wrappers.lambdaQuery() + .eq(DistributionSplitOrderTaskEntity::getStockArticleId, stockArticleId) + .eq(DistributionSplitOrderTaskEntity::getState, OrderSplitStateConstant.InProgress.getValue()) + ); + if (exists) { + return R.fail("订单"+ distributionStockArticle.getOrderCode() +"正在拆单中，不允许重复拆单"); + } + taskLock(stockArticleId, () -> { String allTaskNo = getAllTaskNo(); DistributionSplitOrderAllTaskEntity allTask = new DistributionSplitOrderAllTaskEntity(); @@ -254,12 +257,12 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpl existsList = distributionSplitOrderDetailService.list(Wrappers.lambdaQuery() .in(DistributionSplitOrderDetailEntity::getOrderPackageCode, packageCodes) ); - int addNumber = packageCodes.size(); if (!existsList.isEmpty()) { if (existsList.stream().anyMatch(detail -> !detail.getSplitOrderTaskId().equals(taskId) && detail.getState().equals(OrderPackageSplitStateConstant.finish.getValue()))) { return R.fail("提交包件包含其他拆单任务的包件"); @@ -318,7 +321,7 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpl cancelTask(Long taskId) { DistributionSplitOrderTaskEntity task = getById(taskId); @@ -735,12 +739,7 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpllambdaUpdate() + .eq(DistributionSplitOrderDetailEntity::getSplitOrderTaskId, task.getId()) + .set(DistributionSplitOrderDetailEntity::getState, OrderPackageSplitStateConstant.cancel.getValue()) + .set(DistributionSplitOrderDetailEntity::getCancelUser, AuthUtil.getUser().getUserId()) + .set(DistributionSplitOrderDetailEntity::getCancelUsername, AuthUtil.getUser().getUserName()) + ); + + distributionSplitOrderLogService.record(task, "撤消拆单任务", AuthUtil.getUser().getUserName()); + + } + + @Transactional @Override public R cancelAllTask(Long allTaskId) { DistributionSplitOrderAllTaskEntity allTask = distributionSplitOrderAllTaskService.getById(allTaskId); if (!allTask.getState().equals(OrderSplitAllTaskStateConstant.finish.getValue())) { - return R.fail("拆单总任务已完成，无法操作"); + return R.fail("拆单总任务未完成，无法操作"); } if (!list(Wrappers.lambdaQuery() @@ -766,8 +783,19 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpl list = list( + Wrappers.lambdaQuery() + .eq(DistributionSplitOrderTaskEntity::getSplitOrderAllTaskId, allTaskId) + ); + + long finishCount = list.stream().filter(task -> task.getState().equals(OrderSplitStateConstant.finish.getValue())).count(); + if (finishCount > 0) { + return R.fail("拆单任务中存在已完成拆单任务，无法操作"); + } + allTask.setState(OrderSplitAllTaskStateConstant.cancel.getValue()); distributionSplitOrderAllTaskService.updateById(allTask); + list.forEach(this::cancelTask); return R.success("success"); } @@ -780,11 +808,11 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpllambdaQuery() + boolean existsInProgress = exists(Wrappers.lambdaQuery() .eq(DistributionSplitOrderTaskEntity::getSplitOrderAllTaskId, allTaskId) .eq(DistributionSplitOrderTaskEntity::getState, OrderSplitStateConstant.InProgress.getValue()) ); - if (existsInProgress != null) { + if (existsInProgress) { return R.fail("拆单总任务中存在未完成拆单任务，无法操作"); } @@ -836,8 +864,9 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpl> allTaskList(Query query, DistributionSplitAllTaskSearchDTO distributionSplitAllTaskSearchDTO) { + public R> allTaskList(Query query, DistributionSplitAllTaskSearchDTO distributionSplitAllTaskSearchDTO) { IPage page = Condition.getPage(query); + IPage pageResult = Condition.getPage(query); LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); @@ -878,16 +907,29 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpl list = distributionSplitOrderAllTaskService.list(page, queryWrapper); - page.setRecords(list); - return R.data(page); + String createUserIds = list.stream().map((d) -> d.getCreateUser() + "").collect(Collectors.joining(",")); + List users = iUserClient.userInfoByIds(AuthUtil.getTenantId(), String.join(",", createUserIds)).getData(); + Map userMap = users.stream().collect(Collectors.toMap(User::getId, u -> u)); + List listVo = list.stream().map(d -> { + DistributionSplitOrderAllTaskVO vo = new DistributionSplitOrderAllTaskVO(); + BeanUtil.copyProperties(d, vo); + vo.setCreateUserName(userMap.get(d.getCreateUser()).getName()); + return vo; + }).collect(Collectors.toList()); + + pageResult.setRecords(listVo); + pageResult.setPages(page.getPages()); + pageResult.setTotal(page.getTotal()); + + return R.data(pageResult); } @Override @@ -906,16 +948,35 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpllambdaQuery() + .in(DistributionParcelListEntity::getStockArticleId, stockArticleId) + .ne(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiqianshou.getValue()) + .eq(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.daiyuyue.getValue()) + .eq(DistributionParcelListEntity::getOrderPackageLoadingStatus, OrderPackageLoadingStatusConstant.weizhuancghe.getValue()) + .eq(DistributionParcelListEntity::getOrderPackageFreezeStatus, OrderPackageFreezeStatusConstant.weidongjie.getValue()) + .eq(DistributionParcelListEntity::getIsTransfer, 0) + ); + } - @Override - public R checkOrderCode(String orderCode) { - - DistributionSplitOrderAllTaskEntity exists = distributionSplitOrderAllTaskService.getOne( - Wrappers.lambdaQuery() - .eq(DistributionSplitOrderAllTaskEntity::getOrderCode, orderCode) + public long getSplitOrderAllCount(Long stockArticleId) { + return distributionParcelListService.count( + Wrappers.lambdaQuery() + .in(DistributionParcelListEntity::getStockArticleId, stockArticleId) ); + } - return R.success(exists == null ? "" : exists.getNo()); + @Override + public R checkOrderCode(String orderCode) { + DistributionStockArticleEntity distributionStockArticle = distributionStockArticleService.getOne(Wrappers.lambdaQuery() + .eq(DistributionStockArticleEntity::getOrderCode, orderCode)); + long splitOrderAllCount = getSplitOrderAllCount(distributionStockArticle.getId()); + long splitOrderAllowCount = getSplitOrderAllowCount(distributionStockArticle.getId()); + if (splitOrderAllowCount == 0 || splitOrderAllCount == 1) { + return R.success("该订单无法拆单"); + } + return R.success(""); } @Override diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/vo/DistributionSplitOrderAllTaskVO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/vo/DistributionSplitOrderAllTaskVO.java new file mode 100644 index 000000000..88844757c --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/vo/DistributionSplitOrderAllTaskVO.java @@ -0,0 +1,11 @@ +package com.logpm.distribution.vo; + +import com.logpm.distribution.entity.DistributionSplitOrderAllTaskEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +public class DistributionSplitOrderAllTaskVO extends DistributionSplitOrderAllTaskEntity { + private String createUserName; +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/vo/DistributionSplitOrderTaskVO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/vo/DistributionSplitOrderTaskVO.java new file mode 100644 index 000000000..35eb05339 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/vo/DistributionSplitOrderTaskVO.java @@ -0,0 +1,11 @@ +package com.logpm.distribution.vo; + +import com.logpm.distribution.entity.DistributionSplitOrderTaskEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +public class DistributionSplitOrderTaskVO extends DistributionSplitOrderTaskEntity { + private String createUserName; +} From a594acaa7f9edc7e1aa2ede9ae3640d881662a2b Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 1 Apr 2025 09:21:23 +0800 Subject: [PATCH 10/10] =?UTF-8?q?1.=E4=B8=89=E6=96=B9=E4=B8=AD=E8=BD=AC?= =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=B9=BF=E6=92=AD=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/TrunklineCarsLoadServiceImpl.java | 67 +++++++++---------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 9631e1f09..97232e3f6 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -57,7 +57,6 @@ import org.springblade.common.constant.*; import org.springblade.common.constant.broadcast.FanoutConstants; import org.springblade.common.constant.carsload.CarsLoadLogTypeConstant; import org.springblade.common.enums.BizOperationEnums; -import org.springblade.common.enums.PackageTypeEnums; import org.springblade.common.exception.CustomerException; import org.springblade.common.model.NodeFanoutMsg; import org.springblade.common.model.PackageData; @@ -9768,22 +9767,22 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl parcelListEntityList = distributionParcelListClient.findListByOrderPackageCodeList(findParamterDTO); - parcelListEntityList.forEach(parcelListEntity -> { - PackageData packageData = new PackageData(); - packageData.setWaybillNumber(parcelListEntity.getWaybillNumber()); - packageData.setBrand(parcelListEntity.getBrandName()); - packageData.setPackageCode(parcelListEntity.getOrderPackageCode()); - packageData.setMaterialCode(parcelListEntity.getMaterialCode()); - packageData.setMaterialName(parcelListEntity.getMaterialName()); - packageData.setNumber(1); - packageData.setOrderCode(parcelListEntity.getOrderCode()); - packageData.setPackageType(PackageTypeEnums.CMP); - packageDataList.add(packageData); - }); +// FindParamterDTO findParamterDTO = new FindParamterDTO(); +// findParamterDTO.setOrderPackageCodeList(scanCodes); +// findParamterDTO.setWarehouseId(warehouseId); +// List parcelListEntityList = distributionParcelListClient.findListByOrderPackageCodeList(findParamterDTO); +// parcelListEntityList.forEach(parcelListEntity -> { +// PackageData packageData = new PackageData(); +// packageData.setWaybillNumber(parcelListEntity.getWaybillNumber()); +// packageData.setBrand(parcelListEntity.getBrandName()); +// packageData.setPackageCode(parcelListEntity.getOrderPackageCode()); +// packageData.setMaterialCode(parcelListEntity.getMaterialCode()); +// packageData.setMaterialName(parcelListEntity.getMaterialName()); +// packageData.setNumber(1); +// packageData.setOrderCode(parcelListEntity.getOrderCode()); +// packageData.setPackageType(PackageTypeEnums.CMP); +// packageDataList.add(packageData); +// }); }else{ @@ -9803,19 +9802,19 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl tripartiteVONodeFanoutMsg = buildNodeFanoutMessage(carsLoadEntity, packageDataList, warehouseId); - if(!Objects.isNull(tripartiteVONodeFanoutMsg)){ - rabbitTemplate.convertAndSend(FanoutConstants.trunkline.tripartite.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(tripartiteVONodeFanoutMsg)); - } +// NodeFanoutMsg tripartiteVONodeFanoutMsg = buildNodeFanoutMessage(carsLoadEntity, packageDataList, warehouseId); +// if(!Objects.isNull(tripartiteVONodeFanoutMsg)){ +// rabbitTemplate.convertAndSend(FanoutConstants.trunkline.tripartite.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(tripartiteVONodeFanoutMsg)); +// } return R.success("签收成功"); }