From 035b4b4672cee6535cbe5a90ca7fe2b6d0d001d9 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Wed, 6 Sep 2023 21:28:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=BA=93=E5=86=85?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=BA=93=E5=AD=98=E5=93=81=E6=89=93=E6=89=98?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E4=B8=BA=E8=B4=9F=E6=95=B0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/mapper/WarehouseTaryAllocationMapper.java   | 2 ++
 .../warehouse/mapper/WarehouseTrayAllocationMapper.xml    | 8 ++++++++
 .../service/IWarehouseTaryAllocationService.java          | 3 +++
 .../service/impl/WarehouseTaryAllocationServiceImpl.java  | 5 +++++
 .../service/impl/WarehouseTrayTypeServiceImpl.java        | 2 +-
 .../service/impl/WarehouseUpdownTypeServiceImpl.java      | 4 ++++
 6 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTaryAllocationMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTaryAllocationMapper.java
index 0d2834525..9a2deb6d3 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTaryAllocationMapper.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTaryAllocationMapper.java
@@ -12,4 +12,6 @@ public interface WarehouseTaryAllocationMapper extends BaseMapper<WarehouseTaryA
 	BasicdataTrayEntity getTrayByAllocation(@Param("allocationCode") String allocationCode);
 
 	BasicdataTrayEntity getTrayByAllocationId(@Param("allocationId") Long allocationId);
+
+    void deleteByTrayIdAndAllocationId(@Param("trayId") Long trayId, @Param("allocationId") Long allocationId);
 }
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayAllocationMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayAllocationMapper.xml
index 75cd1997e..eb5aa39d2 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayAllocationMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayAllocationMapper.xml
@@ -22,4 +22,12 @@
         and lwta.allocation_id = #{allocationId}
     </select>
 
+    <update id="deleteByTrayIdAndAllocationId" >
+        update logpm_warehouse_tary_allocation lwta
+        set lwta.is_deleted = 1
+        where lwta.tray_id = #{trayId}
+        and lwta.allocation_id = #{allocationId}
+        and lwta.is_deleted = 0
+    </update>
+
 </mapper>
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTaryAllocationService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTaryAllocationService.java
index 0ce56dace..ff97b1cc8 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTaryAllocationService.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTaryAllocationService.java
@@ -13,4 +13,7 @@ public interface IWarehouseTaryAllocationService extends BaseService<WarehouseTa
 	void deleteById(WarehouseTaryAllocationEntity taryAllocationEntity);
 
 	Long getAllocationIdByTrayId(Long trayId);
+
+    void deleteByTrayIdAndAllocationId(Long trayId, Long allocationId);
+
 }
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTaryAllocationServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTaryAllocationServiceImpl.java
index b6ed4951d..15fb75c4d 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTaryAllocationServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTaryAllocationServiceImpl.java
@@ -43,4 +43,9 @@ public class WarehouseTaryAllocationServiceImpl extends BaseServiceImpl<Warehous
 			return taryAllocationEntity.getAllocationId();
 		}
 	}
+
+	@Override
+	public void deleteByTrayIdAndAllocationId(Long trayId, Long allocationId) {
+		baseMapper.deleteByTrayIdAndAllocationId(trayId,allocationId);
+	}
 }
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 7c0a03131..2a31860f3 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
@@ -1293,7 +1293,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 				//存入有数据库存品与托盘绑定关系表
 				warehouseTrayGoodsService.saveEntityStock(materialId, marketId,trayTypeEntity,incomingBatch,cargoNumber,num, "0");
 			}else{
-				warehouseTrayGoodsService.updateEntityStock(warehouseTrayGoodsEntity,-num);
+				warehouseTrayGoodsService.updateEntityStock(warehouseTrayGoodsEntity,num);
 			}
 		}
 //		//添加上拖日志表
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 3ac10db93..15d64d9f5 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
@@ -933,6 +933,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				if(!Objects.isNull(trayEntity)){
 					//绑定了托盘
 					warehouseTrayTypeService.deleteZeroOrderByTrayCode(orderCode,trayEntity.getPalletCode());
+
+					//解除托盘与库位绑定
+					warehouseTaryAllocationService.deleteByTrayIdAndAllocationId(trayEntity.getId(),allocationId);
+
 				}
 				//全部下架
 				Integer residue = warehouseUpdownGoodsService.deleteByUpdownGoodsId(updownGoodsId);

From 8ab2df959d3810724a87c94e5eafcf8079537be7 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Wed, 6 Sep 2023 21:49:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E5=93=81=E4=B8=8B=E6=9E=B6=E8=A7=A3=E7=BB=91=E6=89=98=E7=9B=98?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java | 3 +++
 1 file changed, 3 insertions(+)

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 15d64d9f5..35014685e 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
@@ -1039,6 +1039,9 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 
 					//绑定了托盘
 					warehouseTrayTypeService.deleteStockByTrayGoodsId(trayGoodsEntity.getId());
+
+					//解绑托盘和库位
+					warehouseTaryAllocationService.deleteByTrayIdAndAllocationId(trayId,allocationId);
 				}
 				//全部下架
 				Integer residue = warehouseUpdownGoodsService.deleteByUpdownGoodsId(updownGoodsId);