From 8116510da39a3f4a78fe0de69684707661c8a48c Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 28 Jun 2024 11:12:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=9C=A8yml=E6=96=87=E4=BB=B6=E4=B8=AD=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=BF=9E=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 18 ++++----- .../src/main/resources/application-dev.yml | 36 +++++++++--------- .../src/main/resources/application-dev.yml | 38 +++++++++---------- .../src/main/resources/application-dev.yml | 36 +++++++++--------- .../src/main/resources/application-dev.yml | 36 +++++++++--------- .../src/main/resources/application-dev.yml | 18 ++++----- .../src/main/resources/application-dev.yml | 18 ++++----- .../src/main/resources/application-dev.yml | 36 +++++++++--------- .../src/main/resources/application-dev.yml | 18 ++++----- 9 files changed, 127 insertions(+), 127 deletions(-) diff --git a/blade-service/logpm-aftersales/src/main/resources/application-dev.yml b/blade-service/logpm-aftersales/src/main/resources/application-dev.yml index 4feaa5d33..87cf7228b 100644 --- a/blade-service/logpm-aftersales/src/main/resources/application-dev.yml +++ b/blade-service/logpm-aftersales/src/main/resources/application-dev.yml @@ -33,15 +33,15 @@ spring: url: ${blade.datasource.aftersales.master.url} username: ${blade.datasource.aftersales.master.username} password: ${blade.datasource.aftersales.master.password} - 627683: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.aftersales.627683.url} - username: ${blade.datasource.aftersales.627683.username} - password: ${blade.datasource.aftersales.627683.password} +# 627683: +# druid: +# #独立校验配置 +# validation-query: select 1 +# #oracle校验 +# #validation-query: select 1 from dual +# url: ${blade.datasource.aftersales.627683.url} +# username: ${blade.datasource.aftersales.627683.username} +# password: ${blade.datasource.aftersales.627683.password} # 703923: # druid: # #独立校验配置 diff --git a/blade-service/logpm-basic/src/main/resources/application-dev.yml b/blade-service/logpm-basic/src/main/resources/application-dev.yml index 2a19240b9..edd1af818 100644 --- a/blade-service/logpm-basic/src/main/resources/application-dev.yml +++ b/blade-service/logpm-basic/src/main/resources/application-dev.yml @@ -33,21 +33,21 @@ spring: url: ${blade.datasource.basic.master.url} username: ${blade.datasource.basic.master.username} password: ${blade.datasource.basic.master.password} - 627683: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.basic.627683.url} - username: ${blade.datasource.basic.627683.username} - password: ${blade.datasource.basic.627683.password} - 703623: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.basic.703623.url} - username: ${blade.datasource.basic.703623.username} - password: ${blade.datasource.basic.703623.password} +# 627683: +# druid: +# #独立校验配置 +# validation-query: select 1 +# #oracle校验 +# #validation-query: select 1 from dual +# url: ${blade.datasource.basic.627683.url} +# username: ${blade.datasource.basic.627683.username} +# password: ${blade.datasource.basic.627683.password} +# 703623: +# druid: +# #独立校验配置 +# validation-query: select 1 +# #oracle校验 +# #validation-query: select 1 from dual +# url: ${blade.datasource.basic.703623.url} +# username: ${blade.datasource.basic.703623.username} +# password: ${blade.datasource.basic.703623.password} diff --git a/blade-service/logpm-basicdata/src/main/resources/application-dev.yml b/blade-service/logpm-basicdata/src/main/resources/application-dev.yml index 055ad083f..ad768428d 100644 --- a/blade-service/logpm-basicdata/src/main/resources/application-dev.yml +++ b/blade-service/logpm-basicdata/src/main/resources/application-dev.yml @@ -33,22 +33,22 @@ spring: url: ${blade.datasource.basicdata.master.url} username: ${blade.datasource.basicdata.master.username} password: ${blade.datasource.basicdata.master.password} - 627683: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.basicdata.627683.url} - username: ${blade.datasource.basicdata.627683.username} - password: ${blade.datasource.basicdata.627683.password} - - 703623: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.basicdata.703623.url} - username: ${blade.datasource.basicdata.703623.username} - password: ${blade.datasource.basicdata.703623.password} +# 627683: +# druid: +# #独立校验配置 +# validation-query: select 1 +# #oracle校验 +# #validation-query: select 1 from dual +# url: ${blade.datasource.basicdata.627683.url} +# username: ${blade.datasource.basicdata.627683.username} +# password: ${blade.datasource.basicdata.627683.password} +# +# 703623: +# druid: +# #独立校验配置 +# validation-query: select 1 +# #oracle校验 +# #validation-query: select 1 from dual +# url: ${blade.datasource.basicdata.703623.url} +# username: ${blade.datasource.basicdata.703623.username} +# password: ${blade.datasource.basicdata.703623.password} diff --git a/blade-service/logpm-business/src/main/resources/application-dev.yml b/blade-service/logpm-business/src/main/resources/application-dev.yml index 8fec08a5c..b43dd1d0d 100644 --- a/blade-service/logpm-business/src/main/resources/application-dev.yml +++ b/blade-service/logpm-business/src/main/resources/application-dev.yml @@ -32,22 +32,22 @@ spring: url: ${blade.datasource.business.master.url} username: ${blade.datasource.business.master.username} password: ${blade.datasource.business.master.password} - 627683: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.business.627683.url} - username: ${blade.datasource.business.627683.username} - password: ${blade.datasource.business.627683.password} - 703623: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.business.703623.url} - username: ${blade.datasource.business.703623.username} - password: ${blade.datasource.business.703623.password} +# 627683: +# druid: +# #独立校验配置 +# validation-query: select 1 +# #oracle校验 +# #validation-query: select 1 from dual +# url: ${blade.datasource.business.627683.url} +# username: ${blade.datasource.business.627683.username} +# password: ${blade.datasource.business.627683.password} +# 703623: +# druid: +# #独立校验配置 +# validation-query: select 1 +# #oracle校验 +# #validation-query: select 1 from dual +# url: ${blade.datasource.business.703623.url} +# username: ${blade.datasource.business.703623.username} +# password: ${blade.datasource.business.703623.password} diff --git a/blade-service/logpm-distribution/src/main/resources/application-dev.yml b/blade-service/logpm-distribution/src/main/resources/application-dev.yml index 4db0194e0..5900ebb32 100644 --- a/blade-service/logpm-distribution/src/main/resources/application-dev.yml +++ b/blade-service/logpm-distribution/src/main/resources/application-dev.yml @@ -62,21 +62,21 @@ spring: url: ${blade.datasource.distribution.master.url} username: ${blade.datasource.distribution.master.username} password: ${blade.datasource.distribution.master.password} - 627683: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.distribution.627683.url} - username: ${blade.datasource.distribution.627683.username} - password: ${blade.datasource.distribution.627683.password} - 703623: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.distribution.703623.url} - username: ${blade.datasource.distribution.703623.username} - password: ${blade.datasource.distribution.703623.password} +# 627683: +# druid: +# #独立校验配置 +# validation-query: select 1 +# #oracle校验 +# #validation-query: select 1 from dual +# url: ${blade.datasource.distribution.627683.url} +# username: ${blade.datasource.distribution.627683.username} +# password: ${blade.datasource.distribution.627683.password} +# 703623: +# druid: +# #独立校验配置 +# validation-query: select 1 +# #oracle校验 +# #validation-query: select 1 from dual +# url: ${blade.datasource.distribution.703623.url} +# username: ${blade.datasource.distribution.703623.username} +# password: ${blade.datasource.distribution.703623.password} diff --git a/blade-service/logpm-factory/src/main/resources/application-dev.yml b/blade-service/logpm-factory/src/main/resources/application-dev.yml index ec7b1d9ce..41154abf0 100644 --- a/blade-service/logpm-factory/src/main/resources/application-dev.yml +++ b/blade-service/logpm-factory/src/main/resources/application-dev.yml @@ -60,14 +60,14 @@ spring: url: ${blade.datasource.factory.master.url} username: ${blade.datasource.factory.master.username} password: ${blade.datasource.factory.master.password} - 627683: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.factory.627683.url} - username: ${blade.datasource.factory.627683.username} - password: ${blade.datasource.factory.627683.password} +# 627683: +# druid: +# #独立校验配置 +# validation-query: select 1 +# #oracle校验 +# #validation-query: select 1 from dual +# url: ${blade.datasource.factory.627683.url} +# username: ${blade.datasource.factory.627683.username} +# password: ${blade.datasource.factory.627683.password} diff --git a/blade-service/logpm-old-project/src/main/resources/application-dev.yml b/blade-service/logpm-old-project/src/main/resources/application-dev.yml index 2b684605a..e55b06c80 100644 --- a/blade-service/logpm-old-project/src/main/resources/application-dev.yml +++ b/blade-service/logpm-old-project/src/main/resources/application-dev.yml @@ -34,12 +34,12 @@ spring: url: ${blade.datasource.oldproject.master.url} username: ${blade.datasource.oldproject.master.username} password: ${blade.datasource.oldproject.master.password} - 627683: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.oldproject.627683.url} - username: ${blade.datasource.oldproject.627683.username} - password: ${blade.datasource.oldproject.627683.password} +# 627683: +# druid: +# #独立校验配置 +# validation-query: select 1 +# #oracle校验 +# #validation-query: select 1 from dual +# url: ${blade.datasource.oldproject.627683.url} +# username: ${blade.datasource.oldproject.627683.username} +# password: ${blade.datasource.oldproject.627683.password} diff --git a/blade-service/logpm-trunkline/src/main/resources/application-dev.yml b/blade-service/logpm-trunkline/src/main/resources/application-dev.yml index b4f87a675..b017fcbd3 100644 --- a/blade-service/logpm-trunkline/src/main/resources/application-dev.yml +++ b/blade-service/logpm-trunkline/src/main/resources/application-dev.yml @@ -60,21 +60,21 @@ spring: url: ${blade.datasource.trunkline.master.url} username: ${blade.datasource.trunkline.master.username} password: ${blade.datasource.trunkline.master.password} - 627683: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.trunkline.627683.url} - username: ${blade.datasource.trunkline.627683.username} - password: ${blade.datasource.trunkline.627683.password} - 703623: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.trunkline.703623.url} - username: ${blade.datasource.trunkline.703623.username} - password: ${blade.datasource.trunkline.703623.password} +# 627683: +# druid: +# #独立校验配置 +# validation-query: select 1 +# #oracle校验 +# #validation-query: select 1 from dual +# url: ${blade.datasource.trunkline.627683.url} +# username: ${blade.datasource.trunkline.627683.username} +# password: ${blade.datasource.trunkline.627683.password} +# 703623: +# druid: +# #独立校验配置 +# validation-query: select 1 +# #oracle校验 +# #validation-query: select 1 from dual +# url: ${blade.datasource.trunkline.703623.url} +# username: ${blade.datasource.trunkline.703623.username} +# password: ${blade.datasource.trunkline.703623.password} diff --git a/blade-service/logpm-warehouse/src/main/resources/application-dev.yml b/blade-service/logpm-warehouse/src/main/resources/application-dev.yml index b3e949d1f..b7affbaba 100644 --- a/blade-service/logpm-warehouse/src/main/resources/application-dev.yml +++ b/blade-service/logpm-warehouse/src/main/resources/application-dev.yml @@ -68,15 +68,15 @@ spring: url: ${blade.datasource.warehouse.627683.url} username: ${blade.datasource.warehouse.627683.username} password: ${blade.datasource.warehouse.627683.password} - 703623: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.warehouse.703623.url} - username: ${blade.datasource.warehouse.703623.username} - password: ${blade.datasource.warehouse.703623.password} +# 703623: +# druid: +# #独立校验配置 +# validation-query: select 1 +# #oracle校验 +# #validation-query: select 1 from dual +# url: ${blade.datasource.warehouse.703623.url} +# username: ${blade.datasource.warehouse.703623.username} +# password: ${blade.datasource.warehouse.703623.password} xxl: job: accessToken: '' From 5fa191b5415c49330944eb212b9ff2eb9cf03bfe Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 28 Jun 2024 14:33:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5BUG=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E3=80=81=E5=AE=89=E8=A3=85=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/RabbitConstant.java | 3 + .../distribution/dto/PushInstallDTO.java | 69 ++++++ .../mapper/DistributionReservationMapper.java | 2 +- .../service/IDistributionAsyncService.java | 6 + .../impl/DistributionAsyncServiceImpl.java | 213 +++++++++++++++--- .../impl/DistributionSignforServiceImpl.java | 6 + .../controller/WarehouseIndexController.java | 4 +- .../impl/WarehouseIndexServiceImpl.java | 6 +- 8 files changed, 268 insertions(+), 41 deletions(-) create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/PushInstallDTO.java diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java index 43c66481b..6f79c32ba 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java @@ -232,4 +232,7 @@ public interface RabbitConstant { /****************自提扫描信息处理 start *************************/ + + + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/PushInstallDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/PushInstallDTO.java new file mode 100644 index 000000000..99066f7f4 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/PushInstallDTO.java @@ -0,0 +1,69 @@ +package com.logpm.distribution.dto; + +import com.logpm.distribution.entity.DistributionStockArticleEntity; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.function.Consumer; + +@Data +public class PushInstallDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + private String name; + + + private String tel; + + + private String address; + + + private String balance_people; + + + private String balance_type; + + + private String balance_name; + + + private List order; + + private List order_detail; + + @Data + public static class Order implements Serializable{ + private static final long serialVersionUID = 1L; + + private String waybill_no; + private String all_num; + private String end_num; + private String order_no; + + } + + + + @Data + public static class OrderDetail implements Serializable { + private static final long serialVersionUID = 1L; + + private String waybill_no; + private String package_code; + private String level1_type; + private String level2_type; + private String level3_type; + private String materials; + private String order_no; + private String num; + + + } + + + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java index c9c80f428..20fad06f3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java @@ -252,7 +252,7 @@ public interface DistributionReservationMapper extends BaseMapper selectReservationZeroOrderDetail(@Param("stockArticleId") Long id,@Param("reservationId") Long reservationId); + List selectReservationZeroOrderDetail(@Param("stockArticleId") Long stockArticleId,@Param("reservationId") Long reservationId); List getStockListAllocation(@Param("stockListId")Long stockListId, @Param("reservationId")Long reservationId); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAsyncService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAsyncService.java index 73a94589b..c4bbec5f2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAsyncService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAsyncService.java @@ -346,4 +346,10 @@ public interface IDistributionAsyncService { * @param ids */ void maintenanceCancelBillLading(List ids); + + /** + * 查询预约信息推送至安装平台 + * @param id + */ + void sendInstallToPlatform(DistributionReservationEntity reservationEntity); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index b65c09b69..0af797fd5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -12,12 +12,15 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.logpm.basicdata.entity.BasicdataClientEntity; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; +import com.logpm.basicdata.feign.IBasicdataClientClient; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.business.entity.BusinessPreOrderEntity; import com.logpm.distribution.dto.DistributionLoadingNumDTO; import com.logpm.distribution.dto.DistributionParcelNumberDTO; import com.logpm.distribution.dto.DistributionStockArticleDTO; +import com.logpm.distribution.dto.PushInstallDTO; import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO; import com.logpm.distribution.dto.app.StockupDTO; import com.logpm.distribution.dto.app.StockupZeroDTO; @@ -159,10 +162,10 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { private final RabbitTemplate rabbitTemplate; - private final ISysClient sysClient; private final ITrunklinePackageTrackLogClient trunklinePackageTrackLogClient; private final IDistributionPrintService distributionPrintService; + private final IBasicdataClientClient basicdataClientClient; // private final @@ -2833,8 +2836,8 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { queryWrapper1.eq("reservation_id", reservationId); } DistributionStockEntity stockEntity = distributionStockService.selectOne(queryWrapper1); - //没有扫 - return ObjectUtils.isNull(stockEntity); + //没有扫 + return ObjectUtils.isNull(stockEntity); } @@ -2858,8 +2861,8 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { queryWrapper1.eq("reservation_id", reservationId); } List stockEntityList = distributionStockService.selectList(queryWrapper1); - //未完成 - return !stockEntityList.isEmpty() && stockEntityList.size() >= num; //已完成 + //未完成 + return !stockEntityList.isEmpty() && stockEntityList.size() >= num; //已完成 } @@ -2872,11 +2875,9 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { } - - @Override @LogpmAsync("asyncExecutor") - public void recordsReservationDeliveryLog(List reservationList,BasicdataWarehouseEntity warehouse,BladeUser user,DistributionDeliveryListEntity deliveryListEntity,Integer node,String content) { + public void recordsReservationDeliveryLog(List reservationList, BasicdataWarehouseEntity warehouse, BladeUser user, DistributionDeliveryListEntity deliveryListEntity, Integer node, String content) { List list = reservationList.stream().map(DistributionReservationEntity::getId).collect(Collectors.toList()); if (!list.isEmpty()) { List distributionReservationPackageEntities = distributionReservationPackageMapper.selectList(Wrappers.query().lambda() @@ -2889,35 +2890,35 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { List pushDatas = new ArrayList<>(); if (!distributionReservationPackageEntities.isEmpty()) { // 通过订单id获取订单，然后根据品牌分组 - Map stockArticleEntityMap = new HashMap<>(); + Map stockArticleEntityMap = new HashMap<>(); List collect = distributionReservationPackageEntities.stream().map(DistributionReservationPackageEntity::getStockArticleId).collect(Collectors.toList()); - if(CollUtil.isNotEmpty(collect)){ + if (CollUtil.isNotEmpty(collect)) { List stockArticleEntities = distributionStockArticleService.list(Wrappers.query().lambda() .in(DistributionStockArticleEntity::getId, collect) ); - if(CollUtil.isNotEmpty(stockArticleEntities)){ - stockArticleEntities.forEach(s->{ - stockArticleEntityMap.put(s.getId(),s); + if (CollUtil.isNotEmpty(stockArticleEntities)) { + stockArticleEntities.forEach(s -> { + stockArticleEntityMap.put(s.getId(), s); }); } } - distributionReservationPackageEntities.forEach(rp->{ + distributionReservationPackageEntities.forEach(rp -> { DistributionReservationEntity r = map.get(rp.getReservationId()).get(0); - JSONObject trunklinePackageTrackLog= new JSONObject(); - trunklinePackageTrackLog.put("tenantId",AuthUtil.getTenantId()); - trunklinePackageTrackLog.put("createTime",new Date()); - trunklinePackageTrackLog.put("createUser",user.getUserId()); - trunklinePackageTrackLog.put("updateUser",user.getUserId()); - trunklinePackageTrackLog.put("updateTime",new Date()); - trunklinePackageTrackLog.put("isDeleted",0); - trunklinePackageTrackLog.put("status",1); - trunklinePackageTrackLog.put("createDept",warehouse.getDepartment()); - trunklinePackageTrackLog.put("orderPackageCode",rp.getPacketBarCode()); - trunklinePackageTrackLog.put("warehouseId",warehouse.getId()); - trunklinePackageTrackLog.put("warehouseName",warehouse.getName()); - trunklinePackageTrackLog.put("workNode",node); - trunklinePackageTrackLog.put("content",content); - trunklinePackageTrackLog.put("operator",AuthUtil.getUser().getNickName()); + JSONObject trunklinePackageTrackLog = new JSONObject(); + trunklinePackageTrackLog.put("tenantId", AuthUtil.getTenantId()); + trunklinePackageTrackLog.put("createTime", new Date()); + trunklinePackageTrackLog.put("createUser", user.getUserId()); + trunklinePackageTrackLog.put("updateUser", user.getUserId()); + trunklinePackageTrackLog.put("updateTime", new Date()); + trunklinePackageTrackLog.put("isDeleted", 0); + trunklinePackageTrackLog.put("status", 1); + trunklinePackageTrackLog.put("createDept", warehouse.getDepartment()); + trunklinePackageTrackLog.put("orderPackageCode", rp.getPacketBarCode()); + trunklinePackageTrackLog.put("warehouseId", warehouse.getId()); + trunklinePackageTrackLog.put("warehouseName", warehouse.getName()); + trunklinePackageTrackLog.put("workNode", node); + trunklinePackageTrackLog.put("content", content); + trunklinePackageTrackLog.put("operator", AuthUtil.getUser().getNickName()); aaa.add(trunklinePackageTrackLog); JSONObject jsonObject = new JSONObject(); jsonObject.put("trainNumber", deliveryListEntity.getTrainNumber()); @@ -2931,13 +2932,13 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { }); } try { - if(CollUtil.isNotEmpty(pushDatas)){ + if (CollUtil.isNotEmpty(pushDatas)) { // 以trainNumber和receiver 分组 将包件封装成list Map> collect = pushDatas.stream().collect(Collectors.groupingBy(jsonObject -> jsonObject.getString("trainNumber") + jsonObject.getString("receiver") + jsonObject.getString("brand"))); - if(CollUtil.isNotEmpty(collect)){ + if (CollUtil.isNotEmpty(collect)) { for (Map.Entry> entry : collect.entrySet()) { List value = entry.getValue(); - if(CollUtil.isNotEmpty(value)){ + if (CollUtil.isNotEmpty(value)) { JSONObject object = value.get(0); NodePushMsg msg = new NodePushMsg(); msg.setNode(WorkNodeEnums.PLAN_DISTRIBUTION); @@ -2956,7 +2957,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { } } } - }catch (Exception e){ + } catch (Exception e) { log.error("推送工程数据失败：{}", e); } @@ -2977,7 +2978,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { ); if (!list.isEmpty()) { List orderIds = list.stream().map(DistrilbutionBillStockEntity::getStockArticleId).distinct().collect(Collectors.toList()); - handlePushFactoryOrderIds(orderIds, s, warehouse, user); + handlePushFactoryOrderIds(orderIds, s, warehouse, user); } } catch (Exception e) { @@ -2995,8 +2996,8 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { if (!list.isEmpty()) { List packageIds = list.stream().map(DistrilbutionBillPackageEntity::getParceListId).collect(Collectors.toList()); distributionParcelListService.update(Wrappers.update().lambda() - .in(DistributionParcelListEntity::getId,packageIds) - .set(DistributionParcelListEntity::getOrderPackageReservationStatus,OrderPackageReservationStatusConstant.daiyuyue.getValue()) + .in(DistributionParcelListEntity::getId, packageIds) + .set(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.daiyuyue.getValue()) ); List orderIds = list.stream().map(DistrilbutionBillPackageEntity::getStockArticleId).distinct().collect(Collectors.toList()); distributionStockArticleService.maintenanceOrderInfoByIds(orderIds); @@ -3004,6 +3005,146 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { } } + + @Override + public void sendInstallToPlatform(DistributionReservationEntity reservationEntity) { + String method = "###############sendInstallToPlatform推送安装平台"; + //查询预约信息 + PushInstallDTO pushInstallDTO = new PushInstallDTO(); + pushInstallDTO.setName(reservationEntity.getConsignee()); + pushInstallDTO.setTel(reservationEntity.getDeliveryPhone()); + pushInstallDTO.setAddress(reservationEntity.getDeliveryAddress()); + //查询客户 + BasicdataClientEntity client = basicdataClientClient.findByName(reservationEntity.getReceivingUnit()); + if (!Func.isEmpty(client)) { + pushInstallDTO.setBalance_name(client.getClientName()); + pushInstallDTO.setBalance_people("1"); + pushInstallDTO.setBalance_type(client.getDefaultPaymentMethods()); + } else { + log.error(method + ">>>>>>>>>>>>>查询客户信息失败" + reservationEntity.getReceivingUnit()); + + } + List orderList = new ArrayList<>(); + List orderDetailList = new ArrayList<>(); + //查询此配送的订单信息 + List distributionReservationStockarticleEntities = distributionReservationMapper.selectStockArticleByReservationId(reservationEntity.getId()); + if (!distributionReservationStockarticleEntities.isEmpty()) { + Map> orderPlanMap = distributionReservationStockarticleEntities.stream().collect(Collectors.groupingBy(DistributionReservationStockarticleEntity::getStockArticleId)); + List orderIds = distributionReservationStockarticleEntities.stream().map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList()); + List distributionStockArticleEntities = distributionStockArticleService.listByIds(orderIds); + if (!distributionStockArticleEntities.isEmpty()) { + for (DistributionStockArticleEntity distributionStockArticleEntity : distributionStockArticleEntities) { + PushInstallDTO.Order order = new PushInstallDTO.Order(); + order.setWaybill_no(distributionStockArticleEntity.getWaybillNumber()); + order.setOrder_no(distributionStockArticleEntity.getOrderCode()); + order.setAll_num(distributionStockArticleEntity.getTotalNumber() + ""); + order.setAll_num("0"); + //查询签收数量 + List loadscanEntityList = distributionLoadscanMapper.selectList(Wrappers.query().lambda() + .eq(DistributionLoadscanEntity::getReservationId, reservationEntity.getId()) + .eq(DistributionLoadscanEntity::getOrderId, distributionStockArticleEntity.getId()) + .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) + .ne(DistributionLoadscanEntity::getSignforState, 2) + ); + if (!loadscanEntityList.isEmpty()) { + order.setEnd_num(loadscanEntityList.stream().mapToInt(DistributionLoadscanEntity::getReceivedQuantity).sum() + ""); + } + orderList.add(order); + + if (distributionStockArticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())){ + //构建包件信息 + List distributionParcelListEntities = distributionReservationMapper.selectPackageByReservationAndStockArticle(reservationEntity.getId(), distributionStockArticleEntity.getId(), distributionStockArticleEntity.getWarehouseId()); + if (!distributionParcelListEntities.isEmpty()) { + for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) { + if (distributionParcelListEntity.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())) { + PushInstallDTO.OrderDetail orderDetail = new PushInstallDTO.OrderDetail(); + orderDetail.setOrder_no(distributionStockArticleEntity.getOrderCode()); + orderDetail.setWaybill_no(distributionStockArticleEntity.getWaybillNumber()); + orderDetail.setMaterials(distributionParcelListEntity.getMaterialName()); + orderDetail.setLevel1_type(distributionParcelListEntity.getFirsts()); + orderDetail.setLevel2_type(distributionParcelListEntity.getSecond()); + orderDetail.setLevel3_type(distributionParcelListEntity.getThirdProduct()); + orderDetail.setNum(distributionParcelListEntity.getQuantity() + ""); + orderDetailList.add(orderDetail); + } + } + } + }else { + //整理零担的数据 + List distributionParcelNumberVOS = distributionReservationMapper.selectReservationZeroOrderDetail(distributionStockArticleEntity.getId(), reservationEntity.getId()); + if (!distributionParcelNumberVOS.isEmpty()) { + for (DistributionParcelNumberVO distributionParcelNumberVO : distributionParcelNumberVOS) { + PushInstallDTO.OrderDetail orderDetail = new PushInstallDTO.OrderDetail(); + orderDetail.setOrder_no(distributionStockArticleEntity.getOrderCode()); + orderDetail.setWaybill_no(distributionStockArticleEntity.getWaybillNumber()); + orderDetail.setMaterials(distributionParcelNumberVO.getFirsts()); + orderDetail.setLevel1_type(distributionParcelNumberVO.getFirsts()); +// orderDetail.setLevel2_type(distributionParcelListEntity.getSecond()); +// orderDetail.setLevel3_type(distributionParcelListEntity.getThirdProduct()); + orderDetail.setNum(distributionParcelNumberVO.getReservationNum() + ""); + orderDetailList.add(orderDetail); + } + } + } + } + } + } + + //查询库存品 + List reservationStocklistEntities = distributionReservationMapper.selectStockListByReservationId(reservationEntity.getId()); + if (!reservationStocklistEntities.isEmpty()) { + List stockListIds = reservationStocklistEntities.stream().map(DistributionReservationStocklistEntity::getStocklistId).collect(Collectors.toList()); + Map> inventoryPlanMap = reservationStocklistEntities.stream().collect(Collectors.groupingBy(DistributionReservationStocklistEntity::getStocklistId)); + if (!stockListIds.isEmpty()) { + List distributionStockListEntities = distributionStockListMapper.selectList(Wrappers.query().lambda() + .in(DistributionStockListEntity::getId, stockListIds) + ); + if (!distributionStockListEntities.isEmpty()) { + for (DistributionStockListEntity distributionStockListEntity : distributionStockListEntities) { + PushInstallDTO.Order order = new PushInstallDTO.Order(); + order.setWaybill_no(distributionStockListEntity.getOrderCode()); + order.setOrder_no(distributionStockListEntity.getIncomingBatch()); + order.setAll_num(distributionStockListEntity.getQuantityStock() + ""); + order.setAll_num("0"); + // + List loadscanEntityList = distributionLoadscaninvnMapper.selectList(Wrappers.query().lambda() + .eq(DistributionLoadscaninvnEntity::getReservationId, reservationEntity.getId()) + .eq(DistributionLoadscaninvnEntity::getInventoryId, distributionStockListEntity.getId()) + .ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) + .ne(DistributionLoadscaninvnEntity::getSignforState, 2) + ); + if (!loadscanEntityList.isEmpty()) { + order.setAll_num(loadscanEntityList.stream().mapToInt(DistributionLoadscaninvnEntity::getReceivedQuantity).sum() + ""); + } + //查询库存品包件 + List list = disStockListDetailService.list(Wrappers.query().lambda() + .eq(DisStockListDetailEntity::getReservationId, reservationEntity.getId()) + .eq(DisStockListDetailEntity::getStockListId, distributionStockListEntity.getId()) + .eq(DisStockListDetailEntity::getStockStatus, ReservationPackageStatusConstant.quxiao.getValue()) + ); + if (!list.isEmpty()) { + for (DisStockListDetailEntity disStockListDetailEntity : list) { + PushInstallDTO.OrderDetail orderDetail = new PushInstallDTO.OrderDetail(); + orderDetail.setOrder_no(distributionStockListEntity.getOrderCode()); +// orderDetail.setWaybill_no(distributionStockArticleEntity.getWaybillNumber()); + orderDetail.setMaterials(distributionStockListEntity.getMarketName()); +// orderDetail.setLevel1_type(distributionParcelListEntity.getFirsts()); +// orderDetail.setLevel2_type(distributionParcelListEntity.getSecond()); +// orderDetail.setLevel3_type(distributionParcelListEntity.getThirdProduct()); +// orderDetail.setLevel3_type(distributionParcelListEntity.getThirdProduct()); + orderDetail.setNum(disStockListDetailEntity.getNum() + ""); + orderDetailList.add(orderDetail); + } + } + } + } + } + } + pushInstallDTO.setOrder(orderList); + pushInstallDTO.setOrder_detail(orderDetailList); + log.info(">>>>>>>>>>>>>>安装推送整理数据",JSONObject.toJSON(pushInstallDTO)); + } + private void handlePushFactoryOrderIds(List orderIds, String s, BasicdataWarehouseEntity warehouse, BladeUser user) { if (!orderIds.isEmpty()) { List distributionStockArticleEntities = distributionStockArticleService.list(Wrappers.query().lambda() 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 29c190c36..23f5f6c6d 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 @@ -661,6 +661,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl myWatchWarehouse = warehouseClient.getMyWarehouseList(); - if (myWatchWarehouse.isEmpty()) { + if (!myWatchWarehouse.isEmpty()) { warehouseIds = myWatchWarehouse.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); } @@ -321,7 +321,7 @@ public class WarehouseIndexController { BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); if(Objects.isNull(myCurrentWarehouse)){ List myWatchWarehouse = warehouseClient.getMyWarehouseList(); - if (myWatchWarehouse.isEmpty()) { + if (!myWatchWarehouse.isEmpty()) { warehouseIds = myWatchWarehouse.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java index 0245d4fbc..856fa08ef 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java @@ -389,6 +389,7 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService { //查询自提相关的签收信息 IndexSignforDataVO indexBillLadingSignforDayDataVO = new IndexSignforDataVO(); + indexBillLadingSignforDayDataVO.setType(3); //查询自提签收包件信息 Integer dayBillLadingSignfor = warehouseIndexMapper.findBillLadingSignforByDay(indexDTO); indexBillLadingSignforDayDataVO.setSignNum(dayBillLadingSignfor); @@ -413,6 +414,8 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService { IndexSignforDataVO indexBillLadingSignforMonthDataVO = new IndexSignforDataVO(); + indexBillLadingSignforMonthDataVO.setType(4); + //查询自提当月签收情况 Integer monthBillLadingSignfor = warehouseIndexMapper.findBillLadingSignforByMonth(indexDTO); indexBillLadingSignforMonthDataVO.setSignNum(monthBillLadingSignfor); @@ -421,7 +424,7 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService { indexBillLadingSignforMonthDataVO.setUnSignNum(monthBillLadingSignfor); //计算当月的签收率 if (monthBillLadingSignfor > 0 && (monthBillLadingSignfor + monthBillLadingUnSignfor) > 0) { - Double monthBillLadingSignforScale = (double) (dayBillLadingSignfor / (dayBillLadingSignfor + dayBillLadingUnSignfor)); + Double monthBillLadingSignforScale = (double) (monthBillLadingSignfor / (monthBillLadingSignfor + monthBillLadingUnSignfor)); indexBillLadingSignforMonthDataVO.setSignScale(monthBillLadingSignforScale); } else { indexBillLadingSignforMonthDataVO.setSignScale(0.00); @@ -439,7 +442,6 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService { //计算当月的超时签收率 Double monthBillLadingClerkOverTimeSignfoNum = (double) (monthBillLadingOverTimeNum / monthBillLadingPlanNum); indexBillLadingSignforMonthDataVO.setClerkOverTimeScale(monthBillLadingClerkOverTimeSignfoNum); - } else { indexBillLadingSignforMonthDataVO.setClerkSignforScale(0.00); }