From 77ffb046026a617ded2407b29165741f5d4aed4d Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Wed, 3 Jul 2024 15:47:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E6=9C=8D=E5=8A=A1=E4=BB=93=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E6=97=A0=E6=B3=95=E5=88=A0=E9=99=A4=20=E5=92=8C?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BasicdataStorageServicesServiceImpl.java | 8 ++++++--
 .../service/impl/DistributionDeliveryListServiceImpl.java | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java
index c23ddafcb..0c70da60d 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java
@@ -80,9 +80,13 @@ public class BasicdataStorageServicesServiceImpl extends BaseServiceImpl<Basicda
 
 			//  获取仓库名称
 			BasicdataWarehouseEntity sendBasicdataWarehouseEntity = basicdataWarehouseService.getById(basicdataStorageServices.getSendWarehouseId());
-			basicdataStorageServices.setSendWarehouseName(sendBasicdataWarehouseEntity.getName());
+			if(sendBasicdataWarehouseEntity!=null){
+				basicdataStorageServices.setSendWarehouseName(sendBasicdataWarehouseEntity.getName());
+			}
 			BasicdataWarehouseEntity serveBasicdataWarehouseEntity = basicdataWarehouseService.getById(basicdataStorageServices.getServeWarehouseId());
-			basicdataStorageServices.setServeWarehouseName(serveBasicdataWarehouseEntity.getName());
+			if(serveBasicdataWarehouseEntity!=null){
+				basicdataStorageServices.setServeWarehouseName(serveBasicdataWarehouseEntity.getName());
+			}
 			this.updateById(basicdataStorageServices);
 			return true;
 		}else{
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 fdcf67d7d..16078a8dc 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
@@ -3259,6 +3259,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 										reservationPackageEntity.setParceListId(p.getId());
 										// 对当前保存的包件再次进行验证
 										boolean isExit = checkList(list,reservationEntity.getId(),reservationStockarticleEntity.getStockArticleId(),p.getOrderPackageCode());
+										log.info(">>>>> 修改计划 验证包件是否存在 {}",isExit);
 										if(!isExit){
 											distributionReservationPackageService.save(reservationPackageEntity);
 											distributionAsyncService.checkStockArticleReservationStatus(p);
@@ -3268,15 +3269,18 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 											JSONObject jsonObject = getJsonObject(deliveryListEntity, reservationEntity, reservationPackageEntity.getPacketBarCode());
 											pushDatas.add(jsonObject);
 											logs.add(js);
+											//包件数量累加
+											packageNum.getAndAdd(p.getQuantity());
 										}
 
 
 									} else {
 										//依然存在包件，
 										oldPackageList.remove(p.getOrderPackageCode());
+										//包件数量累加
+										packageNum.getAndAdd(p.getQuantity());
 									}
-									//包件数量累加
-									packageNum.getAndAdd(p.getQuantity());
+
 								});
 								//进行取消包件的数据清理
 								if (!oldPackageList.isEmpty()) {

From 0e64b7c3c8e47ea3e059de61a28b782eaec5ec87 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Wed, 3 Jul 2024 18:58:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E5=8F=96=E6=B6=88=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E7=9A=84=E5=B7=A5=E5=8E=82=E5=92=8C=E8=80=81?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=9A=84=E5=A4=9A=E7=A7=9F=E6=88=B7=E7=9A=84?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
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     | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

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 41154abf0..a9a180282 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}
+        slave:
+          druid:
+            #独立校验配置
+            validation-query: select 1
+            #oracle校验
+            #validation-query: select 1 from dual
+          url: ${blade.datasource.factory.slave.url}
+          username: ${blade.datasource.factory.slave.username}
+          password: ${blade.datasource.factory.slave.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 e55b06c80..68d1f4215 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}
+        slave:
+          druid:
+            #独立校验配置
+            validation-query: select 1
+            #oracle校验
+            #validation-query: select 1 from dual
+          url: ${blade.datasource.oldproject.slave.url}
+          username: ${blade.datasource.oldproject.slave.username}
+          password: ${blade.datasource.oldproject.slave.password}