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

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2023-11-09 17:07:58 +08:00
parent 23eb185242 9137fc41d8
commit 71efc00756
10 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3085,12 +3085,12 @@
仓库ID 仓库ID
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest.SubStockCode"> <member name="P:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest.SubStockId">
<summary> <summary>
仓位ID 仓位ID
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest.Erp_SubStockCode"> <member name="P:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest.Erp_SubStockId">
<summary> <summary>
子仓库(跟金蝶交互字段) 子仓库(跟金蝶交互字段)
</summary> </summary>

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

@@ -661,12 +661,12 @@
箱号ID 箱号ID
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.SrcSubStockCode"> <member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.SrcSubStockId">
<summary> <summary>
原仓位编码 原仓位编码
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.DestSubStockCode"> <member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.DestSubStockId">
<summary> <summary>
目标仓位编码 目标仓位编码
</summary> </summary>
@@ -819,7 +819,7 @@
仓库 仓库
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.SubStockCode"> <member name="P:WMS.Web.Domain.Entitys.OutStockDetails.SubStockId">
<summary> <summary>
仓位 仓位
</summary> </summary>
@@ -945,7 +945,7 @@
仓库ID 仓库ID
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Domain.Entitys.OutStockTaskDetails.SubStockCode"> <member name="P:WMS.Web.Domain.Entitys.OutStockTaskDetails.SubStockId">
<summary> <summary>
仓位ID 仓位ID
</summary> </summary>
@@ -1070,12 +1070,12 @@
仓库 仓库
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.SubStockCode"> <member name="P:WMS.Web.Domain.Entitys.TakeStock.SubStockId">
<summary> <summary>
仓位 仓位
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.Erp_SubStockCode"> <member name="P:WMS.Web.Domain.Entitys.TakeStock.Erp_SubStockId">
<summary> <summary>
子仓库(跟金蝶交互字段) 子仓库(跟金蝶交互字段)
</summary> </summary>

4
src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs
View File

@@ -29,11 +29,11 @@ namespace WMS.Web.Core.Dto.TakeStock
/// 仓位ID /// 仓位ID
/// </summary> /// </summary>
[Required(ErrorMessage = "仓位不能为空")] [Required(ErrorMessage = "仓位不能为空")]
public string SubStockCode { get; set; } public int SubStockId { get; set; }
/// <summary> /// <summary>
/// 子仓库(跟金蝶交互字段) /// 子仓库(跟金蝶交互字段)
/// </summary> /// </summary>
public string Erp_SubStockCode { get; set; } public int Erp_SubStockId { get; set; }
/// <summary> /// <summary>
/// 盘点前数量（wms系统数量） /// 盘点前数量（wms系统数量）
/// </summary> /// </summary>

8
src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs
View File

@@ -28,13 +28,13 @@ namespace WMS.Web.Domain.Entitys
/// <summary> /// <summary>
/// 原仓位编码 /// 原仓位编码
/// </summary> /// </summary>
[Column("SrcSubStockCode")] [Column("SrcSubStockId")]
public string SrcSubStockCode { get; set; } public int SrcSubStockId { get; set; }
/// <summary> /// <summary>
/// 目标仓位编码 /// 目标仓位编码
/// </summary> /// </summary>
[Column("DestSubStockCode")] [Column("DestSubStockId")]
public string DestSubStockCode { get; set; } public int DestSubStockId { get; set; }
/// <summary> /// <summary>
/// 数量 /// 数量
/// </summary> /// </summary>

4
src/WMS.Web.Domain/Entitys/OutStockDetails.cs
View File

@@ -45,8 +45,8 @@ namespace WMS.Web.Domain.Entitys
/// <summary> /// <summary>
/// 仓位 /// 仓位
///</summary> ///</summary>
[Column("SubStockCode")] [Column("SubStockId")]
public string SubStockCode { get; set; } public string SubStockId { get; set; }
/// <summary> /// <summary>
/// 出库数量 /// 出库数量
///</summary> ///</summary>

4
src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs
View File

@@ -44,8 +44,8 @@ namespace WMS.Web.Domain.Entitys
/// <summary> /// <summary>
/// 仓位ID /// 仓位ID
///</summary> ///</summary>
[Column("SubStockCode")] [Column("SubStockId")]
public string SubStockCode { get; set; } public int SubStockId { get; set; }
/// <summary> /// <summary>
/// 应出库数量 /// 应出库数量
///</summary> ///</summary>

