From e0a64caa4e7d1422bf991153f17088c1b0de80c0 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 26 一月 2024 10:31:30 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/CGGL/YF_PayMentBillController.cs | 130 ++++++++++++++
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 122 ++++++------
WebAPI/Controllers/CJGL/Sc_ProcExchWorkBackBillController.cs | 55 +++++
WebAPI/Web.config | 7
WebAPI/WebAPI.csproj.user | 2
WebAPI/Controllers/CGGL/YF_PayMentBackBillController.cs | 129 ++++++++++++++
WebAPI/Controllers/LMESController.cs | 48 +++++
7 files changed, 423 insertions(+), 70 deletions(-)
diff --git a/WebAPI/Controllers/CGGL/YF_PayMentBackBillController.cs b/WebAPI/Controllers/CGGL/YF_PayMentBackBillController.cs
index f1dbd9a..31a303d 100644
--- a/WebAPI/Controllers/CGGL/YF_PayMentBackBillController.cs
+++ b/WebAPI/Controllers/CGGL/YF_PayMentBackBillController.cs
@@ -665,5 +665,134 @@
}
#endregion
+ #region 搴斾粯閫�娆惧崟 浣滃簾/鍙嶄綔搴熷姛鑳�
+ [Route("YF_PayMentBackBill/DropYF_PayMentBackBill")]
+ [HttpGet]
+ public object DropYF_PayMentBackBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈変綔搴熸潈闄�
+ if (!DBUtility.ClsPub.Security_Log("YF_PayMentBackBill_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愪綔搴�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ BillOld.MvarItemKey = "YF_PayMentBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 浣滃簾 2 鍙嶄綔搴�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡浣滃簾
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶉渶瑕佸啀浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //浣滃簾鍗曟嵁
+ if (!BillOld.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶄綔搴�
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] == null || ds.Tables[0].Rows[0]["HDeleteMan"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈綔搴�!涓嶉渶瑕佸啀鍙嶄綔搴�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶄綔搴熷崟鎹�
+ if (!BillOld.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs b/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
index 988d907..0ab46a0 100644
--- a/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
+++ b/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
@@ -666,7 +666,135 @@
#endregion
+ #region 浠樻鍗� 浣滃簾/鍙嶄綔搴熷姛鑳�
+ [Route("YF_PayMentBill/DropYF_PayMentBill")]
+ [HttpGet]
+ public object DropYF_PayMentBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈変綔搴熸潈闄�
+ if (!DBUtility.ClsPub.Security_Log("YF_PayMentBill_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愪綔搴�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
-
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ BillOld.MvarItemKey = "YF_PayMentBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 浣滃簾 2 鍙嶄綔搴�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡浣滃簾
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶉渶瑕佸啀浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //浣滃簾鍗曟嵁
+ if (!BillOld.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶄綔搴�
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] == null || ds.Tables[0].Rows[0]["HDeleteMan"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈綔搴�!涓嶉渶瑕佸啀鍙嶄綔搴�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶄綔搴熷崟鎹�
+ if (!BillOld.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcExchWorkBackBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcExchWorkBackBillController.cs
index 5027755..efeae35 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcExchWorkBackBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcExchWorkBackBillController.cs
@@ -678,7 +678,8 @@
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- if (ds.Tables.Count == 2) {
+ if (ds.Tables.Count == 2)
+ {
int[] num2 = new int[ds.Tables[0].Columns.Count];//璁板綍姣忎竴鍒楄幏鍙栨湁鍊肩殑琛屾暟
@@ -776,7 +777,57 @@
ds.Tables.Clear();
ds.Tables.Add(dt1);
ds.Tables.Add(dt2);
- }
+ }
+ else {
+ int[] num2 = new int[ds.Tables[0].Columns.Count];//璁板綍姣忎竴鍒楄幏鍙栨湁鍊肩殑琛屾暟
+
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ int num = 0;//璁板綍娌℃湁鏁版嵁琛岀殑鍒楁暟
+ int[] num3 = new int[ds.Tables[0].Columns.Count];//璁板綍姣忎竴鍒楁病鏈夋暟鎹殑琛屾暟
+
+ DataRow dtrow = dt1.NewRow();
+ for (int j = 0; j < ds.Tables[0].Columns.Count; j++)
+ {
+ int num1 = 0;//璁板綍鏈夊灏戞婊¤冻涓嶄负绌虹殑鏉′欢
+ DataColumn col = ds.Tables[0].Columns[j];
+ for (int k = 0; k < ds.Tables[0].Rows.Count; k++)
+ {
+ DataRow item = ds.Tables[0].Rows[k];
+ if (item[col.ColumnName.ToString()].ToString() != "")
+ {
+ num1 += 1;
+ if (num1 > num2[j])
+ {
+ dtrow[col.ColumnName.ToString()] = item[col.ColumnName.ToString()].ToString();
+ num2[j] += 1;
+ break;
+ }
+ else
+ {
+ num3[j] += 1;
+ }
+ }
+ else
+ {
+ num3[j] += 1;
+ }
+ if (num3[j] == ds.Tables[0].Rows.Count)
+ {
+ num += 1;
+ }
+ }
+ }
+ if (num == ds.Tables[0].Columns.Count)
+ {
+ break;
+ }
+ dt1.Rows.Add(dtrow);
+ }
+
+ ds.Tables.Clear();
+ ds.Tables.Add(dt1);
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index fbacc0b..52fe709 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -1452,6 +1452,54 @@
}
#endregion
+ #region 閿�鍞粺璁℃姤琛�
+ [Route("LEMS/SeOutReportList")]
+ [HttpGet]
+ public object SeOutReportList(string DateYear, string HType, string user)
+ {
+ try
+ {
+ DataSet ds;
+ List<object> columnNameList = new List<object>();
+
+ if (DateYear == null || DateYear.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇烽�夋嫨鏈夋晥骞翠唤";
+ return objJsonResult;
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec [h_p_Xe_SeOutReportList] '" + DateYear + "','" + HType + "'", "[h_p_Sc_ProductionAnalysisReportList]");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 瀹㈡埛璁㈠崟 鐢熶骇璁㈠崟瀹屽伐
[Route("LEMS/sc_ICOMReportClose")]
[HttpPost]
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 09b007c..a645a7f 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 16:43:40</publishTime>
@@ -81,7 +81,7 @@
<publishTime>08/25/2021 10:28:25</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:56</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -115,7 +115,7 @@
<publishTime>01/26/2024 10:23:24</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/04/2014 04:33:56</publishTime>
@@ -251,7 +251,7 @@
<publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 12:02:18</publishTime>
@@ -306,58 +306,58 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>04/06/2023 15:57:01</publishTime>
+ <publishTime>09/25/2023 09:42:56</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>04/06/2023 15:57:01</publishTime>
+ <publishTime>09/25/2023 09:42:56</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>04/06/2023 15:57:01</publishTime>
+ <publishTime>09/25/2023 09:42:56</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>04/06/2023 15:57:01</publishTime>
+ <publishTime>09/25/2023 09:42:56</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:56</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:56</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:56</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:56</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:56</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:56</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
<publishTime>03/22/2022 13:17:22</publishTime>
@@ -366,7 +366,7 @@
<publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -375,121 +375,121 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="libman.json">
- <publishTime>07/12/2023 08:14:21</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="packages.config">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>09/25/2023 09:42:57</publishTime>
</File>
<File Include="Web References/WebS/Reference.cs">
<publishTime>12/20/2021 13:19:56</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
- <publishTime>11/03/2023 22:05:51</publishTime>
+ <publishTime>11/01/2023 11:13:09</publishTime>
</File>
<File Include="Web References/WebS/WebService1.disco">
<publishTime>12/20/2021 13:19:56</publishTime>
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 4d2250e..ad3f89b 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.63.53/WEBS-WMS/WebService1.asmx"/><!--棰滃彴寮忔満-->
+ <!--<add key="sUrl" value="http://192.168.63.20/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"/> 鍗氭棩绉戞妧-->
@@ -34,10 +34,7 @@
<!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS-WMS/WebService1.asmx"/> 瀹夌憺鏈嶅姟鍣�-->
<!--<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.56.1:81/web/WebService1.asmx"/>--> <!--闄堥洴闈欐湰鍦伴厤缃�-->
- <!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>--> <!--涔濊彵-->
- <!--<add key="sUrl" value="http://192.168.60.12/WEBS-WMS/WebService1.asmx"/>--> <!--涓帶-->
-
+ <add key="sUrl" value="http://192.168.56.1:81/web/WebService1.asmx"/> <!--闄堥洴闈欐湰鍦伴厤缃�-->
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
<add key="ClientValidationEnabled" value="true" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 250cea5..315ec51 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-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\涔斾竴璁￠噺鍗曚綅鍒楄〃\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
--
Gitblit v1.9.1