更新版本

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;
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="PositionLocationAppService"></param>
+        public PostionLocationController(IPostionLocationAppService PositionLocationAppService)
+        {
+            _PositionLocationAppService = PositionLocationAppService;
+        }
+
+
+
+
+
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="code"></param>
+        /// <returns></returns>
+        [HttpGet("by-code")]
+        public virtual async Task<PostionLocationDTO> GetByCode(string code)
+        {
+            return await _PositionLocationAppService.GetByCodeAsync(code).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="pageSize"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="sorting"></param>
+        /// <returns></returns>
+        [HttpGet("list")]
+        public virtual async Task<PagedResultDto<PostionLocationDTO>> 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;
+        }
+    }
+
+
+
+

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 立库
-
-    /// <summary>
-    ///     立体库同步
-    /// </summary>
-    /// <param name="input"></param>
-    /// <param name="pLoc"></param>
-    /// <returns></returns>
-    [HttpPost("sync-issue-job-stereo")]
-    public async Task<ReusltObject> SyncIssueJobStereoAsync(List<InjectionIssueJobDTO> 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<IssueJobToRestoDetailDTO>();
-            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 私有
 

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 立库
+ 
-
-    /// <summary>
-    ///     立体库同步
-    /// </summary>
-    /// <param name="input"></param>
-    /// <param name="pLoc"></param>
-    /// <returns></returns>
-    [HttpPost("sync-issue-job-stereo")]
-    public async Task<ReusltObject> SyncIssueJobStereoAsync(List<KittingIssueJobDTO> 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<IssueJobToRestoDetailDTO>();
-            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 私有