From c9abc7da1c764607e21f3e5ccf80de939a01f311 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 20 四月 2026 13:10:42 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
BLL/bin/Release/DAL.dll | 0
BLL/bin/Release/BLL.pdb | 0
WebAPI/Controllers/条码管理/WEBSController.cs | 54 ++++++++++
SyntacticSugar/bin/Debug/SyntacticSugar.pdb | 0
WebAPI/WebAPI.csproj.user | 4
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
DAL/车间管理/ClsSc_ProcessExchangeBill.cs | 2
SyntacticSugar/obj/Debug/SyntacticSugar.dll | 0
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0
DAL/bin/Release/DAL.pdb | 0
WebAPI/Controllers/生产管理/设备状态分步/Sc_HEquipStateDistributionController.cs | 10 +-
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache | 0
SyntacticSugar/obj/Debug/SyntacticSugar.pdb | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
BLL/bin/Release/BLL.dll | 0
BLL/bin/Release/DAL.pdb | 0
DAL/bin/Release/DAL.dll | 0
SyntacticSugar/bin/Debug/SyntacticSugar.dll | 0
WebAPI/Properties/PublishProfiles/CHZFolderProfile.pubxml.user | 184 ++++++++++++++++++------------------
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
24 files changed, 155 insertions(+), 99 deletions(-)
diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
index ac130c9..6e3ecd4 100644
--- a/BLL/bin/Release/BLL.dll
+++ b/BLL/bin/Release/BLL.dll
Binary files differ
diff --git a/BLL/bin/Release/BLL.pdb b/BLL/bin/Release/BLL.pdb
index fd57438..9678501 100644
--- a/BLL/bin/Release/BLL.pdb
+++ b/BLL/bin/Release/BLL.pdb
Binary files differ
diff --git a/BLL/bin/Release/DAL.dll b/BLL/bin/Release/DAL.dll
index c2f58e6..203247b 100644
--- a/BLL/bin/Release/DAL.dll
+++ b/BLL/bin/Release/DAL.dll
Binary files differ
diff --git a/BLL/bin/Release/DAL.pdb b/BLL/bin/Release/DAL.pdb
index edaa522..11e8612 100644
--- a/BLL/bin/Release/DAL.pdb
+++ b/BLL/bin/Release/DAL.pdb
Binary files differ
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
index c2f58e6..203247b 100644
--- a/DAL/bin/Release/DAL.dll
+++ b/DAL/bin/Release/DAL.dll
Binary files differ
diff --git a/DAL/bin/Release/DAL.pdb b/DAL/bin/Release/DAL.pdb
index edaa522..11e8612 100644
--- a/DAL/bin/Release/DAL.pdb
+++ b/DAL/bin/Release/DAL.pdb
Binary files differ
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
index e1d0372..a331344 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
@@ -179,6 +179,8 @@
DeleteRelation(ref sReturn, lngBillKey);
//鍒犻櫎瀛愯〃
DeleteBillSub(lngBillKey);
+ //鍒犻櫎杩斿伐娴佽浆鍗″瓙琛�
+ DeleteBillSub2(lngBillKey);
//鎻掑叆瀛愯〃
omodel.HInterID = lngBillKey;
foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index 9c24ff9..ba3b61d 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/obj/Release/Model.csproj.AssemblyReference.cache b/Model/obj/Release/Model.csproj.AssemblyReference.cache
index be5896a..915b63a 100644
--- a/Model/obj/Release/Model.csproj.AssemblyReference.cache
+++ b/Model/obj/Release/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
index 1aa94d0..29103e7 100644
--- a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
+++ b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.dll b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
index ccb6a33..a7e7f70 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
index 5f77762..75e66e8 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..b04aad7
--- /dev/null
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.dll b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
index ccb6a33..a7e7f70 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
index 5f77762..75e66e8 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
Binary files differ
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index 55cff8d..1760065 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -13207,6 +13207,60 @@
#endregion
+ #region WMS姣忔棩杩愯鐘舵�佸垎鏋愶紙姣忔棩鍒跺崟鏁伴噺锛�
+ [Route("WEBSController/GetKf_WMSDailyRunStateReport_Json")]
+ [HttpGet]
+ public object GetKf_WMSDailyRunStateReport_Json(string sWhere, string user)
+ {
+ try
+ {
+
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HBeginDate = dic["HBeginDate"].ToString();
+ string HEndDate = dic["HEndDate"].ToString();
+
+ List<object> columnNameList = new List<object>();
+
+ ds = oCn.RunProcReturn("exec h_p_Kf_WMSDailyRunStateReport '" + HBeginDate + "','" + HEndDate + "'", "h_p_Kf_WMSDailyRunStateReport");
+
+ if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ {
+ //娣诲姞鍒楀悕
+ 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;
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳暟鎹�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
#endregion
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201\345\210\206\346\255\245/Sc_HEquipStateDistributionController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201\345\210\206\346\255\245/Sc_HEquipStateDistributionController.cs"
index 73af695..0ad2747 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201\345\210\206\346\255\245/Sc_HEquipStateDistributionController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201\345\210\206\346\255\245/Sc_HEquipStateDistributionController.cs"
@@ -270,7 +270,7 @@
{
sql += $"and (鎵�灞炴棩鏈� between CONVERT(DATETIME, '{HBeginDate} 00:00:00', 120) AND CONVERT(DATETIME, '{HEndDate} 23:59:59', 120))";
}
-
+ sql += " order by 鎵�灞炴棩鏈� desc";
ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipRunningStatusReport");
//娣诲姞鍒楀悕
@@ -320,18 +320,18 @@
{
// 鍙栧嚭鏃堕棿瀛楁骞惰浆涓烘棩鏈燂紙鑷姩蹇界暐鏃跺垎绉掞級
DateTime time = Convert.ToDateTime(row["鏃堕棿"]);
- string deptId = row["HDeptID"].ToString();
+ string _HEquipID = row["HEquipID"].ToString();
return new
{
HDate = time.ToString("yyyy-MM-dd"),
- HDeptID = deptId
- };// 鍒嗙粍 Key
+ HEquipID = _HEquipID
+ };// 鍒嗙粍 Key HDate_HEquipID
});
foreach (var group in groupedData)
{
- string dateKey = group.Key.HDate + "_" + HDeptID;
+ string dateKey = group.Key.HDate + "_" + group.Key.HEquipID;
JArray dataArray = new JArray();
foreach (DataRow row in group)
diff --git a/WebAPI/Properties/PublishProfiles/CHZFolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/CHZFolderProfile.pubxml.user
index 31ccf22..6889e63 100644
--- a/WebAPI/Properties/PublishProfiles/CHZFolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/CHZFolderProfile.pubxml.user
@@ -5,11 +5,11 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2026-04-16T12:20:42.1729513Z;True|2026-04-16T20:09:43.7053456+08:00;True|2026-04-16T15:53:19.0973613+08:00;True|2026-04-16T15:39:13.4141988+08:00;True|2026-04-16T15:38:52.3518796+08:00;True|2026-04-16T15:10:12.1488324+08:00;True|2026-04-16T10:13:03.8356016+08:00;True|2026-04-16T10:04:54.8347414+08:00;False|2026-04-16T10:04:00.0572214+08:00;True|2026-04-15T15:25:13.5585076+08:00;True|2026-04-15T15:18:40.0113998+08:00;True|2026-04-15T13:40:25.2393656+08:00;False|2026-04-15T13:39:38.6236889+08:00;True|2026-04-14T14:31:30.6734754+08:00;False|2026-04-14T14:30:41.4516757+08:00;True|2026-04-13T16:44:08.4642937+08:00;True|2026-04-13T16:36:02.3077110+08:00;True|2026-04-13T14:59:21.0103174+08:00;True|2026-04-13T14:39:45.1257225+08:00;True|2026-04-13T14:33:54.7926295+08:00;True|2026-04-13T14:28:29.8919092+08:00;True|2026-04-13T14:23:44.7319904+08:00;True|2026-04-13T14:19:18.5894161+08:00;True|2026-04-13T14:13:07.6590290+08:00;True|2026-04-13T14:08:38.6545470+08:00;True|2026-04-13T13:42:48.7331271+08:00;True|2026-04-13T13:28:28.6092259+08:00;True|2026-04-13T13:22:20.9710518+08:00;False|2026-04-13T13:21:10.4412531+08:00;True|2026-04-10T12:36:37.6936108+08:00;False|2026-04-10T12:35:40.0121010+08:00;True|2026-04-09T16:54:43.8820523+08:00;True|2026-04-09T16:45:33.9913393+08:00;True|2026-04-09T16:05:37.9135976+08:00;True|2026-04-09T15:59:59.0415690+08:00;True|2026-04-09T14:40:06.6317662+08:00;True|2026-04-09T14:33:57.7268880+08:00;True|2026-04-09T14:29:06.9748272+08:00;True|2026-04-09T14:15:35.2357549+08:00;True|2026-04-09T13:55:15.7398283+08:00;True|2026-04-09T10:49:39.1474349+08:00;False|2026-04-09T10:48:56.4483129+08:00;True|2026-04-08T15:52:56.0654175+08:00;True|2026-04-08T15:51:48.5362330+08:00;True|2026-04-08T15:38:55.9430240+08:00;True|2026-04-08T14:28:05.8170952+08:00;True|2026-04-08T10:04:26.1290532+08:00;True|2026-04-08T09:54:42.7091796+08:00;True|2026-04-08T09:47:39.4265409+08:00;True|2026-04-08T09:31:33.9940810+08:00;True|2026-04-08T09:25:48.8335042+08:00;True|2026-04-08T09:18:49.2340416+08:00;True|2026-04-08T09:05:38.1946058+08:00;True|2026-04-08T08:51:42.9648664+08:00;False|2026-04-08T08:50:29.4049907+08:00;True|2026-04-07T16:38:07.0366622+08:00;True|2026-04-07T16:30:02.5849908+08:00;True|2026-04-07T10:34:01.7729330+08:00;True|2026-04-07T09:48:28.6594815+08:00;True|2026-04-07T08:27:08.5467426+08:00;</History>
+ <History>True|2026-04-20T01:38:00.7302296Z;False|2026-04-20T09:35:50.0193777+08:00;True|2026-04-16T13:47:52.4189071+08:00;True|2026-04-16T12:55:27.8047391+08:00;True|2026-04-15T15:25:13.5585076+08:00;True|2026-04-15T15:18:40.0113998+08:00;True|2026-04-15T13:40:25.2393656+08:00;False|2026-04-15T13:39:38.6236889+08:00;True|2026-04-14T14:31:30.6734754+08:00;False|2026-04-14T14:30:41.4516757+08:00;True|2026-04-13T16:44:08.4642937+08:00;True|2026-04-13T16:36:02.3077110+08:00;True|2026-04-13T14:59:21.0103174+08:00;True|2026-04-13T14:39:45.1257225+08:00;True|2026-04-13T14:33:54.7926295+08:00;True|2026-04-13T14:28:29.8919092+08:00;True|2026-04-13T14:23:44.7319904+08:00;True|2026-04-13T14:19:18.5894161+08:00;True|2026-04-13T14:13:07.6590290+08:00;True|2026-04-13T14:08:38.6545470+08:00;True|2026-04-13T13:42:48.7331271+08:00;True|2026-04-13T13:28:28.6092259+08:00;True|2026-04-13T13:22:20.9710518+08:00;False|2026-04-13T13:21:10.4412531+08:00;True|2026-04-10T12:36:37.6936108+08:00;False|2026-04-10T12:35:40.0121010+08:00;True|2026-04-09T16:54:43.8820523+08:00;True|2026-04-09T16:45:33.9913393+08:00;True|2026-04-09T16:05:37.9135976+08:00;True|2026-04-09T15:59:59.0415690+08:00;True|2026-04-09T14:40:06.6317662+08:00;True|2026-04-09T14:33:57.7268880+08:00;True|2026-04-09T14:29:06.9748272+08:00;True|2026-04-09T14:15:35.2357549+08:00;True|2026-04-09T13:55:15.7398283+08:00;True|2026-04-09T10:49:39.1474349+08:00;False|2026-04-09T10:48:56.4483129+08:00;True|2026-04-08T15:52:56.0654175+08:00;True|2026-04-08T15:51:48.5362330+08:00;True|2026-04-08T15:38:55.9430240+08:00;True|2026-04-08T14:28:05.8170952+08:00;True|2026-04-08T10:04:26.1290532+08:00;True|2026-04-08T09:54:42.7091796+08:00;True|2026-04-08T09:47:39.4265409+08:00;True|2026-04-08T09:31:33.9940810+08:00;True|2026-04-08T09:25:48.8335042+08:00;True|2026-04-08T09:18:49.2340416+08:00;True|2026-04-08T09:05:38.1946058+08:00;True|2026-04-08T08:51:42.9648664+08:00;False|2026-04-08T08:50:29.4049907+08:00;True|2026-04-07T16:38:07.0366622+08:00;True|2026-04-07T16:30:02.5849908+08:00;True|2026-04-07T10:34:01.7729330+08:00;True|2026-04-07T09:48:28.6594815+08:00;True|2026-04-07T08:27:08.5467426+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>08/04/2025 11:55:27</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="bin/AlibabaCloud.EndpointUtil.dll">
<publishTime>04/07/2020 16:33:48</publishTime>
@@ -45,40 +45,40 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>04/16/2026 20:09:35</publishTime>
+ <publishTime>04/20/2026 09:36:56</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>04/16/2026 20:09:35</publishTime>
+ <publishTime>04/20/2026 09:36:56</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>04/16/2026 20:09:34</publishTime>
+ <publishTime>04/20/2026 09:36:41</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>04/16/2026 20:09:34</publishTime>
+ <publishTime>04/20/2026 09:36:41</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>04/16/2026 20:09:32</publishTime>
+ <publishTime>04/16/2026 12:53:54</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>04/16/2026 20:09:32</publishTime>
+ <publishTime>04/16/2026 12:53:54</publishTime>
</File>
<File Include="bin/Fleck.dll">
<publishTime>04/22/2021 11:48:12</publishTime>
</File>
<File Include="bin/GetuiServerApiSDK.dll">
- <publishTime>03/07/2026 17:33:45</publishTime>
+ <publishTime>01/19/2026 18:29:10</publishTime>
</File>
<File Include="bin/GetuiServerApiSDK.dll.config">
- <publishTime>03/07/2026 17:33:45</publishTime>
+ <publishTime>01/19/2026 18:29:10</publishTime>
</File>
<File Include="bin/Google.ProtocolBuffers.dll">
- <publishTime>03/07/2026 17:33:45</publishTime>
+ <publishTime>01/19/2026 18:29:10</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -105,7 +105,7 @@
<publishTime>05/09/2021 01:08:30</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/04/2025 11:55:26</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="bin/libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -150,13 +150,13 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>04/16/2026 20:09:32</publishTime>
+ <publishTime>04/16/2026 12:53:58</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>04/16/2026 20:09:32</publishTime>
+ <publishTime>04/16/2026 12:53:58</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>08/04/2025 11:55:26</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>03/08/2023 15:09:56</publishTime>
@@ -189,34 +189,34 @@
<publishTime>11/13/2012 20:19:34</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>04/16/2026 19:53:54</publishTime>
+ <publishTime>04/16/2026 12:53:52</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>04/16/2026 19:53:54</publishTime>
+ <publishTime>04/16/2026 12:53:52</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>04/16/2026 19:53:55</publishTime>
+ <publishTime>04/16/2026 12:53:53</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>04/16/2026 19:53:55</publishTime>
+ <publishTime>04/16/2026 12:53:53</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>04/16/2026 20:06:33</publishTime>
+ <publishTime>04/16/2026 12:53:53</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>04/16/2026 20:06:33</publishTime>
+ <publishTime>04/16/2026 12:53:53</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>04/12/2026 19:47:22</publishTime>
+ <publishTime>03/24/2026 09:52:37</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>04/12/2026 19:47:22</publishTime>
+ <publishTime>03/24/2026 09:52:37</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -297,7 +297,7 @@
<publishTime>01/28/2015 12:03:16</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>08/04/2025 11:55:26</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 12:02:18</publishTime>
@@ -330,22 +330,22 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>04/12/2026 19:47:22</publishTime>
+ <publishTime>04/07/2026 12:37:19</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>04/12/2026 19:47:22</publishTime>
+ <publishTime>04/07/2026 12:37:19</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>04/16/2026 20:20:39</publishTime>
+ <publishTime>04/20/2026 09:37:44</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>04/16/2026 20:20:39</publishTime>
+ <publishTime>04/20/2026 09:37:44</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>04/16/2026 20:20:41</publishTime>
+ <publishTime>04/20/2026 09:37:54</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -372,61 +372,61 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>08/04/2025 11:55:26</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>08/04/2025 11:55:26</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>08/04/2025 11:55:26</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>08/04/2025 11:55:26</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>08/04/2025 11:55:26</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>08/04/2025 11:55:26</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>08/04/2025 11:55:26</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Interop.grsvr6Lib.dll">
- <publishTime>12/13/2025 18:12:57</publishTime>
+ <publishTime>12/16/2025 16:29:36</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/04/2025 11:55:26</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>08/04/2025 11:55:26</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>08/04/2025 11:55:26</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>08/04/2025 11:55:26</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>08/04/2025 11:55:26</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>08/04/2025 11:55:26</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>08/04/2025 11:55:27</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>08/04/2025 11:55:27</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>08/04/2025 11:55:27</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>08/04/2025 11:55:27</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>08/04/2025 11:55:26</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
<publishTime>03/22/2022 13:17:22</publishTime>
@@ -435,7 +435,7 @@
<publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>08/04/2025 11:55:26</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -444,133 +444,133 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="libman.json">
- <publishTime>08/04/2025 11:55:27</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>08/04/2025 11:55:26</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="packages.config">
- <publishTime>04/02/2026 19:04:32</publishTime>
+ <publishTime>03/25/2026 10:40:27</publishTime>
</File>
<File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
- <publishTime>12/14/2025 19:28:35</publishTime>
+ <publishTime>12/10/2025 17:08:59</publishTime>
</File>
<File Include="Scripts/jquery.signalR-2.2.2.js">
- <publishTime>03/07/2026 17:33:45</publishTime>
+ <publishTime>01/28/2026 14:08:07</publishTime>
</File>
<File Include="Scripts/jquery.signalR-2.2.2.min.js">
- <publishTime>03/07/2026 17:33:45</publishTime>
+ <publishTime>01/28/2026 14:08:07</publishTime>
</File>
<File Include="Template/barCodeTemplateStorage.json">
- <publishTime>10/26/2025 17:16:50</publishTime>
+ <publishTime>09/05/2025 16:16:48</publishTime>
</File>
<File Include="Utility/Barcode.ashx">
- <publishTime>12/14/2025 21:28:19</publishTime>
+ <publishTime>12/16/2025 16:29:36</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>08/04/2025 11:55:27</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>08/04/2025 11:55:27</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>08/04/2025 11:55:27</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>08/04/2025 11:55:27</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>08/04/2025 11:55:27</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>08/04/2025 11:55:27</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>08/04/2025 11:55:27</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>08/04/2025 11:55:27</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>08/04/2025 11:55:27</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>08/04/2025 11:55:27</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>08/04/2025 11:55:27</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>08/04/2025 11:55:27</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>08/04/2025 11:55:27</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>08/04/2025 11:55:27</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>08/04/2025 21:55:34</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>08/04/2025 21:55:34</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>08/04/2025 21:55:34</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>08/04/2025 21:55:34</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>08/04/2025 21:55:34</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>08/04/2025 21:55:34</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>08/04/2025 21:55:34</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>08/04/2025 21:55:35</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>08/04/2025 21:55:35</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>08/04/2025 21:55:35</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>08/04/2025 21:55:34</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>08/04/2025 21:55:35</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>08/04/2025 21:55:34</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>08/04/2025 21:55:34</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>08/04/2025 21:55:35</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>08/04/2025 21:55:34</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>08/04/2025 21:55:35</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>08/04/2025 21:55:34</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>08/04/2025 21:55:35</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>08/04/2025 21:55:34</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web.config">
- <publishTime>04/12/2026 19:55:27</publishTime>
+ <publishTime>04/16/2026 09:16:19</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 51b246c..046a7de 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -2,7 +2,7 @@
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
@@ -16,7 +16,7 @@
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\WTTFolder.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\WMES\MES-WEB-API\WebAPI\Properties\PublishProfiles\CHZFolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\CHZFolderProfile.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index eb4ffad..267183c 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 1db30dd..0a95074 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.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..146005a
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index eb4ffad..267183c 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 1db30dd..0a95074 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1