From 44fa3b1139b24b65d902a97e2a1ccb69d2896b00 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 30 Aug 2024 09:27:57 +0800 Subject: [PATCH 1/3] =?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 | 2 + .../feign/DistributionStockArticleClient.java | 10 +++ .../mapper/TrunklineCarsLoadMapper.xml | 2 + .../mapper/TrunklineCarsLoadScanMapper.xml | 2 +- .../impl/TrunklineCarsLoadServiceImpl.java | 32 +++++---- .../TrunklineWaybillTrackServiceImpl.java | 70 +++++++++---------- 6 files changed, 68 insertions(+), 50 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 df9c448e7..926d966f9 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 @@ -211,4 +211,6 @@ public interface IDistributionStockArticleClient { @GetMapping(API_PREFIX + "/findSignNumByWaybillNo") Integer findSignNumByWaybillNo(@RequestParam String waybillNo, @RequestParam Long destinationWarehouseId); + @GetMapping(API_PREFIX + "/addSignNum") + void addSignNum(@RequestParam Long orderId, @RequestParam Integer unloadNum); } 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 3d78aa64d..76c45f506 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 @@ -414,4 +414,14 @@ public class DistributionStockArticleClient implements IDistributionStockArticle return distributionStockArticleService.findSignNumByWaybillNo(waybillNo,destinationWarehouseId); } + @Override + public void addSignNum(Long orderId, Integer unloadNum) { + DistributionStockArticleEntity stockArticle = distributionStockArticleService.getById(orderId); + Integer signinQuantity = stockArticle.getSigninQuantity(); + DistributionStockArticleEntity updateEntity = new DistributionStockArticleEntity(); + updateEntity.setId(orderId); + updateEntity.setSigninQuantity(signinQuantity+unloadNum); + distributionStockArticleService.updateById(updateEntity); + } + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index a9d626ec7..c2accde79 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -404,6 +404,8 @@ ltcl.cars_no carsNo, ltcl.carrier_name carrierName, ltcl.carrier_time carrierTime, + ltcl.driver_name driverName, + ltcl.driver_mobile driverMobile, ltcl.pay_method payMethod, ltcl.count_transport_cost countTransportCost, ltcl.replace_price replacePrice, diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml index 9b8e2f006..0455bf279 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml @@ -451,7 +451,7 @@ lww.consignee_mobile consigneeMobile, IFNULL(ltco.plan_num,0) AS planNum, sum(case when ltcls.scan_status != 1 then ltcls.num else 0 end) unloadNum, - sum( ltcls.num ) AS smallTota + IFNULL(sum( ltcls.num ),0) AS smallTotal from logpm_trunkline_cars_load_scan ltcls left join logpm_trunkline_cars_order ltco on ltco.order_code = ltcls.order_code and ltco.waybill_no = ltcls.waybill_no and ltco.load_id = ltcls.load_id and ltco.node_id = ltcls.warehouse_id left join logpm_distribution_stock_article ldsa on ldsa.order_code = ltcls.order_code and ldsa.warehouse_id = ltcls.from_warehouse_id 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 d4816a506..a33e10310 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 @@ -2958,10 +2958,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl orderPackageCodes = new ArrayList<>(); - orderPackageCodes.add(orderPackageCode); - String content = "包件在 " + warehouseName + " " + (StringUtil.isBlank(trayName) ? "扫码" : "托盘（" + trayName + "）") + " 装车, 车次号："+loadCode+" ,配载计划目的仓 " + carsLoadScanEntity.getFinalNodeName() + ",数据来源仓库 " + fromWarehouseName; - packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseName, WorkNodeEnums.INITIAL_WAREHOUSE_LOADING.getCode(), content); + String loadType = carsLoadEntity.getLoadType(); + if(!"4".equals(loadType)){ + List orderPackageCodes = new ArrayList<>(); + orderPackageCodes.add(orderPackageCode); + String content = "包件在 " + warehouseName + " " + (StringUtil.isBlank(trayName) ? "扫码" : "托盘（" + trayName + "）") + " 装车, 车次号："+loadCode+" ,配载计划目的仓 " + carsLoadScanEntity.getFinalNodeName() + ",数据来源仓库 " + fromWarehouseName; + packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseName, WorkNodeEnums.INITIAL_WAREHOUSE_LOADING.getCode(), content); + } trunklineCarsLoadingLogService.savaLoadingLog(warehouseId, warehouseName, loadId, loadCode, waybillId, waybillNo, orderCode, orderPackageCode, 1, 1, isData, isAbnormal, trayId, trayCode, trayName, fromWarehouseId, loadScanId, remark); @@ -4329,10 +4332,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl Date: Fri, 30 Aug 2024 11:38:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zbom/service/impl/ReceiptServiceImpl.java | 3 ++- .../comfac/service/impl/AsyncDataServiceImpl.java | 14 ++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/ReceiptServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/ReceiptServiceImpl.java index 5a84b31de..21c659e6b 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/ReceiptServiceImpl.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/ReceiptServiceImpl.java @@ -27,6 +27,7 @@ import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.logpm.factorydata.base.feign.IFactoryDataBaseClient; import com.logpm.factorydata.base.vo.FactoryWarehouseBindVO; +import com.logpm.factorydata.enums.BrandEnums; import com.logpm.factorydata.feign.IFactoryDataClient; import com.logpm.factorydata.vo.SendMsg; import com.logpm.factorydata.zbom.entity.ZbCategoryContrastEntity; @@ -88,7 +89,7 @@ public class ReceiptServiceImpl extends BaseServiceImpl warehouseByBrandAndSiteName = baseClient.getWarehouseByBrandAndSiteName(zbReceiptDTO.getSenderName(), zbReceiptDTO.getSenderName()); + R warehouseByBrandAndSiteName = baseClient.getWarehouseByBrandAndSiteName(BrandEnums.ZB.getValue(), zbReceiptDTO.getSenderCity()); if (ObjectUtil.equal(HttpConstants.HTTP.HTTP_RESOURCE_CODE.SUCCESS_CODE, warehouseByBrandAndSiteName.getCode())) { FactoryWarehouseBindVO data = warehouseByBrandAndSiteName.getData(); if (ObjectUtil.isNotNull(data)) { diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java index d70d6360a..b9ee80022 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java @@ -96,6 +96,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { private final IAdvanceDetailClient advanceDetailClient; private final IServiceNumClient serviceNumClient; private final IDetailProductClient detailProductClient; + private final IFactoryDataBaseClient factoryDataBaseClient; /* pan */ private final IPanFactoryOrderService panFactoryOrderService; private final IPanPackageInfoService panPackageInfoService; @@ -128,7 +129,6 @@ public class AsyncDataServiceImpl implements IAsyncDataService { private final OuPaiProperties ouPaiProperties; - private final IFactoryDataBaseClient factoryDataBaseClient; private final IFactoryDataClient factoryDataClient; /** @@ -1489,10 +1489,16 @@ public class AsyncDataServiceImpl implements IAsyncDataService { private AdvanceEntity saveAdvanceInfor(ZbOrderPackageEntity serviceNumEntity, List zbOrderPackageEntityList) { Long orderId = serviceNumEntity.getId(); log.info("#########handlerDataToHt: 当前处理的订单id={}", orderId); - + Integer warehouseId = 54; // 查询订单对应的发货单 ZbReceiptEntity zbReceiptEntity = findZbReceiptEntityUseCacheById(serviceNumEntity.getReceiptId()); - + R r = factoryDataBaseClient.getWarehouseByBrandAndSiteName(BrandEnums.ZB.getValue(), zbReceiptEntity.getSenderCity()); + if(r.isSuccess()){ + FactoryWarehouseBindVO data = r.getData(); + if(ObjectUtil.isNotEmpty(data) && ObjectUtil.isNotEmpty(data.getOldWarehouseId())){ + warehouseId = Convert.toInt(data.getWarehouseId()); + } + } AdvanceEntity advanceEntity = findAdvanceEntityUseCacheByOrderSelfNumAndReceiptId(serviceNumEntity.getReceiptId(), serviceNumEntity.getPlatformOrderCode(), zbReceiptEntity.getDepartCode()); if (ObjectUtils.isNotNull(advanceEntity)) { return advanceEntity; @@ -1541,7 +1547,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { advanceEntity.setCarsNum(""); //派车单--snm 可以为空 advanceEntity.setDeleteTime(0); // 删除时间 advanceEntity.setWaybillNo("");//运单号 可以为空 - Integer warehouseId = 54; + advanceEntity.setWarehouseId(warehouseId); //导入人仓库id advanceEntity.setWaybillStatus(Integer.parseInt("1"));//开单状态：1=未开单，2=已开单 From d1f5fc4341136e043734f834f60bc0c9cffeb261 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 30 Aug 2024 12:20:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E9=85=8D=E9=80=81=E7=9A=84=E4=BB=B7=E6=A0=BC=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/DistributionDeliveryListExcel.java | 3 ++ .../DistributionDeliveryListServiceImpl.java | 52 +++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java index 03040c59b..553b0ff1a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java @@ -42,6 +42,9 @@ public class DistributionDeliveryListExcel implements Serializable { private static final long serialVersionUID = 1L; + + + private Long id; /** * 车次 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 530fe9499..f9367f528 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -307,6 +307,30 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionDeliveryListEntities = baseMapper.selectDistributionDeliveryListPage(page, distributionDeliveryList); + // 获取集合中 kind =2 的id集合 + List ids = distributionDeliveryListEntities.stream().filter(item -> "2".equals(item.getKind())).map(DistributionDeliveryListEntity::getId).collect(Collectors.toList()); + + if(!ids.isEmpty()){ + // 关联查询所有的三方配送信息表 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(DistributionDeliveryTripartiteEntity::getDeliveryId, ids); + List distributionDeliveryTripartiteEntities = distributionDeliveryTripartiteService.list(wrapper); + + for (DistributionDeliveryListEntity distributionDeliveryListEntity : distributionDeliveryListEntities) { + if(Objects.equals( "2",distributionDeliveryListEntity.getKind())){ + // 在集合 distributionDeliveryTripartiteEntities 中寻找 distributionDeliveryListEntity的ID相同的 + DistributionDeliveryTripartiteEntity tripartiteEntity = distributionDeliveryTripartiteEntities.stream().filter(item -> item.getDeliveryId().equals(distributionDeliveryListEntity.getId())).findFirst().orElse(null); + if(tripartiteEntity != null){ + // 保留2为小数 + if(tripartiteEntity.getDeliveryFee()!=null){ + distributionDeliveryListEntity.setPrice(tripartiteEntity.getDeliveryFee().setScale(2)); + } + + } + } + } + } + return page.setRecords(distributionDeliveryListEntities); } @@ -336,6 +360,34 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionDeliveryListExcels = baseMapper.exportDistributionDeliveryList(distributionDeliveryList); + + + // 获取集合中 kind =2 的id集合 + List ids = distributionDeliveryListExcels.stream().filter(item -> "三方配送".equals(item.getKind())).map(DistributionDeliveryListExcel::getId).collect(Collectors.toList()); + + if(!ids.isEmpty()){ + // 关联查询所有的三方配送信息表 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(DistributionDeliveryTripartiteEntity::getDeliveryId, ids); + List distributionDeliveryTripartiteEntities = distributionDeliveryTripartiteService.list(wrapper); + + for (DistributionDeliveryListExcel distributionDeliveryListEntity : distributionDeliveryListExcels) { + if(Objects.equals( "三方配送",distributionDeliveryListEntity.getKind())){ + // 在集合 distributionDeliveryTripartiteEntities 中寻找 distributionDeliveryListEntity的ID相同的 + DistributionDeliveryTripartiteEntity tripartiteEntity = distributionDeliveryTripartiteEntities.stream().filter(item -> item.getDeliveryId().equals(distributionDeliveryListEntity.getId())).findFirst().orElse(null); + if(tripartiteEntity != null){ + // 保留2为小数 + if(tripartiteEntity.getDeliveryFee()!=null){ + distributionDeliveryListEntity.setPrice(tripartiteEntity.getDeliveryFee().setScale(2)); + } + + } + } + } + } + + + return distributionDeliveryListExcels; }