From 457d291f4a473262a14b09bda9fb9eea17d35f06 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Thu, 9 Nov 2023 14:58:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=87=BA=E5=BA=93=E5=8D=95?=
=?UTF-8?q?=E5=8F=B7=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/OutStockTaskController.cs | 8 +--
src/WMS.Web.Api/Controllers/TestController.cs | 12 ++---
.../IOutStockTaskRepositories.cs | 2 +-
.../Services/Public/OpsService.cs | 54 +------------------
.../OutStockTaskRepositories.cs | 21 ++++++--
5 files changed, 28 insertions(+), 69 deletions(-)
diff --git a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs
index 4e5cc6c0..63798774 100644
--- a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs
+++ b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs
@@ -93,15 +93,15 @@ namespace WMS.Web.Api.Controllers
///
[HttpGet]
[Route("GetOutStockTaskByNo/{billNo}")]
- public async Task> GetOutStockTaskByNo([FromRoute] string billNo)
+ public async Task> GetOutStockTaskByNo([FromRoute] string billNo)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
- return Result.ReFailure(ResultCodes.Token_Invalid_Error);
+ return ResultList.ReFailure(ResultCodes.Token_Invalid_Error);
var res= await _repositories.GetOutStockTaskByNo(billNo);
- if (res == null) return Result.ReFailure(ResultCodes.OutStockTaskNoData);
- return Result.ReSuccess(res);
+ if (res == null) return ResultList.ReFailure(ResultCodes.OutStockTaskNoData);
+ return ResultList.ReSuccess(res);
}
}
diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index 320edbae..150961d2 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -25,26 +25,22 @@ namespace WMS.Web.Api.Controllers
private IInStockTaskService _inStockTaskService;
private IBasicsRepositories _transactionRepositories;
private readonly IOpsService _opsService;
-
+ private readonly IBoxService _boxService;
public TestController(IErpService erpService, IInStockTaskService inStockTaskService,
- IBasicsRepositories transactionRepositories, IOpsService opsService)
+ IBasicsRepositories transactionRepositories, IOpsService opsService, IBoxService boxService)
{
this._erpService = erpService;
this._inStockTaskService = inStockTaskService;
this._transactionRepositories = transactionRepositories;
_opsService = opsService;
+ _boxService = boxService;
}
[HttpGet]
[Route("hj")]
public async Task TestHJ()
{
- OpsBoxRequest request = new OpsBoxRequest()
- {
- StrartTime = DateTime.Now.AddYears(-1),
- EndTime=DateTime.Now
- };
- await _opsService.GetBox(request);
+ await _boxService.Sync();
//var res = await this._erpService.BillQueryForSubStock();
//var result= await this._erpService.BillQueryForPurchaseInStock();
//var result = await this._erpService.BillQueryForOrg();
diff --git a/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs
index 811a8b26..11494c27 100644
--- a/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs
+++ b/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs
@@ -37,6 +37,6 @@ namespace WMS.Web.Domain.Infrastructure
//获取实体
Task Get(int id);
//根据订单号获取订单信息
- Task GetOutStockTaskByNo(string billNo);
+ Task> GetOutStockTaskByNo(string billNo);
}
}
diff --git a/src/WMS.Web.Domain/Services/Public/OpsService.cs b/src/WMS.Web.Domain/Services/Public/OpsService.cs
index 24b3a8d0..d4ccd455 100644
--- a/src/WMS.Web.Domain/Services/Public/OpsService.cs
+++ b/src/WMS.Web.Domain/Services/Public/OpsService.cs
@@ -34,64 +34,14 @@ namespace WMS.Web.Domain.Services.Public
public async Task> GetBox(OpsBoxRequest request)
{
- List listss = new List();
- OpsBoxResponse respnose = new OpsBoxResponse();
- List details = new List();
- List ss = new List();
- ss.Add(new SerialNumbersResponse() {
- SerialNumber="sss",
- BarCereateUser="sdf",
- BarCreateTime="20-20-20"
- });
- ss.Add(new SerialNumbersResponse()
- {
- SerialNumber = "sss2",
- BarCereateUser = "sdf2",
- BarCreateTime = "20-20-20"
- });
- details.Add(new OpsBoxDetailsResponse()
- {
- MaterialId = 1,
- Qty = 1,
- SerialNumbers = ss
- });
- respnose.Details = details;
- listss.Add(respnose);
-
- OpsBoxResponse respnose2 = new OpsBoxResponse();
- List details2 = new List();
- List ss2 = new List();
- 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 dicHeaders = new Dictionary();
dicHeaders.Add("Authorization", "Bearer " + token);
//_httpClientService.BuildHttpClient(contentHeaders);
var res = await _httpClientService.PostAsync(_option.Url + "BarCode/carton-box_api/carton-box", JsonConvert.SerializeObject(request), dicHeaders);
if (!res.succeeded) return new List();
- return JsonConvert.DeserializeObject>(res.data.date);
+ var list = JsonConvert.DeserializeObject>(res.data.date);
+ return list;
}
private async Task GetToken()
diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
index aa0debe0..dfd5fcdf 100644
--- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
@@ -308,12 +308,25 @@ namespace WMS.Web.Repositories
///
///
///
- public async Task GetOutStockTaskByNo(string billNo)
+ public async Task> GetOutStockTaskByNo(string billNo)
{
- var entity = await _context.OutStockTask.Include(x => x.Details).FirstOrDefaultAsync(f => billNo.Equals(f.BillNo));
- var response = _mapper.Map(entity);
+ var materials_result = await _erpService.BillQueryForMaterial();
+ if (!materials_result.IsSuccess)
+ return new List();
+ var materials = materials_result.Data.ToList();
+
+ var list = await _context.OutStockTask.Include(x => x.Details)
+ .Where(f => (EF.Functions.Like(f.BillNo, "%" + billNo + "%") ||
+ EF.Functions.Like(f.SourceBillNo, "%" + billNo + "%")) &&
+ (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait)).ToListAsync();
+ var response = _mapper.Map>(list);
//获取物料信息 显示物料三件套
- var mIds = entity.Details.Select(s => s.MaterialId).ToList();
+ foreach (var r in response.SelectMany(s => s.details))
+ {
+ r.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, r.MaterialId);
+ r.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, r.MaterialId);
+ r.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, r.MaterialId);
+ }
return response;
}
///