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

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

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

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

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

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

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

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

@@ -58,13 +58,13 @@ namespace WMS.Web.Domain.Entitys
/// <summary>
/// 仓位
/// </summary>
[Column("SubStockCode")]
public string SubStockCode { get; set; }
[Column("SubStockId")]
public int SubStockId { get; set; }
/// <summary>
/// 子仓库(跟金蝶交互字段)
/// </summary>
[Column("Erp_SubStockCode")]
public string Erp_SubStockCode { get; set; }
[Column("Erp_SubStockId")]
public int Erp_SubStockId { get; set; }
/// <summary>
/// 盘点前数量（wms系统数量）
/// </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 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 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);
//组装dto
#region 组装dto
@@ -147,11 +147,11 @@ namespace WMS.Web.Domain.Services
{
//获取金蝶仓库仓位编码
//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 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);
//组装dto
#region 组装dto