From 6a00bae1d56005b2ff2216620a011875d862fbd9 Mon Sep 17 00:00:00 2001 From: kyy <3283105747@qq.com> Date: 星期三, 10 九月 2025 18:15:22 +0800 Subject: [PATCH] 1、异常单 --- WebApi/GS.QC/Service/MesQcExceptionalManager.cs | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- WebApi/Gs.HostIIS/appsettings.json | 2 2 files changed, 108 insertions(+), 6 deletions(-) diff --git a/WebApi/GS.QC/Service/MesQcExceptionalManager.cs b/WebApi/GS.QC/Service/MesQcExceptionalManager.cs index 2ef1c13..fc07aa1 100644 --- a/WebApi/GS.QC/Service/MesQcExceptionalManager.cs +++ b/WebApi/GS.QC/Service/MesQcExceptionalManager.cs @@ -1,12 +1,13 @@ -锘縰sing System.Data; -using System.Data.SqlClient; -using System.Dynamic; -using Gs.Toolbox; +锘縰sing Gs.Toolbox; using Gs.Toolbox.ApiCore.Abstract.Mvc; using Gs.Toolbox.ApiCore.Common.Mvc; using Gs.Toolbox.ApiCore.Group; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using System.Data; +using System.Data.SqlClient; +using System.Dynamic; +using System.Text; using static Gs.Toolbox.UtilityHelper; namespace Gs.Wom.Service; @@ -129,7 +130,7 @@ } /// <summary> - /// + /// 瀹℃牳 /// </summary> /// <param name="mode"></param> /// <returns></returns> @@ -185,6 +186,107 @@ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "鎿嶄綔鎴愬姛锛�"); } + /// <summary> + /// 澧炲姞鎴栫紪杈戝疄浣�-浠呭鐞嗘槑缁嗘暟鎹殑缂栬緫鎿嶄綔 + /// </summary> + /// <param name="model">鍖呭惈鏄庣粏鍒楄〃鐨勬ā鍨�</param> + /// <returns>澶勭悊缁撴灉</returns> + [RequestMethod(RequestMethods.POST)] + public ReturnDto<ExpandoObject> EditModel([FromBody] dynamic model) + { + // 鍒濆鍖栧瓧绗︿覆鏋勫缓鍣ㄥ鐞嗘槑缁嗘暟鎹� + Guid? guid = model.guid; //涓婚敭 + var _sb = new StringBuilder(); + var _split = "|"; // 瀛楁鍒嗛殧绗� + var _lineSeparator = "~"; // 琛屽垎闅旂 + + // 澶勭悊鏄庣粏鍒楄〃锛岃浆鎹负瀛樺偍杩囩▼鎵�闇�鏍煎紡 + foreach (var m in model.list) + { + // 鑾峰彇鏄庣粏椤逛富閿紙鍙负绌猴紝鏂板鏃朵负绌猴級 + string _guid = m.Guid?.ToString() ?? Guid.Empty.ToString(); + + + // 鎷兼帴鍗曡鏄庣粏鏁版嵁锛殀鐢宠鏁伴噺|澶囨敞|鏄庣粏GUID + var _line = m.BatchQty + _split + m.GfRkqty + _split + m.LfRkqtyz + _split + m.HandResult + _split + + m.ChooseType + _split + m.Process + _split + + (UtilityHelper.CheckGuid(_guid) ? _guid : Guid.Empty.ToString()); + + // 澶氭潯鏄庣粏闂存坊鍔犲垎闅旂 + if (_sb.Length > 0) + _sb.Append(_lineSeparator); + _sb.Append(_line); + } + + // 鍑嗗杩斿洖缁撴灉瀵硅薄 + dynamic mObj = new ExpandoObject(); + mObj.outMsg = ""; // 鎿嶄綔娑堟伅 + mObj.outSum = -1; // 鎿嶄綔缁撴灉鐘舵�侊紙-1琛ㄧず澶辫触锛� + mObj.outGuid = ""; // 鍙繚鐣欑敤浜庤繑鍥炴槑缁嗙浉鍏崇殑GUID + mObj.outNo = ""; // 鍙繚鐣欑敤浜庤繑鍥炴槑缁嗙浉鍏崇殑缂栧彿 + + // 璋冪敤瀛樺偍杩囩▼澶勭悊鏄庣粏鏁版嵁 + using (var conn = new SqlConnection(DbHelperSQL.strConn)) + { + using (var cmd = new SqlCommand("[prc_Qcyc_edt]", conn)) // 寤鸿淇敼瀛樺偍杩囩▼鍚嶄负鏄庣粏涓撶敤 + { + try + { + conn.Open(); + cmd.CommandType = CommandType.StoredProcedure; + + // 瀹氫箟瀛樺偍杩囩▼鍙傛暟锛堜粎淇濈暀涓庢槑缁嗙浉鍏崇殑鍙傛暟锛� + SqlParameter[] parameters = + { + new("@outMsg", SqlDbType.NVarChar, 300), // 杈撳嚭锛氭搷浣滄秷鎭� + new("@outSum", SqlDbType.Int), // 杈撳嚭锛氱粨鏋滅姸鎬侊紙>0琛ㄧず鎴愬姛锛� + new("@outGuid", SqlDbType.UniqueIdentifier),// 杈撳嚭锛氬彲杩斿洖澶勭悊鍚庣殑鏄庣粏鍏宠仈ID + new("@outNo", SqlDbType.NVarChar, 300), // 杈撳嚭锛氬彲杩斿洖鏄庣粏鐩稿叧缂栧彿 + new("@inOrderGuid",UtilityHelper.CheckGuid(guid)? guid : DBNull.Value),//涓昏〃GUID + new("@inEdtUserGuid", _userGuid), // 杈撳叆锛氭搷浣滅敤鎴稧UID + new("@inLineList", _sb.ToString()) // 杈撳叆锛氬鐞嗗悗鐨勬槑缁嗗瓧绗︿覆 + }; + + // 璁剧疆杈撳嚭鍙傛暟鏂瑰悜 + parameters[0].Direction = ParameterDirection.Output; + parameters[1].Direction = ParameterDirection.Output; + parameters[2].Direction = ParameterDirection.Output; + parameters[3].Direction = ParameterDirection.Output; + + // 娣诲姞鍙傛暟鍒板懡浠ゅ璞� + foreach (var parameter in parameters) + cmd.Parameters.Add(parameter); + + // 鎵ц瀛樺偍杩囩▼ + cmd.ExecuteNonQuery(); + + // 浠庤緭鍑哄弬鏁拌幏鍙栫粨鏋� + mObj.outMsg = parameters[0].Value?.ToString() ?? "澶勭悊鎴愬姛"; + mObj.outSum = int.TryParse(parameters[1].Value?.ToString(), out int sum) ? sum : -1; + mObj.outGuid = parameters[2].Value?.ToString() ?? ""; + mObj.outNo = parameters[3].Value?.ToString() ?? ""; + } + catch (Exception ex) + { + // 璁板綍寮傚父鏃ュ織 + LogHelper.Debug(ToString(), $"澶勭悊鏄庣粏鏃跺嚭閿欙細{ex.Message}"); + mObj.outMsg = ex.Message; + mObj.outSum = -1; + } + finally + { + conn.Close(); + } + } + } + + // 鏍规嵁澶勭悊缁撴灉杩斿洖瀵瑰簲鐘舵�� + if (mObj.outSum <= 0) + return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Exception, mObj.outMsg); + + return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Success, mObj.outMsg); + } + /// <summary> /// 寮傚父鍗昈AtoMes diff --git a/WebApi/Gs.HostIIS/appsettings.json b/WebApi/Gs.HostIIS/appsettings.json index 873cb13..543b4ec 100644 --- a/WebApi/Gs.HostIIS/appsettings.json +++ b/WebApi/Gs.HostIIS/appsettings.json @@ -7,7 +7,7 @@ }, "AllowedHosts": "*", /*"ConnectionStrings": "Data Source=192.168.1.146;Initial Catalog=TEST_MES;User ID=testUser;Password =qixi1qaz@WSXtest",*/ - "ConnectionStrings": "Data Source=192.168.1.146,12468;Initial Catalog=GS_MES;User ID=mesUser;Password =qixi1qaz@WSXmes", + "ConnectionStrings": "Data Source=192.168.0.51;Initial Catalog=YS_MES;User ID=ysUser;Password =LanBao@2025ysUser", "TestErpUrl": "http://192.168.1.149:8066/WebService1.asmx/MesToErpinfoTest", "TestErpUrl2": "http://192.168.1.149:8066/WebService1.asmx/MesToErpUpdateFlag", "ProductionErpUrl": "http://192.168.1.149:8066/WebService1.asmx/mesToErpinfoFormal", -- Gitblit v1.9.3