8
src/WMS.Web.Domain/Entitys/TakeStock.cs
View File

@@ -58,13 +58,13 @@ namespace WMS.Web.Domain.Entitys
/// <summary> /// <summary>
/// 仓位 /// 仓位
/// </summary> /// </summary>
[Column("SubStockCode")] [Column("SubStockId")]
public string SubStockCode { get; set; } public int SubStockId { get; set; }
/// <summary> /// <summary>
/// 子仓库(跟金蝶交互字段) /// 子仓库(跟金蝶交互字段)
/// </summary> /// </summary>
[Column("Erp_SubStockCode")] [Column("Erp_SubStockId")]
public string Erp_SubStockCode { get; set; } public int Erp_SubStockId { get; set; }
/// <summary> /// <summary>
/// 盘点前数量（wms系统数量） /// 盘点前数量（wms系统数量）
/// </summary> /// </summary>

8
src/WMS.Web.Domain/Services/TakeStockService.cs
View File

@@ -101,11 +101,11 @@ namespace WMS.Web.Domain.Services
{ {
//获取金蝶仓库仓位编码 //获取金蝶仓库仓位编码
//var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockCode); //var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockCode);
//var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockCode); var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId);
var res = await _erpService.BillQueryForStock(); var res = await _erpService.BillQueryForStock();
var stock = res.Data.FirstOrDefault(f => f.Code == entity.StockCode);//需要根据单点code搜索 var stock = res.Data.FirstOrDefault(f => f.Code == entity.StockCode);//需要根据单点code搜索
var subStock = res.Data.FirstOrDefault(f => f.Code == entity.SubStockCode);//需要根据单点code搜索 var subStock = res.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
if (stock == null || subStock == null) return Result.ReFailure(ResultCodes.ErpStockNoData); if (stock == null || subStock == null) return Result.ReFailure(ResultCodes.ErpStockNoData);
//组装dto //组装dto
#region 组装dto #region 组装dto
@@ -147,11 +147,11 @@ namespace WMS.Web.Domain.Services
{ {
//获取金蝶仓库仓位编码 //获取金蝶仓库仓位编码
//var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId); //var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId);
//var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId); var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId);
var res = await _erpService.BillQueryForStock(); var res = await _erpService.BillQueryForStock();
var stock = res.Data.FirstOrDefault(f => f.Code == entity.StockCode);//需要根据单点code搜索 var stock = res.Data.FirstOrDefault(f => f.Code == entity.StockCode);//需要根据单点code搜索
var subStock = res.Data.FirstOrDefault(f => f.Code == entity.SubStockCode);//需要根据单点code搜索 var subStock = res.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
if (stock == null || subStock == null) return Result.ReFailure(ResultCodes.ErpStockNoData); if (stock == null || subStock == null) return Result.ReFailure(ResultCodes.ErpStockNoData);
//组装dto //组装dto
#region 组装dto #region 组装dto

4
src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs
View File

@@ -107,8 +107,8 @@ namespace WMS.Web.Repositories
{ {
#region dto组装 #region dto组装
Box = s.box.BoxBillNo, Box = s.box.BoxBillNo,
SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.SrcSubStockCode), SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.SrcSubStockId),
DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.DestSubStockCode), DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.DestSubStockId),
Qty = s.moveBox.Qty, Qty = s.moveBox.Qty,
Type = s.moveBox.Type.GetRemark(), Type = s.moveBox.Type.GetRemark(),
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.moveBox.CreatorId), Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.moveBox.CreatorId),

4
src/WMS.Web.Repositories/TakeStockRepositories.cs
View File

@@ -197,8 +197,8 @@ namespace WMS.Web.Repositories
BillNo = s.BillNo, BillNo = s.BillNo,
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialId), Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialId),
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.StockCode), Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.StockCode),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SubStockCode), SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SubStockId),
Erp_SubStockCode= _erpBasicDataExtendService.GetStockName(subStocks, s.Erp_SubStockCode), Erp_SubStockCode= _erpBasicDataExtendService.GetStockName(subStocks, s.Erp_SubStockId),
BeforeQty = s.BeforeQty, BeforeQty = s.BeforeQty,
AfterQty = s.AfterQty, AfterQty = s.AfterQty,
FinalQty = s.FinalQty, FinalQty = s.FinalQty,