From 44a7c47a724c154c54e256727c75e79d31fd42e2 Mon Sep 17 00:00:00 2001 From: 啊鑫 <t2856754968@163.com> Date: 星期四, 05 六月 2025 21:42:40 +0800 Subject: [PATCH] 优化代码格式,添加到货标识和查询条件 --- StandardPda/MES.Service/service/QC/LljService.cs | 539 ++++++++++++++++++++++++++++++----------------------------- 1 files changed, 277 insertions(+), 262 deletions(-) diff --git a/StandardPda/MES.Service/service/QC/LljService.cs b/StandardPda/MES.Service/service/QC/LljService.cs index e5e979e..9716690 100644 --- a/StandardPda/MES.Service/service/QC/LljService.cs +++ b/StandardPda/MES.Service/service/QC/LljService.cs @@ -1,23 +1,14 @@ -锘縰sing Masuit.Tools; +锘縰sing System.Data; +using System.Security.Cryptography; +using System.Text; +using Masuit.Tools; using MES.Service.DB; using MES.Service.Dto.service; using MES.Service.Modes; using MES.Service.util; -using MySqlConnector; using Newtonsoft.Json; -using RestSharp; -using SharpCompress.Factories; using SqlSugar; -using System.ComponentModel; -using System.Data; -using System.Xml.Linq; -using ZstdSharp.Unsafe; -using System.Net.Http; -using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database; using DbType = System.Data.DbType; -using System.Text; -using System.Security.Cryptography; -using AngleSharp.Io; namespace MES.Service.service.QC; @@ -40,14 +31,16 @@ var pageList = db .Queryable<LtsLlj, IqcBefore, VMesQaItemsDetect01, SysUser, - IqcBeforeFrom, SysUser, InspectorChangeLog, SysUser>((a, b, d, e, f, g,h,i) => + IqcBeforeFrom, SysUser, InspectorChangeLog, SysUser>((a, b, d, + e, f, g, h, i) => new JoinQueryInfos(JoinType.Left, a.ItemId == b.ItemId, JoinType.Inner, a.Id == d.Id, JoinType.Left, a.CreateBy == e.Fcode, JoinType.Left, f.Id == b.PID, JoinType.Left, f.Sid == g.Fid, - JoinType.Left,a.ReleaseNo==h.InspectionNo && h.IsValid=="Y", - JoinType.Left,i.Fcode==h.Inspector + JoinType.Left, + a.ReleaseNo == h.InspectionNo && h.IsValid == "Y", + JoinType.Left, i.Fcode == h.Inspector )) .WhereIF( StringUtil.IsNotNullOrEmpty(queryObj.result) && @@ -61,6 +54,7 @@ // itemIds is { Length: > 0 }, // (a, b, c) => itemIds.Contains(a.ItemId)) .WhereIF(id > 0, (a, b, d) => a.Id == id) + .WhereIF(queryObj.arrivalFilter >= 0, (a, b, d) => a.IsArrival == queryObj.arrivalFilter) .WhereIF(queryObj.createUser!="PL017"&& queryObj.UserIndex=="0", (a, b, d, e, f, g,h, i) => (g.Fcode == queryObj.createUser || i.Fcode == queryObj.createUser))//鍒ゆ柇姝ゅ崟鐨勬楠屽憳锛屾垨鑰呮楠屼负绌哄氨鏄剧ず姝ゅ崟鎹� //鍔犵瓫閫夋潯浠�,鏍规嵁渚涘簲鍟嗭紝鐗╂枡缂栫爜锛岀墿鏂欏悕绉帮紝椤圭洰鎼滅储 //.WhereIF(queryObj.SearchValue != null && queryObj.SearchValue != "", @@ -79,11 +73,11 @@ .WhereIF(queryObj.result == "宸插畬鎴�" && queryObj.state!= "鎵�鏈夌姸鎬�",(a, b, d, e) => (a.FcheckResu == queryObj.state)) // .WhereIF(queryObj.result == "鏈畬鎴�" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d, e) => (e.Fname.ToLower().Contains(queryObj.SearchValue.ToLower()))) //.OrderByDescending((a, b, d) => a.Id) - .Select((a, b, d, e, f, g,h,i) => new LtsLlj + .Select((a, b, d, e, f, g, h, i) => new LtsLlj { //UserName = g.Fname, //UserName = (i.Fname!=null ||i.Fname!="") ? i.Fname : g.Fname, - UserName = (i.Fname!=null ||i.Fname!="") ? i.Fname : g.Fname, + UserName = i.Fname != null || i.Fname != "" ? i.Fname : g.Fname, FIRST = d.First, CreateUserName = e.Fname, NewFngDesc = d.NewFngDesc, @@ -214,7 +208,7 @@ /// <summary> - /// 璋冪敤瀛樺偍杩囩▼锛岄噸鏂拌幏鍙栨楠岄」鐩� + /// 璋冪敤瀛樺偍杩囩▼锛岄噸鏂拌幏鍙栨楠岄」鐩� /// </summary> /// <param name="itemNo"></param> /// <param name="quantity"></param> @@ -236,9 +230,9 @@ var parameters = new List<SugarParameter> { new("P_RELEASE_NO", releaseNo, - DbType.String, ParameterDirection.Input), - outputResult, - outputMessage + DbType.String, ParameterDirection.Input), + outputResult, + outputMessage }; var db = SqlSugarHelper.GetInstance(); @@ -251,24 +245,22 @@ // 鑾峰彇杈撳嚭鍙傛暟鐨勫�� var resultValue = outputResult.Value?.ToString(); var messageValue = outputMessage.Value?.ToString(); - string[] msg = new string[2]; + var msg = new string[2]; msg[0] = resultValue; msg[1] = messageValue; return msg; - } - - /// <summary> - /// 淇濆瓨鏂版楠屽憳 + /// 淇濆瓨鏂版楠屽憳 /// </summary> /// <param name="NewStaffUserID">鏂版楠屽憳ID</param> /// <param name="userID">淇敼浜�</param> /// <param name="releaseNo">妫�楠屽崟鍙�</param> /// <returns></returns> - public string[] SaveCheckBy(string NewStaffUserID, string userID, string releaseNo) + public string[] SaveCheckBy(string NewStaffUserID, string userID, + string releaseNo) { // 瀹氫箟杈撳嚭鍙傛暟 var outputResult = new SugarParameter("o_Result", null, @@ -283,14 +275,14 @@ var parameters = new List<SugarParameter> { new("P_FCHECK_BY", NewStaffUserID, - DbType.String, ParameterDirection.Input), - new("p_Release_No", releaseNo, - DbType.String, ParameterDirection.Input), + DbType.String, ParameterDirection.Input), + new("p_Release_No", releaseNo, + DbType.String, ParameterDirection.Input), new("p_User", userID, - DbType.String, ParameterDirection.Input), - - outputResult, - outputMessage + DbType.String, ParameterDirection.Input), + + outputResult, + outputMessage }; var db = SqlSugarHelper.GetInstance(); @@ -303,13 +295,11 @@ // 鑾峰彇杈撳嚭鍙傛暟鐨勫�� var resultValue = outputResult.Value?.ToString(); var messageValue = outputMessage.Value?.ToString(); - string[] msg = new string[2]; + var msg = new string[2]; msg[0] = resultValue; msg[1] = messageValue; return msg; - } - public string[] SaveSysSubmit(SysSubmit sysSubmit) @@ -327,30 +317,30 @@ var parameters = new List<SugarParameter> { new("PI_BILLNO", sysSubmit.PI_BILLNO, - DbType.String, ParameterDirection.Input), - new("PI_USER", sysSubmit.PI_USER, - DbType.String, ParameterDirection.Input), - new("PI_SAMPLE_STATUS", sysSubmit.PI_SAMPLE_STATUS, - DbType.String, ParameterDirection.Input), - new("PI_SAMPLE_TYPE", sysSubmit.PI_SAMPLE_TYPE, - DbType.String, ParameterDirection.Input), - new("PI_SAMPLE_REASON", sysSubmit.PI_SAMPLE_REASON, - DbType.String, ParameterDirection.Input), - new("PI_INSPECT_TYPE", sysSubmit.PI_INSPECT_TYPE, - DbType.String, ParameterDirection.Input), - new("PI_SAMPLE_PREPARATION", sysSubmit.PI_SAMPLE_PREPARATION, - DbType.String, ParameterDirection.Input), - new("PI_URGENCY", sysSubmit.PI_URGENCY, - DbType.String, ParameterDirection.Input), - new("PI_FIRMWAREVERSION", sysSubmit.PI_FIRMWAREVERSION, - DbType.String, ParameterDirection.Input), - new("PI_HARDWAREVERSION", sysSubmit.PI_HARDWAREVERSION, - DbType.String, ParameterDirection.Input), - new("PI_REMARK", sysSubmit.PI_REMARK, - DbType.String, ParameterDirection.Input), + DbType.String, ParameterDirection.Input), + new("PI_USER", sysSubmit.PI_USER, + DbType.String, ParameterDirection.Input), + new("PI_SAMPLE_STATUS", sysSubmit.PI_SAMPLE_STATUS, + DbType.String, ParameterDirection.Input), + new("PI_SAMPLE_TYPE", sysSubmit.PI_SAMPLE_TYPE, + DbType.String, ParameterDirection.Input), + new("PI_SAMPLE_REASON", sysSubmit.PI_SAMPLE_REASON, + DbType.String, ParameterDirection.Input), + new("PI_INSPECT_TYPE", sysSubmit.PI_INSPECT_TYPE, + DbType.String, ParameterDirection.Input), + new("PI_SAMPLE_PREPARATION", sysSubmit.PI_SAMPLE_PREPARATION, + DbType.String, ParameterDirection.Input), + new("PI_URGENCY", sysSubmit.PI_URGENCY, + DbType.String, ParameterDirection.Input), + new("PI_FIRMWAREVERSION", sysSubmit.PI_FIRMWAREVERSION, + DbType.String, ParameterDirection.Input), + new("PI_HARDWAREVERSION", sysSubmit.PI_HARDWAREVERSION, + DbType.String, ParameterDirection.Input), + new("PI_REMARK", sysSubmit.PI_REMARK, + DbType.String, ParameterDirection.Input), outputResult, outputMessage - }; + }; var db = SqlSugarHelper.GetInstance(); @@ -362,56 +352,18 @@ // 鑾峰彇杈撳嚭鍙傛暟鐨勫�� var resultValue = outputResult.Value?.ToString(); var messageValue = outputMessage.Value?.ToString(); - string[] msg = new string[2]; + var msg = new string[2]; msg[0] = resultValue; msg[1] = messageValue; return msg; - } - - public class DataAcquisitionConfiguration - { - //娴嬭瘯鐜 - public const string TEST_COMPANY_CODE = "55958795"; - public const string TEST_APP_KEY = "ab2d86b6dffabcc81dca6855c727c246"; - public const string TEST_APP_SECRET = "01b17babe2a96d5ebd802e67709f33d1"; - public const string TEST_ERP_CODE = "Z106"; - - //姝e紡鐜 - public const string COMPANY_CODE = "72505985"; - public const string APP_KEY = "a2866f03bb7f76387bfb1a98001f0e31"; - public const string APP_SECRET = "f13bd1bcb130f0090ed92dc021e5f4e1"; - public const string ERP_CODE = "Z106"; - } - [Serializable] - public class ApiCommonParam - { - //鍙戞斁缁欑敤鎴风殑Key - public string appKey { get; set; } - //鎺ュ彛鐗堟湰 - public string version { get; set; } - //鏁版嵁鎵�灞炲叕鍙哥紪鐮� - public string ownerCompanyCode { get; set; } - //鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮� - public string operateCompanyCode { get; set; } - //绛惧悕 - public string sign { get; set; } - //鏃堕棿鎴� - public long? timestamps { get; set; } - ////鎵╁睍瀛楁 - //public object Reserver { get; set; } - } - [Serializable] - public class BodyParam - { - public string erpCode { get; set; } - public string dnXkNo { get; set; } - } public static string BuildCurrentSign(string paramJson, string appSecret) { var commonDict = new Dictionary<string, string>(); - var jsonDict = JsonConvert.DeserializeObject<Dictionary<string, object>>(paramJson); + var jsonDict = + JsonConvert + .DeserializeObject<Dictionary<string, object>>(paramJson); var keyList = new List<string>(); foreach (var entry in jsonDict) @@ -429,60 +381,21 @@ // 鎷兼帴绛惧悕瀛楃涓� var sb = new StringBuilder(); - foreach (var key in keyList) - { - sb.Append(commonDict[key]).Append(":"); - } + foreach (var key in keyList) sb.Append(commonDict[key]).Append(":"); sb.Append(appSecret); // 璁$畻MD5 using var md5 = MD5.Create(); - byte[] hashBytes = md5.ComputeHash(Encoding.UTF8.GetBytes(sb.ToString())); + var hashBytes = md5.ComputeHash(Encoding.UTF8.GetBytes(sb.ToString())); return BitConverter.ToString(hashBytes) - .Replace("-", "") - .ToLowerInvariant(); - } - public class XkyCommonParam - { - public ApiCommonParam commonParam { get; set; } - public BodyParam body { get; set; } - - public static XkyCommonParam GetInit() - { - var apiParam = new ApiCommonParam - { - // 鍙戞惡瀹簯鎻愪緵鐨刟ppKey - appKey = DataAcquisitionConfiguration.APP_KEY, - // 鎺ュ彛鐗堟湰 - version = "1.0", - // 鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮� - operateCompanyCode = DataAcquisitionConfiguration.COMPANY_CODE, - // 鏁版嵁鎵�灞炲叕鍙哥紪鐮侊紝闈為泦鍥㈠叕鍙搁粯璁よ祴鍊间负鎿嶄綔鍏徃 - ownerCompanyCode = DataAcquisitionConfiguration.COMPANY_CODE, - // 褰撳墠鏃堕棿瀵瑰簲鐨勬椂闂存埑锛堢鏁帮級 - timestamps = DateTimeOffset.UtcNow.ToUnixTimeSeconds() - }; - - - string appSecret = DataAcquisitionConfiguration.APP_SECRET; - - // 鐢熸垚绛惧悕 - string sign = BuildCurrentSign( - JsonConvert.SerializeObject(apiParam), - appSecret); - apiParam.sign = sign; - - return new XkyCommonParam - { - commonParam = apiParam - }; - } + .Replace("-", "") + .ToLowerInvariant(); } public async Task<string[]> SignDelivery(string id) { - string[] msg = new string[2]; + var msg = new string[2]; //鍙戣捣璇锋眰锛岀鏀堕�佽揣鍗� try @@ -495,27 +408,30 @@ }; // 搴忓垪鍖栦负JSON - string json = JsonConvert.SerializeObject(requestData); + var json = JsonConvert.SerializeObject(requestData); - using (var client = new HttpClient()) - { - // 璁剧疆璇锋眰鍐呭 - var content = new StringContent(json, Encoding.UTF8, "application/json"); - // 鍙戦�丳OST璇锋眰 - HttpResponseMessage response = await client.PostAsync( - "https://openapi.xiekeyun.com/delivery/updateDeliveryStatus.json", - content); - // 澶勭悊鍝嶅簲 - if (response.IsSuccessStatusCode) + using (var client = new HttpClient()) { - string responseBody = await response.Content.ReadAsStringAsync(); + // 璁剧疆璇锋眰鍐呭 + var content = new StringContent(json, Encoding.UTF8, + "application/json"); + // 鍙戦�丳OST璇锋眰 + var response = await client.PostAsync( + "https://openapi.xiekeyun.com/delivery/updateDeliveryStatus.json", + content); + // 澶勭悊鍝嶅簲 + if (response.IsSuccessStatusCode) + { + var responseBody = + await response.Content.ReadAsStringAsync(); var result = - JsonConvert.DeserializeObject<XKYApiResponse>(responseBody); + JsonConvert.DeserializeObject<XKYApiResponse>( + responseBody); //鎴愬姛鍚庢墜鍔ㄤ笅鎺ㄥ埌璐у崟 - if (result.Result == 1) { - + if (result.Result == 1) + { // 瀹氫箟杈撳嚭鍙傛暟 - + var outputMessage = new SugarParameter("C_RESULT", null, DbType.String, ParameterDirection.Output, 4000); @@ -523,8 +439,8 @@ // 瀹氫箟杈撳叆鍙傛暟 var parameters = new List<SugarParameter> { - new("C_IN_STR", "閫佽揣鍗曠鏀禰BTNOK[PL017["+id, - DbType.String, ParameterDirection.Input), + new("C_IN_STR", "閫佽揣鍗曠鏀禰BTNOK[PL017[" + id, + DbType.String, ParameterDirection.Input), outputMessage }; @@ -537,7 +453,7 @@ // 鑾峰彇杈撳嚭鍙傛暟鐨勫�� - + var messageValue = outputMessage.Value?.ToString(); msg[0] = "0"; @@ -545,21 +461,22 @@ } else { - if (result.ErrorMsg== "鍑鸿揣鍗曟嵁涓嶆槸宸查�佽揣鐘舵�侊紒") + if (result.ErrorMsg == "鍑鸿揣鍗曟嵁涓嶆槸宸查�佽揣鐘舵�侊紒") { // 瀹氫箟杈撳嚭鍙傛暟 - var outputMessage = new SugarParameter("C_RESULT", null, + var outputMessage = new SugarParameter("C_RESULT", + null, DbType.String, ParameterDirection.Output, 4000); // 瀹氫箟杈撳叆鍙傛暟 var parameters = new List<SugarParameter> - { - new("C_IN_STR", "閫佽揣鍗曠鏀禰BTNOK[PL017["+id, - DbType.String, ParameterDirection.Input), - outputMessage - }; + { + new("C_IN_STR", "閫佽揣鍗曠鏀禰BTNOK[PL017[" + id, + DbType.String, ParameterDirection.Input), + outputMessage + }; var db = SqlSugarHelper.GetInstance(); @@ -581,21 +498,17 @@ msg[0] = "1"; msg[1] = "002[" + id + "绛炬敹澶辫触锛�" + result.ErrorMsg; } - } - } - else - { - + else + { msg[0] = "1"; msg[1] = $"002[{id}绛炬敹澶辫触锛岃姹傚け璐ワ紝鐘舵�佺爜锛歿response.StatusCode}"; + } } } - } catch (Exception ex) { - msg[0] = "1"; msg[1] = $"002[璇锋眰澶辫触锛岀姸鎬佺爜锛歿ex.Message}"; } @@ -604,9 +517,7 @@ //msg[0] = "1"; //msg[1] = responseBody; return msg; - } - private string ExtractSubstring(string input, char startChar, char endChar) @@ -679,9 +590,10 @@ { var db = SqlSugarHelper.GetInstance(); - return db.Queryable<MesQaItemsDetectDetail5, MesQaItemsDetectDetail12>( - (a, b) => - new JoinQueryInfos(JoinType.Left, a.Id == b.MainId)) + return db + .Queryable<MesQaItemsDetectDetail5, + MesQaItemsDetectDetail12>((a, b) => + new JoinQueryInfos(JoinType.Left, a.Id == b.MainId)) .Where((a, b) => a.ReleaseNo == releaseNo) // .WhereIF(id > 0, (a, b) => a.Id == id) .OrderByDescending((a, b) => a.FcheckItem) @@ -726,12 +638,12 @@ } - public DataTable getAllInspectors() { - OracleSQLHelper SQLHelper = new(); - var sql =string.Format(@"select a.USER_NAME label,U.FCODE value from IQC_BEFORE_FROM a JOIN SYS_USER U ON U.FID=A.SID"); - return SQLHelper.ExecuteQuery(sql); + OracleSQLHelper SQLHelper = new(); + var sql = + @"select a.USER_NAME label,U.FCODE value from IQC_BEFORE_FROM a JOIN SYS_USER U ON U.FID=A.SID"; + return SQLHelper.ExecuteQuery(sql); } @@ -800,8 +712,8 @@ // result = "涓嶅悎鏍�"; else if (noCount >= QsItemOqcItem.FreQty) result = "涓嶅悎鏍�"; - var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle( - db => + var useTransactionWithOracle = + SqlSugarHelper.UseTransactionWithOracle(db => { var commit = 0; commit += db.Updateable<MesQaItemsDetectDetail5>() @@ -942,71 +854,71 @@ public DataTable getFromInfo(string BarCode) { OracleSQLHelper SQLHelper = new(); - var sql = string.Format(@"select b.ID,b.LOT_NO,b.RELEASE_NO,b.FSUBMIT from MES_INV_ITEM_BARCODES A + var sql = string.Format( + @"select b.ID,b.LOT_NO,b.RELEASE_NO,b.FSUBMIT from MES_INV_ITEM_BARCODES A left join MES_QA_ITEMS_DETECT_01 B on A.BILL_NO=b.LOT_NO and A.ITEM_ID=b.ITEM_ID - where ITEM_BARCODE='"+ BarCode + "'"); + where ITEM_BARCODE='" + BarCode + "'"); return SQLHelper.ExecuteQuery(sql); } + public DataTable getImgBDlist(string id) { OracleSQLHelper SQLHelper = new(); - var sql = string.Format(@"select id,FID,IMAGE_DATA from MES_QS_IMAGE where FID="+id+""); + var sql = + string.Format( + @"select id,FID,IMAGE_DATA from MES_QS_IMAGE where FID=" + id + + ""); return SQLHelper.ExecuteQuery(sql); } - /// <summary> - /// 涓�鑷存�ч」鐩� - /// </summary> - public class Component - { - public string Name { get; set; } - public List<string> Specs { get; set; } - public List<string> Manufacturers { get; set; } - public List<string> Id { get; set; } - public int SelectedSpec { get; set; } - public int SelectedMfg { get; set; } - } + public List<Component> getYzxBDlist(string id) { OracleSQLHelper SQLHelper = new(); //鏌ュ厓鍣ㄤ欢 - var sql1 = string.Format(@"select ITEMNAME from MES_IQC_CONSISTENCY_ck where PID='"+id+"' group by ITEMNAME order by ITEMNAME"); + var sql1 = + string.Format( + @"select ITEMNAME from MES_IQC_CONSISTENCY_ck where PID='" + + id + "' group by ITEMNAME order by ITEMNAME"); //鏌ユ槑缁� - var sql2 = string.Format(@"select * from MES_IQC_CONSISTENCY_ck where PID='"+id+"' order by ITEMNAME,ITEMMODE,SUPPNAME"); - DataTable dataTable1= SQLHelper.ExecuteQuery(sql1); - DataTable dataTable2 = SQLHelper.ExecuteQuery(sql2); - List<Component> Components = new List<Component>(); + var sql2 = + string.Format(@"select * from MES_IQC_CONSISTENCY_ck where PID='" + + id + "' order by ITEMNAME,ITEMMODE,SUPPNAME"); + var dataTable1 = SQLHelper.ExecuteQuery(sql1); + var dataTable2 = SQLHelper.ExecuteQuery(sql2); + var Components = new List<Component>(); - - for (int i = 0; i <dataTable1.Rows.Count; i++) + for (var i = 0; i < dataTable1.Rows.Count; i++) { - Component component = new Component(); - component.Name= dataTable1.Rows[i]["ITEMNAME"].ToString(); - component.Specs= new List<string>(); + var component = new Component(); + component.Name = dataTable1.Rows[i]["ITEMNAME"].ToString(); + component.Specs = new List<string>(); component.Manufacturers = new List<string>(); component.Id = new List<string>(); component.SelectedSpec = -1; component.SelectedMfg = -1; - int index = 0; - for (int j = 0; j < dataTable2.Rows.Count; j++) - { - - if (dataTable2.Rows[j]["ITEMNAME"].ToString()== dataTable1.Rows[i]["ITEMNAME"].ToString()) + var index = 0; + for (var j = 0; j < dataTable2.Rows.Count; j++) + if (dataTable2.Rows[j]["ITEMNAME"].ToString() == + dataTable1.Rows[i]["ITEMNAME"].ToString()) { - component.Specs.Add(dataTable2.Rows[j]["ITEMMODE"].ToString()); - component.Manufacturers.Add(dataTable2.Rows[j]["SUPPNAME"].ToString()); + component.Specs.Add(dataTable2.Rows[j]["ITEMMODE"] + .ToString()); + component.Manufacturers.Add(dataTable2.Rows[j]["SUPPNAME"] + .ToString()); component.Id.Add(dataTable2.Rows[j]["ID"].ToString()); - if (dataTable2.Rows[j]["ISCHACK"].ToString()=="1") + if (dataTable2.Rows[j]["ISCHACK"].ToString() == "1") { component.SelectedSpec = index; component.SelectedMfg = index; } + index++; } - } Components.Add(component); } + return Components; } @@ -1014,66 +926,73 @@ { OracleSQLHelper SQLHelper = new(); //鏌ヤ笉鑹弿杩� - var sql1 = string.Format(@"select DEFECT_NAME + var sql1 = @"select DEFECT_NAME from MES_DEFECT_CODE A - left join MES_DEFECT_TYPE X ON X.TYPE_NO = A.DEFECT_SORT AND X.COMPANY = A.COMPANY AND X.FACTORY = A.FACTORY"); - + left join MES_DEFECT_TYPE X ON X.TYPE_NO = A.DEFECT_SORT AND X.COMPANY = A.COMPANY AND X.FACTORY = A.FACTORY"; + return SQLHelper.ExecuteQuery(sql1); } + public DataTable getBlmsItem(string id) { OracleSQLHelper SQLHelper = new(); //鏌ヤ笉鑹弿杩� - var sql1 = string.Format(@"select FCHECK_ITEM,FUNIT from mes_qa_items_detect_detail5 f where RELEASE_NO='"+id+"' and FUNIT is not null order by FCHECK_ITEM"); + var sql1 = string.Format( + @"select FCHECK_ITEM,FUNIT from mes_qa_items_detect_detail5 f where RELEASE_NO='" + + id + "' and FUNIT is not null order by FCHECK_ITEM"); return SQLHelper.ExecuteQuery(sql1); } - public void saveYzxBDlist(string id,DataTable DB) + + public void saveYzxBDlist(string id, DataTable DB) { OracleSQLHelper SQLHelper = new(); //鍏堟妸缁撴灉娓呯┖ - var sql1 = string.Format(@"update MES_IQC_CONSISTENCY_ck set ISCHACK=0 where PID='"+ id + "' "); + var sql1 = + string.Format( + @"update MES_IQC_CONSISTENCY_ck set ISCHACK=0 where PID='" + + id + "' "); SQLHelper.ExecuteQuery(sql1); - string rowId = ""; - for (int i = 0; i < DB.Rows.Count; i++) - { + var rowId = ""; + for (var i = 0; i < DB.Rows.Count; i++) rowId += "'" + DB.Rows[i]["id"] + "',"; - } rowId = rowId.Substring(0, rowId.Length - 1); //淇敼缁撴灉 - var sql2 = string.Format(@"update MES_IQC_CONSISTENCY_ck set ISCHACK=1 where PID='" + id + "'and id in("+ rowId + ") "); + var sql2 = + string.Format( + @"update MES_IQC_CONSISTENCY_ck set ISCHACK=1 where PID='" + + id + "'and id in(" + rowId + ") "); SQLHelper.ExecuteQuery(sql2); - } public string[] YzxImgVerify(string id) { - string[] msgStr = new string[2]; - + var msgStr = new string[2]; + OracleSQLHelper SQLHelper = new(); //淇敼缁撴灉 - var sql2 = string.Format(@"select A.ITEMNAME from ( select 888||min(id) id,ITEMNAME from MES_IQC_CONSISTENCY_CK where pid='"+ id + "' group by ITEMNAME) A " + + var sql2 = string.Format( + @"select A.ITEMNAME from ( select 888||min(id) id,ITEMNAME from MES_IQC_CONSISTENCY_CK where pid='" + + id + "' group by ITEMNAME) A " + "left join MES_QS_IMAGE b on a.id=b.fid where B.id is null order by ITEMNAME"); - DataTable db= SQLHelper.ExecuteQuery(sql2); + var db = SQLHelper.ExecuteQuery(sql2); if (db.Rows.Count > 0) { msgStr[1] = "鍏冨櫒浠讹細"; - for (int i = 0; i < db.Rows.Count; i++) - { - msgStr[1] += db.Rows[i]["ITEMNAME"]+ ","; - } + for (var i = 0; i < db.Rows.Count; i++) + msgStr[1] += db.Rows[i]["ITEMNAME"] + ","; msgStr[1] += "鏈畬鎴愬浘鐗囦笂浼狅紝璇蜂笂浼狅紒"; msgStr[0] = "1"; } - else + else { msgStr[0] = "0"; msgStr[1] = "ok"; } - return msgStr; + return msgStr; } public int UpdateQSItemDetail(MesQaItemsDetectDetail12 detail) @@ -1142,8 +1061,8 @@ return SqlSugarHelper.UseTransactionWithOracle(db => { return db.Updateable<MesQaItemsDetectDetail5>() - .SetColumns(it => - it.Funit == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊� + .SetColumns(it => + it.Funit == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊� .Where(it => it.Id == dto.pid) .ExecuteCommand(); }); @@ -1212,11 +1131,10 @@ // 鑾峰彇杈撳嚭鍙傛暟鐨勫�� var resultValue = outputResult.Value?.ToString(); var messageValue = outputMessage.Value?.ToString(); - string[] msg = new string[2]; + var msg = new string[2]; msg[0] = resultValue; msg[1] = messageValue; return msg; - } catch (Exception ex) { @@ -1253,6 +1171,106 @@ } } + + public class DataAcquisitionConfiguration + { + //娴嬭瘯鐜 + public const string TEST_COMPANY_CODE = "55958795"; + public const string TEST_APP_KEY = "ab2d86b6dffabcc81dca6855c727c246"; + + public const string TEST_APP_SECRET = + "01b17babe2a96d5ebd802e67709f33d1"; + + public const string TEST_ERP_CODE = "Z106"; + + //姝e紡鐜 + public const string COMPANY_CODE = "72505985"; + public const string APP_KEY = "a2866f03bb7f76387bfb1a98001f0e31"; + public const string APP_SECRET = "f13bd1bcb130f0090ed92dc021e5f4e1"; + public const string ERP_CODE = "Z106"; + } + + [Serializable] + public class ApiCommonParam + { + //鍙戞斁缁欑敤鎴风殑Key + public string appKey { get; set; } + + //鎺ュ彛鐗堟湰 + public string version { get; set; } + + //鏁版嵁鎵�灞炲叕鍙哥紪鐮� + public string ownerCompanyCode { get; set; } + + //鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮� + public string operateCompanyCode { get; set; } + + //绛惧悕 + public string sign { get; set; } + + //鏃堕棿鎴� + public long? timestamps { get; set; } + ////鎵╁睍瀛楁 + //public object Reserver { get; set; } + } + + [Serializable] + public class BodyParam + { + public string erpCode { get; set; } + public string dnXkNo { get; set; } + } + + public class XkyCommonParam + { + public ApiCommonParam commonParam { get; set; } + public BodyParam body { get; set; } + + public static XkyCommonParam GetInit() + { + var apiParam = new ApiCommonParam + { + // 鍙戞惡瀹簯鎻愪緵鐨刟ppKey + appKey = DataAcquisitionConfiguration.APP_KEY, + // 鎺ュ彛鐗堟湰 + version = "1.0", + // 鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮� + operateCompanyCode = DataAcquisitionConfiguration.COMPANY_CODE, + // 鏁版嵁鎵�灞炲叕鍙哥紪鐮侊紝闈為泦鍥㈠叕鍙搁粯璁よ祴鍊间负鎿嶄綔鍏徃 + ownerCompanyCode = DataAcquisitionConfiguration.COMPANY_CODE, + // 褰撳墠鏃堕棿瀵瑰簲鐨勬椂闂存埑锛堢鏁帮級 + timestamps = DateTimeOffset.UtcNow.ToUnixTimeSeconds() + }; + + + var appSecret = DataAcquisitionConfiguration.APP_SECRET; + + // 鐢熸垚绛惧悕 + var sign = BuildCurrentSign( + JsonConvert.SerializeObject(apiParam), + appSecret); + apiParam.sign = sign; + + return new XkyCommonParam + { + commonParam = apiParam + }; + } + } + + /// <summary> + /// 涓�鑷存�ч」鐩� + /// </summary> + public class Component + { + public string Name { get; set; } + public List<string> Specs { get; set; } + public List<string> Manufacturers { get; set; } + public List<string> Id { get; set; } + public int SelectedSpec { get; set; } + public int SelectedMfg { get; set; } + } + /// <summary> /// 鏂欏彿鍥剧焊鎺ュ彛杩斿洖瀵硅薄 /// </summary> @@ -1266,27 +1284,24 @@ [JsonProperty("totalCount")] public int TotalCount { get; set; } } + /// <summary> - /// 鎼哄浜戞帴鍙h繑鍥炲璞� + /// 鎼哄浜戞帴鍙h繑鍥炲璞� /// </summary> public class XKYApiResponse { - [JsonProperty("errorCode")] - public string ErrorCode { get; set; } + [JsonProperty("errorCode")] public string ErrorCode { get; set; } - [JsonProperty("errorMsg")] - public string ErrorMsg { get; set; } + [JsonProperty("errorMsg")] public string ErrorMsg { get; set; } - [JsonProperty("result")] - public int Result { get; set; } + [JsonProperty("result")] public int Result { get; set; } - [JsonProperty("data")] - public object Data { get; set; } + [JsonProperty("data")] public object Data { get; set; } - [JsonProperty("curServerTime")] - public long CurServerTime { get; set; } + [JsonProperty("curServerTime")] public long CurServerTime { get; set; } // 濡傛灉闇�瑕佹椂闂磋浆鎹㈠彲浠ユ坊鍔犺繖涓睘鎬� - public DateTime ServerTime => DateTimeOffset.FromUnixTimeMilliseconds(CurServerTime).DateTime; + public DateTime ServerTime => DateTimeOffset + .FromUnixTimeMilliseconds(CurServerTime).DateTime; } } \ No newline at end of file -- Gitblit v1.9.3