Merge branch 'dev' into pre-production

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