From b6b0cca1863c2ca0c6c3df68ebddad5de827bf7e Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 23 八月 2024 09:43:20 +0800
Subject: [PATCH] 制程陷阱测试趋势图、PPM绩效趋势图报表调用方法新增，单位换算同步调用方法修改
---
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.dll | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.dll | 0
WebAPI/WebAPI.csproj.user | 2
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt | 12
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache | 0
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0
WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user | 298 +++++++++++++++++++++----------------
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/基础资料/基础资料/Gy_UnitConvertRateController.cs | 8
/dev/null | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb | 0
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | 82 ++++++++++
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 36 ---
WebAPI/Web.config | 4
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.pdb | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
19 files changed, 272 insertions(+), 170 deletions(-)
diff --git a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
index 3be7791..147b13a 100644
--- a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
+++ b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
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..a20b31e 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"
@@ -1427,5 +1427,87 @@
}
#endregion
+ #region 璐ㄩ噺妯″潡 鍒剁▼闄烽槺娴嬭瘯瓒嬪娍鍥炬姤琛�
+
+ /// <summary>
+ /// 鍒剁▼闄烽槺娴嬭瘯瓒嬪娍鍥炬姤琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route("QC_QualityReportsController/GetQC_SkillExamMonthSumReport_Json")]
+ [HttpGet]
+ public object GetQC_SkillExamMonthSumReport_Json(Int64 HYear, Int64 HDeptID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("exec h_p_QC_SkillExamMonthSumReport '" + HYear.ToString() + "'," + HDeptID.ToString(), "h_p_QC_SkillExamMonthSumReport");
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ 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 = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //}
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩斿洖鎶ヨ〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 璐ㄩ噺妯″潡 PPM缁╂晥瓒嬪娍鍥炬姤琛�
+
+ /// <summary>
+ /// PPM缁╂晥瓒嬪娍鍥炬姤琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route("QC_QualityReportsController/GetQC_PPMReport_Json")]
+ [HttpGet]
+ public object GetQC_PPMReport_Json(Int64 HYear, Int64 HDeptID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("exec h_p_QC_PPMReport '" + HYear.ToString() + "'," + HDeptID.ToString(), "h_p_QC_PPMReport");
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ 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 = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //}
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩斿洖鎶ヨ〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
}
}
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs"
index 3453dcc..222eabd 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs"
@@ -181,7 +181,8 @@
FormId = "BD_UNITCONVERTRATE",
FieldKeys = "FUNITCONVERTRATEID,FBILLNO,FMATERIALID,FUSEORGID,FCREATEORGID,FFORBIDSTATUS" +
",FCURRENTUNITID,FDESTUNITID,FCONVERTTYPE,FCONVERTNUMERATOR,FCONVERTDENOMINATOR" +
- ",FCREATORID,FCREATEDATE,FMODIFIERID,FMODIFYDATE,FAPPROVERID,FAPPROVEDATE,FFORBIDDERID,FFORBIDDATE",
+ ",FCREATORID,FCREATEDATE,FMODIFIERID,FMODIFYDATE,FAPPROVERID,FAPPROVEDATE,FFORBIDDERID,FFORBIDDATE" +
+ ",FMATERIALID.FNUMBER",
FilterString = "",
OrderString = "",
TopRowCount = 0,
@@ -245,6 +246,7 @@
HModifyTime = DBUtility.ClsPub.isDate(arr[i, 14]),
HStopEmp = DBUtility.ClsPub.isStrNull(arr[i, 17]),
HStopTime = DBUtility.ClsPub.isDate(arr[i, 18]),
+ HMaterNumber = DBUtility.ClsPub.isStrNull(arr[i, 19]),
};
//鍐欏叆鍗曚綅鎹㈢畻琛ㄦ暟鎹�
@@ -253,7 +255,7 @@
(HItemID,HNumber,HName,HShortNumber,HParentID,HLevel
,HEndFlag,HStopflag,HRemark,HUseFlag,HUSEORGID,HCREATEORGID
,HBILLNO,HMATERID,HCURRENTUNITID,HDESTUNITID,HCONVERTTYPE,HCONVERTNUMERATOR
- ,HCONVERTDENOMINATOR,HFORBIDSTATUS,HUnitID
+ ,HCONVERTDENOMINATOR,HFORBIDSTATUS,HUnitID,HMaterNumber
,HMakeEmp,HMakeTime
,HCheckEmp,HCheckTime
,HModifyEmp,HModifyTime
@@ -261,7 +263,7 @@
Values({subData.HItemID},'{subData.HNumber}','{subData.HName}','{subData.HShortNumber}',{subData.HParentID},{subData.HLevel}
,{subData.HEndFlag},{subData.HStopflag},'{subData.HRemark}','{subData.HUseFlag}',{subData.HUSEORGID},{subData.HCREATEORGID}
,'{subData.HBILLNO}',{subData.HMATERID},{subData.HCURRENTUNITID},{subData.HDESTUNITID},{subData.HCONVERTTYPE},{subData.HCONVERTNUMERATOR}
- ,{subData.HCONVERTDENOMINATOR},'{subData.HFORBIDSTATUS}',{subData.HUnitID}
+ ,{subData.HCONVERTDENOMINATOR},'{subData.HFORBIDSTATUS}',{subData.HUnitID},'{subData.HMaterNumber}'
,'{subData.HMakeEmp}',case when '{subData.HMakeTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HMakeTime}' end
,'{subData.HCheckEmp}',case when '{subData.HCheckTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HCheckTime}' end
,'{subData.HModifyEmp}',case when '{subData.HModifyTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HModifyTime}' end
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
index 122166f..0401602 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
@@ -4,147 +4,174 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2024-06-08T04:38:30.4153773Z;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-23T01:28:59.6852470Z;False|2024-08-23T09:28:05.1857669+08:00;True|2024-08-22T09:38:03.7896560+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>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.EndpointUtil.dll">
+ <publishTime>04/07/2020 16:33:48</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
+ <publishTime>04/25/2023 17:49:04</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.GatewaySpi.dll">
+ <publishTime>07/31/2024 20:50:30</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.OpenApiClient.dll">
+ <publishTime>08/06/2024 18:07:52</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.OpenApiUtil.dll">
+ <publishTime>11/22/2022 11:24:18</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
+ <publishTime>08/08/2024 19:43:22</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.TeaUtil.dll">
+ <publishTime>07/15/2024 20:25:56</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.TeaXML.dll">
+ <publishTime>08/03/2022 21:46:08</publishTime>
+ </File>
+ <File Include="bin/Aliyun.Credentials.dll">
+ <publishTime>07/24/2024 10:36:58</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
- <publishTime>02/22/2013 16:43:40</publishTime>
+ <publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.pdb">
- <publishTime>02/22/2013 16:43:40</publishTime>
+ <publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>06/08/2024 12:38:12</publishTime>
+ <publishTime>08/22/2024 09:37:54</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>06/08/2024 12:38:12</publishTime>
+ <publishTime>08/22/2024 09:37:54</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
- <publishTime>12/18/2020 05:32:28</publishTime>
+ <publishTime>12/17/2020 21:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>06/08/2024 12:38:10</publishTime>
+ <publishTime>08/22/2024 09:37:52</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>06/08/2024 12:38:10</publishTime>
+ <publishTime>08/22/2024 09:37:52</publishTime>
</File>
<File Include="bin/Dapper.dll">
- <publishTime>07/22/2016 22:52:40</publishTime>
+ <publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>06/08/2024 12:38:08</publishTime>
+ <publishTime>08/19/2024 08:52:30</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>06/08/2024 12:38:08</publishTime>
+ <publishTime>08/19/2024 08:52:30</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
- <publishTime>03/22/2022 13:17:26</publishTime>
+ <publishTime>03/22/2022 05:17:26</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.pdb">
- <publishTime>03/19/2022 07:39:42</publishTime>
+ <publishTime>03/18/2022 23:39:42</publishTime>
</File>
<File Include="bin/Grpc.Core.dll">
- <publishTime>03/22/2022 13:17:20</publishTime>
+ <publishTime>03/22/2022 05:17:20</publishTime>
</File>
<File Include="bin/Grpc.Core.pdb">
- <publishTime>03/19/2022 07:39:48</publishTime>
+ <publishTime>03/18/2022 23:39:48</publishTime>
</File>
<File Include="bin/grpc_csharp_ext.x64.dll">
- <publishTime>03/22/2022 13:17:22</publishTime>
+ <publishTime>03/22/2022 05:17:22</publishTime>
</File>
<File Include="bin/grpc_csharp_ext.x86.dll">
- <publishTime>03/22/2022 13:17:22</publishTime>
+ <publishTime>03/22/2022 05:17:22</publishTime>
</File>
<File Include="bin/ICSharpCode.SharpZipLib.dll">
- <publishTime>05/09/2021 01:08:30</publishTime>
+ <publishTime>05/08/2021 17:08:30</publishTime>
</File>
<File Include="bin/ICSharpCode.SharpZipLib.pdb">
- <publishTime>05/09/2021 01:08:30</publishTime>
+ <publishTime>05/08/2021 17:08:30</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/09/2023 20:21:24</publishTime>
</File>
<File Include="bin/libgrpc_csharp_ext.x64.dylib">
- <publishTime>03/19/2022 07:38:44</publishTime>
+ <publishTime>03/18/2022 23:38:44</publishTime>
</File>
<File Include="bin/libgrpc_csharp_ext.x64.so">
- <publishTime>03/19/2022 07:38:42</publishTime>
+ <publishTime>03/18/2022 23:38:42</publishTime>
</File>
<File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
- <publishTime>03/19/2015 01:02:50</publishTime>
+ <publishTime>03/18/2015 17:02:50</publishTime>
</File>
<File Include="bin/Microsoft.CSharp.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/Microsoft.Web.Infrastructure.dll">
- <publishTime>07/25/2012 19:48:56</publishTime>
+ <publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>06/08/2024 12:38:08</publishTime>
+ <publishTime>08/22/2024 09:37:49</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>06/08/2024 12:38:08</publishTime>
+ <publishTime>08/22/2024 09:37:49</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
- <publishTime>08/04/2014 04:33:56</publishTime>
+ <publishTime>03/08/2023 15:09:56</publishTime>
</File>
<File Include="bin/NPOI.dll">
- <publishTime>10/23/2021 09:07:54</publishTime>
+ <publishTime>10/23/2021 01:07:54</publishTime>
</File>
<File Include="bin/NPOI.OOXML.dll">
- <publishTime>10/23/2021 09:07:56</publishTime>
+ <publishTime>10/23/2021 01:07:56</publishTime>
</File>
<File Include="bin/NPOI.OOXML.pdb">
- <publishTime>10/23/2021 17:07:56</publishTime>
+ <publishTime>10/23/2021 09:07:56</publishTime>
</File>
<File Include="bin/NPOI.OpenXml4Net.dll">
- <publishTime>10/23/2021 09:07:54</publishTime>
+ <publishTime>10/23/2021 01:07:54</publishTime>
</File>
<File Include="bin/NPOI.OpenXml4Net.pdb">
- <publishTime>10/23/2021 17:07:54</publishTime>
- </File>
- <File Include="bin/NPOI.OpenXmlFormats.dll">
<publishTime>10/23/2021 09:07:54</publishTime>
</File>
+ <File Include="bin/NPOI.OpenXmlFormats.dll">
+ <publishTime>10/23/2021 01:07:54</publishTime>
+ </File>
<File Include="bin/NPOI.OpenXmlFormats.pdb">
- <publishTime>10/23/2021 17:07:54</publishTime>
+ <publishTime>10/23/2021 09:07:54</publishTime>
</File>
<File Include="bin/NPOI.pdb">
- <publishTime>10/23/2021 17:07:54</publishTime>
+ <publishTime>10/23/2021 09:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>06/08/2024 12:38:04</publishTime>
+ <publishTime>08/19/2024 08:52:29</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>06/08/2024 12:38:04</publishTime>
+ <publishTime>08/19/2024 08:52:29</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>06/08/2024 12:38:06</publishTime>
+ <publishTime>08/19/2024 08:52:29</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>06/08/2024 12:38:06</publishTime>
+ <publishTime>08/19/2024 08:52:29</publishTime>
</File>
<File Include="bin/RestSharp.dll">
- <publishTime>08/31/2012 06:22:50</publishTime>
+ <publishTime>08/30/2012 22:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>06/08/2024 12:38:07</publishTime>
+ <publishTime>08/19/2024 08:52:29</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>06/08/2024 12:38:07</publishTime>
+ <publishTime>08/19/2024 08:52:29</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
- <publishTime>02/16/2015 01:57:08</publishTime>
+ <publishTime>02/15/2015 17:57:08</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
- <publishTime>07/19/2017 18:01:28</publishTime>
+ <publishTime>07/19/2017 10:01:28</publishTime>
</File>
<File Include="bin/System.ComponentModel.DataAnnotations.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -168,19 +195,25 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
- <publishTime>08/19/2014 18:03:34</publishTime>
+ <publishTime>08/19/2014 10:03:34</publishTime>
</File>
<File Include="bin/System.Memory.dll">
- <publishTime>04/18/2019 00:24:34</publishTime>
+ <publishTime>04/17/2019 16:24:34</publishTime>
</File>
<File Include="bin/System.Net.Http.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
+ <File Include="bin/System.Net.Http.Extensions.dll">
+ <publishTime>02/20/2015 04:10:46</publishTime>
+ </File>
<File Include="bin/System.Net.Http.Formatting.dll">
- <publishTime>11/28/2018 21:00:36</publishTime>
+ <publishTime>11/28/2018 13:00:36</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Primitives.dll">
+ <publishTime>02/20/2015 04:10:46</publishTime>
</File>
<File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
- <publishTime>09/19/2018 03:38:10</publishTime>
+ <publishTime>09/18/2018 19:38:10</publishTime>
</File>
<File Include="bin/System.Runtime.Serialization.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -189,7 +222,7 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Cors.dll">
- <publishTime>11/28/2018 20:58:44</publishTime>
+ <publishTime>11/28/2018 12:58:44</publishTime>
</File>
<File Include="bin/System.Web.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -204,37 +237,37 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Helpers.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Web.Http.Cors.dll">
- <publishTime>11/28/2018 21:01:26</publishTime>
+ <publishTime>11/28/2018 13:01:26</publishTime>
</File>
<File Include="bin/System.Web.Http.dll">
- <publishTime>11/28/2018 21:01:00</publishTime>
+ <publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
- <publishTime>01/28/2015 12:02:18</publishTime>
+ <publishTime>01/28/2015 04:02:18</publishTime>
</File>
<File Include="bin/System.Web.Optimization.dll">
- <publishTime>02/11/2014 23:26:04</publishTime>
+ <publishTime>02/11/2014 15:26:04</publishTime>
</File>
<File Include="bin/System.Web.Razor.dll">
- <publishTime>01/28/2015 12:02:32</publishTime>
+ <publishTime>01/28/2015 04:02:32</publishTime>
</File>
<File Include="bin/System.Web.Services.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.WebPages.Deployment.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.Razor.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Xml.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -242,17 +275,26 @@
<File Include="bin/System.Xml.Linq.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
+ <File Include="bin/Tea.dll">
+ <publishTime>05/09/2023 10:43:40</publishTime>
+ </File>
+ <File Include="bin/TopSdk.dll">
+ <publishTime>08/23/2024 09:26:48</publishTime>
+ </File>
+ <File Include="bin/TopSdk.pdb">
+ <publishTime>08/23/2024 09:26:48</publishTime>
+ </File>
<File Include="bin/WebActivatorEx.dll">
- <publishTime>11/24/2014 19:18:48</publishTime>
+ <publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>06/08/2024 12:38:18</publishTime>
+ <publishTime>08/23/2024 09:28:53</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>06/08/2024 12:38:18</publishTime>
+ <publishTime>08/23/2024 09:28:53</publishTime>
</File>
<File Include="bin/WebGrease.dll">
- <publishTime>07/18/2013 01:03:52</publishTime>
+ <publishTime>07/17/2013 17:03:52</publishTime>
</File>
<File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
<publishTime>11/29/2018 21:26:02</publishTime>
@@ -261,190 +303,190 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>07/12/2024 16:38:23</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>11/01/2021 09:26:33</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/09/2023 20:21:24</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
- <publishTime>03/22/2022 13:17:22</publishTime>
+ <publishTime>03/22/2022 05:17:22</publishTime>
</File>
<File Include="grpc_csharp_ext.x86.dll">
- <publishTime>03/22/2022 13:17:22</publishTime>
+ <publishTime>03/22/2022 05:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
- <publishTime>03/19/2022 07:38:44</publishTime>
+ <publishTime>03/18/2022 23:38:44</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.so">
- <publishTime>03/19/2022 07:38:42</publishTime>
+ <publishTime>03/18/2022 23:38:42</publishTime>
</File>
<File Include="libman.json">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>07/17/2023 13:22:30</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="packages.config">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/21/2024 16:12:07</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/28/2024 15:55:22</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/28/2024 15:55:21</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/28/2024 15:55:23</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/28/2024 15:55:22</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/28/2024 15:55:22</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/28/2024 15:55:22</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/28/2024 15:55:23</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/28/2024 15:55:26</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/28/2024 15:55:26</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/28/2024 15:55:25</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/28/2024 15:55:24</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/28/2024 15:55:25</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/28/2024 15:55:24</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/28/2024 15:55:23</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/28/2024 15:55:26</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/28/2024 15:55:24</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/28/2024 15:55:25</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/28/2024 15:55:24</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/28/2024 15:55:26</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/28/2024 15:55:27</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/28/2024 15:55:16</publishTime>
</File>
<File Include="Web.config">
- <publishTime>06/08/2024 12:38:29</publishTime>
+ <publishTime>08/22/2024 09:38:00</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 2667c8e..0b0c1a7 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -22,7 +22,7 @@
<!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
<!--<add key="FileIP" value="http://localhost:8080/" />-->
<!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> -->
- <!--<add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx"/>--><!--棰滃彴寮忔満-->
+ <add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx" /><!--棰滃彴寮忔満-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
@@ -35,7 +35,7 @@
<!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> --> <!--娴嬭瘯鏈嶅姟鍣�-->
<!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/> 鏈湴-->
<!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>--> <!--闄堥洴闈欐湰鍦伴厤缃�-->
- <add key="surl" value="http://localhost/webs-web/webservice1.asmx"/> <!--缈佹稕娑涙湰鍦伴厤缃�-->
+ <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx"/>--> <!--缈佹稕娑涙湰鍦伴厤缃�-->
<!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>涔濊彵-->
<!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--鏂帿灏�-->
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index c25d2ec..53460bf 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile15.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\GIT浠撳簱\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile10.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index 1bcb473..700d9e9 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 ccffc4c..c6b4d80 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/bin/Release/TopSdk.dll b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
index 92fbd28..2982c4e 100644
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
index 387496a..4e59507 100644
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index 2542fae..0000000
--- a/sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
index f09fdd0..09317e3 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
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 4a303e1..8cd2796 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,30 +1,6 @@
-D:\缃戠珯鍙戝竷\娴嬭瘯\閽夐拤娴嬭瘯\娴嬭瘯椤圭洰2\sdk_dingding\topSDK\bin\Debug\TopSdk.dll
-D:\缃戠珯鍙戝竷\娴嬭瘯\閽夐拤娴嬭瘯\娴嬭瘯椤圭洰2\sdk_dingding\topSDK\bin\Debug\TopSdk.pdb
-D:\缃戠珯鍙戝竷\娴嬭瘯\閽夐拤娴嬭瘯\娴嬭瘯椤圭洰2\sdk_dingding\topSDK\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-D:\缃戠珯鍙戝竷\娴嬭瘯\閽夐拤娴嬭瘯\娴嬭瘯椤圭洰2\sdk_dingding\topSDK\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\缃戠珯鍙戝竷\娴嬭瘯\閽夐拤娴嬭瘯\娴嬭瘯椤圭洰2\sdk_dingding\topSDK\obj\Debug\TopSdk.dll
-D:\缃戠珯鍙戝竷\娴嬭瘯\閽夐拤娴嬭瘯\娴嬭瘯椤圭洰2\sdk_dingding\topSDK\obj\Debug\TopSdk.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-<<<<<<< HEAD
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-=======
-D:\鏅轰簯LMes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\鏅轰簯LMes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-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
->>>>>>> 5c681da4317f7267921689c0015a89d07dffdc23
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+D:\GIT浠撳簱\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 1bcb473..700d9e9 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 ccffc4c..c6b4d80 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
index 444eaec..09317e3 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
index 1d0745a..b33254c 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -1,6 +1,6 @@
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
index 92fbd28..2982c4e 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
index 387496a..4e59507 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1