From 520f3a8bb32107582a323decbd237626ec36e4f3 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 26 八月 2024 17:33:06 +0800
Subject: [PATCH] 修改制程绩效趋势图(合格率和一次合格率方法) 查询
---
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml | 16 ++
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | 129 ++++++++++++++------
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 5
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 27 ++++
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
WebAPI/WebAPI.csproj.user | 4
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user | 162 +++++++++++++-------------
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user | 6 +
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
11 files changed, 226 insertions(+), 123 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 7102970..3d381bf 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -261,6 +261,33 @@
}
#endregion
+ #region 鑾峰彇浜嬩笟閮�
+ [Route("Gy_Material/Get_Gy_Division")]
+ [HttpGet]
+ public object Get_Gy_Division(string HOrgID)
+ {
+ try
+ {
+ DataSet oDs = new DataSet();
+ //==========
+ oDs = oCN.RunProcReturn(" select HItemID,HName from Gy_Division", "Gy_Division");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇鎴愬姛锛�";
+ objJsonResult.data = oDs.Tables[0];
+ return objJsonResult; ;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
/// <summary>
/// 鐗╂枡璁剧疆鑾峰彇淇℃伅
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 bf33427..2aee655 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"
@@ -678,7 +678,7 @@
}
#endregion
- #region 璐ㄩ噺妯″潡 璁惧宸ヨ壓鍙傛暟瓒嬪娍鍥� 鏍规嵁娴佽浆鍗¤幏鍙栬澶�
+ #region 璐ㄩ噺妯″潡 璁惧宸ヨ壓鍙傛暟瓒嬪娍鍥� 鏍规嵁娴佽浆鍗¤幏鍙栬澶�+妯″叿
[Route("QC_CustomerAppealReport/Get_EquipList")]
[HttpGet]
@@ -688,7 +688,10 @@
{
List<object> columnNameList = new List<object>();
- ds = oCN.RunProcReturn("select distinct b.HInterID HItemID,b.HName HName from SB_EquipICMOTechParamBillMain a left join Gy_EquipFileBillMain b on a.HEquipID=b.HInterID where HProcExchBillNo='" + HProcExchBillNo + "'", "SB_EquipICMOTechParamBillMain");
+ ds = oCN.RunProcReturn("select distinct b.HInterID HItemID,b.HEquipFileNumber HEquipFileNumber,b.HName HName,d.HMouldNo HMouldNumber,d.HName HMouldName " +
+ " from SB_EquipICMOTechParamBillMain a left join Gy_EquipFileBillMain b on a.HEquipID=b.HInterID" +
+ " left join Sc_ICMOBillStatus_Tmp c on a.HProcExchInterID = c.HSourceInterID and a.HProcExchEntryID = c.HSourceEntryID and a.HProcID = c.HProcID" +
+ " left join Gy_MouldFileMain d on c.HMouldID = d.HInterID where HProcExchBillNo='" + HProcExchBillNo + "'", "SB_EquipICMOTechParamBillMain");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -949,16 +952,19 @@
try
{
List<object> columnNameList = new List<object>();
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_QC_ProcessPerformanceFirstPassList order by 鏈堜唤 desc", "h_v_QC_ProcessPerformanceFirstPassList");
- }
- else
- {
- string sql1 = "select * from h_v_QC_ProcessPerformanceFirstPassList where 1 = 1 ";
- string sql = sql1 + sWhere + " order by 鏈堜唤 ";
- ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessPerformanceFirstPassList");
- }
+
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HYear = dic["HYear"].ToString();//骞�
+ string HDeptName = dic["HDeptName"].ToString();//閮ㄩ棬
+ string HProject = dic["HProject"].ToString();//椤圭洰鍙�
+ string HMaterNumber = dic["HMaterNumber"].ToString();//鐗╂枡浠ｇ爜
+ string HMaterName = dic["HMaterName"].ToString();//鐗╂枡鍚嶇О
+ string HBatchWork = dic["HBatchWork"].ToString();//鏄惁閲忎骇
+ string HDivisionName = dic["HDivisionName"].ToString();//浜嬩笟閮�
+
+ ds = oCN.RunProcReturn("exec h_p_QC_ProcessPerformanceFirstPassList '" + HYear + "','"+ HDeptName + "','" + HProject + "','" + HMaterNumber + "','" + HMaterName + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_ProcessPerformanceFirstPassList");
+
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -986,7 +992,6 @@
}
#endregion
-
#region 璐ㄩ噺妯″潡 鍒剁▼缁╂晥瓒嬪娍鍥�(鍚堟牸鐜�) 鏌ヨ
[Route("QC_CustomerAppealReport/getQC_ProcessPerformancePass")]
@@ -996,16 +1001,19 @@
try
{
List<object> columnNameList = new List<object>();
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_QC_ProcessPerformancePassList order by 鏈堜唤 desc", "h_v_QC_ProcessPerformancePassList");
- }
- else
- {
- string sql1 = "select * from h_v_QC_ProcessPerformancePassList where 1 = 1 ";
- string sql = sql1 + sWhere + " order by 鏈堜唤 ";
- ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessPerformancePassList");
- }
+
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HYear = dic["HYear"].ToString();//骞�
+ string HDeptName = dic["HDeptName"].ToString();//閮ㄩ棬
+ string HProject = dic["HProject"].ToString();//椤圭洰鍙�
+ string HMaterNumber = dic["HMaterNumber"].ToString();//鐗╂枡浠ｇ爜
+ string HMaterName = dic["HMaterName"].ToString();//鐗╂枡鍚嶇О
+ string HBatchWork = dic["HBatchWork"].ToString();//鏄惁閲忎骇
+ string HDivisionName = dic["HDivisionName"].ToString();//浜嬩笟閮�
+
+ ds = oCN.RunProcReturn("exec h_p_QC_ProcessPerformancePassList '" + HYear + "','" + HDeptName + "','" + HProject + "','" + HMaterNumber + "','" + HMaterName + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_ProcessPerformancePassList");
+
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1381,25 +1389,16 @@
{
List<object> columnNameList = new List<object>();
- Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
-
- string HEquipNumber = dic["HEquipNumber"].ToString();
- string HEquipName = dic["HEquipName"].ToString();
- string HProcName = dic["HProcName"].ToString();
-
- string HTechParamName = dic["HTechParamName"].ToString();
- string HDate = dic["HDate"].ToString();
-
- if ((HEquipNumber == null || HEquipNumber == "") && (HEquipName == null || HEquipName == "") && (HProcName == null || HProcName == "") && (HTechParamName == null || HTechParamName == "") && (HDate == null || HDate == ""))
+ if (sWhere == null || sWhere.Equals(""))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡璇㈡潯浠讹紒";
- objJsonResult.data = null;
- return objJsonResult;
+ ds = oCN.RunProcReturn("select * from h_v_Sb_EquipMentCollectionTechParam order by 閲囬泦鏃ユ湡 desc", "h_v_Sb_EquipMentCollectionTechParam");
}
-
- ds = oCN.RunProcReturn("select HSourceCode 璁惧缂栫爜,CONVERT(VARCHAR, HDate, 120) 閲囬泦鏃ユ湡,HTechParamName 宸ヨ壓浜ф暟,HResult 鏁伴噰鍊� from Sb_EquipMentCollectionTechParam_Temp where HSourceCode='" + HEquipNumber + "' and HTechParamName='"+ HTechParamName + "' and CONVERT(date, HDate) <='"+HDate+"'", "Sb_EquipMentCollectionTechParam_Temp");
+ else
+ {
+ string sql1 = "select * from h_v_Sb_EquipMentCollectionTechParam where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 閲囬泦鏃ユ湡 ";
+ ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMentCollectionTechParam");
+ }
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1427,5 +1426,55 @@
}
#endregion
+ #region 璐ㄩ噺妯″潡 鍏ㄧ▼璐ㄩ噺杩芥函
+ /// <summary>
+ /// 杩斿洖寮傚父闂鏉ユ簮
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList")]
+ [HttpGet]
+ public object Get_QC_FiveMenOneRingList(string SN, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList '" + SN + "'", "h_p_QC_FiveMenOneRingList");
+
+ // 閬嶅巻鎵�鏈夎〃
+ foreach (DataTable table in ds.Tables)
+ {
+ List<object> tableColumnList = new List<object>();
+
+ // 娣诲姞鍒楀悕
+ foreach (DataColumn col in table.Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ tableColumnList.Add(JsonConvert.DeserializeObject(ColmString));
+ }
+
+ // 灏嗘瘡涓〃鐨勫垪鍚嶅垪琛ㄦ坊鍔犲埌鎬诲垪鍚嶅垪琛�
+ columnNameList.Add(new { TableName = table.TableName, Columns = tableColumnList });
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds;
+ 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
}
}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
index 0186fdd..8aa0ddc 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
@@ -4,12 +4,12 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2024-08-22T01:48:50.0760398Z;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History>
+ <History>True|2024-08-26T09:21:30.8800173Z;True|2024-08-26T17:19:23.9260010+08:00;True|2024-08-26T14:27:20.8154004+08:00;True|2024-08-26T14:16:14.4482284+08:00;True|2024-08-26T13:12:42.9574127+08:00;True|2024-08-26T12:48:31.2107630+08:00;True|2024-08-26T11:07:15.1181342+08:00;False|2024-08-26T11:07:09.9429791+08:00;True|2024-08-26T10:49:20.8494484+08:00;True|2024-08-26T10:13:11.5222607+08:00;False|2024-08-26T10:12:59.1146882+08:00;True|2024-08-23T15:39:39.9842990+08:00;False|2024-08-23T15:39:33.9824708+08:00;True|2024-08-22T16:55:46.4689463+08:00;True|2024-08-22T16:44:25.0981764+08:00;True|2024-08-22T16:19:29.9801909+08:00;True|2024-08-22T14:25:13.5120259+08:00;True|2024-08-22T09:48:50.0760398+08:00;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="bin/AlibabaCloud.EndpointUtil.dll">
<publishTime>04/07/2020 16:33:48</publishTime>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>08/22/2024 09:36:27</publishTime>
+ <publishTime>08/26/2024 17:21:20</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>08/22/2024 09:36:27</publishTime>
+ <publishTime>08/26/2024 17:21:20</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>08/22/2024 09:36:26</publishTime>
+ <publishTime>08/26/2024 17:21:18</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>08/22/2024 09:36:26</publishTime>
+ <publishTime>08/26/2024 17:21:18</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>08/22/2024 09:36:24</publishTime>
+ <publishTime>08/26/2024 17:21:16</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>08/22/2024 09:36:24</publishTime>
+ <publishTime>08/26/2024 17:21:16</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -93,7 +93,7 @@
<publishTime>05/09/2021 01:08:30</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>02/08/2023 09:47:46</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="bin/libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -111,13 +111,13 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>08/22/2024 09:36:24</publishTime>
+ <publishTime>08/26/2024 17:21:16</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>08/22/2024 09:36:24</publishTime>
+ <publishTime>08/26/2024 17:21:16</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>03/08/2023 15:09:56</publishTime>
@@ -147,25 +147,25 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>08/22/2024 09:36:23</publishTime>
+ <publishTime>08/26/2024 17:21:14</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>08/22/2024 09:36:23</publishTime>
+ <publishTime>08/26/2024 17:21:14</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>08/22/2024 09:36:23</publishTime>
+ <publishTime>08/26/2024 17:21:15</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>08/22/2024 09:36:23</publishTime>
+ <publishTime>08/26/2024 17:21:15</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>08/22/2024 09:36:23</publishTime>
+ <publishTime>08/26/2024 17:21:15</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>08/22/2024 09:36:23</publishTime>
+ <publishTime>08/26/2024 17:21:15</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
@@ -246,7 +246,7 @@
<publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 12:02:18</publishTime>
@@ -279,19 +279,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>08/22/2024 09:36:24</publishTime>
+ <publishTime>08/26/2024 17:21:17</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>08/22/2024 09:36:24</publishTime>
+ <publishTime>08/26/2024 17:21:17</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>08/22/2024 09:36:30</publishTime>
+ <publishTime>08/26/2024 17:21:24</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>08/22/2024 09:36:30</publishTime>
+ <publishTime>08/26/2024 17:21:24</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -303,58 +303,58 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>08/15/2022 15:46:13</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>02/08/2023 09:47:46</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
<publishTime>03/22/2022 13:17:22</publishTime>
@@ -363,7 +363,7 @@
<publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -372,121 +372,121 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="libman.json">
- <publishTime>07/18/2023 17:26:29</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="packages.config">
- <publishTime>08/15/2024 22:14:00</publishTime>
+ <publishTime>08/16/2024 09:07:08</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>03/31/2023 09:57:09</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
- <publishTime>05/13/2024 10:26:00</publishTime>
+ <publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/22/2024 09:48:49</publishTime>
+ <publishTime>08/26/2024 17:21:29</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml
new file mode 100644
index 0000000..d16ec41
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml
@@ -0,0 +1,16 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <DeleteExistingFiles>False</DeleteExistingFiles>
+ <ExcludeApp_Data>False</ExcludeApp_Data>
+ <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+ <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+ <LastUsedPlatform>Any CPU</LastUsedPlatform>
+ <PublishProvider>FileSystem</PublishProvider>
+ <PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</PublishUrl>
+ <WebPublishMethod>FileSystem</WebPublishMethod>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
new file mode 100644
index 0000000..a32fee2
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
@@ -0,0 +1,6 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index c1e72b5..b62369d 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,8 +9,8 @@
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile21.pubxml</NameOfLastUsedPublishProfile>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile10.pubxml</NameOfLastUsedPublishProfile>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index 2ae9bf4..6ff6431 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
index 0672e52..47f150e 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index 8a75d00..48ab1c4 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -4,3 +4,8 @@
D:\鏅轰簯LMes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\鏅轰簯LMes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\鏅轰簯LMes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index 2ae9bf4..6ff6431 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
index 0672e52..47f150e 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1