From 63822d66041ff711851e83d50f25771a18ebcfc5 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 1 Mar 2024 10:51:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/launch/LauncherServiceImpl.java           | 10 +++++-----
 .../mapper/DistributionReservationMapper.xml         |  5 ++++-
 .../service/impl/DistributionSignforServiceImpl.java |  7 ++++++-
 .../controller/WarehouseStockController.java         |  3 +++
 .../logpm/warehouse/mapper/WarehouseStockMapper.xml  | 12 ++++++------
 5 files changed, 24 insertions(+), 13 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 eb7a75c87..3d5ab632b 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
@@ -43,11 +43,11 @@ 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.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");
 		// dubbo注册
 		PropsUtil.setProperty(props, "dubbo.application.name", appName);
 		PropsUtil.setProperty(props, "dubbo.application.qos.enable", "false");
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
index c8de2a25a..8e5a1f6d2 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
@@ -819,7 +819,7 @@
         ldpl.order_package_delivery_status
         FROM
             logpm_distribution_reservation_package AS ldrp
-            LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldpl.order_package_code = ldrp.packet_bar_code and ldpl.warehouse_id=#{warehourseId}
+            LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldpl.order_package_code = ldrp.packet_bar_code
             LEFT JOIN logpm_warehouse_tray_goods AS lwtg ON ldpl.id = lwtg.association_id and lwtg.association_type = 3
             LEFT JOIN logpm_warehouse_updown_goods AS lwug ON ldpl.id = lwug.association_id and lwug.association_type = 3
         <where>
@@ -830,6 +830,9 @@
             <if test="stockArticleId !=null and stockArticleId!= ''">
                 and ldrp.stock_article_id = #{stockArticleId}
             </if>
+            <if test="warehourseId !=null and warehourseId!= ''">
+                and ldpl.warehouse_id=#{warehourseId}
+            </if>
         </where>
     </select>
     <select id="selectStockArticleByReservationId"
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 26132137d..6d02a533f 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
@@ -4038,7 +4038,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		if (Func.isNotEmpty(reservationStockarticleEntityList)) {
 			reservationStockarticleEntityList.forEach(rs -> {
 				if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())) {
-					List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.selectPackageByReservationAndStockArticle(rs.getReservationId(), rs.getStockArticleId(), myCurrentWarehouse.getId());
+					List<DistributionParcelListEntity> parcelListEntityList = null;
+					if (Func.isNotEmpty(myCurrentWarehouse)){
+						 parcelListEntityList = distributionReservationMapper.selectPackageByReservationAndStockArticle(rs.getReservationId(), rs.getStockArticleId(), myCurrentWarehouse.getId());
+					}else {
+						parcelListEntityList = distributionReservationMapper.selectPackageByReservationAndStockArticle(rs.getReservationId(), rs.getStockArticleId(), null);
+					}
 					List<DistributionParcelListVO> parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList);
 					parcelListVOList.forEach(p -> {
 						p.setReservationNum(p.getQuantity());
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseStockController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseStockController.java
index e38fad6eb..01acc87f0 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseStockController.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseStockController.java
@@ -90,6 +90,9 @@ public class WarehouseStockController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入WarehouseStock")
 	public R<IPage<WarehouseScanRecordVO>> page(WarehouseScanRecordVO warehouseScanRecordVO, Query query) {
 		IPage<WarehouseScanRecordVO> pages = warehouseStockService.selectWarehouseStockPage(Condition.getPage(query), warehouseScanRecordVO);
+		if (Func.isEmpty(pages)){
+			return R.data(null);
+		}
 		return R.data(WarehouseStockVOWrapper.build().pageVO(pages));
 	}
 
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml
index 5b4372ae2..40a699be6 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml
@@ -143,7 +143,7 @@
             <if test="param.thirdProduct != null and param.thirdProduct != '' ">
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
-            <if test="param.date != null and param.date != '' ">
+            <if test="param.date != null  ">
                 and ldl.update_time like concat(#{param.date},'%')
             </if>
         </where>
@@ -244,7 +244,7 @@
             <if test="param.thirdProduct != null and param.thirdProduct != '' ">
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
-            <if test="param.date != null and param.date != '' ">
+            <if test="param.date != null  ">
                 and ldl.create_time like concat(#{param.date},'%')
             </if>
         </where>
@@ -345,7 +345,7 @@
             <if test="param.thirdProduct != null and param.thirdProduct != '' ">
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
-            <if test="param.date != null and param.date != '' ">
+            <if test="param.date != null  ">
                 and ldl.update_time like concat(#{param.date},'%')
             </if>
         </where>
@@ -452,7 +452,7 @@
             <if test="param.thirdProduct != null and param.thirdProduct != '' ">
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
-            <if test="param.date != null and param.date != '' ">
+            <if test="param.date != null  ">
                 and lds.create_time like concat(#{param.date},'%')
             </if>
         </where>
@@ -552,7 +552,7 @@
             <if test="param.thirdProduct != null and param.thirdProduct != '' ">
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
-            <if test="param.date != null and param.date != '' ">
+            <if test="param.date != null  ">
                 and lwug.create_time like concat(#{param.date},'%')
             </if>
         </where>
@@ -652,7 +652,7 @@
             <if test="param.thirdProduct != null and param.thirdProduct != '' ">
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
-            <if test="param.date != null and param.date != '' ">
+            <if test="param.date != null  ">
                 and lwtg.create_time like concat(#{param.date},'%')
             </if>
         </where>