diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index c17e0283..03db77d9 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -4126,6 +4126,11 @@
ID
+
+
+ Id集合
+
+
名称请求对象
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 77147ada..e9cc24ff 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -1090,7 +1090,7 @@
-
+
同步金蝶(成功)
@@ -1766,6 +1766,14 @@
+
+
+ 获取仓位详情：根据仓位ID集合和公司ID
+
+
+
+
+
获取仓库
@@ -3483,7 +3491,7 @@
改箱 移箱服务
-
+
改箱保存
@@ -5523,6 +5531,11 @@
获取仓位详情：根据仓位ID和公司ID
+
+
+ 获取仓位详情：根据仓位ID集合和公司ID
+
+
盘点单类型
diff --git a/src/WMS.Web.Core/Dto/SingleData/IdsRequest.cs b/src/WMS.Web.Core/Dto/SingleData/IdsRequest.cs
new file mode 100644
index 00000000..95020307
--- /dev/null
+++ b/src/WMS.Web.Core/Dto/SingleData/IdsRequest.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WMS.Web.Core.Dto.SingleData
+{
+ public class IdsRequest : SingleDataRequest
+ {
+ public IdsRequest() { }
+
+ public IdsRequest(List ids,int companyId)
+ {
+ this.Ids = ids;
+ this.CompanyId = companyId;
+ }
+
+ ///
+ /// Id集合
+ ///
+ public List Ids { get; set; } = new List();
+ }
+}
diff --git a/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs
index ada51881..a7a08b3b 100644
--- a/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs
+++ b/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs
@@ -41,6 +41,14 @@ namespace WMS.Web.Domain.Infrastructure
///
///
Task GetSubUcStockAsync(int id, int companyId);
+
+ ///
+ /// 获取仓位详情：根据仓位ID集合和公司ID
+ ///
+ ///
+ ///
+ ///
+ Task GetSubUcStockAsync(List ids, int companyId);
///
/// 获取仓库
///
diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs
index 0b0458ad..8a5cf7c7 100644
--- a/src/WMS.Web.Domain/Services/InStockService.cs
+++ b/src/WMS.Web.Domain/Services/InStockService.cs
@@ -340,6 +340,11 @@ namespace WMS.Web.Domain.Services
//6.当按产品上架：就要调用改箱的操作；
if (dto.ShelfMethod == (int)ShelfMethod.Product)
{
+ //通过序列号，获取序列号对应的箱
+ var cureent_serialNumbs = await _serialNumbersRepositories.GetEntityList(dto.Boxs.SelectMany(x => x.Details).SelectMany(x => x.SerialNumbers).ToList());
+ var current_boxIds= cureent_serialNumbs.GroupBy(x => x.BoxId).Select(x => x.Key).ToList();
+
+ var ganenrateChangeBoxs = new List();
var dto_box = dto.Boxs.FirstOrDefault();
var changeBox = new SaveChangeBoxRecordRequest();
changeBox.DestBoxId = dto_box.BoxId;
@@ -349,9 +354,12 @@ namespace WMS.Web.Domain.Services
changeBoxRD.MaterialId = item.MaterialId;
changeBoxRD.Qty = item.Qty;
changeBoxRD.SerialNumbers = item.SerialNumbers;
+ changeBox.Details.Add(changeBoxRD);
}
+
+ ganenrateChangeBoxs.Add(changeBox);
//改箱保存操作
- var changeBoxSave_Result = await _changeMoveBoxService.ChangeBoxSave(changeBox, loginInfo, isTransaction);
+ var changeBoxSave_Result = await _changeMoveBoxService.ChangeBoxSave(ganenrateChangeBoxs, loginInfo, isTransaction);
if (!changeBoxSave_Result.IsSuccess)
return changeBoxSave_Result;
}
diff --git a/src/WMS.Web.Domain/Values/Single/SysConfigAction.cs b/src/WMS.Web.Domain/Values/Single/SysConfigAction.cs
index f9fb7656..55d9d921 100644
--- a/src/WMS.Web.Domain/Values/Single/SysConfigAction.cs
+++ b/src/WMS.Web.Domain/Values/Single/SysConfigAction.cs
@@ -197,5 +197,9 @@ namespace WMS.Web.Domain.Values.Single
/// 获取仓位详情：根据仓位ID和公司ID
///
GetWmsSubWarehouseByIdAndCompany = 45,
+ ///
+ /// 获取仓位详情：根据仓位ID集合和公司ID
+ ///
+ GetWmsSubWarehouseByIdsAndCompany = 46,
}
}
diff --git a/src/WMS.Web.Repositories/BasicsRepositories.cs b/src/WMS.Web.Repositories/BasicsRepositories.cs
index dded2071..cd0a8131 100644
--- a/src/WMS.Web.Repositories/BasicsRepositories.cs
+++ b/src/WMS.Web.Repositories/BasicsRepositories.cs
@@ -87,6 +87,22 @@ namespace WMS.Web.Repositories
return result.Data;
}
+ ///
+ /// 获取仓位详情：根据仓位ID集合和公司ID
+ ///
+ ///
+ ///
+ ///
+ public async Task GetSubUcStockAsync(List ids, int companyId)
+ {
+ var result = await _singleDataService.GetSysConfigData, IdsRequest>
+ (new IdsRequest(ids, companyId),
+ SysConfigAction.GetWmsSubWarehouseByIdsAndCompany);
+ if (!result.Success)
+ return null;
+ return result.Data;
+ }
+
public async Task> GetUcStockAsync(string systemCode, string name, int companyId)
{
var result = await _singleDataService.GetSysConfigData, SystemCodeRequest>