Merge branch 'dev' into pre-production

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{

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -3272,6 +3272,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);
@@ -3281,15 +3282,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()) {

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}
 
 

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}