From 74a9679160c158f1831de41bb5ecc25e73978f42 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 16 Oct 2024 11:57:39 +0800 Subject: [PATCH 01/28] =?UTF-8?q?fix=EF=BC=9A=E4=BC=98=E5=8C=96=E5=95=86?= =?UTF-8?q?=E5=B8=82=E9=85=8D=E7=9A=84=E5=A4=87=E8=B4=A7=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/distribution/mapper/DistributionStockupMapper.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index 50c5c49a6..da999d5be 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -264,7 +264,6 @@ logpm_distribution_stockup lds LEFT JOIN logpm_distribution_stockup_info ldsi ON ldsi.stockup_id = lds.id LEFT JOIN logpm_distribution_reservation ldr ON ldsi.reservation_id = ldr.id - LEFT JOIN logpm_distribution_reservation_package ldrp ON ldrp.reservation_id = ldsi.reservation_id lds.is_deleted = 0 AND ldsi.stock_status != 4 From 82d0d2ac16d4a3b2ceb870bc5a4e23b0b52b1db3 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 16 Oct 2024 13:44:17 +0800 Subject: [PATCH 02/28] =?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 --- .../com/logpm/trunkline/dto/LoadCarsDTO.java | 2 ++ .../controller/CarsLoadController.java | 21 +++++++++++++++++-- .../mapper/TrunklineCarsLoadMapper.xml | 18 ++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java index 209185100..0bf40421e 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java @@ -189,4 +189,6 @@ public class LoadCarsDTO implements Serializable { private List addUrlList = new ArrayList<>(); private List removeUrlList = new ArrayList<>(); + private Long endWarehouseId; + } 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 94ed7dea5..8655b7178 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 @@ -53,9 +53,17 @@ public class CarsLoadController { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + List warehouseIds = new ArrayList<>(); if(!Objects.isNull(myCurrentWarehouse)){ - loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId()); + Long warehouseId = myCurrentWarehouse.getId(); + warehouseIds.add(warehouseId); + }else{ + List myWatchWarehouse = warehouseClient.getMyWatchWarehouse(); + myWatchWarehouse.forEach(warehouseEntity -> { + warehouseIds.add(warehouseEntity.getId()); + }); } + loadCarsDTO.setWarehouseIds(warehouseIds); IPage pages = carsLoadService.loadCarsPageList(loadCarsDTO); @@ -80,9 +88,18 @@ public class CarsLoadController { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + List warehouseIds = new ArrayList<>(); if(!Objects.isNull(myCurrentWarehouse)){ - loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId()); + Long warehouseId = myCurrentWarehouse.getId(); + warehouseIds.add(warehouseId); + }else{ + List myWatchWarehouse = warehouseClient.getMyWatchWarehouse(); + myWatchWarehouse.forEach(warehouseEntity -> { + warehouseIds.add(warehouseEntity.getId()); + }); } + loadCarsDTO.setWarehouseIds(warehouseIds); + IPage pages = carsLoadService.arriveCarsPageList(loadCarsDTO); return R.data(pages); }catch (CustomerException e){ 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 062663827..2e6db992c 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 @@ -42,9 +42,18 @@ where ltcl.is_deleted = 0 and ltcl.load_type != '4' and ltcl.load_status != '100' + + and ltcl.start_warehouse_id in + + #{item} + + and ltcl.start_warehouse_id = #{param.warehouseId} + + and Locate(#{param.endWarehouseId},ltcl.end_warehouse_ids) > 0 + and ltcl.cars_no = #{param.loadCarsNo} @@ -132,9 +141,18 @@ where ltcl.is_deleted = 0 and ltcl.load_status != '100' and ltcl.load_type != '4' + + and ltcl.start_warehouse_id in + + #{item} + + and ltcl.end_warehouse_ids like concat('%',#{param.warehouseId},'%') + + and Locate(#{param.endWarehouseId},ltcl.end_warehouse_ids) > 0 + and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_names) > 0) From 63b3722ad4f68db70b716830c7cde22c90d541ad Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 16 Oct 2024 14:20:24 +0800 Subject: [PATCH 03/28] =?UTF-8?q?=E8=BD=AC=E5=BA=93=E5=AD=98=E5=93=81?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=B1=95=E7=A4=BA=E7=BB=B4=E6=8A=A4=E3=80=81?= =?UTF-8?q?=E7=AD=BE=E6=94=B6=E6=89=AB=E6=8F=8FBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionParcelListServiceImpl.java | 3 ++- .../impl/DistributionSignforServiceImpl.java | 26 ++++++++++--------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index a444b41dd..5fe46467f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -601,6 +601,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl Date: Wed, 16 Oct 2024 14:39:45 +0800 Subject: [PATCH 04/28] =?UTF-8?q?=E8=BD=AC=E5=BA=93=E5=AD=98=E5=93=81?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=B1=95=E7=A4=BA=E7=BB=B4=E6=8A=A4=E3=80=81?= =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=8F=90=E7=A4=BA=E8=AF=AD=E9=9F=B3=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionStockListMapper.xml | 28 +++++++++++-------- .../DistributionParcelListServiceImpl.java | 5 +++- .../service/impl/TaskQuestServiceImpl.java | 7 +++++ 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml index 5a63c32cb..8807419b5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml @@ -399,21 +399,27 @@ diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml index 42b91cd6c..3e3bde05d 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml @@ -87,6 +87,7 @@ lawo.process_number, lawo.customer_service_name customerServiceName, lawo.warehouse_id warehouseId, + lawo.investigation_process investigationProcess, lawo.customer_service_id customerServiceId FROM logpm_aftersales_work_order lawo @@ -195,8 +196,9 @@ lawo.waybill_number, lawo.order_code, lawo.train_number, - lawo.FIRST, - lawo.secondary, + GROUP_CONCAT(DISTINCT laap.`first`) AS first, + GROUP_CONCAT(DISTINCT laap.secondary) AS secondary, + GROUP_CONCAT(DISTINCT laap.brand_name) AS brandName, lawo.vehicle_route, lawo.deliver_goods_time, lawo.discovery_time, @@ -219,17 +221,18 @@ lawo.process_number, lawo.customer_service_name customerServiceName, lawo.warehouse_id warehouseId, - lawo.brand_name brandName, + lawo.investigation_process investigationProcess, lawo.customer_service_id customerServiceId FROM logpm_aftersales_work_order lawo LEFT JOIN logpm_aftersales_processor lap ON lawo.id = lap.work_order_id - AND lap.types_of = '2' - AND lap.conditions IN ( 1, 2 ) LEFT JOIN logpm_aftersales_completion_record lacr ON lacr.work_order_id = lawo.id - AND lacr.is_deleted = '0' + LEFT JOIN logpm_aftersales_abnormal_package AS laap ON laap.work_order_id = lawo.id lawo.is_deleted = 0 + AND lap.types_of = '2' + AND lap.conditions IN ( 1, 2 ) + AND lacr.is_deleted = '0' and lawo.id IN diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesCompletionRecordService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesCompletionRecordService.java index 30648845f..14750ac3d 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesCompletionRecordService.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesCompletionRecordService.java @@ -53,5 +53,5 @@ public interface IAftersalesCompletionRecordService extends BaseService aftersalesCompletionRecipientEntities = collect.get(workOrder.getId()); if(ObjectUtils.isNotNull(aftersalesCompletionRecipientEntities)){ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java index 8fb48bcd0..18112794f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java @@ -180,7 +180,6 @@ public class DistributionReservationController extends BladeController { public R autonomouslySave(@Valid @RequestBody DistributionReservationDTO distributionReservationDTO) { try{ R result = reservationService.insertAutonomouslyReservation(distributionReservationDTO); - return result; }catch (Exception e){ return R.fail(e.getMessage()); 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 dd2d1d79c..fe4d365ce 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 @@ -4189,7 +4189,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl deletedList = oldList.stream().filter(f -> !newList.stream().map(DistributionReservationEntity::getId).collect(Collectors.toList()).contains(f.getId())).collect(Collectors.toList()); if (!deletedList.isEmpty()) { //存在取消 - for (DistributionReservationEntity reservationEntity : addNewList) { + for (DistributionReservationEntity reservationEntity : deletedList) { String reservationContent = user.getNickName() + "在" + myCurrentWarehouse.getName() + "进行预约计划取消转配送;预约计划:" + reservationEntity.getReservationCode() + "车次号:" + deliveryListEntity.getTrainNumber(); @@ -4208,7 +4208,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl[" + newList.stream().map(DistributionReservationEntity::getReservationCode).collect(Collectors.joining(",")) + "]"; + + "预约编号:[" + oldList.stream().map(DistributionReservationEntity::getReservationCode).collect(Collectors.joining(",")) + "]变更为-->[" + newList.stream().map(DistributionReservationEntity::getReservationCode).collect(Collectors.joining(",")) + "]"+"当前总件数:"+(newList.stream().mapToInt(DistributionReservationEntity::getReservationNum).sum()+newList.stream().mapToInt(DistributionReservationEntity::getReservationStockListNum).sum()); DistributionPlanLogEntity distributionPlanLogEntity = new DistributionPlanLogEntity(); distributionPlanLogEntity.setContent(distributionContent); distributionPlanLogEntity.setRefId(deliveryListEntity.getId()); @@ -4216,7 +4216,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildNodeFanoutMsgByReservation(reservationEntity,map,BizOperationEnums.ADD); - distributionNodeWorkService.planReservation(nodeFanoutMsg,AuthUtil.getUser()); + handleCreatedReservationPlanLog(reservationEntity,user,myCurrentWarehouse); return R.status(true); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index f2aa4756d..c31539104 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -3478,7 +3478,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl jsonObjects = updateBillPackeg(distrilbutionBillLading, myCurrentWarehouse, billLadingEntity.getPickupBatch()); if (!jsonObjects.isEmpty()) { logs.addAll(jsonObjects); @@ -682,7 +645,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl zeroPackageList = distrilbutionBillLading.getParcelLisList(); zeroPackageMap = zeroPackageList.stream().collect(Collectors.groupingBy(DistributionParcelListDTO::getStockArticleId)); } - this.saveDistrilbutionBillLading(distrilbutionBillLading); + this.saveDistrilbutionBillLading(distrilbutionBillLading,myCurrentWarehouse); // List packageEntityList = new ArrayList<>(); if (StringUtils.isNotBlank(distrilbutionBillLading.getStockArticleId())) { String[] split = distrilbutionBillLading.getStockArticleId().split(","); @@ -916,10 +879,10 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl buildNodeFanoutMsgForBill(DistrilbutionBillLadingDTO distrilbutionBillLading, List packageEntityList, List detailsEntities, List zeroPackageEntityList, List listEntity) { if (distrilbutionBillLading.getId() == null) { @@ -4272,7 +4255,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl list = new ArrayList<>(); boolean isZeroType = false; @@ -4283,60 +4266,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl zeroPackageEntityList = new ArrayList<>(); -// List parcelNumberEntityList = new ArrayList<>(); -// AtomicInteger nu = new AtomicInteger(); -// //是 添加物料信息 -// list.forEach(i -> { -// if (i.getQuantity() != 0) { -// DistributionReservationZeroPackageEntity zeroPackageEntity = new DistributionReservationZeroPackageEntity(); -// zeroPackageEntity.setQuantity(i.getQuantity()); -// zeroPackageEntity.setReservationId(distrilbutionBillLading.getId()); -// zeroPackageEntity.setType("3"); -// zeroPackageEntity.setCategoryName(i.getFirsts()); -// zeroPackageEntity.setZeroPackageStatus("1"); -// zeroPackageEntity.setStockArticleId(i.getStockArticleId()); -// zeroPackageEntity.setRealityQuantity(0); -// //修改包件配送数量 -// //查询 -// DistributionStockArticleEntity byId = distributionStockArticleService.getById(i.getStockArticleId()); -// DistributionParcelNumberEntity one = distributionParcelNumberService.getOne(Wrappers.query().lambda().eq(DistributionParcelNumberEntity::getParcelListId, i.getId())); -// -// int i1 = one.getDeliveryQuantity() + i.getQuantity(); -// //全部数据不能大于预约数 -// if (ObjectUtils.isNotNull(one) && i1 <= one.getHandQuantity()) { -// nu.addAndGet(i.getQuantity()); -// DistributionParcelNumberEntity parcelNumberEntity = new DistributionParcelNumberEntity(); -// parcelNumberEntity.setId(one.getId()); -// parcelNumberEntity.setDeliveryQuantity(one.getDeliveryQuantity() + i.getQuantity()); -// parcelNumberEntity.setHandQuantity(byId.getHandQuantity()); -// parcelNumberEntityList.add(parcelNumberEntity); -// zeroPackageEntity.setParcelListId(one.getParcelListId()); -// zeroPackageEntityList.add(zeroPackageEntity); -// } else { -// throw new ServiceException("配送数量大于在库数量！！"); -// } -// -// } -// }); -// if (!parcelNumberEntityList.isEmpty()) { -// parcelNumberEntityList.forEach(p -> { -// if (nu.get() <= p.getHandQuantity()) { -// p.setHandQuantity(null); -// distributionParcelNumberService.updateById(p); -// } else { -// throw new ServiceException("预约数量大于在库数量！！"); -// } -// }); -// } else { -// throw new ServiceException("数据异常，请联系管理员！！"); -// } -// distributionZeroPackageService.saveBatch(zeroPackageEntityList); -// } + //新增自提日志 // 创建备货任务 DistributionStockupEntity distributionStockupEntity = buildDistributionStockupEntityBydistrilbutionBillLading(distrilbutionBillLading); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseConfigServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseConfigServiceImpl.java index aef4c0699..9e961ab86 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseConfigServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseConfigServiceImpl.java @@ -45,13 +45,13 @@ public class WarehouseConfigServiceImpl extends BaseServiceImpl Date: Wed, 16 Oct 2024 19:02:22 +0800 Subject: [PATCH 07/28] =?UTF-8?q?=E8=A3=85=E8=BD=A6=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=BC=82=E5=B8=B8=E5=B1=95=E7=A4=BABUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryListServiceImpl.java | 2 ++ .../impl/DistributionSignforServiceImpl.java | 21 ++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) 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 fe4d365ce..c7d3df5aa 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 @@ -9111,6 +9111,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl Date: Wed, 16 Oct 2024 20:11:44 +0800 Subject: [PATCH 08/28] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=B9=B2?= =?UTF-8?q?=E7=BA=BF=E6=B5=8B=E8=AF=95=E9=81=87=E5=88=B0=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/trunkline/vo/UnloadPackageVO.java | 2 ++ .../controller/CarsLoadController.java | 24 +++++++++++-------- .../mapper/TrunklineCarsLoadMapper.xml | 9 ------- .../mapper/TrunklineCarsLoadScanMapper.xml | 2 ++ .../TrunklineAdvanceDetailServiceImpl.java | 2 +- .../impl/TrunklineCarsLoadServiceImpl.java | 21 ++++++++++++---- 6 files changed, 35 insertions(+), 25 deletions(-) diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadPackageVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadPackageVO.java index 52e15fb7c..d640d8839 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadPackageVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadPackageVO.java @@ -15,6 +15,8 @@ public class UnloadPackageVO implements Serializable { private Integer unloadNum; private String trayName; private String trayCode; + private String unloadTrayName; + private String unloadTrayCode; private String scanStatus; private String unloadNodeName; private String orderCode; 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 8655b7178..f201e98a2 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 @@ -88,17 +88,21 @@ public class CarsLoadController { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - List warehouseIds = new ArrayList<>(); - if(!Objects.isNull(myCurrentWarehouse)){ - Long warehouseId = myCurrentWarehouse.getId(); - warehouseIds.add(warehouseId); - }else{ - List myWatchWarehouse = warehouseClient.getMyWatchWarehouse(); - myWatchWarehouse.forEach(warehouseEntity -> { - warehouseIds.add(warehouseEntity.getId()); - }); + if(Objects.isNull(myCurrentWarehouse)){ + log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); + return R.fail(400,"多仓权限无法操作，请选择仓库"); } - loadCarsDTO.setWarehouseIds(warehouseIds); +// List warehouseIds = new ArrayList<>(); +// if(!Objects.isNull(myCurrentWarehouse)){ +// Long warehouseId = myCurrentWarehouse.getId(); +// warehouseIds.add(warehouseId); +// }else{ +// List myWatchWarehouse = warehouseClient.getMyWatchWarehouse(); +// myWatchWarehouse.forEach(warehouseEntity -> { +// warehouseIds.add(warehouseEntity.getId()); +// }); +// } + loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId()); IPage pages = carsLoadService.arriveCarsPageList(loadCarsDTO); return R.data(pages); 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 2e6db992c..047a58c1c 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 @@ -141,18 +141,9 @@ where ltcl.is_deleted = 0 and ltcl.load_status != '100' and ltcl.load_type != '4' - - and ltcl.start_warehouse_id in - - #{item} - - and ltcl.end_warehouse_ids like concat('%',#{param.warehouseId},'%') - - and Locate(#{param.endWarehouseId},ltcl.end_warehouse_ids) > 0 - and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_names) > 0) 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 3723792f0..fbc939a8e 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 @@ -940,6 +940,8 @@ unload_num unloadNum, tray_code trayCode, tray_name trayName, + unload_tray_code unloadTrayCode, + unload_tray_name unloadTrayName, scan_status scanStatus, unload_node_name unloadNodeName, order_code orderCode, diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java index 2d667f043..2c6bf4a54 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java @@ -216,7 +216,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl Date: Wed, 16 Oct 2024 20:38:06 +0800 Subject: [PATCH 09/28] =?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 --- .../com/logpm/trunkline/dto/LoadCarsDTO.java | 2 ++ .../entity/TrunklineCarsLoadEntity.java | 3 +++ .../mapper/TrunklineCarsLoadMapper.xml | 2 ++ .../mapper/TrunklineCarsLoadScanMapper.java | 2 ++ .../mapper/TrunklineCarsLoadScanMapper.xml | 13 +++++++++++ .../ITrunklineCarsLoadScanService.java | 2 ++ .../TrunklineCarsLoadScanServiceImpl.java | 5 +++++ .../impl/TrunklineCarsLoadServiceImpl.java | 22 +++++++++++-------- 8 files changed, 42 insertions(+), 9 deletions(-) diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java index 0bf40421e..76dda93a3 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java @@ -71,6 +71,8 @@ public class LoadCarsDTO implements Serializable { private String trayCode; private String trayName; + private String unloadTrayName; + private String unloadTrayCode; private String trayType; private Integer isZero; private String scanCode; diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java index a3ac3b560..e0eac6929 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java @@ -130,6 +130,9 @@ public class TrunklineCarsLoadEntity extends TenantEntity { /** 卸车件数 */ @ApiModelProperty(name = "卸车件数",notes = "") private Integer unloadNumber ; + /** 卸车件数 */ + @ApiModelProperty(name = "在车件数",notes = "") + private Integer stockNumber ; /** 异常件数 */ @ApiModelProperty(name = "异常件数",notes = "") private Integer abnormalNum ; 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 047a58c1c..ce9c6e976 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 @@ -8,6 +8,7 @@ ltcl.cars_line_name carsLineName, ltcl.plan_loading_number planLoadingNumber, ltcl.real_loading_number realLoadingNumber, + ltcl.stock_number stockCarsNum, ltcl.unload_number unloadNumber, ltcl.loading_type loadingType, ltcl.full_load_rate fullLoadRate, @@ -107,6 +108,7 @@ ltcl.cars_no carsNo, ltcl.plan_loading_number planLoadingNumber, ltcl.real_loading_number realLoadingNumber, + ltcl.stock_number stockCarsNum, ltcl.unload_number unloadNumber, ltcl.full_load_rate fullLoadRate, ltcl.is_customer isCustomer, diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java index dda64ed39..1c837c4a4 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java @@ -185,4 +185,6 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper findAllIdListByLoadIdAndScanStatus(@Param("loadId") Long loadId, @Param("scanStatus") String scanStatus); CustmoerUnloadNumVO findCarsLoadCustomeNumByLoadIdAndUnloadWarehouseId(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId); + + Integer findStockNumByLoadId(@Param("loadId") Long loadId); } 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 fbc939a8e..897cd4113 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 @@ -115,6 +115,12 @@ and Locate(#{param.trayCode},cls.tray_code) > 0 + + and Locate(#{param.unloadTrayName},cls.unload_tray_name) > 0 + + + and Locate(#{param.unloadTrayCode},cls.unload_tray_code) > 0 + and Locate(#{param.unloadNodeName},cls.unload_node_name) > 0 @@ -995,5 +1001,12 @@ and sign_order_id is not null + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java index bd2a2600d..4cf654b4a 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java @@ -181,4 +181,6 @@ public interface ITrunklineCarsLoadScanService extends BaseService findAllIdListByLoadIdAndScanStatus(Long loadId, String scanStatus); CustmoerUnloadNumVO findCarsLoadCustomeNumByLoadIdAndUnloadWarehouseId(Long loadId, Long warehouseId); + + Integer findStockNumByLoadId(Long loadId); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java index 3607d9f0c..4c242ea94 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java @@ -464,4 +464,9 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl Date: Thu, 17 Oct 2024 10:41:30 +0800 Subject: [PATCH 10/28] =?UTF-8?q?feat(all):=20=E5=A2=9E=E5=8A=A0=E6=AC=A7?= =?UTF-8?q?=E6=B4=BE=E7=9A=AE=E9=98=BF=E8=AF=BA=E5=8F=91=E9=80=81=E6=B6=88?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1增加欧派和皮阿诺作业时发送消息到工厂 --- .../java/com/logpm/factorydata/util/FactoryDataUtil.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataUtil.java b/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataUtil.java index 30a338e54..cff09564f 100644 --- a/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataUtil.java +++ b/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataUtil.java @@ -27,6 +27,12 @@ public class FactoryDataUtil { factorys.put(BrandEnums.OLO.getValue(), FactoryDataConstants.Mq.RoutingKeys.OLO_NODE_DATA_PUSH); factorys.put(BrandEnums.SFY.getValue(), FactoryDataConstants.Mq.RoutingKeys.SFY_NODE_DATA_PUSH); factorys.put(BrandEnums.MTMM.getValue(), FactoryDataConstants.Mq.RoutingKeys.MENGTIAN_NODE_DATA_PUSH); + factorys.put(BrandEnums.MHJ.getValue(), FactoryDataConstants.Mq.RoutingKeys.MWH_NODE_DATA_PUSH); + // 皮阿诺 + // 欧派 + factorys.put(BrandEnums.OP.getValue(), FactoryDataConstants.Mq.RoutingKeys.OPPEIN_NODE_DATA_PUSH); + // 金牌 + factorys.put(BrandEnums.JP.getValue(), FactoryDataConstants.Mq.RoutingKeys.JP_NODE_DATA_PUSH); } From 206309d4e9e9cbe8d9b39b84b64bdd4349d8c7c2 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Thu, 17 Oct 2024 10:55:53 +0800 Subject: [PATCH 11/28] =?UTF-8?q?feat(all):=20=E5=A2=9E=E5=8A=A0=E6=AC=A7?= =?UTF-8?q?=E6=B4=BE=E7=9A=AE=E9=98=BF=E8=AF=BA=E5=8F=91=E9=80=81=E6=B6=88?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1增加欧派和皮阿诺作业时发送消息到工厂 --- .../common/constant/factorydata/FactoryDataConstants.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/factorydata/FactoryDataConstants.java b/blade-biz-common/src/main/java/org/springblade/common/constant/factorydata/FactoryDataConstants.java index 69078511f..107f16589 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/factorydata/FactoryDataConstants.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/factorydata/FactoryDataConstants.java @@ -83,6 +83,7 @@ public abstract class FactoryDataConstants { /** * 曼好家工厂订单 */ + String MWH_NODE_DATA_PUSH = "factory.data.queue.mwh.nodeDataPush" + DEVAUTH; String MWH_FACTORY_ORDER = "factory.data.queue.mwh.factoryOrder" + DEVAUTH; /** * 金牌工厂订单 @@ -134,6 +135,7 @@ public abstract class FactoryDataConstants { /** * 曼好家工厂订单 */ + String MWH_NODE_DATA_PUSH = "mwh.nodeDataPush" + DEVAUTH; String MWH_FACTORY_ORDER = "mwh.factoryOrder" + DEVAUTH; /** * 金牌工厂订单 From 470177c4f8a14e517e3714ca908995a84d810b28 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 17 Oct 2024 16:49:08 +0800 Subject: [PATCH 12/28] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BasicdataWarehouseServiceImpl.java | 2 +- .../service/impl/OpenOrderServiceImpl.java | 84 ++++++++++--------- .../impl/TrunklineCarsLoadServiceImpl.java | 2 +- 3 files changed, 45 insertions(+), 43 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java index a9f62399d..486bf922d 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java @@ -133,7 +133,7 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl getWarehouseList() { List myWatchWarehouse = getMyWatchWarehouse(); - if (myWatchWarehouse.size() > 0) { + if (!myWatchWarehouse.isEmpty()) { return myWatchWarehouse; } List basicdataGoodsShelfVOList = warehouseMapper.getWarehouseList(); 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 b45421f0b..dd00ce783 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 @@ -262,55 +262,57 @@ public class OpenOrderServiceImpl implements IOpenOrderService { //收货单位-----根据三方商场找到对应的clientId Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrandAndCode(dealerName,StringUtil.isBlank(dealerCode)?"":dealerCode, brand); - BasicdataClientVO basicdataClientEntity = basicdataClientClient.findEntityVoById(clientId); - if (!Objects.isNull(basicdataClientEntity)) { - openOrderVO.setConsigneeClientId(clientId); - openOrderVO.setConsignee(basicdataClientEntity.getClientName()); - openOrderVO.setConsigneeName(basicdataClientEntity.getLinkman()); - openOrderVO.setConsigneeMobile(basicdataClientEntity.getPhone()); - openOrderVO.setConsigneeAddress(basicdataClientEntity.getDetailedly()); + if(!Objects.isNull(clientId)){ + BasicdataClientVO basicdataClientEntity = basicdataClientClient.findEntityVoById(clientId); + if (!Objects.isNull(basicdataClientEntity)) { + openOrderVO.setConsigneeClientId(clientId); + openOrderVO.setConsignee(basicdataClientEntity.getClientName()); + openOrderVO.setConsigneeName(basicdataClientEntity.getLinkman()); + openOrderVO.setConsigneeMobile(basicdataClientEntity.getPhone()); + openOrderVO.setConsigneeAddress(basicdataClientEntity.getDetailedly()); - List destinationArray = new ArrayList<>(); - String badeRegionAreaId = basicdataClientEntity.getBladeRegionAreaId(); - String bladeRegionProvinceId = basicdataClientEntity.getBladeRegionProvinceId(); - String bladeRegionCityId = basicdataClientEntity.getBladeRegionCityId(); - destinationArray.add(bladeRegionProvinceId); - destinationArray.add(bladeRegionCityId); - String name = regionFeign.getName(bladeRegionCityId); - String areaId = bladeRegionCityId; - if (!StringUtil.isBlank(badeRegionAreaId)) { - destinationArray.add(badeRegionAreaId); - name = regionFeign.getName(badeRegionAreaId); - areaId = badeRegionAreaId; - } + List destinationArray = new ArrayList<>(); + String badeRegionAreaId = basicdataClientEntity.getBladeRegionAreaId(); + String bladeRegionProvinceId = basicdataClientEntity.getBladeRegionProvinceId(); + String bladeRegionCityId = basicdataClientEntity.getBladeRegionCityId(); + destinationArray.add(bladeRegionProvinceId); + destinationArray.add(bladeRegionCityId); + String name = regionFeign.getName(bladeRegionCityId); + String areaId = bladeRegionCityId; + if (!StringUtil.isBlank(badeRegionAreaId)) { + destinationArray.add(badeRegionAreaId); + name = regionFeign.getName(badeRegionAreaId); + areaId = badeRegionAreaId; + } - openOrderVO.setDefaultDeliveryWay("2"); - String typeService = "1"; - BasicdataStoreBusinessEntity storeBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(clientId, 3); - if(!Objects.isNull(storeBusinessEntity)){ - typeService = storeBusinessEntity.getMold(); - } - if ("1".equals(typeService)){ openOrderVO.setDefaultDeliveryWay("2"); - }else if("2".equals(typeService)){ - openOrderVO.setDefaultDeliveryWay("3"); - }else if("3".equals(typeService)){ - openOrderVO.setDefaultDeliveryWay("1"); - } + String typeService = "1"; + BasicdataStoreBusinessEntity storeBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(clientId, 3); + if(!Objects.isNull(storeBusinessEntity)){ + typeService = storeBusinessEntity.getMold(); + } + if ("1".equals(typeService)){ + openOrderVO.setDefaultDeliveryWay("2"); + }else if("2".equals(typeService)){ + openOrderVO.setDefaultDeliveryWay("3"); + }else if("3".equals(typeService)){ + openOrderVO.setDefaultDeliveryWay("1"); + } - openOrderVO.setDestination(name); - openOrderVO.setDestinationCode(areaId); - openOrderVO.setDestinationArray(destinationArray); + openOrderVO.setDestination(name); + openOrderVO.setDestinationCode(areaId); + openOrderVO.setDestinationArray(destinationArray); - openOrderVO.setDefaultPayWay(basicdataClientEntity.getDefaultPaymentMethods()); + openOrderVO.setDefaultPayWay(basicdataClientEntity.getDefaultPaymentMethods()); - //查询目的仓数据 - BasicdataStorageServicesEntity basicdataStorageServicesEntity = basicdataStorageServicesClient.findEntityBySendWarehouseIdAndClientId(warehouseId, clientId); - if (!Objects.isNull(basicdataStorageServicesEntity)) { - openOrderVO.setDestinationWarehouseId(basicdataStorageServicesEntity.getServeWarehouseId()); - openOrderVO.setDestinationWarehouseName(basicdataStorageServicesEntity.getServeWarehouseName()); + //查询目的仓数据 + BasicdataStorageServicesEntity basicdataStorageServicesEntity = basicdataStorageServicesClient.findEntityBySendWarehouseIdAndClientId(warehouseId, clientId); + if (!Objects.isNull(basicdataStorageServicesEntity)) { + openOrderVO.setDestinationWarehouseId(basicdataStorageServicesEntity.getServeWarehouseId()); + openOrderVO.setDestinationWarehouseName(basicdataStorageServicesEntity.getServeWarehouseName()); + } } } 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 789e2e199..9be5baed2 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 @@ -480,7 +480,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl Date: Thu, 17 Oct 2024 18:52:06 +0800 Subject: [PATCH 13/28] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E5=BC=80=E5=8D=95?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/IDistributionParcelListClient.java | 4 + .../logpm/distribution/vo/UpdateOrderDTO.java | 15 +++ .../feign/DistributionParcelListClient.java | 6 ++ .../IDistributionParcelListService.java | 2 + .../DistributionParcelListServiceImpl.java | 101 ++++++++++++------ .../mapper/TrunklineAdvanceDetailMapper.java | 4 + .../mapper/TrunklineAdvanceDetailMapper.xml | 47 ++++++++ .../ITrunklineAdvanceDetailService.java | 4 + .../service/impl/OpenOrderServiceImpl.java | 19 ++-- .../TrunklineAdvanceDetailServiceImpl.java | 10 ++ .../impl/TrunklineAdvanceServiceImpl.java | 5 + 11 files changed, 177 insertions(+), 40 deletions(-) create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/UpdateOrderDTO.java diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java index 5e4e16492..ec786854c 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java @@ -21,6 +21,7 @@ import com.logpm.distribution.dto.FindParamterDTO; import com.logpm.distribution.dto.OrderPackageDTO; import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.vo.DistributionParcelListVO; +import com.logpm.distribution.vo.UpdateOrderDTO; import com.logpm.distribution.vo.ZeroPackageSupplyVO; import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; @@ -167,6 +168,9 @@ public interface IDistributionParcelListClient { @GetMapping(API_PREFIX + "/updateEntityByOpenOrder") void updateEntityByOpenOrder(@RequestParam Long advanceId, @RequestParam Long waybillId); + @PostMapping(API_PREFIX + "/updateEntityByOpenOrderByAdvanceIds") + void updateEntityByOpenOrderByAdvanceIds(@RequestBody UpdateOrderDTO updateOrderDTO); + @GetMapping(API_PREFIX + "/findByWaybillNumber") List findByWaybillNumber(@RequestParam String waybillNumber); diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/UpdateOrderDTO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/UpdateOrderDTO.java new file mode 100644 index 000000000..784b58282 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/UpdateOrderDTO.java @@ -0,0 +1,15 @@ +package com.logpm.distribution.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class UpdateOrderDTO implements Serializable { + + private List advanceIds; + + private Long waybillId; + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java index 07b2a590a..8f32ae7da 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java @@ -34,6 +34,7 @@ import com.logpm.distribution.service.IDistributionParcelListService; import com.logpm.distribution.service.IDistributionParcelNumberService; import com.logpm.distribution.service.IDistributionStockArticleService; import com.logpm.distribution.vo.DistributionParcelListVO; +import com.logpm.distribution.vo.UpdateOrderDTO; import com.logpm.distribution.vo.ZeroPackageSupplyVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -333,6 +334,11 @@ public class DistributionParcelListClient implements IDistributionParcelListClie } + @Override + public void updateEntityByOpenOrderByAdvanceIds(UpdateOrderDTO updateOrderDTO) { + distributionParcelListService.updateEntityByOpenOrderByAdvanceIds(updateOrderDTO); + } + @Override public List findByWaybillNumber(String waybillNumber) { return distributionParcelListService.findByWaybillNumber(waybillNumber); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java index d8b4102d4..929d55168 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java @@ -284,4 +284,6 @@ public interface IDistributionParcelListService extends BaseService findOrderInfoByOrderPackageCode(String orderPackageCode, Long warehouseId); + + void updateEntityByOpenOrderByAdvanceIds(UpdateOrderDTO updateOrderDTO); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index 30b3cc3ee..a28c97c8a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -24,7 +24,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.google.zxing.WriterException; import com.logpm.basic.entity.BasicMaterialEntity; import com.logpm.basic.feign.IBasicMaterialClient; import com.logpm.basicdata.entity.BasicdataClientEntity; @@ -35,30 +34,10 @@ import com.logpm.basicdata.feign.IBasicdataGoodsAllocationClient; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.distribution.dto.DistributionParcelListDTO; import com.logpm.distribution.dto.app.StockupDTO; -import com.logpm.distribution.entity.DistributionParcelListEntity; -import com.logpm.distribution.entity.DistributionParcelNumberEntity; -import com.logpm.distribution.entity.DistributionReservationZeroPackageEntity; -import com.logpm.distribution.entity.DistributionStockArticleEntity; -import com.logpm.distribution.entity.DistributionStockListEntity; -import com.logpm.distribution.entity.DistributionStockListInfoEntity; -import com.logpm.distribution.entity.DistrilbutionBillPackageEntity; import com.logpm.distribution.entity.*; import com.logpm.distribution.excel.DistributionParcelListExcel; import com.logpm.distribution.mapper.DistributionParcelListMapper; import com.logpm.distribution.mapper.DistributionStockArticleMapper; -import com.logpm.distribution.service.IDistributionParcelDetailsService; -import com.logpm.distribution.service.IDistributionParcelListService; -import com.logpm.distribution.service.IDistributionParcelNumberService; -import com.logpm.distribution.service.IDistributionReservationZeroPackageService; -import com.logpm.distribution.service.IDistributionStockArticleService; -import com.logpm.distribution.service.IDistributionStockListInfoService; -import com.logpm.distribution.service.IDistributionStockListService; -import com.logpm.distribution.service.IDistrilbutionBillPackageService; -import com.logpm.distribution.vo.DistributionParcelListBaseVO; -import com.logpm.distribution.vo.DistributionParcelListNodeVO; -import com.logpm.distribution.vo.DistributionParcelListVO; -import com.logpm.distribution.vo.DistributionParcelListZeroVO; -import com.logpm.distribution.vo.PackageStockupVO; import com.logpm.distribution.service.*; import com.logpm.distribution.vo.*; import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient; @@ -98,20 +77,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import java.awt.image.BufferedImage; import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.TreeSet; +import java.util.*; import java.util.stream.Collectors; /** @@ -1487,4 +1454,70 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl advanceIds = updateOrderDTO.getAdvanceIds(); + + WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId); + if (Objects.isNull(waybillEntity)) { + log.warn("############updateEntityByOpenOrderByAdvanceIds: 运单信息不存在 waybillId={}", waybillId); + throw new CustomerException(405, "运单信息不存在"); + } + Long departureWarehouseId = waybillEntity.getDepartureWarehouseId(); + String departureWarehouseName = waybillEntity.getDepartureWarehouseName(); + Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId(); + String destinationWarehouseName = waybillEntity.getDestinationWarehouseName(); + String waybillNo = waybillEntity.getWaybillNo(); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("advance_id", advanceIds) + .eq("is_deleted", 0); + List listEntityList = baseMapper.selectList(queryWrapper); + Set orderCodes = new TreeSet<>(); + for (DistributionParcelListEntity parcelListEntity : listEntityList) { + Long packageWarehouseId = parcelListEntity.getWarehouseId(); + parcelListEntity.setWaybillId(waybillId); + parcelListEntity.setWaybillNumber(waybillNo); + parcelListEntity.setSendWarehouseId(departureWarehouseId); + parcelListEntity.setSendWarehouseName(departureWarehouseName); + parcelListEntity.setAcceptWarehouseId(destinationWarehouseId); + parcelListEntity.setAcceptWarehouseName(destinationWarehouseName); + if (departureWarehouseId.equals(destinationWarehouseId)) { + parcelListEntity.setIsTransfer(0); + } else { + if (destinationWarehouseId.equals(packageWarehouseId)) { + parcelListEntity.setIsTransfer(0); + } else { + parcelListEntity.setIsTransfer(1); + } + } + orderCodes.add(parcelListEntity.getOrderCode()); + } + updateBatchById(listEntityList); + + Long consigneeId = waybillEntity.getConsigneeId(); + BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(consigneeId); + + for (String orderCode : orderCodes) { + QueryWrapper stockArticleEntityQueryWrapper = new QueryWrapper<>(); + stockArticleEntityQueryWrapper.eq("order_code", orderCode) + .eq("is_deleted", 0); + List stockArticleEntities = distributionStockArticleMapper.selectList(stockArticleEntityQueryWrapper); + for (DistributionStockArticleEntity stockArticleEntity : stockArticleEntities) { + Long orderId = stockArticleEntity.getId(); + String waybillNumber = baseMapper.findOrderWaybillNo(orderId); + stockArticleEntity.setWaybillNumber(waybillNumber); + stockArticleEntity.setMallId(consigneeId); + stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode()); + stockArticleEntity.setMallName(basicdataClientEntity.getClientName()); + stockArticleEntity.setConsigneePerson(waybillEntity.getConsigneeName()); + stockArticleEntity.setConsigneeMobile(waybillEntity.getConsigneeMobile()); + stockArticleEntity.setConsigneeAddress(waybillEntity.getConsigneeAddress()); + stockArticleEntity.setConsigneeUnit(basicdataClientEntity.getClientName()); + } + distributionStockArticleService.updateBatchById(stockArticleEntities); + } + } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java index 59d578758..42b7e598b 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java @@ -83,4 +83,8 @@ public interface TrunklineAdvanceDetailMapper extends BaseMapper advanceIds); + + void updateWaybillNoByAdvanceIds(@Param("advanceIds") List advanceIds, @Param("waybillNo") String waybillNo, @Param("waybillId") Long waybillId); + + List findListByAdvanceIds(@Param("advanceIds") List advanceIds); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml index caf947386..47ec044be 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml @@ -184,6 +184,17 @@ where advance_id = #{advanceId} + + + update logpm_trunkline_advance_detail + set waybill_no = #{waybillNo}, + waybill_id = #{waybillId} + where advance_id in + + #{item} + + + + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java index c614fa3a2..3deb213cd 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java @@ -100,4 +100,8 @@ public interface ITrunklineAdvanceDetailService extends BaseService sendAdvanceDetailEntityList, Long warehouseId, String warehouseName,Integer incomingType); void sendReportAdvanceOpenData(String nickName, Long userId, Long warehouseId, String warehouseName, List updateAdvanceDetailList, WarehouseWaybillEntity waybillEntity); + + void updateWaybillNoByAdvanceIds(List advanceIds, String waybillNo, Long waybillId); + + List findListByAdvanceIds(List advanceIds); } 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 dd00ce783..9fbb945cb 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 @@ -23,6 +23,7 @@ import com.logpm.distribution.feign.IDistributionParcelListClient; import com.logpm.distribution.feign.IDistributionParcelNumberClient; import com.logpm.distribution.feign.IDistributionReservationStockarticleClient; import com.logpm.distribution.feign.IDistributionStockArticleClient; +import com.logpm.distribution.vo.UpdateOrderDTO; import com.logpm.statistics.feign.IOrderInfoClient; import com.logpm.trunkline.dto.*; import com.logpm.trunkline.entity.*; @@ -657,12 +658,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService { waybillOrderEntity.setHandleNumber(incomingNum); waybillOrderEntities.add(waybillOrderEntity); - //更新暂存单包件的运单信息 - advanceDetailService.updateWaybillNoByAdvanceId(advanceId, waybillNo, waybillId); - List list = advanceDetailService.findList(advanceId); - trunklineWaybillPackageService.saveList(list, waybillEntity); - trunklineWaybillPackageService.updateWaybillStatus(waybillEntity); - distributionParcelListClient.updateEntityByOpenOrder(advanceId, waybillId); // orderCodes.add(advanceEntity.getOrderCode()); advanceEntity.setWaybillStatus("1"); advanceEntity.setWaybillNo(waybillNo); @@ -672,6 +667,18 @@ public class OpenOrderServiceImpl implements IOpenOrderService { //修改暂存单的状态为已开单 advanceService.updateBatchById(advanceEntityList); + //更新暂存单包件的运单信息 + if(CollUtil.isNotEmpty(advanceIds)){ + advanceDetailService.updateWaybillNoByAdvanceIds(advanceIds, waybillNo, waybillId); + List list = advanceDetailService.findListByAdvanceIds(advanceIds); + trunklineWaybillPackageService.saveList(list, waybillEntity); + UpdateOrderDTO updateOrderDTO = new UpdateOrderDTO(); + updateOrderDTO.setAdvanceIds(advanceIds); + updateOrderDTO.setWaybillId(waybillId); + distributionParcelListClient.updateEntityByOpenOrderByAdvanceIds(updateOrderDTO); + } + trunklineWaybillPackageService.updateWaybillStatus(waybillEntity); + //修改暂存单明细的结算品类 List updateAdvanceDetailList = openOrderDTO.getUpdateAdvanceDetailList(); advanceDetailService.updateBatchById(updateAdvanceDetailList); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java index 2c6bf4a54..96dd6a9b9 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java @@ -542,4 +542,14 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl advanceIds, String waybillNo, Long waybillId) { + baseMapper.updateWaybillNoByAdvanceIds(advanceIds, waybillNo, waybillId); + } + + @Override + public List findListByAdvanceIds(List advanceIds) { + return baseMapper.findListByAdvanceIds(advanceIds); + } } 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 60e8313e8..2c798f171 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 @@ -830,6 +830,11 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl advanceDetailEntities1 = orderCodeMap.get(orderCode); + //把advanceDetailEntities1中素有所有元素的incomeCategoryName去重并拼接成一个字符串 + String incomeCategoryName = advanceDetailEntities1.stream().map(TrunklineAdvanceDetailEntity::getIncomeCategoryName).distinct().collect(Collectors.joining(",")); + stockArticleEntity.setDescriptionGoods(incomeCategoryName); + BasicdataClientEntity clientEntity = basicdataClientClient.findByName(consigneeName1); if(!Objects.isNull(clientEntity)){ stockArticleEntity.setMallId(clientEntity.getId()); From 0e09accdd2a50ca8046a0a224b14897be9c33c48 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 17 Oct 2024 19:04:32 +0800 Subject: [PATCH 14/28] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E9=85=8D=E8=BD=BD?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml | 1 + 1 file changed, 1 insertion(+) 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 ce9c6e976..f1a455164 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 @@ -571,6 +571,7 @@ and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_name) > 0) + order by ltcl.create_time desc 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 9be5baed2..9ee43206d 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 @@ -472,8 +472,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl> brandMap = brands.stream().collect(Collectors.groupingBy(LoadScanBrandDTO::getBrand)); + for (Map.Entry> entry : brandMap.entrySet()) { + List value = entry.getValue(); + LoadScanBrandDTO brand = value.get(0); + String packageCode = value.stream().map(LoadScanBrandDTO::getPackageCode).collect(Collectors.joining(",")); if (StrUtil.isEmpty(packageCode)) { continue; } @@ -505,7 +509,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl{ - return PushData.builder() + return PushData.builder() .packageCode(data) .warehouseName(warehouseEntity.getName()) .orderCode(brand.getOrderCode()) @@ -4945,7 +4949,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl list = trunklineCarsLoadScanService.findNoFinalNodeData(loadId, warehouseId); - if (Objects.isNull(list) || list.size() == 0) { + if (Objects.isNull(list) || list.isEmpty()) { return R.success("未有需要添加目的仓的数据"); } else { return R.data(list);