From 2c8827fc7e55b9e41d882049cdb9f6490ab76482 Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Fri, 5 Jan 2024 15:58:22 +0800
Subject: [PATCH] zhushi
---
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 15 +++--
.../Services/BoxInventoryService.cs | 66 +++++++++----------
2 files changed, 44 insertions(+), 37 deletions(-)
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 301c6ea4..1102c4b9 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -2587,7 +2587,7 @@
-
+
盘点-箱库存的变更
@@ -3782,7 +3782,7 @@
-
+
盘点单-箱库存的变更
@@ -3834,7 +3834,7 @@
-
+
盘点单-箱库存的变更
@@ -3842,7 +3842,7 @@
-
+
盘点单-箱库存的变更:第二步骤,为了不是当前扫的所在箱里的序列号;如果是其它箱的需要减箱库存
@@ -5156,6 +5156,13 @@
+
+
+ 获取改变了箱的序列号
+
+
+
+
出入库回退类型
diff --git a/src/WMS.Web.Domain/Services/BoxInventoryService.cs b/src/WMS.Web.Domain/Services/BoxInventoryService.cs
index 731b6fc1..897bbea3 100644
--- a/src/WMS.Web.Domain/Services/BoxInventoryService.cs
+++ b/src/WMS.Web.Domain/Services/BoxInventoryService.cs
@@ -1360,42 +1360,42 @@ namespace WMS.Web.Domain.Services
var InventoryDetailsGenerateDto1 = new List();
foreach (var item in boxInventorys)
{
- var update_entity = item;
- update_entity.Details = new List();
+ //var update_entity = item;
+ //update_entity.Details = new List();
- foreach (var itemDet in item.Details)
- {
- var current_sers_info = out_SerialNumbers.Where(x => x.BoxId == item.BoxId && x.MaterialId == itemDet.MaterialId).ToList();
- if (current_sers_info != null && current_sers_info.Count != 0)
- {
- var uptDet = update_entity.Details.Where(d => d.MaterialId == itemDet.MaterialId).FirstOrDefault();
- uptDet.Qty = uptDet.Qty - current_sers_info.Count;
- var crrent_sers = current_sers_info.Select(x => x.SerialNumber).ToList();
- uptDet.SerialNumbers.RemoveAll(r => crrent_sers.Contains(r));
- update_entity.Details.Add(uptDet);
+ //foreach (var itemDet in item.Details)
+ //{
+ // var current_sers_info = out_SerialNumbers.Where(x => x.BoxId == item.BoxId && x.MaterialId == itemDet.MaterialId).ToList();
+ // if (current_sers_info != null && current_sers_info.Count != 0)
+ // {
+ // var uptDet = update_entity.Details.Where(d => d.MaterialId == itemDet.MaterialId).FirstOrDefault();
+ // uptDet.Qty = uptDet.Qty - current_sers_info.Count;
+ // var crrent_sers = current_sers_info.Select(x => x.SerialNumber).ToList();
+ // uptDet.SerialNumbers.RemoveAll(r => crrent_sers.Contains(r));
+ // update_entity.Details.Add(uptDet);
- //3.2.2组装即时库存dto
- var inventoryDet = new InventoryDetailsGenerateDto();
- inventoryDet.MaterialId = itemDet.MaterialId;
- inventoryDet.OrgCode = item.OrgCode;
- inventoryDet.StockCode = item.StockCode;
- inventoryDet.SubStockId = item.SubStockId;
- inventoryDet.Qty = current_sers_info.Count;
- inventoryDet.InventoryInOutType = (int)InventoryInOutType.Out;
- //3.2.2即时库存:修改的集合
- InventoryDetailsGenerateDto1.Add(inventoryDet);
- }
- else
- update_entity.Details.Add(itemDet);
- }
+ // //3.2.2组装即时库存dto
+ // var inventoryDet = new InventoryDetailsGenerateDto();
+ // inventoryDet.MaterialId = itemDet.MaterialId;
+ // inventoryDet.OrgCode = item.OrgCode;
+ // inventoryDet.StockCode = item.StockCode;
+ // inventoryDet.SubStockId = item.SubStockId;
+ // inventoryDet.Qty = current_sers_info.Count;
+ // inventoryDet.InventoryInOutType = (int)InventoryInOutType.Out;
+ // //3.2.2即时库存:修改的集合
+ // InventoryDetailsGenerateDto1.Add(inventoryDet);
+ // }
+ // else
+ // update_entity.Details.Add(itemDet);
+ //}
- //4.1判断要修改的箱库存对象:是否所有的物料库存的数量都为0,“是”则删除该箱库存,"否"则修改;
- var isAllNoInventory = update_entity.Details.All(x => x.Qty == 0);
- if (isAllNoInventory)
- delete_ids1.Add(update_entity.Id);
- else
- //4.2添加要更新的箱库存实体
- update_entitys1.Add(update_entity);
+ ////4.1判断要修改的箱库存对象:是否所有的物料库存的数量都为0,“是”则删除该箱库存,"否"则修改;
+ //var isAllNoInventory = update_entity.Details.All(x => x.Qty == 0);
+ //if (isAllNoInventory)
+ // delete_ids1.Add(update_entity.Id);
+ //else
+ // //4.2添加要更新的箱库存实体
+ // update_entitys1.Add(update_entity);
}
var isSuccess = true;