From 2a363a58ad45f09afdcc0a2c54383b0a76ea1208 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 12 八月 2024 08:51:45 +0800
Subject: [PATCH] 增加工艺参数大类分析报表方法,新增字段 HTechParamClassID int //工艺参数大类（Gy_TechnologyParameterClass） HSNO int //工艺次序 HStdNextTimes money //理论次序间隔 HTechParamIDStd int //对应设定值工艺参数(Gy_TechnologyParameter)
---
Model/生产管理/设备管理/ClsSB_EquipICMOTechParamBillSub.cs | 5 ++
DAL/生产管理/设备管理/ClsSB_EquipICMOTechParamBill.cs | 9 ++--
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | 54 +++++++++++++++++++++++++++
WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user | 36 +++++++++---------
4 files changed, 81 insertions(+), 23 deletions(-)
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSB_EquipICMOTechParamBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSB_EquipICMOTechParamBill.cs"
index 96d3642..604e2c9 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSB_EquipICMOTechParamBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSB_EquipICMOTechParamBill.cs"
@@ -130,16 +130,17 @@
DeleteBillSub(lngBillKey);
//鎻掑叆瀛愯〃
omodel.HInterID = lngBillKey;
+ //鎻掑叆瀛愯〃
foreach (Model.ClsSB_EquipICMOTechParamBillSub oSub in DetailColl)
{
oCn.RunProc("Insert into SB_EquipICMOTechParamBillSub " +
" (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HBillNo_bak" +
- ",HTechParamID,HTechParamUnitID,HVaule,HStd,HMax,HMin,HResult" +
+ ",HTechParamID,HTechParamUnitID,HVaule,HStd,HMax,HMin,HResult,HTechParamIDStd,HResultStd,HTechParamClassID,HSNO" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "','" + omodel.HBillNo + "'" +
- "," + oSub.HTechParamID.ToString() + "," + oSub.HTechParamUnitID.ToString() + ",'" + oSub.HVaule + "','" + oSub.HStd + "','" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HResult + "'" +
+ "," + oSub.HTechParamID.ToString() + "," + oSub.HTechParamUnitID.ToString() + ",'" + oSub.HVaule + "','" + oSub.HStd + "','" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HResult + "','" + oSub.HTechParamIDStd + "','" + oSub.HResultStd + "','" + oSub.HTechParamClassID + "','" + oSub.HSNO + "'" +
") ");
}
//淇濆瓨鍚庢帶鍒�
@@ -199,11 +200,11 @@
oCn.RunProc("Insert into SB_EquipICMOTechParamBillSub " +
" (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HBillNo_bak" +
- ",HTechParamID,HTechParamUnitID,HVaule,HStd,HMax,HMin,HResult" +
+ ",HTechParamID,HTechParamUnitID,HVaule,HStd,HMax,HMin,HResult,HTechParamIDStd,HResultStd,HTechParamClassID,HSNO" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "','" + omodel.HBillNo + "'" +
- "," + oSub.HTechParamID.ToString() + "," + oSub.HTechParamUnitID.ToString() + ",'" + oSub.HVaule + "','" + oSub.HStd + "','" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HResult + "'" +
+ "," + oSub.HTechParamID.ToString() + "," + oSub.HTechParamUnitID.ToString() + ",'" + oSub.HVaule + "','" + oSub.HStd + "','" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HResult + "','" + oSub.HTechParamIDStd + "','" + oSub.HResultStd + "','" + oSub.HTechParamClassID + "','" + oSub.HSNO + "'" +
") ");
}
//淇濆瓨鍚庢帶鍒�
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSB_EquipICMOTechParamBillSub.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSB_EquipICMOTechParamBillSub.cs"
index 4f93d45..e2d0260 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSB_EquipICMOTechParamBillSub.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSB_EquipICMOTechParamBillSub.cs"
@@ -13,6 +13,9 @@
public string HMax; // varchar(200) //上限
public string HMin; // varchar(200) //下限
public string HResult; // varchar(50) //检测结果（OK，NG）
-
+ public Int64 HTechParamIDStd; // int --设备设定值工艺参数
+ public string HResultStd; //varchar(200) //设备设定值
+ public Int64 HTechParamClassID; //工艺参数大类（Gy_TechnologyParameterClass）
+ public Int64 HSNO; //int //工艺次序
}
}
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
index 81c0f64..6f1df55 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
@@ -770,6 +770,60 @@
}
#endregion
+ #region 璐ㄩ噺妯″潡 宸ヨ壓鍙傛暟澶х被鍒嗘瀽鎶ヨ〃
+
+ [Route("QC_CustomerAppealReport/GtetQc_TechnologyParameterClassList")]
+ [HttpGet]
+ public object GtetQc_TechnologyParameterClassList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HProcExchBillNo = dic["HProcExchBillNo"].ToString();
+ string HProcName = dic["HProcName"].ToString();
+ string HTechParamClass = dic["HTechParamName"].ToString();
+ string HEquipName = dic["HEquipName"].ToString();
+
+ if ((HProcExchBillNo == null || HProcExchBillNo == "") && (HProcName == null || HProcName == "") && (HTechParamClass == null || HTechParamClass == "") && (HEquipName == null || HEquipName == ""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潯浠讹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("exec h_p_SB_EquipICMOTechParamBillList_Class '" + HProcExchBillNo + "','" + HProcName + "','" + HTechParamClass + "'," + HEquipName, "h_p_SB_EquipICMOTechParamBillList_Class");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 璐ㄩ噺妯″潡 鎬ц兘鎶ュ簾鍙拌处
/// <summary>
/// 杩斿洖鐩撮�氱巼鎶ヨ〃鍒楄〃
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user
index 80bd64c..5dd900b 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2024-08-08T03:02:37.2677877Z;True|2024-08-07T17:10:36.0727818+08:00;True|2024-08-07T16:48:57.8261661+08:00;True|2024-08-07T15:58:57.7021790+08:00;True|2024-08-07T15:57:11.6698959+08:00;True|2024-08-07T15:56:55.4052340+08:00;True|2024-08-07T14:54:25.8394649+08:00;True|2024-08-07T14:50:30.7287125+08:00;True|2024-08-07T14:47:58.1033886+08:00;True|2024-08-07T14:42:04.7937203+08:00;False|2024-08-07T14:41:11.1166410+08:00;True|2024-08-07T14:40:06.2944968+08:00;True|2024-08-06T17:31:51.1577940+08:00;True|2024-08-06T15:58:21.9478483+08:00;True|2024-08-06T15:52:25.5671153+08:00;False|2024-08-06T15:51:36.2108945+08:00;True|2024-08-06T14:35:38.9800527+08:00;True|2024-08-06T14:25:56.9168610+08:00;True|2024-08-06T14:18:02.5135044+08:00;True|2024-08-06T14:06:42.1692600+08:00;True|2024-08-06T14:05:29.0677989+08:00;True|2024-08-06T13:37:17.0765163+08:00;True|2024-08-06T13:31:19.5058940+08:00;True|2024-08-06T10:32:58.9689049+08:00;True|2024-08-06T10:20:27.5609081+08:00;True|2024-08-05T17:16:04.0580512+08:00;True|2024-08-05T14:15:37.7606467+08:00;True|2024-08-05T10:38:17.0385673+08:00;True|2024-08-02T15:30:55.2850118+08:00;True|2024-08-02T14:51:56.4523731+08:00;True|2024-08-02T11:15:21.6141517+08:00;True|2024-08-02T11:02:47.2279329+08:00;True|2024-08-02T10:12:26.2043659+08:00;True|2024-08-02T10:06:59.9131305+08:00;True|2024-08-01T15:48:47.0889207+08:00;True|2024-08-01T15:41:57.2619074+08:00;False|2024-08-01T15:38:42.2210774+08:00;True|2024-08-01T15:26:38.2209058+08:00;True|2024-08-01T15:20:30.4979113+08:00;True|2024-08-01T15:18:30.8515336+08:00;True|2024-08-01T14:39:01.4083319+08:00;True|2024-08-01T14:33:31.9930824+08:00;True|2024-08-01T10:59:53.5042176+08:00;True|2024-08-01T10:58:17.7670138+08:00;True|2024-07-31T10:42:25.9690193+08:00;True|2024-07-31T10:39:22.9657733+08:00;</History>
+ <History>True|2024-08-09T09:04:30.2758430Z;False|2024-08-09T17:03:52.3206484+08:00;True|2024-08-09T09:55:41.7605093+08:00;True|2024-08-08T11:02:37.2677877+08:00;True|2024-08-07T17:10:36.0727818+08:00;True|2024-08-07T16:48:57.8261661+08:00;True|2024-08-07T15:58:57.7021790+08:00;True|2024-08-07T15:57:11.6698959+08:00;True|2024-08-07T15:56:55.4052340+08:00;True|2024-08-07T14:54:25.8394649+08:00;True|2024-08-07T14:50:30.7287125+08:00;True|2024-08-07T14:47:58.1033886+08:00;True|2024-08-07T14:42:04.7937203+08:00;False|2024-08-07T14:41:11.1166410+08:00;True|2024-08-07T14:40:06.2944968+08:00;True|2024-08-06T17:31:51.1577940+08:00;True|2024-08-06T15:58:21.9478483+08:00;True|2024-08-06T15:52:25.5671153+08:00;False|2024-08-06T15:51:36.2108945+08:00;True|2024-08-06T14:35:38.9800527+08:00;True|2024-08-06T14:25:56.9168610+08:00;True|2024-08-06T14:18:02.5135044+08:00;True|2024-08-06T14:06:42.1692600+08:00;True|2024-08-06T14:05:29.0677989+08:00;True|2024-08-06T13:37:17.0765163+08:00;True|2024-08-06T13:31:19.5058940+08:00;True|2024-08-06T10:32:58.9689049+08:00;True|2024-08-06T10:20:27.5609081+08:00;True|2024-08-05T17:16:04.0580512+08:00;True|2024-08-05T14:15:37.7606467+08:00;True|2024-08-05T10:38:17.0385673+08:00;True|2024-08-02T15:30:55.2850118+08:00;True|2024-08-02T14:51:56.4523731+08:00;True|2024-08-02T11:15:21.6141517+08:00;True|2024-08-02T11:02:47.2279329+08:00;True|2024-08-02T10:12:26.2043659+08:00;True|2024-08-02T10:06:59.9131305+08:00;True|2024-08-01T15:48:47.0889207+08:00;True|2024-08-01T15:41:57.2619074+08:00;False|2024-08-01T15:38:42.2210774+08:00;True|2024-08-01T15:26:38.2209058+08:00;True|2024-08-01T15:20:30.4979113+08:00;True|2024-08-01T15:18:30.8515336+08:00;True|2024-08-01T14:39:01.4083319+08:00;True|2024-08-01T14:33:31.9930824+08:00;True|2024-08-01T10:59:53.5042176+08:00;True|2024-08-01T10:58:17.7670138+08:00;True|2024-07-31T10:42:25.9690193+08:00;True|2024-07-31T10:39:22.9657733+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -21,28 +21,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>08/08/2024 10:53:04</publishTime>
+ <publishTime>08/09/2024 17:04:21</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>08/08/2024 10:53:04</publishTime>
+ <publishTime>08/09/2024 17:04:21</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>08/08/2024 10:53:02</publishTime>
+ <publishTime>08/09/2024 17:04:20</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>08/08/2024 10:53:02</publishTime>
+ <publishTime>08/09/2024 17:04:20</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>08/08/2024 10:53:00</publishTime>
+ <publishTime>08/09/2024 17:04:18</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>08/08/2024 10:53:00</publishTime>
+ <publishTime>08/09/2024 17:04:18</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -87,10 +87,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>08/08/2024 10:53:01</publishTime>
+ <publishTime>08/09/2024 17:04:18</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>08/08/2024 10:53:01</publishTime>
+ <publishTime>08/09/2024 17:04:18</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>05/25/2024 09:46:41</publishTime>
@@ -123,25 +123,25 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>08/08/2024 10:52:59</publishTime>
+ <publishTime>08/09/2024 17:04:17</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>08/08/2024 10:52:59</publishTime>
+ <publishTime>08/09/2024 17:04:17</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>08/08/2024 10:53:00</publishTime>
+ <publishTime>08/09/2024 17:04:17</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>08/08/2024 10:53:00</publishTime>
+ <publishTime>08/09/2024 17:04:17</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>08/08/2024 10:53:00</publishTime>
+ <publishTime>08/09/2024 17:04:17</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>08/08/2024 10:53:00</publishTime>
+ <publishTime>08/09/2024 17:04:17</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
@@ -255,10 +255,10 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>08/08/2024 10:53:08</publishTime>
+ <publishTime>08/09/2024 17:04:24</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>08/08/2024 10:53:08</publishTime>
+ <publishTime>08/09/2024 17:04:24</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -453,7 +453,7 @@
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/08/2024 11:02:36</publishTime>
+ <publishTime>08/09/2024 17:04:29</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1