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 14:39:46 +08:00
parent c44d637fe3 3d893136e4
commit e04f0eeae0
16 changed files with 99 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/WMS.Web.Domain/Services/Public/OpsService.cs
View File

@@ -34,6 +34,7 @@ namespace WMS.Web.Domain.Services.Public
public async Task<List<OpsBoxResponse>> GetBox(OpsBoxRequest request)
{
List<OpsBoxResponse> listss = new List<OpsBoxResponse>();
OpsBoxResponse respnose = new OpsBoxResponse();
List<OpsBoxDetailsResponse> details = new List<OpsBoxDetailsResponse>();
List<SerialNumbersResponse> ss = new List<SerialNumbersResponse>();
@@ -55,7 +56,34 @@ namespace WMS.Web.Domain.Services.Public
SerialNumbers = ss
});
respnose.Details = details;
var str = JsonConvert.SerializeObject(respnose);
listss.Add(respnose);
OpsBoxResponse respnose2 = new OpsBoxResponse();
List<OpsBoxDetailsResponse> details2 = new List<OpsBoxDetailsResponse>();
List<SerialNumbersResponse> ss2 = new List<SerialNumbersResponse>();
ss2.Add(new SerialNumbersResponse()
{
SerialNumber = "sss",
BarCereateUser = "sdf",
BarCreateTime = "20-20-20"
});
ss2.Add(new SerialNumbersResponse()
{
SerialNumber = "sss2",
BarCereateUser = "sdf2",
BarCreateTime = "20-20-20"
});
details2.Add(new OpsBoxDetailsResponse()
{
MaterialId = 1,
Qty = 1,
SerialNumbers = ss
});
respnose2.Details = details2;
listss.Add(respnose2);
var str = JsonConvert.SerializeObject(listss);
var token = await GetToken();
Dictionary<string, string> dicHeaders = new Dictionary<string, string>();

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

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