From 0a8be6bec440a11e848be2000524c04c86e8d46e Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Fri, 15 Sep 2023 11:32:44 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=BA=93=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

---
 .../mapper/WarehouseGoodsAllocationMapper.xml       | 10 +++++-----
 .../impl/WarehouseGoodsAllocationServiceImpl.java   |  5 +++--
 .../impl/WarehouseUpdownGoodsServiceImpl.java       |  1 +
 .../impl/WarehouseUpdownTypeServiceImpl.java        | 13 ++++++++++---
 4 files changed, 19 insertions(+), 10 deletions(-)

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 5855dbfa1..f90cfc2b5 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
@@ -19,10 +19,10 @@
         FROM logpm_warehouse_goods_allocation ${ew.customSqlSegment}
     </select>
     <select id="selectnum" resultType="com.logpm.warehouse.vo.WarehouseGoodsAllocationVO">
-        SELECT COALESCE(SUM(CASE WHEN association_type = '1' THEN 1 END), 0) orderNum,
-               COALESCE(SUM(CASE WHEN association_type = '2' THEN 1 END), 0) lessNum,
-               COALESCE(SUM(CASE WHEN association_type = '3' THEN 1 END), 0) packageNum,
-               COALESCE(SUM(CASE WHEN association_type = '4' THEN 1 END), 0) inventoryNum
+        SELECT COALESCE(SUM(CASE WHEN association_type = '1' THEN num END), 0) orderNum,
+               COALESCE(SUM(CASE WHEN association_type = '2' THEN num END), 0) lessNum,
+               COALESCE(SUM(CASE WHEN association_type = '3' THEN num END), 0) packageNum,
+               COALESCE(SUM(CASE WHEN association_type = '4' THEN num END), 0) inventoryNum
         FROM logpm_warehouse_updown_goods
         where allocation_id = #{id}
           and is_deleted = 0
@@ -238,7 +238,7 @@
         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
         <where>
-            lwug.association_id is null and ldsl.is_deleted = 0
+            (ldsl.quantity_stock > lwug.num 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>
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 dbd4af9df..1bdb598ed 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
@@ -207,11 +207,12 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
 		for (WarehouseStockListZationVO warehouseStockListZationVO : list) {
 			Integer quantityStock = warehouseStockListZationVO.getQuantityStock();
 			Long id = warehouseStockListZationVO.getId();
+			log.info("传入id>>>>>>>>>>>>{}",id);
 			//查询库位数量
 			Integer num1 =	warehouseUpdownGoodsService.getNumByZation(id);
 			//查询不在库位的托盘数量
-			Integer num2 =warehouseTrayGoodsService.getNumByZation(id);
-			warehouseStockListZationVO.setResidueNumber(quantityStock-(null==num1?0:num1)-(null==num2?0:num2));
+			//Integer num2 =warehouseTrayGoodsService.getNumByZation(id); -(null==num2?0:num2)
+			warehouseStockListZationVO.setResidueNumber(quantityStock-(null==num1?0:num1));
 		}
 		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 6c5428813..e14773275 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
@@ -210,6 +210,7 @@ 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 c9945018f..4f4ee0623 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
@@ -1609,13 +1609,16 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				.eq("association_value",materialCode)
 				.eq("incoming_batch",incomingBatch);
 			WarehouseUpdownGoodsEntity updownGoodsEntity = warehouseUpdownGoodsService.getOne(queryWrapper);
+			DistributionStockListEntity stockListEntity = distributionStockListClient.getEntityByMarketIdAndMaterialCodeAndIncomingBatch(marketId, materialCode,incomingBatch);
 			if(!Objects.isNull(updownGoodsEntity)){
 				Integer num = updownGoodsEntity.getNum();
-				if (enterNum>num){
+				int i = num + enterNum;
+				//对比原库存数量
+				if (i>stockListEntity.getQuantityStock()){
 					stringBuffer.append("{").append(materialCode).append("},");
 					continue;
 				}
-				updownGoodsEntity.setNum(num+enterNum);
+				updownGoodsEntity.setNum(i);
 				updownGoodsList.add(updownGoodsEntity);
 				//存入日志对象
 				WarehouseUpdownGoodsEntity oldUpdownGoodsEntity = new WarehouseUpdownGoodsEntity();
@@ -1624,7 +1627,11 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				oldUpdownGoodsEntity.setId(null);
 				updownGoodsLogList.add(oldUpdownGoodsEntity);
 			}else{
-				DistributionStockListEntity stockListEntity = distributionStockListClient.getEntityByMarketIdAndMaterialCodeAndIncomingBatch(marketId, materialCode,incomingBatch);
+				//对比原库存数量
+				if (enterNum>stockListEntity.getQuantityStock()){
+					stringBuffer.append("{").append(materialCode).append("},");
+					continue;
+				}
 				updownGoodsEntity = new WarehouseUpdownGoodsEntity();
 				updownGoodsEntity.setUpdownTypeId(updownTypeEntity.getId());
 				updownGoodsEntity.setAreaId(updownTypeEntity.getAreaId());