From 363a13acdd63ad7ef40804e54c0d1fffcf520822 Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Thu, 28 Sep 2023 13:59:27 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=87=8D=E6=96=B0=E8=AE=A1=E7=AE=97=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E5=93=81=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/WarehouseStockListZationVO.java        |  5 ++
 .../mapper/WarehouseGoodsAllocationMapper.xml | 75 ++++++++++++++-----
 .../WarehouseGoodsAllocationServiceImpl.java  |  9 +--
 .../impl/WarehouseUpdownGoodsServiceImpl.java |  1 -
 .../impl/WarehouseUpdownTypeServiceImpl.java  | 16 ++--
 5 files changed, 75 insertions(+), 31 deletions(-)

diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockListZationVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockListZationVO.java
index 94f9332e1..4b37387ca 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockListZationVO.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockListZationVO.java
@@ -57,6 +57,11 @@ public class WarehouseStockListZationVO extends DistributionStockListEntity {
 	 */
 	@ApiModelProperty(value = "剩余数量")
 	private Integer residueNumber;
+	/**
+	 * 货位数量
+	 */
+	@ApiModelProperty(value = "货位数量")
+	private Integer allNum;
 
 	/**
 	 * 物料名称
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml
index b842df2b3..db4a407ef 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml
@@ -196,6 +196,7 @@
         ldsl.cargo_number cargoNumber,
         ldsl.cargo_norms cargoNorms,
         ldsl.cargo_unit cargoUnit,
+        ldsl.market_id marketId,
          ldsl.incoming_batch incomingBatch,
         lbm.product_code materialCode,
         ldsl.sku sku,
@@ -218,27 +219,66 @@
         </where>
     </select>
     <select id="selectInventory" resultType="com.logpm.warehouse.vo.WarehouseStockListZationVO">
+--         SELECT
+--         ldsl.id id,
+--         ldsl.material_id materialId,
+--         ldsl.order_code orderCode,
+--         lbm.product_code materialCode,
+--         ldsl.service_number serviceNumber,
+--         ldsl.description_goods descriptionGoods,
+--         ldsl.cargo_number cargoNumber,
+--         ldsl.market_id marketId,
+--         ldsl.cargo_norms cargoNorms,
+--         ldsl.incoming_batch incomingBatch,
+--         ldsl.cargo_unit cargoUnit,
+--         ldsl.stock_list_code stockListCode,
+--         ldsl.quantity_stock quantityStock,
+--         ldsl.sku sku,
+--         sum(lwug.num) allNum
+--         FROM
+--         logpm_distribution_stock_list ldsl
+--         left JOIN logpm_warehouse_updown_goods lwug ON ldsl.material_id = lwug.association_id
+--         AND ldsl.market_id = lwug.market_id
+--         AND ldsl.incoming_batch = lwug.incoming_batch
+--         left join logpm_basicdata_material lbm on lbm.id =ldsl.material_id
         SELECT
-        distinct ldsl.id id,
-        ldsl.material_id materialId,
-        ldsl.order_code orderCode,
-        lbm.product_code materialCode,
-        ldsl.service_number serviceNumber,
-        ldsl.description_goods descriptionGoods,
-        ldsl.cargo_number cargoNumber,
-        ldsl.market_id marketId,
-        ldsl.cargo_norms cargoNorms,
-        ldsl.incoming_batch incomingBatch,
-        ldsl.cargo_unit cargoUnit,
-        ldsl.stock_list_code stockListCode,
-        ldsl.quantity_stock quantityStock,
-        ldsl.sku sku
+        ldsl.id AS id,
+        ldsl.material_id AS materialId,
+        ldsl.order_code AS orderCode,
+        lbm.product_code AS materialCode,
+        ldsl.service_number AS serviceNumber,
+        ldsl.description_goods AS descriptionGoods,
+        ldsl.cargo_number AS cargoNumber,
+        ldsl.market_id AS marketId,
+        ldsl.cargo_norms AS cargoNorms,
+        ldsl.incoming_batch AS incomingBatch,
+        ldsl.cargo_unit AS cargoUnit,
+        ldsl.stock_list_code AS stockListCode,
+        ldsl.quantity_stock AS quantityStock,
+        ldsl.sku AS sku,
+        COALESCE(lwug.allNum, 0) AS allNum
         FROM
         logpm_distribution_stock_list ldsl
-        left JOIN logpm_warehouse_updown_goods lwug ON ldsl.material_id = lwug.association_id
-        left join logpm_basicdata_material lbm on lbm.id =ldsl.material_id
+        LEFT JOIN (
+        SELECT
+        association_id,
+        market_id,
+        incoming_batch,
+        SUM(num) AS allNum
+        FROM
+        logpm_warehouse_updown_goods
+        WHERE
+        tenant_id = '627683'
+        GROUP BY
+        association_id,
+        market_id,
+        incoming_batch
+        ) lwug ON ldsl.material_id = lwug.association_id
+        AND ldsl.market_id = lwug.market_id
+        AND ldsl.incoming_batch = lwug.incoming_batch
+        LEFT JOIN logpm_basicdata_material lbm ON lbm.id = ldsl.material_id
         <where>
-            (ldsl.quantity_stock > lwug.num or lwug.association_id is null) and ldsl.is_deleted = 0
+            (ldsl.quantity_stock > COALESCE(lwug.allNum, 0) OR lwug.association_id IS NULL) and ldsl.is_deleted = 0
             <if test="param.orderCode!=null and param.orderCode !=''">
                 and ldpl.order_code like concat('%',#{param.orderCode},'%')
             </if>
@@ -252,7 +292,6 @@
                 and ldpl.sku like concat('%',#{param.sku},'%')
             </if>
         </where>
-
     </select>
     <select id="selectAllTray" resultType="com.logpm.warehouse.vo.WarehouseTrayVO">
         SELECT
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java
index 614bc496a..2fd12ccf7 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java
@@ -205,13 +205,12 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
 		//可上架数量
 		for (WarehouseStockListZationVO warehouseStockListZationVO : list) {
 			Integer quantityStock = warehouseStockListZationVO.getQuantityStock();
-			Long id = warehouseStockListZationVO.getId();
-			log.info("传入id>>>>>>>>>>>>{}",id);
+//			Long id = warehouseStockListZationVO.getId();
+//			log.info("传入id>>>>>>>>>>>>{}",id);
 			//查询库位数量
-			Integer num1 =	warehouseUpdownGoodsService.getNumByZation(id);
-			//查询不在库位的托盘数量
+		//	Integer num1 =	warehouseUpdownGoodsService.getNumByZation(id);
 			//Integer num2 =warehouseTrayGoodsService.getNumByZation(id); -(null==num2?0:num2)
-			warehouseStockListZationVO.setResidueNumber(quantityStock-(null==num1?0:num1));
+			warehouseStockListZationVO.setResidueNumber(quantityStock-(null==warehouseStockListZationVO.getAllNum()?0:warehouseStockListZationVO.getAllNum()));
 		}
 		return page.setRecords(list);
 	}
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java
index c2ab3fdc0..750e7dacc 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java
@@ -211,7 +211,6 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl<WarehouseUp
 
 	@Override
 	public Integer getNumByZation(Long id) {
-		log.info("id>>>>>>>>>>{}",id);
 		return baseMapper.getNumByZation(id);
 	}
 
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 b3fa704b9..167778b6a 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
@@ -1211,6 +1211,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 					//修改库位状态为空闲
 					basicdataGoodsAllocationClient.updateAllocationStatus(allocationId,"1");
 				}
+				//更新货位缓存
+				warehouseGoodsAllocationClient.updateAllocationCache(allocationId.toString());
 				saveUpdownGoodsLog(updownGoodsList,"2",0,"下架:库存品下架",updownTypeEntity.getWarehouseId());
 //				updateUpdownTypeNum(updownTypeEntity);
 			}else{
@@ -1975,15 +1977,15 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				.eq("incoming_batch",incomingBatch);
 			WarehouseUpdownGoodsEntity updownGoodsEntity = warehouseUpdownGoodsService.getOne(queryWrapper);
 			DistributionStockListEntity stockListEntity = distributionStockListClient.getEntityByMarketIdAndMaterialCodeAndIncomingBatch(marketId, materialCode,incomingBatch,warehouseId);
+			//查询原库存数量
+			Integer num1 =	warehouseUpdownGoodsService.getNumByZation(stockListEntity.getId());
+			if (num1+enterNum>stockListEntity.getQuantityStock()){
+				stringBuffer.append("{").append(materialCode).append("},");
+				continue;
+			}
 			if(!Objects.isNull(updownGoodsEntity)){
 				Integer num = updownGoodsEntity.getNum();
-				int i = num + enterNum;
-				//对比原库存数量
-				if (i>stockListEntity.getQuantityStock()){
-					stringBuffer.append("{").append(materialCode).append("},");
-					continue;
-				}
-				updownGoodsEntity.setNum(i);
+				updownGoodsEntity.setNum(num + enterNum);
 				updownGoodsList.add(updownGoodsEntity);
 				//存入日志对象
 				WarehouseUpdownGoodsEntity oldUpdownGoodsEntity = new WarehouseUpdownGoodsEntity();