18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

再次修改了收货上架

Browse Source
This commit is contained in:
18923810322
2025-05-24 15:40:13 +08:00
parent b88ad56ec5
commit f31a761f76
5 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -207,7 +207,7 @@
<param name="qty"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Entitys.Box.BoxInventory(WMS.Web.Domain.Entitys.BoxInventory)">
<member name="M:WMS.Web.Domain.Entitys.Box.BoxInventory(WMS.Web.Domain.Entitys.BoxInventory,System.String)">
<summary>
箱库存同步箱信息
</summary>
@@ -5449,7 +5449,7 @@
箱服务信息
</summary>
</member>
<member name="M:WMS.Web.Domain.Services.BoxService.BoxInventorySync(System.Collections.Generic.List{WMS.Web.Domain.Entitys.BoxInventory},System.Boolean)">
<member name="M:WMS.Web.Domain.Services.BoxService.BoxInventorySync(System.Collections.Generic.List{WMS.Web.Domain.Entitys.BoxInventory},System.Boolean,System.String)">
<summary>
箱库存同步箱信息
</summary>

15
src/WMS.Web.Domain/Entitys/Box.cs
View File

@@ -184,7 +184,7 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
/// <param name="inventory"></param>
/// <returns></returns>
public Result BoxInventory(BoxInventory inventory)
public Result BoxInventory(BoxInventory inventory,string isNotUpdateBoxInv)
{
var detailClone = this.Details.Clone();
foreach (var d in detailClone)
@@ -203,8 +203,17 @@ namespace WMS.Web.Domain.Entitys
var md = this.Details.FirstOrDefault(w => w.MaterialNumber == d.MaterialNumber);
if (md == null)
this.Details.Add(new BoxDetails() { MaterialNumber = d.MaterialNumber, Qty = d.Qty });
//else//alter by yzh
// md.Qty = d.Qty;
else//alter by yzh
{
if (isNotUpdateBoxInv == "1")
{
}
else
{
md.Qty = d.Qty;
}
}
}
return Result.ReSuccess();

2
src/WMS.Web.Domain/IService/IBoxService.cs
View File

@@ -14,6 +14,6 @@ namespace WMS.Web.Domain.IService
// 同步老Ops箱信息
Task<Result> Sync(List<OpsBoxResponse> list = null);
// 箱库存同步箱信息
Task<Result> BoxInventorySync(List<BoxInventory> list, bool isTransaction = true);
Task<Result> BoxInventorySync(List<BoxInventory> list, bool isTransaction = true,string isNotUpdateBoxInv="0");
}
}

12
src/WMS.Web.Domain/Services/BoxInventoryService.cs
View File

@@ -838,7 +838,7 @@ namespace WMS.Web.Domain.Services
}
//改箱
var changeBox_result = await _boxService.BoxInventorySync(changeBox_inventoryList, isTransaction);
var changeBox_result = await _boxService.BoxInventorySync(changeBox_inventoryList, isTransaction,"0");
if (!changeBox_result.IsSuccess)
return changeBox_result;
@@ -1255,7 +1255,7 @@ namespace WMS.Web.Domain.Services
}
//改箱
var changeBox_result = await _boxService.BoxInventorySync(changeBox_inventoryList, isTransaction);
var changeBox_result = await _boxService.BoxInventorySync(changeBox_inventoryList, isTransaction,"1");
if (!changeBox_result.IsSuccess)
return changeBox_result;
@@ -1464,7 +1464,7 @@ namespace WMS.Web.Domain.Services
}
//改箱
var changeBox_result = await _boxService.BoxInventorySync(changeBox_inventoryList, isTransaction);
var changeBox_result = await _boxService.BoxInventorySync(changeBox_inventoryList, isTransaction, "0");
if (!changeBox_result.IsSuccess)
return changeBox_result;
@@ -1584,7 +1584,7 @@ namespace WMS.Web.Domain.Services
}
//改箱
var changeBox_result = await _boxService.BoxInventorySync(changeBox_inventoryList, isTransaction);
var changeBox_result = await _boxService.BoxInventorySync(changeBox_inventoryList, isTransaction, "0");
if (!changeBox_result.IsSuccess)
return changeBox_result;
@@ -1758,7 +1758,7 @@ namespace WMS.Web.Domain.Services
}
//改箱
var changeBox_result = await _boxService.BoxInventorySync(changeBox_inventoryList, isTransaction);
var changeBox_result = await _boxService.BoxInventorySync(changeBox_inventoryList, isTransaction, "0");
if (!changeBox_result.IsSuccess)
return changeBox_result;
@@ -1923,7 +1923,7 @@ namespace WMS.Web.Domain.Services
}
//改箱
var changeBox_result = await _boxService.BoxInventorySync(changeBox_inventoryList, isTransaction);
var changeBox_result = await _boxService.BoxInventorySync(changeBox_inventoryList, isTransaction, "0");
if (!changeBox_result.IsSuccess)
return changeBox_result;

4
src/WMS.Web.Domain/Services/BoxService.cs
View File

@@ -154,7 +154,7 @@ namespace WMS.Web.Domain.Services
/// <param name="list"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
public async Task<Result> BoxInventorySync(List<BoxInventory> list, bool isTransaction = true)
public async Task<Result> BoxInventorySync(List<BoxInventory> list, bool isTransaction = true,string isNotUpdateBoxInv="0")
{
if (list.Count() == 0) return Result.ReSuccess();
@@ -165,7 +165,7 @@ namespace WMS.Web.Domain.Services
{
var box = boxs.FirstOrDefault(f => f.Id == db.BoxId);
if (box == null) continue;
box.BoxInventory(db);
box.BoxInventory(db, isNotUpdateBoxInv);
}
_Logger.LogInformation($"即时库存改箱信息 改之后:{JsonConvert.SerializeObject(boxs)}");
IDbContextTransaction _transaction = null;