From 56f5b01b7fce60a659f18f7c840c0867cd42067a Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 01 四月 2025 23:48:47 +0800
Subject: [PATCH] 新增审核和确认接口，优化登录逻辑
---
Tiger.Business.WMS/ERP/WMS_U9C.CreateTransferIn.cs | 139 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 133 insertions(+), 6 deletions(-)
diff --git a/Tiger.Business.WMS/ERP/WMS_U9C.CreateTransferIn.cs b/Tiger.Business.WMS/ERP/WMS_U9C.CreateTransferIn.cs
index 977af98..31fe6c6 100644
--- a/Tiger.Business.WMS/ERP/WMS_U9C.CreateTransferIn.cs
+++ b/Tiger.Business.WMS/ERP/WMS_U9C.CreateTransferIn.cs
@@ -26,13 +26,18 @@
{
public partial class WMS_U9C
{
+ public static string TransferInSubmitUrl
+ { get; set; } = "http://172.16.80.20/u9c/webapi/TransferIn/Submit"; // ApiConfig.IsTestServer ? Cache.SysParam["TransferInSubmitUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["TransferInSubmitUrl", "U9CUrl"].PARAM_VALUE; //http://172.16.80.20/u9c/webapi/TransferIn/Submit
+ public static string TransferInApproveUrl
+ { get; set; } = "http://172.16.80.20/u9c/webapi/TransferIn/Approve"; // ApiConfig.IsTestServer ? Cache.SysParam["TransferInApproveUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["TransferInApproveUrl", "U9CUrl"].PARAM_VALUE; //http://172.16.80.20/u9c/webapi/TransferIn/Approve
+
/// <summary>
- /// 鍒涘缓鐢熶骇閫�鏂欏崟-鎸夎閫�鏂欐帴鍙�
+ /// 鍒涘缓璋冨叆鍗曟帴鍙�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public async Task<ApiAction<List<U9CReturnData>>> CreateTransferIn(CreateTransferInInput input) {
- Logger.Interface.Info($"/**\r\n *杩涘叆鍒涘缓鐢熶骇閫�鏂欏崟-鎸夎閫�鏂欐帴鍙�....\r\n */\r\n"); //鍥哄畾鍐欐硶
+ Logger.Interface.Info($"/**\r\n *杩涘叆鍒涘缓璋冨叆鍗曟帴鍙�....\r\n */\r\n"); //鍥哄畾鍐欐硶
var action = new ApiAction<List<U9CReturnData>>();
try
{
@@ -54,21 +59,143 @@
if (result.Success && result.Data[0].m_isSucess)
{
action.Data = result.Data;
- Logger.Interface.Info($"鍒涘缓鐢熶骇閫�鏂欏崟-鎸夎閫�鏂欐帴鍙ｆ彁浜son: {JsonConvert.SerializeObject(input.CreateTransferInParam)}锛岃繑鍥濲son: {response.Message}");
+ Logger.Interface.Info($"鍒涘缓璋冨叆鍗曟帴鍙ｆ彁浜son: {JsonConvert.SerializeObject(input.CreateTransferInParam)}锛岃繑鍥濲son: {response.Message}");
}
else
{
action.IsSuccessed = false;
action.LocaleMsg = new($"{action.Message}; {result.Data[0].m_errorMsg}");
- Logger.Interface.Info($"鍒涘缓鐢熶骇閫�鏂欏崟-鎸夎閫�鏂欐帴鍙ｅけ璐�:{result.Data[0].m_errorMsg}");
+ Logger.Interface.Info($"鍒涘缓璋冨叆鍗曟帴鍙ｅけ璐�:{result.Data[0].m_errorMsg}");
}
}
}
catch (System.Exception ex)
{
- action.CatchExceptionWithLog(ex, "鍒涘缓鐢熶骇閫�鏂欏崟-鎸夎閫�鏂欏紓甯�");
+ action.CatchExceptionWithLog(ex, "鍒涘缓璋冨叆鍗曞紓甯�");
}
- Logger.Interface.Info($"/* 鍒涘缓鐢熶骇閫�鏂欏崟-鎸夎閫�鏂欐帴鍙ｇ粨鏉� */\r\n"); //鍥哄畾鍐欐硶
+ Logger.Interface.Info($"/* 鍒涘缓璋冨叆鍗曟帴鍙ｇ粨鏉� */\r\n"); //鍥哄畾鍐欐硶
+ return action;
+ }
+
+
+
+ /// <summary>
+ /// 璋冨叆鍗曞鏍告�诲叆鍙ｆ帴鍙�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<ApiAction<List<U9CReturnData2>>> TransferInApprove(TransferInSubmitInput input)
+ {
+ Logger.Interface.Info($"/**\r\n *杩涘叆璋冨叆鍗曞鏍告�诲叆鍙ｆ帴鍙�....\r\n */\r\n"); //鍥哄畾鍐欐硶
+ var action = new ApiAction<List<U9CReturnData2>>();
+ try
+ {
+ //action = await Submit(input);
+ //if (action.IsSuccessed)
+ //{
+ // input.IsLogin = false;
+ // action = await Approve(input);
+ //}
+
+ action = await Approve(input);
+ }
+ catch (System.Exception ex)
+ {
+ action.CatchExceptionWithLog(ex, "璋冨叆鍗曞鏍稿紓甯�");
+ }
+ Logger.Interface.Info($"/* 璋冨叆鍗曞鏍告�诲叆鍙ｆ帴鍙ｇ粨鏉� */\r\n"); //鍥哄畾鍐欐硶
+ return action;
+ }
+
+ /// <summary>
+ /// 璋冨叆鍗曟彁浜�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ private async Task<ApiAction<List<U9CReturnData2>>> Submit(TransferInSubmitInput input)
+ {
+ Logger.Interface.Info($"/**\r\n *杩涘叆璋冨叆鍗曟彁浜ゆ帴鍙�....\r\n */\r\n"); //鍥哄畾鍐欐硶
+ var action = new ApiAction<List<U9CReturnData2>>();
+ try
+ {
+ //濡傛灉宸茬粡鐧诲綍鍒欎笉闇�瑕佸啀娆＄櫥褰曪紝鐩存帴浣跨敤浼犲叆鐨則oken
+ if (input.IsLogin)
+ {
+ var u9CLoginResult = await HttpHelper.GetAsync<U9CLoginResult>($"{U9CAuthLoginUrl}userCode={input.userId}{secret}");
+ if (u9CLoginResult.Success)
+ {
+ input.token = u9CLoginResult.Data;
+ Logger.Interface.Info($"U9C鐧诲綍token: {input.token}");
+ }
+ }
+ var response = await HttpHelper.PostAsync(TransferInSubmitUrl, JsonConvert.SerializeObject(input.TransferInSubmitParam), new Dictionary<string, string>() { { "token", input.token } });
+ var result = JsonConvert.DeserializeObject<U9CResult2>(response.Message);
+ if (result != null)
+ {
+ if (result.Success && result.Data[0].IsSucess)
+ {
+ action.Data = result.Data;
+ Logger.Interface.Info($"璋冨叆鍗曟彁浜ゆ帴鍙ｆ彁浜son: {JsonConvert.SerializeObject(input.TransferInSubmitParam)}锛岃繑鍥濲son: {response.Message}");
+ }
+ else
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = new($"{action.Message}; {result.Data[0].ErrorMsg}");
+ Logger.Interface.Info($"璋冨叆鍗曟彁浜ゆ帴鍙ｅけ璐�:{result.Data[0].ErrorMsg}");
+ }
+ }
+ }
+ catch (System.Exception ex)
+ {
+ action.CatchExceptionWithLog(ex, "璋冨叆鍗曟彁浜ゅ紓甯�");
+ }
+ Logger.Interface.Info($"/* 璋冨叆鍗曟彁浜ゆ帴鍙ｇ粨鏉� */\r\n"); //鍥哄畾鍐欐硶
+ return action;
+ }
+
+ /// <summary>
+ /// 璋冨叆鍗曞鏍�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ private async Task<ApiAction<List<U9CReturnData2>>> Approve(TransferInSubmitInput input)
+ {
+ Logger.Interface.Info($"/**\r\n *杩涘叆璋冨叆鍗曞鏍告帴鍙�....\r\n */\r\n"); //鍥哄畾鍐欐硶
+ var action = new ApiAction<List<U9CReturnData2>>();
+ try
+ {
+ //濡傛灉宸茬粡鐧诲綍鍒欎笉闇�瑕佸啀娆＄櫥褰曪紝鐩存帴浣跨敤浼犲叆鐨則oken
+ if (input.IsLogin)
+ {
+ var u9CLoginResult = await HttpHelper.GetAsync<U9CLoginResult>($"{U9CAuthLoginUrl}userCode={input.userId}{secret}");
+ if (u9CLoginResult.Success)
+ {
+ input.token = u9CLoginResult.Data;
+ Logger.Interface.Info($"U9C鐧诲綍token: {input.token}");
+ }
+ }
+ var response = await HttpHelper.PostAsync(TransferInApproveUrl, JsonConvert.SerializeObject(input.TransferInSubmitParam), new Dictionary<string, string>() { { "token", input.token } });
+ var result = JsonConvert.DeserializeObject<U9CResult2>(response.Message);
+ if (result != null)
+ {
+ if (result.Success && result.Data[0].IsSucess)
+ {
+ action.Data = result.Data;
+ Logger.Interface.Info($"璋冨叆鍗曞鏍告帴鍙ｆ彁浜son: {JsonConvert.SerializeObject(input.TransferInSubmitParam)}锛岃繑鍥濲son: {response.Message}");
+ }
+ else
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = new($"{action.Message}; {result.Data[0].ErrorMsg}");
+ Logger.Interface.Info($"璋冨叆鍗曞鏍告帴鍙ｅけ璐�:{result.Data[0].ErrorMsg}");
+ }
+ }
+ }
+ catch (System.Exception ex)
+ {
+ action.CatchExceptionWithLog(ex, "璋冨叆鍗曞鏍稿紓甯�");
+ }
+ Logger.Interface.Info($"/* 璋冨叆鍗曞鏍告帴鍙ｇ粨鏉� */\r\n"); //鍥哄畾鍐欐硶
return action;
}
}
--
Gitblit v1.9.3