From f0bf9d076ac5c42221d584ef74998c97d0e8efd3 Mon Sep 17 00:00:00 2001
From: Diss <1157651603@qq.com>
Date: Mon, 22 Jan 2024 09:32:27 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=8F=90=E8=B4=A7=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=80=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/basicdata/entity/BasicdataCarrierEntity.java  | 6 +-----
 .../com/logpm/basicdata/entity/BasicdataVehicleEntity.java  | 3 +--
 .../logpm/basicdata/entity/BasicdataWarehouseEntity.java    | 5 -----
 .../distribution/mapper/DistrilbutionBillStockMapper.xml    | 1 +
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCarrierEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCarrierEntity.java
index faafccbd4..1c68ceebd 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCarrierEntity.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCarrierEntity.java
@@ -207,10 +207,6 @@ public class BasicdataCarrierEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
-	/**
-	 * id
-	 */
-	@ApiModelProperty(value = "id")
-	private Long id;
+
 
 }
diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java
index fde956de0..4637ec2ec 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java
@@ -319,6 +319,5 @@ public class BasicdataVehicleEntity extends TenantEntity {
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
 
-	@ApiModelProperty(value = "id")
-	private Long id;
+
 }
diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataWarehouseEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataWarehouseEntity.java
index 66b8dbaed..39fbc2e19 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataWarehouseEntity.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataWarehouseEntity.java
@@ -281,9 +281,4 @@ public class BasicdataWarehouseEntity extends TenantEntity {
 	private Integer oldId;
 
 
-	/**
-	 *   对应id
-	 */
-	@ApiModelProperty(value = "仓库id")
-	public Long id;
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml
index 8a499d4af..831493ea0 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml
@@ -123,6 +123,7 @@
         CASE
         WHEN (SELECT COUNT(id) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id) - (SELECT COUNT(id) FROM logpm_distrilbution_bill_package WHERE stock_article_id = ldsa.id AND packet_bar_status IN (1,3)) = 0 THEN 20
         WHEN (SELECT COUNT(id) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id) - (SELECT COUNT(id) FROM logpm_distrilbution_bill_package WHERE stock_article_id = ldsa.id AND packet_bar_status IN (1,3)) > 0 THEN 10
+        WHEN (SELECT COUNT(id) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id) - (SELECT COUNT(id) FROM logpm_distrilbution_bill_package WHERE stock_article_id = ldsa.id AND packet_bar_status IN (1,3)) &lt;  0 THEN 30
         END AS conditions,
         (select GROUP_CONCAT(DISTINCT ldpl.material_name )
         from logpm_distribution_parcel_list ldpl

From 6e6e1823eee778a76417250e550a571d2b141c91 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 22 Jan 2024 10:03:43 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=BE=85=E7=AD=BE=E6=94=B6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=BF=87=E6=BB=A4=E6=95=B0=E9=87=8F=E4=B8=BA0?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/distribution/mapper/DistributionLoadscanMapper.xml  | 4 ----
 .../logpm/distribution/mapper/DistributionSignforMapper.xml   | 2 +-
 .../service/impl/DistributionSignforServiceImpl.java          | 3 ---
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml
index 5aabf4b43..44825f6fb 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml
@@ -256,9 +256,6 @@
     </select>
 
     <select id="getLoadCountNum" resultType="int">
-
-
-
         SELECT
         count( ldl.id )
         FROM
@@ -269,7 +266,6 @@
         AND ldl.delivery_id = #{deliveryId}
         AND ldl.scan_status != '1'
         AND ldl.is_abnormal_loading = 1
-
     </select>
     <select id="selectLoadingNumByReservationId" resultType="java.lang.Integer">
         SELECT (IF((SELECT sum(loaded_nub) FROM logpm_distribution_loadscan WHERE reservation_id = #{reservationId} AND scan_state != 1 AND is_abnormal_loading != 2) is null,0,(SELECT sum(loaded_nub) FROM logpm_distribution_loadscan WHERE reservation_id = #{reservationId} AND scan_state != 1 AND is_abnormal_loading != 2)))
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
index 0d0d744c8..6d373a4e9 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
@@ -349,7 +349,7 @@
         JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id
         JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
         <where>
-            lds.is_deleted = 0 and ldr.is_deleted = 0 and lddl.is_deleted = 0
+            lds.is_deleted = 0 and ldr.is_deleted = 0 and lddl.is_deleted = 0 AND (ldr.reservation_num + ldr.reservation_stock_list_num) > 0
             <if test="param.mallName != null and param.mallName!=''">
                 and ldr.mall_name like concat('%',#{param.mallName},'%')
             </if>
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 b7b267aa9..2997c00de 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
@@ -218,10 +218,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			Integer abnormalLoading = distributionLoadscanMapper.selectAbnormalLoadingByReservationId(d.getReservationId());
 			//该客户的异常签收件数
 			Integer abnormalSigning = distributionLoadscanMapper.selectAbnormalSigningByReservationId(d.getReservationId());
-
-
 //			DistributionLoadingNumDTO reservationSigningNum = distributionReservationMapper.selectReservationSigningNum(d.getReservationId());
-
 			if (d.getDeliveryType().equals(DistributionTypeConstant.shipie.getValue())){
 				List<DisStockListDetailEntity> disStockListDetailEntities = distributionReservationMapper.selectInventoryListByReservation(d.getReservationId());
 				if (Func.isNotEmpty(disStockListDetailEntities)){

From a4fdccc17b41c5c6f797290a36f8c0235f272ead Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 22 Jan 2024 10:49:12 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=A4=87=E8=B4=A7PDA=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E3=80=81=E5=95=86=E5=9C=BA=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feign/IBasicdataClientClient.java         |  7 ++
 .../feign/BasicdataClientClient.java          |  5 ++
 .../basicdata/feign/BasicdataCodeClient.java  |  2 +
 .../mapper/DistributionReservationMapper.java |  2 +-
 .../mapper/DistributionReservationMapper.xml  |  6 +-
 .../IDistributionReservationService.java      |  2 +-
 .../DistributionReservationServiceImpl.java   |  4 +-
 .../impl/DistributionStockupServiceImpl.java  | 74 +++++++++++++------
 8 files changed, 72 insertions(+), 30 deletions(-)

diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java
index b38dbc80d..f81c54658 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java
@@ -80,4 +80,11 @@ public interface IBasicdataClientClient {
 
 	@GetMapping(API_PREFIX+"/findListByClientName")
     List<JSONObject> findListByClientName(@RequestParam String clientName);
+
+	/**
+	 * 根据Id查询客户
+	 * @param mallId
+	 * @return
+	 */
+    BasicdataClientEntity getMallById(Long mallId);
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java
index 6fa79eca0..32fdde633 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java
@@ -114,4 +114,9 @@ public class BasicdataClientClient implements IBasicdataClientClient {
 		return basicdataClientService.findListByClientName(clientName);
 	}
 
+	@Override
+	public BasicdataClientEntity getMallById(Long mallId) {
+		return basicdataClientService.getById(mallId);
+	}
+
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataCodeClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataCodeClient.java
index 40abf0ddb..11156019c 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataCodeClient.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataCodeClient.java
@@ -1,5 +1,6 @@
 package com.logpm.basicdata.feign;
 
+import com.logpm.basicdata.entity.BasicdataClientEntity;
 import com.logpm.basicdata.service.IBasicdataCodeService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.RestController;
@@ -16,4 +17,5 @@ public class BasicdataCodeClient implements IBasicdataCodeClient {
 	public String getCodeByType(Integer type,String warehouseCode,String orderCode) {
 		return basicdataCodeService.getCodeByType(type,warehouseCode,orderCode);
 	}
+
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
index bbef2c2a6..43c267ab4 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
@@ -70,7 +70,7 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 	List<DistributionStockupOrderListVO> selectStockupOrderList(@Param("reservationId")Long reservationId,@Param("isZero") String isZero);
 
     List<DistributionStockupStockListVO> selectStockupStockList(@Param("reservationId")Long reservationId);
-    List<DistributionStockupStockListVO> selectStockupStockListNew(@Param("reservationId")Long reservationId);
+    List<DistributionStockupStockListVO> selectStockupStockListNew(@Param("reservationId")Long reservationId,@Param("warehouseId")Long warehouseId,@Param("mallName")String mallName);
 
     Integer selectOrderNumByReservationId(@Param("reservationId")Long reservationId);
 
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 4672d55b8..bf161ba6e 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
@@ -318,7 +318,7 @@
         (SELECT SUM(newldrs.reservation_num) FROM logpm_distribution_reservation_stocklist AS newldrs WHERE newldrs.reservation_id = #{reservationId} AND newldrs.stocklist_id in (t.aaa)) AS planNum,
         (
         select GROUP_CONCAT( DISTINCT (allocation_id)) from logpm_warehouse_updown_goods where association_value =ldslNew.cargo_number or association_value in (
-        SELECT order_package_code from logpm_distribution_parcel_list where conditions=2 and material_code=ldslNew.cargo_number)
+        SELECT order_package_code from logpm_distribution_parcel_list where conditions=2 and material_code=ldslNew.cargo_number) AND warehouse_id = #{warehouseId}
         ) as allocations
         FROM
         (
@@ -335,10 +335,12 @@
         LEFT JOIN logpm_distribution_stock_list ldsl ON ldrs.stocklist_id = ldsl.id
         WHERE
         ldrs.reservation_id = #{reservationId}
+        AND ldsl.mall_name = #{mallName}
         group by ldsl.cargo_number
         ) t
         LEFT JOIN logpm_distribution_stock_list ldslNew ON t.cargo_number = ldslNew.cargo_number
-        LEFT JOIN logpm_distribution_stock ldss ON ldss.stock_list_id = t.id where ldslNew.is_deleted = 0
+        LEFT JOIN logpm_distribution_stock ldss ON ldss.stock_list_id = t.id
+        where ldslNew.is_deleted = 0
 
 <!--        SELECT-->
 <!--        ldsl.sku AS sku,-->
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java
index 7d4d58eb9..680034c36 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java
@@ -173,7 +173,7 @@ public interface IDistributionReservationService extends BaseService<Distributio
 
 	List<DistributionStockupOrderListVO> selectStockupOrderList(Long reservationId,String isZero);
 
-	List<DistributionStockupStockListVO> selectStockupStockList(Long reservationId);
+	List<DistributionStockupStockListVO> selectStockupStockList(Long reservationId,Long warehouseId,String mallName);
 
     Integer selectOrderNumByReservationId(Long reservationId);
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
index fa44537e7..9e696e6ee 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
@@ -2863,8 +2863,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 	}
 
 	@Override
-	public List<DistributionStockupStockListVO> selectStockupStockList(Long reservationId) {
-		return baseMapper.selectStockupStockListNew(reservationId);
+	public List<DistributionStockupStockListVO> selectStockupStockList(Long reservationId,Long warehouseId,String mallName) {
+		return baseMapper.selectStockupStockListNew(reservationId,warehouseId,mallName);
 	}
 
 	@Override
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index fb9a54b45..d55d33684 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -26,7 +26,9 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.logpm.basicdata.entity.BasicdataClientEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataClientClient;
 import com.logpm.basicdata.feign.IBasicdataCodeClient;
 import com.logpm.basicdata.feign.IBasicdataGoodsAreaClient;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
@@ -201,6 +203,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	@Autowired
 	private DistributionStockListInfoMapper distributionStockListInfoMapper;
 
+	@Autowired
+	private IBasicdataClientClient basicdataClientClient;
+
 
 	@Override
 	public IPage<DistributionStockupVO> selectDistributionStockupPage(IPage<DistributionStockupVO> page, DistributionStockupVO distributionStockup) {
@@ -1135,7 +1140,29 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 	@Override
 	public List<DistributionStockupStockListVO> selectStockupStockList(StockupDTO stockupDTO) {
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+		if (Func.isEmpty(myCurrentWarehouse)){
+			log.error("###########myCurrentWarehouse:{}",myCurrentWarehouse);
+			return null;
+		}
 		Long reservationId = stockupDTO.getReservationId();//预约单id
+		DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId);
+		if (Func.isEmpty(reservationEntity)){
+			log.error("###########查询预约失败reservationId:{}",reservationId);
+			return null;
+		}
+		String mallName = reservationEntity.getMallName();
+		if (Func.isBlank(mallName)){
+			//预约商场名称为空  查看是否存在商场ID
+			if (Func.isNotEmpty(reservationEntity.getMallId())){
+				BasicdataClientEntity basicdataClientEntity = basicdataClientClient.getMallById(reservationEntity.getMallId());
+				mallName = basicdataClientEntity.getClientName();
+			}else {
+				log.error("###########预约单无商场信息:{}",reservationId);
+
+			}
+		}
+
 		if (stockupDTO.getTypeService().equals("3")) {
 			//自
 			List<DistributionStockupStockListVO> list = distributionStockupService.selectStockupSelf(reservationId);
@@ -1163,30 +1190,29 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		} else {
 
 			//商，市
-			List<DistributionStockupStockListVO> list = distributionReservationService.selectStockupStockList(reservationId);
-			for (int i = 0; i < list.size(); i++) {
-				DistributionStockupStockListVO distributionStockupStockListVO = list.get(i);
-				if (distributionStockupStockListVO.getPlanNum().equals(distributionStockupStockListVO.getRealNum())) {
-					distributionStockupStockListVO.setCompleteStact(true);
-				}
-				if (Func.isNotEmpty(distributionStockupStockListVO.getAllocations())){
-
-					String[] ids = distributionStockupStockListVO.getAllocations().split(",");
-					List<WarehouseGoodsAllocationEntity> allocationInforByIds = warehouseGoodsAllocationClient.getAllocationInforByIds(ids);
-
-					for (WarehouseGoodsAllocationEntity allocationInforById : allocationInforByIds) {
-						if (distributionStockupStockListVO.getAllocationList() == null) {
-							distributionStockupStockListVO.setAllocationList(new ArrayList<>());
-						}
-						Map<String, Object> map = new HashMap<>();
-						map.put("id", allocationInforById.getId());
-						map.put("name", allocationInforById.getQrCode());
-						distributionStockupStockListVO.getAllocationList().add(map);
-					}
-				}
-
-
-			}
+			List<DistributionStockupStockListVO> list = distributionReservationService.selectStockupStockList(reservationId,myCurrentWarehouse.getId(),mallName);
+            for (DistributionStockupStockListVO distributionStockupStockListVO : list) {
+                if (distributionStockupStockListVO.getPlanNum().equals(distributionStockupStockListVO.getRealNum())) {
+                    distributionStockupStockListVO.setCompleteStact(true);
+                }
+                if (Func.isNotEmpty(distributionStockupStockListVO.getAllocations())) {
+
+                    String[] ids = distributionStockupStockListVO.getAllocations().split(",");
+                    List<WarehouseGoodsAllocationEntity> allocationInforByIds = warehouseGoodsAllocationClient.getAllocationInforByIds(ids);
+
+                    for (WarehouseGoodsAllocationEntity allocationInforById : allocationInforByIds) {
+                        if (distributionStockupStockListVO.getAllocationList() == null) {
+                            distributionStockupStockListVO.setAllocationList(new ArrayList<>());
+                        }
+                        Map<String, Object> map = new HashMap<>();
+                        map.put("id", allocationInforById.getId());
+                        map.put("name", allocationInforById.getQrCode());
+                        distributionStockupStockListVO.getAllocationList().add(map);
+                    }
+                }
+
+
+            }
 			return list;
 		}
 

From 0a5cd9af5bd19ada38d2533b9fcf5a49d3378b75 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 22 Jan 2024 11:15:26 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E5=A2=9E=E5=8A=A0warehou?=
 =?UTF-8?q?seId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/distribution/mapper/DistributionReservationMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 bf161ba6e..dd74a5209 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
@@ -318,7 +318,7 @@
         (SELECT SUM(newldrs.reservation_num) FROM logpm_distribution_reservation_stocklist AS newldrs WHERE newldrs.reservation_id = #{reservationId} AND newldrs.stocklist_id in (t.aaa)) AS planNum,
         (
         select GROUP_CONCAT( DISTINCT (allocation_id)) from logpm_warehouse_updown_goods where association_value =ldslNew.cargo_number or association_value in (
-        SELECT order_package_code from logpm_distribution_parcel_list where conditions=2 and material_code=ldslNew.cargo_number) AND warehouse_id = #{warehouseId}
+        SELECT order_package_code from logpm_distribution_parcel_list where conditions=2 and material_code=ldslNew.cargo_number AND warehouse_id = #{warehouseId}) AND warehouse_id = #{warehouseId}
         ) as allocations
         FROM
         (

From 8624778eb4c2abccdfeda3534ac5f904e2fb18c0 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 22 Jan 2024 11:18:13 +0800
Subject: [PATCH 5/6] =?UTF-8?q?1.=E5=BA=93=E5=86=85-=E4=B8=8B=E6=9E=B6?=
 =?UTF-8?q?=E8=A7=A3=E6=89=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/service/impl/WarehouseTrayTypeServiceImpl.java  | 4 ++--
 .../service/impl/WarehouseUpdownTypeServiceImpl.java          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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 943807e80..76c43d115 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
@@ -2127,12 +2127,12 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 	@Override
 	public void downPackageByOrderPackageCode(String orderPackageCode,String remark,Long warehouseId) {
 		QueryWrapper<WarehouseTrayGoodsEntity> trayGoodsQueryWrapper = new QueryWrapper<>();
-		DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);
+		DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,warehouseId);
 		trayGoodsQueryWrapper.eq("association_type","3")
 			.eq("association_value",orderPackageCode);
 		WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.getOne(trayGoodsQueryWrapper);
 		StringBuffer stringBuffer = new StringBuffer();
-		if (Func.isNotEmpty(trayGoodsEntity)){
+		if (!Objects.isNull(trayGoodsEntity)){
 			Long trayGoodsId = trayGoodsEntity.getId();
 			Long trayTypeId = trayGoodsEntity.getTrayTypeId();
 			Long trayId = trayGoodsEntity.getTrayId();
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
index 166845aa7..52d668835 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
@@ -1370,7 +1370,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				WarehouseTrayGoodsEntity warehouseTrayGoodsEntity = warehouseTrayGoodsService.getOne(trayGoodsEntityQueryWrapper);
 				if(!Objects.isNull(warehouseTrayGoodsEntity)){
 					//有托盘，托盘下托
-					warehouseTrayTypeService.downPackageByOrderPackageCode(orderPackageCode,"包件下架:同步下托",warehouseId);
+					warehouseTrayTypeService.downPackageByOrderPackageCode(orderPackageCode,"包件解托",warehouseId);
 				}
 				continue;
 			}

From a5114aa2b7ff193661eacd832360362dcda87824 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Mon, 22 Jan 2024 11:22:47 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionReservationMapper.java         | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
index f3c54c30a..a2f2b3649 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
@@ -70,8 +70,7 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 	List<DistributionStockupOrderListVO> selectStockupOrderList(@Param("reservationId")Long reservationId,@Param("isZero") String isZero);
 
     List<DistributionStockupStockListVO> selectStockupStockList(@Param("reservationId")Long reservationId);
-    List<DistributionStockupStockListVO> selectStockupStockListNew(@Param("reservationId")Long reservationId,@Param("warehouseId") Long warehouseId);
-
+	List<DistributionStockupStockListVO> selectStockupStockListNew(@Param("reservationId")Long reservationId,@Param("warehouseId")Long warehouseId,@Param("mallName")String mallName);
     Integer selectOrderNumByReservationId(@Param("reservationId")Long reservationId);
 
 	Integer selectPlanNum(@Param("reservationId")Long reservationId);
@@ -119,8 +118,8 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 
 	/**
 	 * 查询预约单下指定订单包件列表
-	 * @param id
-	 * @param id1
+	 * @param orderIds
+	 * @param param
 	 * @return
 	 */
 	IPage<DistributionParcelListEntity> getReservationPackage(IPage<DistributionParcelListEntity> page,@Param("orderIds") List<Long> orderIds,@Param("param")Map<String,Object> param);
@@ -133,8 +132,8 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 
 	/**
 	 * 通过预约和订单查询预约订单中间表
-	 * @param id
-	 * @param id1
+	 * @param reservationId
+	 * @param warehourseId
 	 * @return
 	 */
 	List<DistributionParcelListEntity> selectPackageByReservationAndStockArticle(@Param("reservationId") Long reservationId,@Param("stockArticleId") Long stockArticleId,@Param("warehourseId") Long warehourseId);