签收列表接口调整

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");

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"

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());

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));
 	}
 

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>