TigerClouds-Tech/Server/TigerApi6_2024.git

			@@ -18,6 +18,10 @@
			public static string U9CAuthLoginUrl { get; set; } = ApiConfig.IsTestServer ? Cache.SysParam["U9CAuthLoginUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["U9CAuthLoginUrl", "U9CUrl"].PARAM_VALUE; // "http://172.16.80.20/U9C/webapi/OAuth2/AuthLogin?"; 测试
			//public static string U9CAuthLoginUrl { get; set; } = Cache.SysParam["U9CAuthLoginUrl", "U9CUrl"].PARAM_VALUE; //正式
			public static string secret = "&entcode=02&orgcode=101&clientid=mes&clientsecret=12c8ee7e9bb74ad2a6a0fb3315c8af20";
			/// <summary>
			/// 审核人
			/// </summary>
			public static string Reviewer = Cache.SysParam["Reviewer", "U9CUrl"].PARAM_VALUE;
			public static string CreateRcvBySrcASNUrl
			{ get; set; } = "http://172.16.80.20/U9C/webapi/Receivement/CreateRcvBySrcASN"; //ApiConfig.IsTestServer ? Cache.SysParam["CreateRcvBySrcASNUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["CreateRcvBySrcASNUrl", "U9CUrl"].PARAM_VALUE; //"http://172.16.80.20/U9C/webapi/Receivement/CreateRcvBySrcASN"; 测试
			public static string CreateReceivementUrl
			@@ -26,14 +30,19 @@
			{ get; set; } = "http://172.16.80.20/u9c/webapi/Receivement/SubmitLine"; // ApiConfig.IsTestServer ? Cache.SysParam["SubmitLineUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["SubmitLineUrl", "U9CUrl"].PARAM_VALUE; //http://172.16.80.20/u9c/webapi/Receivement/SubmitLine; 测试
			public static string ApproveLineUrl
			{ get; set; } = "http://172.16.80.20/u9c/webapi/Receivement/ApproveLine"; // ApiConfig.IsTestServer ? Cache.SysParam["ApproveLineUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["ApproveLineUrl", "U9CUrl"].PARAM_VALUE; //http://172.16.80.20/u9c/webapi/Receivement/ApproveLine; 测试
			public static string CreateProdMaterialReqUrl
			{ get; set; } = "http://172.16.80.20/u9c/webapi/IssueDoc/Create"; // ApiConfig.IsTestServer ? Cache.SysParam["CreateProdMaterialReqUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["CreateProdMaterialReqUrl", "U9CUrl"].PARAM_VALUE; //http://172.16.80.20/u9c/webapi/IssueDoc/Create
			public static string CreateProdReturnOrderUrl
			/// <summary>
			/// 创建生产退料单-按行退料
			/// </summary>
			public static string CreateProdReturnOrderNewUrl
			{ get; set; } = "http://172.16.80.20/u9c/webapi/IssueDoc/CreateRecedeIssueDocNew"; // ApiConfig.IsTestServer ? Cache.SysParam["CreateProdReturnOrderUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["CreateProdReturnOrderUrl", "U9CUrl"].PARAM_VALUE; //http://172.16.80.20/u9c/webapi/IssueDoc/CreateRecedeIssueDocNew
			public static string CreateOutProdMaterialReqUrl
			{ get; set; } = "http://172.16.80.20/u9c/webapi/PMIssueDoc/Create"; // ApiConfig.IsTestServer ? Cache.SysParam["CreateOutProdMaterialReqUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["CreateOutProdMaterialReqUrl", "U9CUrl"].PARAM_VALUE; //http://172.16.80.20/u9c/webapi/PMIssueDoc/Create
			/// <summary>
			/// 创建委外生产退料单
			/// </summary>
			public static string CreateOutProdReturnOrderUrl
			{ get; set; } = "http://172.16.80.20/u9c/webapi/PMIssueDoc/CreateRecedeIssueDoc"; // ApiConfig.IsTestServer ? Cache.SysParam["CreateOutProdReturnOrderUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["CreateOutProdReturnOrderUrl", "U9CUrl"].PARAM_VALUE; //http://172.16.80.20/u9c/webapi/PMIssueDoc/CreateRecedeIssueDoc
			/// <summary>
			/// 创建调入单
			/// </summary>
			public static string CreateTransferInUrl
			{ get; set; } = "http://172.16.80.20/u9c/webapi/TransferIn/Create"; // ApiConfig.IsTestServer ? Cache.SysParam["CreateTransferInUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["CreateTransferInUrl", "U9CUrl"].PARAM_VALUE; //http://172.16.80.20/u9c/webapi/TransferIn/Create

			@@ -70,7 +79,7 @@
			if (result.Success && result.Data[0].IsSucess)
			{
			action.Data = result.Data;
			// Logger.Interface.Info($"新增收货单-来源ASN单接口提交Json: {JsonConvert.SerializeObject(param)}，返回Json: {response.Message}");
			Logger.Interface.Info($"新增收货单-来源ASN单接口提交Json: {JsonConvert.SerializeObject(param)}，返回Json: {response.Message}");
			}
			else
			{
			@@ -155,11 +164,12 @@
			var action = new ApiAction<List<U9CReturnData2>>();
			try
			{
			action = await SubmitLine(input);
			if (action.IsSuccessed) {
			input.IsLogin = false;
			action = await ApproveLine(input);
			}
			//action = await SubmitLine(input);
			//if (action.IsSuccessed) {
			// input.IsLogin = false;
			// action = await ApproveLine(input);
			//}
			action = await ApproveLine(input);
			}
			catch (System.Exception ex)
			{
			@@ -190,14 +200,16 @@
			Logger.Interface.Info($"U9C登录token: {input.token}");
			}
			}
			var response = await HttpHelper.PostAsync(SubmitLineUrl, JsonConvert.SerializeObject(input.param), new Dictionary<string, string>() { { "token", input.token } });
			var _params = new List<SubmitLineInputParam>();
			_params.Add(input.param);
			var response = await HttpHelper.PostAsync(SubmitLineUrl, JsonConvert.SerializeObject(_params), 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($"收货单-行提交接口提交Json: {JsonConvert.SerializeObject(input.param)}，返回Json: {response.Message}");
			Logger.Interface.Info($"收货单-行提交接口提交Json: {JsonConvert.SerializeObject(_params)}，返回Json: {response.Message}");
			}
			else
			{
			@@ -229,27 +241,29 @@
			//如果已经登录则不需要再次登录，直接使用传入的token
			if (input.IsLogin)
			{
			var u9CLoginResult = await HttpHelper.GetAsync<U9CLoginResult>($"{U9CAuthLoginUrl}userCode={input.userId}{secret}");
			var u9CLoginResult = await HttpHelper.GetAsync<U9CLoginResult>($"{U9CAuthLoginUrl}userCode={Reviewer}{secret}");
			if (u9CLoginResult.Success)
			{
			input.token = u9CLoginResult.Data;
			Logger.Interface.Info($"U9C登录token: {input.token}");
			}
			}
			var response = await HttpHelper.PostAsync(ApproveLineUrl, JsonConvert.SerializeObject(input.param), new Dictionary<string, string>() { { "token", input.token } });
			var _params = new List<SubmitLineInputParam>();
			_params.Add(input.param);
			var response = await HttpHelper.PostAsync(ApproveLineUrl, JsonConvert.SerializeObject(_params), 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($"收货单-行审核接口提交Json: {JsonConvert.SerializeObject(input.param)}，返回Json: {response.Message}");
			Logger.Interface.Info($"收货单-行审核接口提交Json: {JsonConvert.SerializeObject(_params)}，返回Json: {response.Message}");
			}
			else
			{
			action.IsSuccessed = false;
			action.LocaleMsg = new($"收货单 - 行审核接口失败:{result.Data[0].ErrorMsg}");
			Logger.Interface.Info($"收货单-行审核接口失败:{result.Data[0].ErrorMsg}");
			Logger.Interface.Info($"收货单-行审核接口提交Json: {JsonConvert.SerializeObject(_params)}，失败:{result.Data[0].ErrorMsg}");
			}
			}
			}