From 33ad94d82c78532f7179f68c352aa844e3effdf0 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 12 Apr 2024 11:04:21 +0800 Subject: [PATCH 01/19] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=9F=A5=E4=B8=8D?= =?UTF-8?q?=E5=87=BA=E9=9B=B6=E6=8B=85=E9=85=8D=E9=80=81=E5=8D=95=E5=AD=90?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionStockArticleMapper.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 6fc72d26b..1ef2ad855 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -625,10 +625,13 @@ WHERE ldpll.order_package_loading_status != '20' AND ldpll.order_package_reservation_status !='20' AND ldpll.order_package_status != '70' - AND ldpll.conditions = 1 + AND ldpll.conditions != 2 AND ldsaa.warehouse_id = #{par.warehouseId} AND ldpll.warehouse_id = #{par.warehouseId} AND ldsaa.type_service = #{par.typeService} + + and ldsaa.order_code like concat(#{par.orderCode},'%') + GROUP BY ldsaa.id ) AS t ON t.id = ldsa.id From d7fff879f5cad8a4575eb3fcb2b7ec56ab340103 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 16 Apr 2024 09:52:57 +0800 Subject: [PATCH 02/19] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83mq=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-test.yml | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/blade-service/logpm-trunkline/src/main/resources/application-test.yml b/blade-service/logpm-trunkline/src/main/resources/application-test.yml index fd764eb95..10a029db2 100644 --- a/blade-service/logpm-trunkline/src/main/resources/application-test.yml +++ b/blade-service/logpm-trunkline/src/main/resources/application-test.yml @@ -10,6 +10,32 @@ server: # password: ${blade.datasource.test.password} spring: + #rabbitmq配置 + rabbitmq: + host: 192.168.2.110 + port: 5672 + username: admin + password: Slwk@123654 + #虚拟host 可以不设置,使用server默认host + virtual-host: / + #确认消息已发送到队列(Queue) + publisher-returns: true + publisher-confirm-type: correlated + # 手动提交消息 + listener: + simple: + acknowledge-mode: auto + default-requeue-rejected: false + retry: + enabled: true # 开启消费者失败重试 + initial-interval: 1000 # 初识的失败等待时长为1秒 + multiplier: 1 # 失败的等待时长倍数，下次等待时长 = multiplier * last-interval + max-attempts: 3 # 最大重试次数 + stateless: true # true无状态；false有状态。如果业务中包含事务，这里改为false + direct: + acknowledge-mode: manual + template: + mandatory: true #排除DruidDataSourceAutoConfigure autoconfigure: exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure From 74efb83039c60d4a0958c639b8fd9bb3cc4f61d3 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 26 Apr 2024 16:39:42 +0800 Subject: [PATCH 03/19] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF-=E6=9A=82=E5=AD=98?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5=EF=BC=8C=E8=A3=85=E8=BD=A6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=97=A0=E5=9B=9E=E6=98=BEbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/trunkline/mq/AdvanceToLoadListener.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/AdvanceToLoadListener.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/AdvanceToLoadListener.java index a9d135146..6772e7a32 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/AdvanceToLoadListener.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/AdvanceToLoadListener.java @@ -87,13 +87,16 @@ public class AdvanceToLoadListener { if(r.getCode() == 200){ carsLoadScanEntity.setFromWarehouseId(warehouseId); carsLoadScanEntity.setOrderCode(orderCode); + carsLoadScanEntity.setIsData(1); Date createTime = carsLoadScanEntity.getCreateTime(); Long createUser = carsLoadScanEntity.getCreateUser(); Long createDept = carsLoadScanEntity.getCreateDept(); + String tenantId = carsLoadScanEntity.getTenantId(); carsLoadScanService.updateById(carsLoadScanEntity); loadIds.add(carsLoadScanEntity.getLoadId()); DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId); parcelListEntity.setWarehouseEntryTimeEnd(CommonUtil.addDate(createTime,-60)); + parcelListEntity.setTenantId(tenantId); parcelListEntity.setUpdateUser(createUser); parcelListEntity.setCreateUser(createUser); parcelListEntity.setCreateDept(createDept); From 19a910c2efced3005ebffc6a113f18593ba83d7a Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 8 May 2024 20:44:54 +0800 Subject: [PATCH 04/19] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8Dnacos=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/common/launch/LauncherServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java index 23a0734e0..eb7a75c87 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java +++ b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java @@ -44,10 +44,10 @@ public class LauncherServiceImpl implements LauncherService { PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile)); -// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.username","nacos"); -// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.password","Nacos123123"); -// PropsUtil.setProperty(props, "spring.cloud.nacos.config.username","nacos"); -// PropsUtil.setProperty(props, "spring.cloud.nacos.config.password","Nacos123123"); + PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.username","nacos"); + PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.password","Nacos123123"); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.username","nacos"); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.password","Nacos123123"); // dubbo注册 PropsUtil.setProperty(props, "dubbo.application.name", appName); PropsUtil.setProperty(props, "dubbo.application.qos.enable", "false"); From 2e4a39b498efcd855ea4173ad66a3328d06e8c3c Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 8 May 2024 21:42:28 +0800 Subject: [PATCH 05/19] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=B7=A5=E5=8E=82?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B7=A5=E5=8E=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interceptor/LocalServerLoginAccountsInterceptor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/LocalServerLoginAccountsInterceptor.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/LocalServerLoginAccountsInterceptor.java index 2c744732a..18a51a719 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/LocalServerLoginAccountsInterceptor.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/LocalServerLoginAccountsInterceptor.java @@ -42,11 +42,13 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws CustomerException { + log.info(">>> 执行拦截器"); + try { JSONObject data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+"shujutongbu"); CustomHttpServletRequestWrapper wrappedRequest = new CustomHttpServletRequestWrapper(request); if(Objects.isNull(data)){ - String url = "http://"+ LauncherConstant.loginAddr(AppConstant.DEV_CODE)+"/blade-auth/oauth/token"; + String url = "http://"+ LauncherConstant.loginAddr(AppConstant.TEST_CODE)+"/blade-auth/oauth/token"; cn.hutool.http.HttpRequest urlRequest = HttpRequest.post(url); urlRequest.header("Authorization", "Basic c2FiZXI6c2FiZXJfc2VjcmV0"); urlRequest.header("Tenant-Id", "627683"); From c4218f6ec2e25f1c765802df79184ac156dd0506 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 17 May 2024 18:11:31 +0800 Subject: [PATCH 06/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/common/constant/ModuleNameConstant.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java index 71fc125ac..c3cc1b12c 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java @@ -9,7 +9,7 @@ public interface ModuleNameConstant { /** * 如果不需要 "" */ - public static final String DEVAUTH ="-pref"; + public static final String DEVAUTH =""; /** * 工厂对接服务名称 From 8c3894842c60479c4137d25069ed4465b52966cd Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 21 May 2024 18:16:39 +0800 Subject: [PATCH 07/19] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=A7=9F=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-test.yml | 4 ++++ .../logpm-basic/src/main/resources/application-test.yml | 9 +++++++++ .../src/main/resources/application-test.yml | 4 ++++ .../src/main/resources/application-test.yml | 9 +++++++++ .../src/main/resources/application-test.yml | 4 ++++ .../src/main/resources/application-test.yml | 4 ++++ 6 files changed, 34 insertions(+) diff --git a/blade-service/logpm-aftersales/src/main/resources/application-test.yml b/blade-service/logpm-aftersales/src/main/resources/application-test.yml index 83532be50..7508cbc1c 100644 --- a/blade-service/logpm-aftersales/src/main/resources/application-test.yml +++ b/blade-service/logpm-aftersales/src/main/resources/application-test.yml @@ -29,3 +29,7 @@ spring: url: ${blade.datasource.aftersales.627683.url} username: ${blade.datasource.aftersales.627683.username} password: ${blade.datasource.aftersales.627683.password} + 695224: + url: ${blade.datasource.aftersales.695224.url} + username: ${blade.datasource.aftersales.695224.username} + password: ${blade.datasource.aftersales.695224.password} diff --git a/blade-service/logpm-basic/src/main/resources/application-test.yml b/blade-service/logpm-basic/src/main/resources/application-test.yml index cd3e38478..30a75c8bf 100644 --- a/blade-service/logpm-basic/src/main/resources/application-test.yml +++ b/blade-service/logpm-basic/src/main/resources/application-test.yml @@ -43,3 +43,12 @@ spring: username: ${blade.datasource.basic.627683.username} password: ${blade.datasource.basic.627683.password} + 695224: + druid: + #独立校验配置 + validation-query: select 1 + #oracle校验 + #validation-query: select 1 from dual + url: ${blade.datasource.basic.695224.url} + username: ${blade.datasource.basic.695224.username} + password: ${blade.datasource.basic.695224.password} diff --git a/blade-service/logpm-basicdata/src/main/resources/application-test.yml b/blade-service/logpm-basicdata/src/main/resources/application-test.yml index e44535e5c..d6423cc25 100644 --- a/blade-service/logpm-basicdata/src/main/resources/application-test.yml +++ b/blade-service/logpm-basicdata/src/main/resources/application-test.yml @@ -42,3 +42,7 @@ spring: url: ${blade.datasource.basicdata.627683.url} username: ${blade.datasource.basicdata.627683.username} password: ${blade.datasource.basicdata.627683.password} + 695224: + url: ${blade.datasource.basicdata.695224.url} + username: ${blade.datasource.basicdata.695224.username} + password: ${blade.datasource.basicdata.695224.password} diff --git a/blade-service/logpm-distribution/src/main/resources/application-test.yml b/blade-service/logpm-distribution/src/main/resources/application-test.yml index 0da4c60f5..8881c848a 100644 --- a/blade-service/logpm-distribution/src/main/resources/application-test.yml +++ b/blade-service/logpm-distribution/src/main/resources/application-test.yml @@ -69,3 +69,12 @@ spring: url: ${blade.datasource.distribution.627683.url} username: ${blade.datasource.distribution.627683.username} password: ${blade.datasource.distribution.627683.password} + 695224: + druid: + #独立校验配置 + validation-query: select 1 + #oracle校验 + #validation-query: select 1 from dual + url: ${blade.datasource.distribution.695224.url} + username: ${blade.datasource.distribution.695224.username} + password: ${blade.datasource.distribution.695224.password} diff --git a/blade-service/logpm-trunkline/src/main/resources/application-test.yml b/blade-service/logpm-trunkline/src/main/resources/application-test.yml index ed8efc964..4d09a2bd1 100644 --- a/blade-service/logpm-trunkline/src/main/resources/application-test.yml +++ b/blade-service/logpm-trunkline/src/main/resources/application-test.yml @@ -55,3 +55,7 @@ spring: url: ${blade.datasource.trunkline.627683.url} username: ${blade.datasource.trunkline.627683.username} password: ${blade.datasource.trunkline.627683.password} + 695224: + url: ${blade.datasource.trunkline.695224.url} + username: ${blade.datasource.trunkline.695224.username} + password: ${blade.datasource.trunkline.695224.password} diff --git a/blade-service/logpm-warehouse/src/main/resources/application-test.yml b/blade-service/logpm-warehouse/src/main/resources/application-test.yml index 01c2ba312..d1fb2c002 100644 --- a/blade-service/logpm-warehouse/src/main/resources/application-test.yml +++ b/blade-service/logpm-warehouse/src/main/resources/application-test.yml @@ -29,6 +29,10 @@ spring: url: ${blade.datasource.warehouse.627683.url} username: ${blade.datasource.warehouse.627683.username} password: ${blade.datasource.warehouse.627683.password} + 695224: + url: ${blade.datasource.warehouse.695224.url} + username: ${blade.datasource.warehouse.695224.username} + password: ${blade.datasource.warehouse.695224.password} #rabbitmq配置 rabbitmq: host: 192.168.2.110 From a3cee2c94c097df187ab9a53eecad4035d367a1a Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 22 May 2024 17:23:13 +0800 Subject: [PATCH 08/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/common/constant/ModuleNameConstant.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java index 71fc125ac..c3cc1b12c 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java @@ -9,7 +9,7 @@ public interface ModuleNameConstant { /** * 如果不需要 "" */ - public static final String DEVAUTH ="-pref"; + public static final String DEVAUTH =""; /** * 工厂对接服务名称 From e4fc37438103e3c20fe0d98d2c9763e9596fdc38 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 23 May 2024 14:48:09 +0800 Subject: [PATCH 09/19] =?UTF-8?q?1.=E6=8E=A8=E9=80=81=E8=AE=A2=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 --- .../comfac/service/impl/FactoryCommonServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryCommonServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryCommonServiceImpl.java index cb7a207a7..5471b98b6 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryCommonServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryCommonServiceImpl.java @@ -129,6 +129,7 @@ public class FactoryCommonServiceImpl implements IFactoryCommonService { @Override public void extracted(String status, String unitNo, String currentWarehouseId, String operationTime, Integer trayId) { log.info("#############extracted: 当前处理的数据为 status={} unitNo={} currentWarehouseId={} operationTime={} trayId={}",status,unitNo,currentWarehouseId,operationTime,trayId); + String redisKey = "extracted:"+unitNo; if ("4".equals(status) || "2".equals(status) || "1".equals(status)) { //继续判断是否到达目的仓 @@ -152,8 +153,12 @@ public class FactoryCommonServiceImpl implements IFactoryCommonService { if (OldSystemDataPushConfig.getWarehourseIdList().contains(currentWarehouseId)) { try { if ("1".equals(status) || "4".equals(status)) { - // 始发仓和目的仓入库 - panFactoryDataService.handleDataToPlatform(unitNo, operationTime,Integer.parseInt(currentWarehouseId)); + Boolean exists = bladeRedis.exists(redisKey); + if(Boolean.FALSE.equals(exists)){ + bladeRedis.setEx(redisKey, "1", 60L); + // 始发仓和目的仓入库 + panFactoryDataService.handleDataToPlatform(unitNo, operationTime,Integer.parseInt(currentWarehouseId)); + } } else { log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>> 错误的状态"); } From 2067311a293aa70f3131c98cd964ee0f0cad8942 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 4 Jun 2024 09:12:59 +0800 Subject: [PATCH 10/19] =?UTF-8?q?1.=E4=B8=8A=E6=9E=B6=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 22f596e547153474e91f03b3cfd991c10809ca62) --- .../warehouse/service/impl/WarehouseTrayTypeServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java index 908314712..e19676aa6 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java @@ -2412,7 +2412,10 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl { From 0a3e2cd7ca07cd64148d2c5d7fca64f5737a5778 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 4 Jun 2024 09:25:12 +0800 Subject: [PATCH 11/19] =?UTF-8?q?1.=E8=87=AA=E6=8F=90=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 060a827606a88e6fa26e001316ce8aa9e234d124) --- .../DistrilbutionBillLadingServiceImpl.java | 148 +++++++++--------- 1 file changed, 77 insertions(+), 71 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index d98790833..34c888edd 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -3305,84 +3305,90 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl parcelListIds = new HashSet<>(); - for (int i = 0; i < split.length; i++) { - String s = split[i]; - //查询是不是上传图片 - List list1 = distributionPrintService.list(Wrappers.query().lambda() - .eq(DistributionPrintEntity::getBillLadingId, s) - ); - if (list1.isEmpty()) { - throw new ServiceException("请上传签收图片！！"); - } - int count = (int) list1.stream().filter(ii -> "1".equals(ii.getGenre().toString())).count(); - int count1 = (int) list1.stream().filter(ii -> "2".equals(ii.getGenre().toString())).count(); - int count2 = (int) list1.stream().filter(ii -> "3".equals(ii.getGenre().toString())).count(); - if (count1 < 1 || count < 1 || count2 < 1) { - throw new ServiceException("请上传完整签收图片！！"); - } - //修改提货状态 - DistrilbutionBillLadingEntity billLadingEntity = new DistrilbutionBillLadingEntity(); - billLadingEntity.setConditions(BillLadingStatusConstant.yiqianshou.getValue()); - billLadingEntity.setId(Long.parseLong(s)); - this.updateById(billLadingEntity); - //完成备货状态 - distributionStockupInfoService.maintenanceStockUp(Long.parseLong(s), 2); - //查询自提单是否完成扫描 - Integer integer = this.selectBillLadingPlanNum(Long.parseLong(s)); - List ladingScanEntities = distributionBillLadingScanService.list(Wrappers.query().lambda() - .eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s)) - .eq(DistributionBillLadingScanEntity::getMaterialType, "2") - ); - if (Func.isNotEmpty(ladingScanEntities)) { - int sum = ladingScanEntities.stream().mapToInt(DistributionBillLadingScanEntity::getQuantity).sum(); - if (integer != sum) { - //存在资源释放操作 - distributionAsyncService.releaseBillLadingResource(Long.parseLong(s), myCurrentWarehouse.getId()); + try{ + for (int i = 0; i < split.length; i++) { + String s = split[i]; + //查询是不是上传图片 + List list1 = distributionPrintService.list(Wrappers.query().lambda() + .eq(DistributionPrintEntity::getBillLadingId, s) + ); + if (list1.isEmpty()) { + throw new ServiceException("请上传签收图片！！"); } - parcelListIds.addAll(ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getParcelListId).collect(Collectors.toSet())); - for (DistributionBillLadingScanEntity ladingScanEntity : ladingScanEntities) { - // 签收发送消息到工厂 - pushFactoryOrderData(myCurrentWarehouse.getId(), ladingScanEntity.getParcelListId().toString(), ladingScanEntity.getOrderSelfNumbering()); + int count = (int) list1.stream().filter(ii -> "1".equals(ii.getGenre().toString())).count(); + int count1 = (int) list1.stream().filter(ii -> "2".equals(ii.getGenre().toString())).count(); + int count2 = (int) list1.stream().filter(ii -> "3".equals(ii.getGenre().toString())).count(); + if (count1 < 1 || count < 1 || count2 < 1) { + throw new ServiceException("请上传完整签收图片！！"); + } + //修改提货状态 + DistrilbutionBillLadingEntity billLadingEntity = new DistrilbutionBillLadingEntity(); + billLadingEntity.setConditions(BillLadingStatusConstant.yiqianshou.getValue()); + billLadingEntity.setId(Long.parseLong(s)); + this.updateById(billLadingEntity); + //完成备货状态 + distributionStockupInfoService.maintenanceStockUp(Long.parseLong(s), 2); + //查询自提单是否完成扫描 + Integer integer = this.selectBillLadingPlanNum(Long.parseLong(s)); + List ladingScanEntities = distributionBillLadingScanService.list(Wrappers.query().lambda() + .eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s)) + .eq(DistributionBillLadingScanEntity::getMaterialType, "2") + ); + if (Func.isNotEmpty(ladingScanEntities)) { + int sum = ladingScanEntities.stream().mapToInt(DistributionBillLadingScanEntity::getQuantity).sum(); + if (integer != sum) { + //存在资源释放操作 + distributionAsyncService.releaseBillLadingResource(Long.parseLong(s), myCurrentWarehouse.getId()); + } + parcelListIds.addAll(ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getParcelListId).collect(Collectors.toSet())); + for (DistributionBillLadingScanEntity ladingScanEntity : ladingScanEntities) { + // 签收发送消息到工厂 + pushFactoryOrderData(myCurrentWarehouse.getId(), ladingScanEntity.getParcelListId().toString(), ladingScanEntity.getOrderSelfNumbering()); + } + } else { + distributionAsyncService.releaseBillLadingResource(Long.parseLong(s), myCurrentWarehouse.getId()); } - } else { - distributionAsyncService.releaseBillLadingResource(Long.parseLong(s), myCurrentWarehouse.getId()); - } - //修改订单状态 - List list = distrilbutionBillStockService.list(Wrappers.query().lambda() - .eq(DistrilbutionBillStockEntity::getBillLadingId, s) - .apply("order_status in ( '1' , '3')") + //修改订单状态 + List list = distrilbutionBillStockService.list(Wrappers.query().lambda() + .eq(DistrilbutionBillStockEntity::getBillLadingId, s) + .apply("order_status in ( '1' , '3')") // .or(ew -> ew.eq(DistrilbutionBillStockEntity::getBillLadingId, s).apply(DistrilbutionBillStockEntity::getOrderStatus, "2")) - ); - if (!list.isEmpty()) { - list.forEach(li -> { - DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity(); - stockArticleEntity.setId(li.getStockArticleId()); + ); + if (!list.isEmpty()) { + list.forEach(li -> { + DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity(); + stockArticleEntity.setId(li.getStockArticleId()); - List list2 = distributionParcelListService.list(Wrappers.query().lambda() - .eq(DistributionParcelListEntity::getStockArticleId, li.getStockArticleId()) - .apply("order_package_status != 70 ") - ); - if (list2.isEmpty()) { - stockArticleEntity.setOrderStatus(OrderStatusConstant.qianshou.getValue()); - } else { - stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue()); - } - //回退包件数据 - Integer i1 = updatePack(li.getStockArticleId(), Long.valueOf(s)); - if (i1 > 0) { - stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue()); - } - distributionStockArticleService.updateById(stockArticleEntity); - }); - } - //处理库存品签收数据 - updateStock(s); + List list2 = distributionParcelListService.list(Wrappers.query().lambda() + .eq(DistributionParcelListEntity::getStockArticleId, li.getStockArticleId()) + .apply("order_package_status != 70 ") + ); + if (list2.isEmpty()) { + stockArticleEntity.setOrderStatus(OrderStatusConstant.qianshou.getValue()); + } else { + stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue()); + } + //回退包件数据 + Integer i1 = updatePack(li.getStockArticleId(), Long.valueOf(s)); + if (i1 > 0) { + stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue()); + } + distributionStockArticleService.updateById(stockArticleEntity); + }); + } + //处理库存品签收数据 + updateStock(s); - // 回传老系统自提数据 - sendOldSystem(Long.parseLong(s)); + // 回传老系统自提数据 + sendOldSystem(Long.parseLong(s)); + } + }catch (Exception e){ + log.error(">>>>>",e); + return false; } + // 回传工厂数据 sendFactory(myCurrentWarehouse, parcelListIds); @@ -3467,7 +3473,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl Date: Tue, 4 Jun 2024 11:51:38 +0800 Subject: [PATCH 12/19] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/common/constant/ModuleNameConstant.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java index 6b1921dd9..d54a35e6d 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java @@ -9,7 +9,7 @@ public interface ModuleNameConstant { /** * 如果不需要 "" */ - public static final String DEVAUTH ="-zhy"; + public static final String DEVAUTH =""; /** * 工厂对接服务名称 From fe849127179f398cdc559778a6ce30c2d94d9105 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 6 Jun 2024 18:32:33 +0800 Subject: [PATCH 13/19] =?UTF-8?q?1.bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trunkline/mapper/TrunklineAdvanceDetailMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 d945081a5..1a44af87b 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 @@ -239,10 +239,10 @@ ltad.weight weight, ltad.volume volume, ltad.send_date_str sendDateStr, - ltcls.load_code trunklineCarsNo, - ltcls.scan_status scanStatus, - ltcls.create_time trunklineLoadingTime, - ltcls.sign_time trunklineSignTime, + m.load_code trunklineCarsNo, + m.scan_status scanStatus, + m.create_time trunklineLoadingTime, + m.sign_time trunklineSignTime, lddl.train_number deliveryTrainNumber, ldl.scan_time deliveryLoadingTime, ldl.signing_time deliverySignTime, From 9bb93da8437a153dad6c01aa25bcb31a7f5db5af Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 7 Jun 2024 23:09:05 +0800 Subject: [PATCH 14/19] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E8=8C=82=E5=90=8D?= =?UTF-8?q?=E4=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit d23bfcd947f9bc9d39aa66557143071bec886950) --- .../springblade/common/constant/OldSystemDataPushConfig.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java index 602b2f48a..4826d53a1 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java @@ -90,6 +90,9 @@ public class OldSystemDataPushConfig { //双流金牌基地仓 warehourseIds.add("55"); + + //茂名仓 + warehourseIds.add("152"); } From b3b36b4aa6243a979e726596c73b65529aaaacd3 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 13 Jun 2024 19:29:30 +0800 Subject: [PATCH 15/19] =?UTF-8?q?=E5=B7=B2=E7=AD=BE=E8=AE=A2=E5=8D=95BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/DistributionSignforStockArticleVO.java | 20 ++++- .../DistributionSignForStockArticleExcel.java | 86 +++++++++---------- .../mapper/DistributionStockArticleMapper.xml | 14 +-- .../DistributionStockArticleServiceImpl.java | 1 + 4 files changed, 70 insertions(+), 51 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java index a9e77c376..7bf35c4eb 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java @@ -192,7 +192,7 @@ public class DistributionSignforStockArticleVO implements Serializable { * 审核人 */ @ApiModelProperty(value = "审核人") - private String examineUserNames; + private String examineUserName; /** * 最早入库时间 @@ -230,6 +230,24 @@ public class DistributionSignforStockArticleVO implements Serializable { @ApiModelProperty(value = "创建人") private String reservationIds; + /** + * 预约编码 + */ + @ApiModelProperty(value = "预约编码") + private String reservationCode; + + /** + * 车次号 + */ + @ApiModelProperty(value = "车次号") + private String trainNumber; + + /** + * 预约数量 + */ + @ApiModelProperty(value = "预约数量") + private Integer reservationNum; + /** * 创建时间 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignForStockArticleExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignForStockArticleExcel.java index a7f3346c1..4e644eecc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignForStockArticleExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignForStockArticleExcel.java @@ -141,12 +141,12 @@ public class DistributionSignForStockArticleExcel implements Serializable { @ExcelProperty("备货数") private Integer stockUpNumber; - /** - * 预约数 - */ - @ColumnWidth(20) - @ExcelProperty("预约数") - private Integer reservationNumber; +// /** +// * 预约数 +// */ +// @ColumnWidth(20) +// @ExcelProperty("预约数") +// private Integer reservationNumber; /** * 订单状态 @@ -183,40 +183,40 @@ public class DistributionSignForStockArticleExcel implements Serializable { @ExcelProperty("服务类型") private String typeServiceName; - /** - * 预约信息 - */ - @ColumnWidth(20) - @ExcelProperty("预约信息") - private String reservationInfo; +// /** +// * 预约信息 +// */ +// @ColumnWidth(20) +// @ExcelProperty("预约信息") +// private String reservationInfo; - /** - * 车次信息 - */ - @ColumnWidth(20) - @ExcelProperty("车次信息") - private String deliveryListInfo; +// /** +// * 车次信息 +// */ +// @ColumnWidth(20) +// @ExcelProperty("车次信息") +// private String deliveryListInfo; - /** - * 司机信息 - */ - @ColumnWidth(20) - @ExcelProperty("司机信息") - private String driverName; +// /** +// * 司机信息 +// */ +// @ColumnWidth(20) +// @ExcelProperty("司机信息") +// private String driverName; - /** - * 车辆信息 - */ - @ColumnWidth(20) - @ExcelProperty("车辆信息") - private String vehicleName; +// /** +// * 车辆信息 +// */ +// @ColumnWidth(20) +// @ExcelProperty("车辆信息") +// private String vehicleName; - /** - * 审核人 - */ - @ColumnWidth(20) - @ExcelProperty("审核人") - private String examineUserNames; +// /** +// * 审核人 +// */ +// @ColumnWidth(20) +// @ExcelProperty("审核人") +// private String examineUserNames; /** * 最早入库时间 @@ -253,12 +253,12 @@ public class DistributionSignForStockArticleExcel implements Serializable { @ExcelProperty("创建人") private String createUserName; - - /** - * 复核时间 - */ - @ColumnWidth(20) - @ExcelProperty("复核时间") - private Date signinTime; +// +// /** +// * 复核时间 +// */ +// @ColumnWidth(20) +// @ExcelProperty("复核时间") +// private Date signinTime; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index a80d2aa99..3e809e19e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -1467,13 +1467,13 @@