From a619299816f2f632c7c6ba3a1bb869e2c212797d Mon Sep 17 00:00:00 2001
From: fcx <2246384483@qq.com>
Date: 星期五, 19 十二月 2025 14:12:33 +0800
Subject: [PATCH] 对添加巡检单物料编码进行去重
---
StandardPda/MES.Service/service/QC/LljService.cs | 846 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 809 insertions(+), 37 deletions(-)
diff --git a/StandardPda/MES.Service/service/QC/LljService.cs b/StandardPda/MES.Service/service/QC/LljService.cs
index df99c12..6deba4d 100644
--- a/StandardPda/MES.Service/service/QC/LljService.cs
+++ b/StandardPda/MES.Service/service/QC/LljService.cs
@@ -1,13 +1,17 @@
-锘縰sing System.Data;
-using System.Security.Cryptography;
-using System.Text;
+锘縰sing Dm.Config;
using Masuit.Tools;
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
+using Microsoft.Extensions.Configuration;
using Newtonsoft.Json;
+using Oracle.ManagedDataAccess.Client;
using SqlSugar;
+using System.Data;
+using System.Security.Cryptography;
+using System.Text;
+using System.Text.Json.Serialization;
using DbType = System.Data.DbType;
@@ -16,6 +20,10 @@
public class LljService
{
private static readonly HttpClient client = new();
+ private static IConfiguration configuration = new ConfigurationBuilder()
+ .SetBasePath(Directory.GetCurrentDirectory())
+ .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
+ .Build();
public (List<LtsLlj> item, int TotalCount) GetPage(XJPageResult queryObj)
{
@@ -338,6 +346,8 @@
DbType.String, ParameterDirection.Input),
new("PI_REMARK", sysSubmit.PI_REMARK,
DbType.String, ParameterDirection.Input),
+ new("PI_SAMPLE_QTY", sysSubmit.PI_SAMPLE_QTY,
+ DbType.String, ParameterDirection.Input),
outputResult,
outputMessage
};
@@ -346,7 +356,51 @@
// 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
db.Ado.ExecuteCommand(
- "BEGIN PRC_MES_IQC_QC_SYSSUBMIT(:PI_BILLNO,:PI_USER,:PI_SAMPLE_STATUS,:PI_SAMPLE_TYPE,:PI_SAMPLE_REASON,:PI_INSPECT_TYPE,:PI_SAMPLE_PREPARATION,:PI_URGENCY,:PI_FIRMWAREVERSION,:PI_HARDWAREVERSION,:PI_REMARK, :o_Result, :o_Msg); END;",
+ "BEGIN PRC_MES_IQC_QC_SYSSUBMIT(:PI_BILLNO,:PI_USER,:PI_SAMPLE_STATUS,:PI_SAMPLE_TYPE,:PI_SAMPLE_REASON,:PI_INSPECT_TYPE,:PI_SAMPLE_PREPARATION,:PI_URGENCY,:PI_FIRMWAREVERSION,:PI_HARDWAREVERSION,:PI_REMARK,:PI_SAMPLE_QTY, :o_Result, :o_Msg); END;",
+ parameters.ToArray());
+
+ // 鑾峰彇杈撳嚭鍙傛暟鐨勫��
+ var resultValue = outputResult.Value?.ToString();
+ var messageValue = outputMessage.Value?.ToString();
+ var msg = new string[2];
+ msg[0] = resultValue;
+ msg[1] = messageValue;
+ return msg;
+ }
+
+
+ public string[] SaveYCCZSubmit(YCCZSubmit sysSubmit)
+ {
+ // 瀹氫箟杈撳嚭鍙傛暟
+ var outputResult = new SugarParameter("o_Result", null,
+ DbType.Int32, ParameterDirection.Output,
+ 4000);
+
+ var outputMessage = new SugarParameter("o_Msg", null,
+ DbType.String,
+ ParameterDirection.Output, 4000);
+
+ // 瀹氫箟杈撳叆鍙傛暟
+ 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("PTOTAL_QTY", sysSubmit.PI_QTY,
+ DbType.String, ParameterDirection.Input),
+ new("PNG_QTY", sysSubmit.PI_BADQTY,
+ DbType.String, ParameterDirection.Input),
+
+ outputResult,
+ outputMessage
+ };
+
+ var db = SqlSugarHelper.GetInstance();
+
+ // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
+ db.Ado.ExecuteCommand(
+ "BEGIN PRC_MES_IQC_QC_YCCZ(:PI_BILLNO,:PI_USER,:PTOTAL_QTY,:PNG_QTY,:o_Result, :o_Msg); END;",
parameters.ToArray());
// 鑾峰彇杈撳嚭鍙傛暟鐨勫��
@@ -666,6 +720,345 @@
//msg[0] = "1";
//msg[1] = responseBody;
return msg;
+ }
+ /// <summary>
+ /// 鍙戝竷鎼哄浜戞敼鍠勬姤鍛�
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ public async Task<string[]> SaveXkyImproveReport(string id)
+ {
+ var msg = new string[2];
+ try
+ {
+ //琛ㄥご鏁版嵁
+ string MianSql= "select " +
+ "B.SUPP_NO," +
+ "CASE WHEN REPORTTYPE = '鍑嗗叆璇勪及鏀瑰杽' THEN '1' WHEN REPORTTYPE = '鐗╂枡鍑嗗叆鏀瑰杽' THEN '2' WHEN REPORTTYPE = '缁╂晥鏀瑰杽' THEN '3' WHEN REPORTTYPE = '杩濈害浜嬮」鏀瑰杽' THEN '4' ELSE '3' END AS DEFECT_LEVEL," +
+ "(REQUIRED_DATE - TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh24:mi:ss')) * 86400000 AS timestamp from MES_IQC_ABNORMAL_FEEDBACK A left join MES_SUPPLIER B on A.SUPPLIER_ID=B.ID " +
+ "where A.id = '"+id+"'";
+ //琛ㄨ韩鏁版嵁
+ string DetailSql = "select " +
+ "DEFECT_ANALYSIS," +
+ "CASE WHEN DEFECT_LEVEL = '杞诲井缂洪櫡' THEN 0 WHEN DEFECT_LEVEL = '涓ラ噸缂洪櫡' THEN 1 WHEN DEFECT_LEVEL = '鑷村懡缂洪櫡' THEN 2 ELSE 0 END AS DEFECT_LEVEL from MES_IQC_ABNORMAL_FEEDBACK_DETS " +
+ "where FID='"+id+"' order by id asc";
+ OracleSQLHelper SQLHelper = new();
+
+ DataTable MianDB= SQLHelper.ExecuteQuery(MianSql);
+ DataTable DetailDB = SQLHelper.ExecuteQuery(DetailSql);
+
+ var requestData = XkyinnerVendorParam.GetInit();
+
+ requestData.body = new BodyImproveReport
+ {
+ erpCode = "C003",
+ innerVendorCode = MianDB.Rows[0]["SUPP_NO"].ToString(),
+ reportType= int.Parse(MianDB.Rows[0]["DEFECT_LEVEL"].ToString()),
+ completionDate= Convert.ToInt64(MianDB.Rows[0]["timestamp"]) ,
+ lineList= new List<LineItem>(),
+ isPublish=1
+ };
+ for (int i = 0; i < DetailDB.Rows.Count; i++)
+ {
+ requestData.body.lineList.Add(new LineItem
+ {
+ questionDesc = DetailDB.Rows[i]["DEFECT_ANALYSIS"].ToString(),
+ questionGrade = Convert.ToInt32(DetailDB.Rows[i]["DEFECT_LEVEL"])
+ });
+ }
+ // 搴忓垪鍖栦负JSON
+ var json = JsonConvert.SerializeObject(requestData);
+
+ using (var client = new HttpClient())
+ {
+ // 璁剧疆璇锋眰鍐呭
+ var content = new StringContent(json, Encoding.UTF8,
+ "application/json");
+ // 鍙戦�丳OST璇锋眰
+ var response = await client.PostAsync(
+ "https://openapi.xiekeyun.com/improveReport/save.json",
+ content);
+ // 澶勭悊鍝嶅簲
+ if (response.IsSuccessStatusCode)
+ {
+ var responseBody =
+ await response.Content.ReadAsStringAsync();
+ var result =
+ JsonConvert.DeserializeObject<XKYApiResponse>(
+ responseBody);
+ //鎴愬姛鍚庤繑鍥炵粨鏋滐紝鍓嶅彴鍝嶅簲
+ if (result.Result == 1)
+ {
+ string updateSql = "update MES_IQC_ABNORMAL_FEEDBACK set SRM_IMPROVE_NO='"+ result.Data.irXkNo + "',REPORT_RELEASE=1 where ID='"+id+"'";
+ SQLHelper.ExecuteQuery(updateSql);
+ // 瀹氫箟杈撳嚭鍙傛暟
+ msg[0] = "0";
+ msg[1] = $"鍙戝竷鎴愬姛锛�";
+
+ }
+ else
+ {
+ // 瀹氫箟杈撳嚭鍙傛暟
+ msg[0] = "1";
+ msg[1] = $"鍙戝竷澶辫触锛亄result.ErrorMsg}";
+ }
+ }
+ else
+ {
+ msg[0] = "1";
+ msg[1] = $"{id}鍙戝竷澶辫触锛岃姹傚け璐ワ紝鐘舵�佺爜锛歿response.StatusCode}";
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ msg[0] = "1";
+ msg[1] = $"璇锋眰澶辫触锛岀姸鎬佺爜锛歿ex.Message}";
+ }
+
+ return msg;
+ }
+
+
+
+ /// <summary>
+ /// 鍒锋柊鎼哄浜戞敼鍠勬姤鍛婏紝鏇存柊渚涘簲鍟嗗洖澶嶄俊鎭�
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ public async Task<string[]> FlushedXkyImproveReport(string id)
+ {
+ var msg = new string[2];
+ try
+ {
+ string MianSql = "";
+ if (id!=null &&id!="")
+ {
+ //鏌ヨ娌℃湁渚涘簲鍟嗗洖澶嶇殑鏀瑰杽鎶ュ憡
+ MianSql = "select SRM_IMPROVE_NO from MES_IQC_ABNORMAL_FEEDBACK where REPORT_RELEASE=1 and SRM_IMPROVE_NO is not null and SUPPLIER_REPLY_RELEASE=0 and SRM_IMPROVE_NO="+id+"";
+ }
+ else
+ {
+ //鏌ヨ娌℃湁渚涘簲鍟嗗洖澶嶇殑鏀瑰杽鎶ュ憡
+ MianSql = "select SRM_IMPROVE_NO from MES_IQC_ABNORMAL_FEEDBACK where REPORT_RELEASE=1 and SRM_IMPROVE_NO is not null and SUPPLIER_REPLY_RELEASE=0";
+ }
+
+
+ OracleSQLHelper SQLHelper = new();
+
+ DataTable MianDB = SQLHelper.ExecuteQuery(MianSql);
+ // 瀹氫箟杈撳嚭鍙傛暟
+ msg[0] = "0";
+ msg[1] = $"鍒锋柊鎴愬姛锛�";
+ for (int i = 0; i < MianDB.Rows.Count; i++)
+ {
+ var requestData = XkyFlushedrVendorParam.GetInit();
+
+ requestData.body = new BodyFlushedImproveReport
+ {
+ erpCode = "C003",
+ irXkNo = MianDB.Rows[i]["SRM_IMPROVE_NO"].ToString()
+ };
+
+ // 搴忓垪鍖栦负JSON
+ var json = JsonConvert.SerializeObject(requestData);
+
+ using (var client = new HttpClient())
+ {
+ // 璁剧疆璇锋眰鍐呭
+ var content = new StringContent(json, Encoding.UTF8,
+ "application/json");
+ // 鍙戦�丳OST璇锋眰
+ var response = await client.PostAsync(
+ "https://openapi.xiekeyun.com/improveReport/details.json",
+ content);
+ // 澶勭悊鍝嶅簲
+ if (response.IsSuccessStatusCode)
+ {
+ var responseBody =
+ await response.Content.ReadAsStringAsync();
+ var result =
+ JsonConvert.DeserializeObject<XKYApiResponse>(
+ responseBody);
+ //鎴愬姛鍚庤繑鍥炵粨鏋滐紝鍓嶅彴鍝嶅簲
+ int resultCode = 0;
+ if (result.Result == 1)
+ {
+ //鏌ヨmes绯荤粺瀵瑰簲鎼哄浜戞敼鍠勬姤鍛婄殑ID
+ string xkyIDSql = "select B.id from MES_IQC_ABNORMAL_FEEDBACK A left join MES_IQC_ABNORMAL_FEEDBACK_DETS B on A.id = B.FID where SRM_IMPROVE_NO = '"+ MianDB.Rows[i]["SRM_IMPROVE_NO"].ToString() + "' order by B.id asc";
+ string updateSql = "";
+ DataTable xkyIDDB = SQLHelper.ExecuteQuery(xkyIDSql);
+ for (int j = 0; j < result.Data.lineList.Count; j++)
+ {
+ if (result.Data.lineList[j].reasonAnalyze!=null && result.Data.lineList[j].reasonAnalyze != "")
+ {
+
+ if (resultCode==0)
+ {
+ //鏀逛緵搴斿晢鍥炲鐘舵��
+ updateSql = "update MES_IQC_ABNORMAL_FEEDBACK set SUPPLIER_REPLY_RELEASE=1 where SRM_IMPROVE_NO='"+ MianDB.Rows[i]["SRM_IMPROVE_NO"].ToString() + "'";
+ resultCode++;
+ SQLHelper.ExecuteQuery(updateSql);
+ }
+
+ //鏀规槑缁�
+ updateSql = "update MES_IQC_ABNORMAL_FEEDBACK_DETS set " +
+ "ROOT_CAUSE_ANALYSIS='"+ result.Data.lineList[j].reasonAnalyze + "'," +
+ "IMPROVEMENT_ACTION='"+ result.Data.lineList[j].correctPreventMeasure + "'," +
+ "ESTIMATED_DATE=to_date('" + ParseUnixTimestamp(result.Data.lineList[j].expectedFinishTime) + "','MM/DD/YYYY HH24:MI:SS') where id='" + xkyIDDB.Rows[j]["id"].ToString() + "'";
+ SQLHelper.ExecuteQuery(updateSql);
+ }
+ }
+
+ // 瀹氫箟杈撳嚭鍙傛暟
+ msg[0] = "0";
+ msg[1] = $"鍒锋柊鎴愬姛锛�";
+
+ }
+ else
+ {
+ // 瀹氫箟杈撳嚭鍙傛暟
+ msg[0] = "1";
+ msg[1] = $"鍒锋柊澶辫触锛亄result.ErrorMsg}";
+ }
+ }
+ else
+ {
+ msg[0] = "1";
+ msg[1] = $"{id}鍒锋柊澶辫触锛岃姹傚け璐ワ紝鐘舵�佺爜锛歿response.StatusCode}";
+ }
+ }
+ }
+
+
+ }
+ catch (Exception ex)
+ {
+ msg[0] = "1";
+ msg[1] = $"璇锋眰澶辫触锛岀姸鎬佺爜锛歿ex.Message}";
+ }
+
+ return msg;
+ }
+
+
+
+ /// <summary>
+ /// 瀹℃牳鎼哄浜戞敼鍠勬姤鍛�
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ public async Task<string[]> AuditXkyImproveReport(string id)
+ {
+ var msg = new string[2];
+ try
+ {
+ string MianSql = "";
+ MianSql = "select SRM_IMPROVE_NO,CASE WHEN JUDGMENT_RESULT = '宸查��鍥�' THEN 4 WHEN JUDGMENT_RESULT = '涓嶅悎鏍�' THEN 5 WHEN JUDGMENT_RESULT = '缁撴' THEN 6 END AS status from MES_IQC_ABNORMAL_FEEDBACK where SRM_IMPROVE_NO=" + id + "";
+ //琛ㄨ韩鏁版嵁
+ string DetailSql = "select VERIFICATION_DESC, CASE WHEN VERIFICATION_RESULT = '鍚堟牸' THEN 0 WHEN VERIFICATION_RESULT = '涓嶅悎鏍�' THEN 1 END AS DEFECT_LEVEL from MES_IQC_ABNORMAL_FEEDBACK A left join MES_IQC_ABNORMAL_FEEDBACK_DETS b on A.id=B.FID where SRM_IMPROVE_NO= '" + id+"'";
+ OracleSQLHelper SQLHelper = new();
+
+ DataTable MianDB = SQLHelper.ExecuteQuery(MianSql);
+ DataTable DetailDB = SQLHelper.ExecuteQuery(DetailSql);
+ var requestData = XkyAuditVendorParam.GetInit();
+
+ requestData.body = new BodyAuditImproveReport
+ {
+ erpCode = "C003",
+ irXkNo = MianDB.Rows[0]["SRM_IMPROVE_NO"].ToString(),
+ status= Convert.ToInt32(MianDB.Rows[0]["status"]),
+ lineList=new List<AuditLineItem>()
+ };
+ for (int i = 0; i < DetailDB.Rows.Count; i++)
+ {
+ requestData.body.lineList.Add(new AuditLineItem
+ {
+ lineNo = i+1,
+ checkStatus = Convert.ToInt32(DetailDB.Rows[i]["DEFECT_LEVEL"]),
+ checkPeopleNumber = "031",
+ checkExplain = DetailDB.Rows[i]["VERIFICATION_DESC"].ToString()
+
+ });
+ }
+
+ // 搴忓垪鍖栦负JSON
+ var json = JsonConvert.SerializeObject(requestData);
+
+ using (var client = new HttpClient())
+ {
+ // 璁剧疆璇锋眰鍐呭
+ var content = new StringContent(json, Encoding.UTF8,
+ "application/json");
+ // 鍙戦�丳OST璇锋眰
+ var response = await client.PostAsync(
+ "https://openapi.xiekeyun.com/improveReport/audit.json",
+ content);
+ // 澶勭悊鍝嶅簲
+ if (response.IsSuccessStatusCode)
+ {
+ var responseBody =
+ await response.Content.ReadAsStringAsync();
+ var result =
+ JsonConvert.DeserializeObject<XKYApiResponse>(
+ responseBody);
+ //鎴愬姛鍚庤繑鍥炵粨鏋滐紝鍓嶅彴鍝嶅簲
+ int resultCode = 0;
+ if (result.Result == 1)
+ {
+
+
+ //鏀圭姸鎬�,鏀逛负瀹岀粨鐘舵��
+ string updateSql = "update MES_IQC_ABNORMAL_FEEDBACK set CLOSURE_STATUS=1,CLOSED_DATE=sysdate where SRM_IMPROVE_NO='" + id + "'";
+ SQLHelper.ExecuteQuery(updateSql);
+
+ // 瀹氫箟杈撳嚭鍙傛暟
+ msg[0] = "0";
+ msg[1] = $"瀹℃牳鎴愬姛锛�";
+
+ }
+ else
+ {
+ // 瀹氫箟杈撳嚭鍙傛暟
+ msg[0] = "1";
+ msg[1] = $"瀹℃牳澶辫触锛亄result.ErrorMsg}";
+ }
+ }
+ else
+ {
+ msg[0] = "1";
+ msg[1] = $"{id}瀹℃牳澶辫触锛岃姹傚け璐ワ紝鐘舵�佺爜锛歿response.StatusCode}";
+ }
+ }
+
+ }
+ catch (Exception ex)
+ {
+ msg[0] = "1";
+ msg[1] = $"璇锋眰澶辫触锛岀姸鎬佺爜锛歿ex.Message}";
+ }
+
+ return msg;
+ }
+
+
+
+ static DateTime ParseUnixTimestamp(string timestampStr)
+ {
+ // 灏濊瘯瑙ｆ瀽涓洪暱鏁村瀷
+ if (long.TryParse(timestampStr, out long timestamp))
+ {
+ // 鏍规嵁浣嶆暟鍒ゆ柇鍗曚綅锛堢鎴栨绉掞級
+ if (timestampStr.Length <= 10) // 绉掔骇 (10浣嶆垨鏇村皯)
+ {
+ return DateTimeOffset.FromUnixTimeSeconds(timestamp).UtcDateTime;
+ }
+ else // 姣绾�
+ {
+ return DateTimeOffset.FromUnixTimeMilliseconds(timestamp).UtcDateTime;
+ }
+ }
+ throw new FormatException("鏃犳晥鐨勬椂闂存埑鏍煎紡");
}
private string ExtractSubstring(string input, char startChar, char endChar)
@@ -1039,10 +1432,14 @@
{
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");
+ @"select CASE WHEN max(MULTI_SELECT) is null THEN ''ELSE '銆�'||max(MULTI_SELECT)||'銆�' END as A,ITEMNAME as 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='" +
@@ -1055,7 +1452,7 @@
for (var i = 0; i < dataTable1.Rows.Count; i++)
{
var component = new Component();
- component.Name = dataTable1.Rows[i]["ITEMNAME"].ToString();
+ component.Name = dataTable1.Rows[i]["A"].ToString()+ dataTable1.Rows[i]["ITEMNAME"].ToString();
component.Specs = new List<string>();
component.Manufacturers = new List<string>();
component.Id = new List<string>();
@@ -1108,28 +1505,96 @@
return SQLHelper.ExecuteQuery(sql1);
}
+ //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 + "' ");
+ // SQLHelper.ExecuteQuery(sql1);
+ // 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 + ") ");
+ // SQLHelper.ExecuteQuery(sql2);
+ //}
+
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 + "' ");
- SQLHelper.ExecuteQuery(sql1);
- var rowId = "";
- for (var i = 0; i < DB.Rows.Count; i++)
- rowId += "'" + DB.Rows[i]["id"] + "',";
- rowId = rowId.Substring(0, rowId.Length - 1);
+ var sqlHelper = new OracleSQLHelper();
+ using (var connection = new OracleConnection(AppsettingsUtility.Settings.DataBaseConn))
+ {
+ connection.Open();
+ using (var transaction = connection.BeginTransaction())
+ {
+ try
+ {
+ // 1. 娓呯┖ ISCHACK
+ var sql1 = @"UPDATE MES_IQC_CONSISTENCY_ck
+ SET ISCHACK = 0
+ WHERE PID = :pid";
- //淇敼缁撴灉
- var sql2 =
- string.Format(
- @"update MES_IQC_CONSISTENCY_ck set ISCHACK=1 where PID='" +
- id + "'and id in(" + rowId + ") ");
- SQLHelper.ExecuteQuery(sql2);
+ using (var cmd1 = new OracleCommand(sql1, connection))
+ {
+ cmd1.Transaction = transaction;
+ cmd1.Parameters.Add(new OracleParameter(":pid", id));
+ cmd1.ExecuteNonQuery();
+ }
+
+ // 2. 濡傛灉 DataTable 閲屾湁瑕佹洿鏂扮殑 id
+ if (DB != null && DB.Rows.Count > 0)
+ {
+ // 鎷兼帴 in 鏉′欢锛堝弬鏁板寲锛�
+ var inParams = new List<string>();
+ var parameters = new List<OracleParameter>
+ {
+ new OracleParameter(":pid", id)
+ };
+
+ for (int i = 0; i < DB.Rows.Count; i++)
+ {
+ string paramName = ":id" + i;
+ inParams.Add(paramName);
+ parameters.Add(new OracleParameter(paramName, DB.Rows[i]["id"]));
+ }
+
+ var sql2 = $@"
+ UPDATE MES_IQC_CONSISTENCY_ck
+ SET ISCHACK = 1
+ WHERE PID = :pid
+ AND id IN ({string.Join(",", inParams)})";
+
+ using (var cmd2 = new OracleCommand(sql2, connection))
+ {
+ cmd2.Transaction = transaction;
+ cmd2.Parameters.AddRange(parameters.ToArray());
+ cmd2.ExecuteNonQuery();
+ }
+ }
+
+ // 鍏ㄩ儴鎴愬姛锛屾彁浜�
+ transaction.Commit();
+ }
+ catch (Exception ex)
+ {
+ // 鍑洪敊鍥炴粴
+ transaction.Rollback();
+ throw new Exception("鎵ц saveYzxBDlist 鍑洪敊: " + ex.Message, ex);
+ }
+ }
+ }
}
+
public string[] YzxImgVerify(string id)
{
@@ -1137,10 +1602,19 @@
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 " +
+ // "left join MES_QS_IMAGE b on a.id=b.fid where B.id is null order by ITEMNAME");
+
+
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");
+ @"select A.ITEMNAME from ( select 888||min(id) id,ITEMNAME from MES_IQC_CONSISTENCY_CK where pid='"+id.ToString()+ "' and ITEMNAME not in(select ITEMNAME from MES_IQC_CONSISTENCY_CK where PID='"+id.ToString()+"' and MULTI_SELECT is not null)" +
+ "group by ITEMNAME) A" +
+ " left join MES_QS_IMAGE b on a.id=b.fid where B.id is null" +
+ " union" +
+ " select '鍒嗙粍锛�' || MULTI_SELECT as ITEMNAME from MES_IQC_CONSISTENCY_CK where pid = '"+id.ToString()+ "' and MULTI_SELECT is not null and MULTI_SELECT not in(select A.MULTI_SELECT as ITEMNAME from (select 888 || min(id) id, MULTI_SELECT from MES_IQC_CONSISTENCY_CK where pid = '"+id.ToString()+ "' and MULTI_SELECT is not null group by MULTI_SELECT,ITEMNAME) A left join MES_QS_IMAGE b on a.id = b.fid where B.id is not null) group by MULTI_SELECT");
+
var db = SQLHelper.ExecuteQuery(sql2);
if (db.Rows.Count > 0)
{
@@ -1335,7 +1809,9 @@
}
}
-
+ /// <summary>
+ /// 鎼哄浜戝瘑閽�
+ /// </summary>
public class DataAcquisitionConfiguration
{
//娴嬭瘯鐜
@@ -1384,7 +1860,100 @@
public string erpCode { get; set; }
public string dnXkNo { get; set; }
}
+ [Serializable]
+ public class BodyFlushedImproveReport
+ {
+ public string erpCode { get; set; }
+ public string irXkNo { get; set; }
+ }
+ [Serializable]
+ public class BodyAuditImproveReport
+ {
+ public string erpCode { get; set; }
+ public string irXkNo { get; set; }
+ public int status { get; set; }
+ /// <summary>
+ /// 鍗曡韩鍒楄〃
+ /// </summary>
+ public List<AuditLineItem> lineList { get; set; }
+ }
+ public class AuditLineItem
+ {
+ /// <summary>
+ /// 椤规
+ /// </summary>
+ public int lineNo { get; set; }
+ /// <summary>
+ /// 妫�鏍哥粨鏋� 0:鍚堟牸,1:涓嶅悎鏍�
+ /// </summary>
+ public int checkStatus { get; set; }
+ /// <summary>
+ /// 妫�鏍镐汉宸ュ彿
+ /// </summary>
+ public string checkExplain { get; set; }
+ /// <summary>
+ /// 妫�鏍歌鏄�
+ /// </summary>
+ public string checkPeopleNumber { get; set; }
+ }
+
+ [Serializable]
+ public class BodyImproveReport
+ {
+ /// <summary>
+ /// 璇锋眰鑰呯敤鎴稥RP甯愬彿
+ /// </summary>
+ public string erpCode { get; set; }
+ /// <summary>
+ /// 鍐呴儴渚涘簲鍟嗙紪鐮�
+ /// </summary>
+ public string innerVendorCode { get; set; }
+ /// <summary>
+ /// 鎶ュ憡绫诲瀷:1 鍑嗗叆璇勪及鏀瑰杽,2 鐗╂枡鍑嗗叆鏀瑰杽,3 缁╂晥鏀瑰杽,4 杩濈害浜嬮」鏀瑰杽
+ /// </summary>
+ public int reportType { get; set; } // 鏍规嵁JSON鍊间娇鐢╥nt
+ /// <summary>
+ /// 瀹屾垚鏃ユ湡(姣鏃堕棿鎴�)
+ /// </summary>
+ public long completionDate { get; set; }
+
+ // 鏃ユ湡鎵╁睍瀛楁锛堝瓧绗︿覆鏍煎紡锛�
+ public string platformExtendN01 { get; set; }
+
+ public string platformExtendN02 { get; set; }
+
+ public string platformExtendN03 { get; set; }
+ /// <summary>
+ /// 鏄惁鑷姩鍙戝竷 0:鍚� 1:鏄� 榛樿锛氬惁
+ /// </summary>
+ public int isPublish { get; set; } // 鏍规嵁JSON鍊间娇鐢╥nt
+ /// <summary>
+ /// 鍒╂鼎涓績/宸ュ巶缂栫爜
+ /// </summary>
+ public string profitCenterCode { get; set; }
+ /// <summary>
+ /// 鍒╂鼎涓績/宸ュ巶鍚嶇О
+ /// </summary>
+ public string profitCenterName { get; set; }
+ /// <summary>
+ /// 鍗曡韩鍒楄〃
+ /// </summary>
+ public List<LineItem> lineList { get; set; }
+ }
+
+ [Serializable]
+ public class LineItem
+ {
+ /// <summary>
+ /// 闂鎻忚堪
+ /// </summary>
+ public string questionDesc { get; set; }
+ /// <summary>
+ /// 闂绛夌骇 0:娆¤,1:閲嶈,2:鑷村懡
+ /// </summary>
+ public int questionGrade { get; set; } // 鏍规嵁JSON鍊间娇鐢╥nt
+ }
public class XkyCommonParam
{
public ApiCommonParam commonParam { get; set; }
@@ -1394,14 +1963,14 @@
{
var apiParam = new ApiCommonParam
{
- // 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
- appKey = DataAcquisitionConfiguration.APP_KEY,
+ //// 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
+ appKey = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.APP_KEY : DataAcquisitionConfiguration.TEST_APP_KEY,
// 鎺ュ彛鐗堟湰
version = "1.0",
// 鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮�
- operateCompanyCode = DataAcquisitionConfiguration.COMPANY_CODE,
+ operateCompanyCode = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.COMPANY_CODE : DataAcquisitionConfiguration.TEST_COMPANY_CODE,
// 鏁版嵁鎵�灞炲叕鍙哥紪鐮侊紝闈為泦鍥㈠叕鍙搁粯璁よ祴鍊间负鎿嶄綔鍏徃
- ownerCompanyCode = DataAcquisitionConfiguration.COMPANY_CODE,
+ ownerCompanyCode = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.COMPANY_CODE : DataAcquisitionConfiguration.TEST_COMPANY_CODE,
// 褰撳墠鏃堕棿瀵瑰簲鐨勬椂闂存埑锛堢鏁帮級
timestamps = DateTimeOffset.UtcNow.ToUnixTimeSeconds()
};
@@ -1424,14 +1993,14 @@
{
var apiParam = new ApiCommonParam
{
- // 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
- appKey = DataAcquisitionConfiguration.TEST_APP_KEY,
+ //// 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
+ appKey = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.APP_KEY : DataAcquisitionConfiguration.TEST_APP_KEY,
// 鎺ュ彛鐗堟湰
version = "1.0",
// 鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮�
- operateCompanyCode = DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ operateCompanyCode = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.COMPANY_CODE : DataAcquisitionConfiguration.TEST_COMPANY_CODE,
// 鏁版嵁鎵�灞炲叕鍙哥紪鐮侊紝闈為泦鍥㈠叕鍙搁粯璁よ祴鍊间负鎿嶄綔鍏徃
- ownerCompanyCode = DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ ownerCompanyCode = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.COMPANY_CODE : DataAcquisitionConfiguration.TEST_COMPANY_CODE,
// 褰撳墠鏃堕棿瀵瑰簲鐨勬椂闂存埑锛堢鏁帮級
timestamps = DateTimeOffset.UtcNow.ToUnixTimeSeconds()
};
@@ -1450,6 +2019,156 @@
commonParam = apiParam
};
}
+ }
+
+ public class XkyinnerVendorParam
+ {
+ public ApiCommonParam commonParam { get; set; }
+ public BodyImproveReport body { get; set; }
+
+ public static XkyinnerVendorParam GetInit()
+ {
+
+ var apiParam = new ApiCommonParam
+ {
+
+ //// 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
+ appKey = (configuration["AppSettings:XKYamgylchedd"]=="1")?DataAcquisitionConfiguration.APP_KEY: DataAcquisitionConfiguration.TEST_APP_KEY,
+ // 鎺ュ彛鐗堟湰
+ version = "1.0",
+ // 鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮�
+ operateCompanyCode = (configuration["AppSettings:XKYamgylchedd"] == "1")?DataAcquisitionConfiguration.COMPANY_CODE:DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ // 鏁版嵁鎵�灞炲叕鍙哥紪鐮侊紝闈為泦鍥㈠叕鍙搁粯璁よ祴鍊间负鎿嶄綔鍏徃
+ ownerCompanyCode = (configuration["AppSettings:XKYamgylchedd"] == "1")?DataAcquisitionConfiguration.COMPANY_CODE: DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ // 褰撳墠鏃堕棿瀵瑰簲鐨勬椂闂存埑锛堢鏁帮級
+ timestamps = DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+
+ // 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
+ //appKey = DataAcquisitionConfiguration.TEST_APP_KEY,
+ //// 鎺ュ彛鐗堟湰
+ //version = "1.0",
+ //// 鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮�
+ //operateCompanyCode = DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ //// 鏁版嵁鎵�灞炲叕鍙哥紪鐮侊紝闈為泦鍥㈠叕鍙搁粯璁よ祴鍊间负鎿嶄綔鍏徃
+ //ownerCompanyCode = DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ //// 褰撳墠鏃堕棿瀵瑰簲鐨勬椂闂存埑锛堢鏁帮級
+ //timestamps = DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+ };
+
+
+ // var appSecret = DataAcquisitionConfiguration.APP_SECRET;
+ var appSecret = DataAcquisitionConfiguration.TEST_APP_SECRET;
+
+ // 鐢熸垚绛惧悕
+ var sign = BuildCurrentSign(
+ JsonConvert.SerializeObject(apiParam),
+ appSecret);
+ apiParam.sign = sign;
+
+ return new XkyinnerVendorParam
+ {
+ commonParam = apiParam
+ };
+ }
+
+ }
+ public class XkyFlushedrVendorParam
+ {
+ public ApiCommonParam commonParam { get; set; }
+ public BodyFlushedImproveReport body { get; set; }
+
+ public static XkyFlushedrVendorParam GetInit()
+ {
+ var apiParam = new ApiCommonParam
+ {
+ //// 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
+ appKey = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.APP_KEY : DataAcquisitionConfiguration.TEST_APP_KEY,
+ // 鎺ュ彛鐗堟湰
+ version = "1.0",
+ // 鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮�
+ operateCompanyCode = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.COMPANY_CODE : DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ // 鏁版嵁鎵�灞炲叕鍙哥紪鐮侊紝闈為泦鍥㈠叕鍙搁粯璁よ祴鍊间负鎿嶄綔鍏徃
+ ownerCompanyCode = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.COMPANY_CODE : DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ // 褰撳墠鏃堕棿瀵瑰簲鐨勬椂闂存埑锛堢鏁帮級
+ timestamps = DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+
+ // 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
+ //appKey = DataAcquisitionConfiguration.TEST_APP_KEY,
+ //// 鎺ュ彛鐗堟湰
+ //version = "1.0",
+ //// 鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮�
+ //operateCompanyCode = DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ //// 鏁版嵁鎵�灞炲叕鍙哥紪鐮侊紝闈為泦鍥㈠叕鍙搁粯璁よ祴鍊间负鎿嶄綔鍏徃
+ //ownerCompanyCode = DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ //// 褰撳墠鏃堕棿瀵瑰簲鐨勬椂闂存埑锛堢鏁帮級
+ //timestamps = DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+ };
+
+
+ // var appSecret = DataAcquisitionConfiguration.APP_SECRET;
+ var appSecret = DataAcquisitionConfiguration.TEST_APP_SECRET;
+
+ // 鐢熸垚绛惧悕
+ var sign = BuildCurrentSign(
+ JsonConvert.SerializeObject(apiParam),
+ appSecret);
+ apiParam.sign = sign;
+
+ return new XkyFlushedrVendorParam
+ {
+ commonParam = apiParam
+ };
+ }
+
+ }
+ public class XkyAuditVendorParam
+ {
+ public ApiCommonParam commonParam { get; set; }
+ public BodyAuditImproveReport body { get; set; }
+
+ public static XkyAuditVendorParam GetInit()
+ {
+ var apiParam = new ApiCommonParam
+ {
+ //// 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
+ appKey = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.APP_KEY : DataAcquisitionConfiguration.TEST_APP_KEY,
+ // 鎺ュ彛鐗堟湰
+ version = "1.0",
+ // 鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮�
+ operateCompanyCode = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.COMPANY_CODE : DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ // 鏁版嵁鎵�灞炲叕鍙哥紪鐮侊紝闈為泦鍥㈠叕鍙搁粯璁よ祴鍊间负鎿嶄綔鍏徃
+ ownerCompanyCode = (configuration["AppSettings:XKYamgylchedd"] == "1") ? DataAcquisitionConfiguration.COMPANY_CODE : DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ // 褰撳墠鏃堕棿瀵瑰簲鐨勬椂闂存埑锛堢鏁帮級
+ timestamps = DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+
+ // 鍙戞惡瀹簯鎻愪緵鐨刟ppKey
+ //appKey = DataAcquisitionConfiguration.TEST_APP_KEY,
+ //// 鎺ュ彛鐗堟湰
+ //version = "1.0",
+ //// 鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮�
+ //operateCompanyCode = DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ //// 鏁版嵁鎵�灞炲叕鍙哥紪鐮侊紝闈為泦鍥㈠叕鍙搁粯璁よ祴鍊间负鎿嶄綔鍏徃
+ //ownerCompanyCode = DataAcquisitionConfiguration.TEST_COMPANY_CODE,
+ //// 褰撳墠鏃堕棿瀵瑰簲鐨勬椂闂存埑锛堢鏁帮級
+ //timestamps = DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+ };
+
+
+ // var appSecret = DataAcquisitionConfiguration.APP_SECRET;
+ var appSecret = DataAcquisitionConfiguration.TEST_APP_SECRET;
+
+ // 鐢熸垚绛惧悕
+ var sign = BuildCurrentSign(
+ JsonConvert.SerializeObject(apiParam),
+ appSecret);
+ apiParam.sign = sign;
+
+ return new XkyAuditVendorParam
+ {
+ commonParam = apiParam
+ };
+ }
+
}
/// <summary>
@@ -1490,7 +2209,7 @@
[JsonProperty("result")] public int Result { get; set; }
- [JsonProperty("data")] public object Data { get; set; }
+ [JsonProperty("data")] public Root Data { get; set; }
[JsonProperty("curServerTime")] public long CurServerTime { get; set; }
@@ -1498,4 +2217,57 @@
public DateTime ServerTime => DateTimeOffset
.FromUnixTimeMilliseconds(CurServerTime).DateTime;
}
+ public class Root
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ public string irXkNo { get; set; }
+
+ public List<LineListItem> lineList { get; set; }
+
+ }
+ public class LineListItem
+ {
+ /// <summary>
+ /// 椤规鍙�
+ /// </summary>
+ public int lineNo { get; set; }
+ /// <summary>
+ /// 闂鎻忚堪
+ /// </summary>
+ public string questionDesc { get; set; }
+ /// <summary>
+ /// 闂绛夌骇 0:娆¤,1:閲嶈,2:鑷村懡
+ /// </summary>
+ public int questionGrade { get; set; }
+ /// <summary>
+ /// 鍘熷洜鍒嗘瀽
+ /// </summary>
+ public string reasonAnalyze { get; set; }
+ /// <summary>
+ /// 绾犳棰勯槻鎺柦
+ /// </summary>
+ public string correctPreventMeasure { get; set; }
+ /// <summary>
+ /// 璐熻矗浜�
+ /// </summary>
+ public string principal { get; set; }
+ /// <summary>
+ /// 棰勮瀹屾垚鏃堕棿瀵瑰簲鐨勬椂闂存埑
+ /// </summary>
+ public string expectedFinishTime { get; set; }
+ /// <summary>
+ /// 妫�鏍歌鏄�
+ /// </summary>
+ public string checkExplain { get; set; }
+ /// <summary>
+ /// 妫�鏍镐汉濮撳悕
+ /// </summary>
+ public string checkPeopleName { get; set; }
+ /// <summary>
+ /// 妫�鏍哥粨鏋� 0:鍚堟牸,1:涓嶅悎鏍�
+ /// </summary>
+ public string checkStatus { get; set; }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3