From 72bc9d490ec3ae0cb1522afc95163ed247ce9fba Mon Sep 17 00:00:00 2001
From: zhaoxinyu <89237069@qq.com>
Date: Sat, 11 May 2024 14:06:36 +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
---
.../test/TestAppService.cs | 2 +-
.../KittingIssueJobAppService.cs | 44 +++++++++++++------
.../IssueJobs/proxy/IssueJobToRestoClient.cs | 2 +-
3 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/test/TestAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/test/TestAppService.cs
index 817019c53..11f7020c5 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/test/TestAppService.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/test/TestAppService.cs
@@ -72,7 +72,7 @@ public class TestService:ApplicationService
{
ReusltObject reuslt=new ReusltObject();
- reuslt.Code = "0";
+ reuslt.Code = "1";
reuslt.Message = "操作成功";
reuslt.OperateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
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 0c8a5f2fe..d030f8a55 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
@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
+using System.Net.Http.Headers;
using System.Threading.Tasks;
using Castle.Components.DictionaryAdapter;
using Microsoft.AspNetCore.Authorization;
@@ -22,6 +23,7 @@ using Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy;
using Win_in.Sfs.Wms.Store.Notes;
using Win_in.Sfs.Wms.Store.Options;
using static IdentityModel.ClaimComparer;
+using static Volo.Abp.Identity.Settings.IdentitySettingNames;
namespace Win_in.Sfs.Wms.Store.Application;
@@ -358,10 +360,15 @@ public class KittingIssueJobAppService
+ ///
+ /// 立体库同步
+ ///
+ ///
+ ///
+ ///
+ [HttpPost("sync-issue-job-stereo")]
-
-
- private async Task SyncIssueJobStereoAsync(List input,string p_loc)
+ public async Task SyncIssueJobStereoAsync(List input,string p_loc)
{
ReusltObject ret = new ReusltObject();
@@ -388,15 +395,29 @@ public class KittingIssueJobAppService
}
}
main.Details = IssueJobToRestoDetailDTOs;
-
-
+ var httpclient = _httpClientFactory.CreateClient();
#if DEBUG
+
string json= System.Text.Json.JsonSerializer.Serialize(main);
- _options.Value.Address = "http://localhost:59094/CargoState/SyncCoatingJobStereo";//测试地址
+ _options.Value.Address = "http://localhost:59094/";//测试地址
+ _options.Value.Token = "";//测试token
+ _options.Value.UserName = "";//测试用户名
+ _options.Value.Password = "";//测试密码
+
#endif
+ 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(System.Text.Encoding.ASCII.GetBytes($"{username}:{password}")));
+ }
- #region
- IssueJobToRestoClient client = new IssueJobToRestoClient(_options.Value.Address, _httpClientFactory.CreateClient());
+ IssueJobToRestoClient client = new IssueJobToRestoClient(_options.Value.Address, httpclient);
ret = await client.SyncIssueJobStereoAsync(main).ConfigureAwait(false);
}
catch(Exception ex) {
@@ -405,14 +426,11 @@ public class KittingIssueJobAppService
ret.Message=ex.Message;
ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd");
}
- #endregion
+
return ret;
}
-
-
-
[HttpPost("receive-issue-job-stereo")]
public virtual async Task SyncReciveIssueJobStereoAsync(IssueRequestFromRestoDTO input)
{
@@ -440,7 +458,7 @@ public class KittingIssueJobAppService
var dtos = ObjectMapper.Map, List>(entities);
if (input.Jobs.Count == entities.Count)
{
- errors.Add("提交出库任务和WMS出库任务不符,请核对! \n");
+ errors.Add("立体库提交出库任务和WMS任务不符,请核对! \n");
}
foreach (var itm in dtos)
{
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/IssueJobToRestoClient.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/IssueJobToRestoClient.cs
index 094f914e8..034c0a0ae 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/IssueJobToRestoClient.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/IssueJobToRestoClient.cs
@@ -95,7 +95,7 @@ namespace MyNamespace
var urlBuilder_ = new System.Text.StringBuilder();
if (!string.IsNullOrEmpty(_baseUrl)) urlBuilder_.Append(_baseUrl);
// Operation Path: "CargoState/SyncIssueJobStereo"
- urlBuilder_.Append("CargoState/SyncIssueJobStereo");//修改路由
+ urlBuilder_.Append("CargoState/SyncIssueJobStereo");//修改路由按需求
PrepareRequest(client_, request_, urlBuilder_);