From 382bc63b68d1f8f99b0455194f45f5c2b42d4f5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Mon, 23 Dec 2024 09:58:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseDatas/PositionLocationController.cs | 69 +++++++++++++++ .../InjectionIssueJobAppService.cs | 84 ------------------ .../KittingIssueJobAppService.cs | 86 +------------------ 3 files changed, 70 insertions(+), 169 deletions(-) create mode 100644 be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/BaseDatas/PositionLocationController.cs diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/BaseDatas/PositionLocationController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/BaseDatas/PositionLocationController.cs new file mode 100644 index 000000000..8a1073e60 --- /dev/null +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/BaseDatas/PositionLocationController.cs @@ -0,0 +1,69 @@ + +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.Application.Dtos; +using Volo.Abp.AspNetCore.Mvc; +using Win_in.Sfs.Basedata.Application.Contracts; + + +namespace Win_in.Sfs.Wms.Pda.Controllers.BaseDatas; + + + [ApiController] + [Route($"{PdaHostConst.ROOT_ROUTE}post-location")] + public class PostionLocationController : AbpController + { + + private readonly IPostionLocationAppService _PositionLocationAppService; + + /// + /// + /// + /// + public PostionLocationController(IPostionLocationAppService PositionLocationAppService) + { + _PositionLocationAppService = PositionLocationAppService; + } + + + + + + + + /// + /// + /// + /// + /// + [HttpGet("by-code")] + public virtual async Task GetByCode(string code) + { + return await _PositionLocationAppService.GetByCodeAsync(code).ConfigureAwait(false); + } + + /// + /// + /// + /// + /// + /// + /// + [HttpGet("list")] + public virtual async Task> GetListAsync(int pageSize, int pageIndex, string sorting) + { + var request = new SfsBaseDataRequestInputBase + { + MaxResultCount = pageSize, + SkipCount = (pageIndex - 1) * pageSize, + Sorting = sorting + }; + + var list = await _PositionLocationAppService.GetPagedListByFilterAsync(request, false).ConfigureAwait(false); + return list; + } + } + + + + diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs index ac925e2b6..85c0e378d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs @@ -487,91 +487,7 @@ public class InjectionIssueJobAppService return dto; } - #region 立库 - - /// - /// 立体库同步 - /// - /// - /// - /// - [HttpPost("sync-issue-job-stereo")] - public async Task SyncIssueJobStereoAsync(List input, string pLoc) - { - var ret = new ReusltObject(); - ret.Code = 1; - ret.Message = "操作成功"; - ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd"); - try - { - var IssueJobToRestoDetailDTOs = new List(); - var main = new IssueJobToRestoDTO(); - main.OperatorName = CurrentUser.UserName; - foreach (var job in input) - { - foreach (var jobitem in job.Details) - { - IssueJobToRestoDetailDTOs.Add(new IssueJobToRestoDetailDTO - { - Count = jobitem.HandledToQty, - ProductNo = jobitem.ItemCode, - NeedSite = pLoc, - WorkNo = job.Number, - TaskNo = job.Number - }); - } - } - - main.Details = IssueJobToRestoDetailDTOs; - var httpclient = _httpClientFactory.CreateClient(); -#if DEBUG - - var json = JsonSerializer.Serialize(main); - _options.Value.Address = "http://7e42682n64.goho.co:21171/"; //测试地址 - _options.Value.Token = ""; //测试token - _options.Value.UserName = ""; //测试用户名 - _options.Value.Password = ""; //测试密码 - -#endif - //var json = JsonSerializer.Serialize(main); - _options.Value.Address = "http://7e42682n64.goho.co:21171/"; //测试地址 - _options.Value.Token = ""; //测试token - _options.Value.UserName = ""; //测试用户名 - _options.Value.Password = ""; //测试密码 - _options.Value.Path = "zozocnApi/custom/receiveProductionPlan"; //测试密码 - - //_logger.LogInformation(System.Text.Json.JsonSerializer.Serialize(_options)); - if (!string.IsNullOrEmpty(_options.Value.Token)) - { - var token = _options.Value.Token; - httpclient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token); - } - - if (!string.IsNullOrEmpty(_options.Value.UserName) && !string.IsNullOrEmpty(_options.Value.Password)) - { - var username = _options.Value.UserName; - var password = _options.Value.Password; - httpclient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", - Convert.ToBase64String(Encoding.ASCII.GetBytes($"{username}:{password}"))); - } - - var client = new IssueJobToRestoClient(_options.Value.Address, httpclient, _options.Value.Path); - ret = await client.SyncIssueJobStereoAsync(main).ConfigureAwait(false); - } - catch (Exception ex) - { - ret = new ReusltObject(); - ret.Code = -1; - ret.Message = ex.Message; - ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd"); - } - - return ret; - } - - - #endregion #region 私有 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs index a65aeec90..ae7b93b9a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs @@ -503,91 +503,7 @@ public class KittingIssueJobAppService return dto; } - #region 立库 - - /// - /// 立体库同步 - /// - /// - /// - /// - [HttpPost("sync-issue-job-stereo")] - public async Task SyncIssueJobStereoAsync(List input, string pLoc) - { - var ret = new ReusltObject(); - ret.Code = 1; - ret.Message = "操作成功"; - ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd"); - try - { - var IssueJobToRestoDetailDTOs = new List(); - var main = new IssueJobToRestoDTO(); - main.OperatorName = CurrentUser.UserName; - foreach (var job in input) - { - foreach (var jobitem in job.Details) - { - IssueJobToRestoDetailDTOs.Add(new IssueJobToRestoDetailDTO - { - Count = jobitem.HandledToQty, - ProductNo = jobitem.ItemCode, - NeedSite = pLoc, - WorkNo = job.Number, - TaskNo = job.Number - }); - } - } - - main.Details = IssueJobToRestoDetailDTOs; - var httpclient = _httpClientFactory.CreateClient(); -#if DEBUG - - var json = JsonSerializer.Serialize(main); - _options.Value.Address = "http://localhost:59094/"; //测试地址 - _options.Value.Token = ""; //测试token - _options.Value.UserName = ""; //测试用户名 - _options.Value.Password = ""; //测试密码 - -#endif - //var json = JsonSerializer.Serialize(main); - _options.Value.Address = "http://7e42682n64.goho.co:21171/"; //测试地址 - _options.Value.Token = ""; //测试token - _options.Value.UserName = ""; //测试用户名 - _options.Value.Password = ""; //测试密码 - _options.Value.Path = "zozocnApi/custom/receiveProductionPlan"; //测试密码 - - //_logger.LogInformation(System.Text.Json.JsonSerializer.Serialize(_options)); - - if (!string.IsNullOrEmpty(_options.Value.Token)) - { - var token = _options.Value.Token; - httpclient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token); - } - - if (!string.IsNullOrEmpty(_options.Value.UserName) && !string.IsNullOrEmpty(_options.Value.Password)) - { - var username = _options.Value.UserName; - var password = _options.Value.Password; - httpclient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", - Convert.ToBase64String(Encoding.ASCII.GetBytes($"{username}:{password}"))); - } - - var client = new IssueJobToRestoClient(_options.Value.Address, httpclient, _options.Value.Path); - ret = await client.SyncIssueJobStereoAsync(main).ConfigureAwait(false); - } - catch (Exception ex) - { - ret = new ReusltObject(); - ret.Code = -1; - ret.Message = ex.Message; - ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd"); - } - - return ret; - } - - - #endregion + #region 私有