From 76245024a71fedf2e9c9cb03fd489851f81bce55 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 02 四月 2025 16:34:58 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Business.WMS/ERP/WMS_U9C.CreateProdReturnOrder.cs | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/Tiger.Business.WMS/ERP/WMS_U9C.CreateProdReturnOrder.cs b/Tiger.Business.WMS/ERP/WMS_U9C.CreateProdReturnOrder.cs
index 135be19..10e4aed 100644
--- a/Tiger.Business.WMS/ERP/WMS_U9C.CreateProdReturnOrder.cs
+++ b/Tiger.Business.WMS/ERP/WMS_U9C.CreateProdReturnOrder.cs
@@ -31,7 +31,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public async Task<ApiAction<List<U9CReturnData>>> CreateProdReturnOrder(CreateProdReturnOrderInput input) {
+ public async Task<ApiAction<List<U9CReturnData>>> CreateProdReturnOrderNew(CreateProdReturnOrderNewInput input) {
Logger.Interface.Info($"/**\r\n *杩涘叆鍒涘缓鐢熶骇閫�鏂欏崟-鎸夎閫�鏂欐帴鍙�....\r\n */\r\n"); //鍥哄畾鍐欐硶
var action = new ApiAction<List<U9CReturnData>>();
try
@@ -47,20 +47,20 @@
}
}
- var response = await HttpHelper.PostAsync(CreateProdReturnOrderUrl, JsonConvert.SerializeObject(input.CreateProdReturnOrderParam), new Dictionary<string, string>() { { "token", input.token } });
+ var response = await HttpHelper.PostAsync(CreateProdReturnOrderNewUrl, JsonConvert.SerializeObject(input.CreateProdReturnOrderNewParams), new Dictionary<string, string>() { { "token", input.token } });
var result = JsonConvert.DeserializeObject<U9CResult>(response.Message);
if (result != null)
{
if (result.Success && result.Data[0].m_isSucess)
{
action.Data = result.Data;
- Logger.Interface.Info($"鍒涘缓鐢熶骇閫�鏂欏崟-鎸夎閫�鏂欐帴鍙ｆ彁浜son: {JsonConvert.SerializeObject(input.CreateProdReturnOrderParam)}锛岃繑鍥濲son: {response.Message}");
+ Logger.Interface.Info($"鍒涘缓鐢熶骇閫�鏂欏崟-鎸夎閫�鏂欐帴鍙ｆ彁浜son: {JsonConvert.SerializeObject(input.CreateProdReturnOrderNewParams)}锛岃繑鍥濲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}锛屾彁浜son: {JsonConvert.SerializeObject(input.CreateProdReturnOrderNewParams)}");
}
}
}
@@ -71,5 +71,52 @@
Logger.Interface.Info($"/* 鍒涘缓鐢熶骇閫�鏂欏崟-鎸夎閫�鏂欐帴鍙ｇ粨鏉� */\r\n"); //鍥哄畾鍐欐硶
return action;
}
+
+ /// <summary>
+ /// 鍒涘缓鐢熶骇閫�鏂欏崟
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<ApiAction<List<U9CReturnData>>> CreateProdReturnOrder(CreateProdReturnOrderInput input)
+ {
+ Logger.Interface.Info($"/**\r\n *杩涘叆鍒涘缓鐢熶骇閫�鏂欏崟鎺ュ彛....\r\n */\r\n"); //鍥哄畾鍐欐硶
+ var action = new ApiAction<List<U9CReturnData>>();
+ 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(CreateProdReturnOrderNewUrl, JsonConvert.SerializeObject(input.CreateProdReturnOrderParam), new Dictionary<string, string>() { { "token", input.token } });
+ var result = JsonConvert.DeserializeObject<U9CResult>(response.Message);
+ if (result != null)
+ {
+ if (result.Success && result.Data[0].m_isSucess)
+ {
+ action.Data = result.Data;
+ Logger.Interface.Info($"鍒涘缓鐢熶骇閫�鏂欏崟鎺ュ彛鎻愪氦Json: {JsonConvert.SerializeObject(input.CreateProdReturnOrderParam)}锛岃繑鍥濲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}");
+ }
+ }
+ }
+ catch (System.Exception ex)
+ {
+ action.CatchExceptionWithLog(ex, "鍒涘缓鐢熶骇閫�鏂欏崟寮傚父");
+ }
+ Logger.Interface.Info($"/* 鍒涘缓鐢熶骇閫�鏂欏崟鎺ュ彛缁撴潫 */\r\n"); //鍥哄畾鍐欐硶
+ return action;
+ }
}
}
--
Gitblit v1.9.3