From 33ffe895b1862cda181a7fbb5028f81620226087 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 16 八月 2024 13:53:37 +0800
Subject: [PATCH] 1
---
WebAPI/Properties/PublishProfiles/FolderProfile19.pubxml.user | 36 +++++++++---------
WebAPI/Controllers/CGGL/Cg_PayableBillController.cs | 51 +++++++++++++++++++++++++
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | 2
WebAPI/WebAPI.csproj.user | 2
DAL/应付管理/ClsYF_PayMentBill.cs | 4 +-
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/LMESController.cs | 2
7 files changed, 74 insertions(+), 23 deletions(-)
diff --git "a/DAL/\345\272\224\344\273\230\347\256\241\347\220\206/ClsYF_PayMentBill.cs" "b/DAL/\345\272\224\344\273\230\347\256\241\347\220\206/ClsYF_PayMentBill.cs"
index 3fd9975..39ea7a2 100644
--- "a/DAL/\345\272\224\344\273\230\347\256\241\347\220\206/ClsYF_PayMentBill.cs"
+++ "b/DAL/\345\272\224\344\273\230\347\256\241\347\220\206/ClsYF_PayMentBill.cs"
@@ -102,7 +102,7 @@
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() +
- ",'" + oSub.HReceiveBillNo + "'," + oSub.HReceiveBillInterID.ToString() + "," + oSub.HReceiveBillEntryID.ToString() + "," + oSub.HSourceDate.ToString() + "," + oSub.HSourceMoney.ToString() +
+ ",'" + oSub.HReceiveBillNo + "'," + oSub.HReceiveBillInterID.ToString() + "," + oSub.HReceiveBillEntryID.ToString() + ",'" + oSub.HSourceDate.ToString() + "'," + oSub.HSourceMoney.ToString() +
"," + oSub.HSourceMoneyBB.ToString() + "," + oSub.HReadyCheckMoney.ToString() + "," + oSub.HUnCheckMoney.ToString() + "," + oSub.HCheckMoney.ToString() + "," + oSub.HCheckMoneyBB.ToString() + "," + oSub.HInovceExRate.ToString() + ",'" + oSub.HSeContractBillNo + "'" +
"," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
"," + oSub.HPOContractInterID.ToString() + "," + oSub.HPOContractEntryID.ToString() + ",'" + oSub.HPOContractBillNo + "'," + oSub.HSeContractInterID.ToString() + "," + oSub.HSeContractEntryID.ToString() + ",'" + oSub.HSeContractBillNo + "'" +
@@ -172,7 +172,7 @@
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() +
- ",'" + oSub.HReceiveBillNo + "'," + oSub.HReceiveBillInterID.ToString() + "," + oSub.HReceiveBillEntryID.ToString() + "," + oSub.HSourceDate.ToString() + "," + oSub.HSourceMoney.ToString() +
+ ",'" + oSub.HReceiveBillNo + "'," + oSub.HReceiveBillInterID.ToString() + "," + oSub.HReceiveBillEntryID.ToString() + ",'" + oSub.HSourceDate.ToString() + "'," + oSub.HSourceMoney.ToString() +
"," + oSub.HSourceMoneyBB.ToString() + "," + oSub.HReadyCheckMoney.ToString() + "," + oSub.HUnCheckMoney.ToString() + "," + oSub.HCheckMoney.ToString() + "," + oSub.HCheckMoneyBB.ToString() + "," + oSub.HInovceExRate.ToString() + ",'" + oSub.HSeContractBillNo + "'" +
"," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
"," + oSub.HPOContractInterID.ToString() + "," + oSub.HPOContractEntryID.ToString() + ",'" + oSub.HPOContractBillNo + "'," + oSub.HSeContractInterID.ToString() + "," + oSub.HSeContractEntryID.ToString() + ",'" + oSub.HSeContractBillNo + "'" +
diff --git a/Model/obj/Release/Model.csproj.AssemblyReference.cache b/Model/obj/Release/Model.csproj.AssemblyReference.cache
index 1a81f01..ef95a58 100644
--- a/Model/obj/Release/Model.csproj.AssemblyReference.cache
+++ b/Model/obj/Release/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git a/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs b/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
index da93c5a..5aa6438 100644
--- a/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
@@ -1474,5 +1474,56 @@
}
#endregion
+ #region 搴斾粯鍗曞垪琛� 鏌ヨ渚涘簲鍟嗕粯娆捐鍒掕〃
+ /// <summary>
+ /// 杩斿洖搴旀敹鍗曞垪琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Cg_PayableBill/SupplierPayPlanList")]
+ [HttpGet]
+ public object SupplierPayPlanList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_SupplierPayPlanList order by 鍗曟嵁鍙� desc", "h_v_Gy_SupplierPayPlanList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_SupplierPayPlanList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_SupplierPayPlanList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index a85923e..6642d0d 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -1708,7 +1708,7 @@
try
{
- ds = oCN.RunProcReturn(" exec h_p_Sc_ProcessExchangeBillQuery_TechParam '" + hinterid + "' and HEntryID='" + HEntryID + "'", "h_v_Sc_ProcessExchangeBillQuerySub");
+ ds = oCN.RunProcReturn(" exec h_p_Sc_ProcessExchangeBillQuery_TechParam '" + hinterid + "' , '" + HEntryID + "'", "h_p_Sc_ProcessExchangeBillQuery_TechParam");
}
catch (Exception e)
{
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 6f1df55..1a51767 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"
@@ -742,7 +742,7 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn("exec h_p_SB_EquipICMOTechParamBillList '" + HProcExchBillNo + "','" + HProcName + "','" + HTechParamName + "',"+HEquipName, "h_p_SB_EquipICMOTechParamBillList");
+ ds = oCN.RunProcReturn("exec h_p_SB_EquipICMOTechParamBillList '" + HProcExchBillNo + "','" + HProcName + "','" + HTechParamName + "','"+HEquipName+"'", "h_p_SB_EquipICMOTechParamBillList");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile19.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile19.pubxml.user
index 928abd9..799d670 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile19.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile19.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2024-08-15T03:05:05.5377207Z;True|2024-08-15T10:51:59.8586373+08:00;True|2024-08-15T09:34:19.6954590+08:00;True|2024-08-15T09:27:30.4910263+08:00;True|2024-08-14T17:10:23.3978810+08:00;True|2024-08-14T17:03:22.1530532+08:00;True|2024-08-14T15:01:12.5015047+08:00;True|2024-08-14T10:54:40.0433008+08:00;True|2024-08-14T10:54:29.3944984+08:00;True|2024-08-14T09:39:23.8085209+08:00;True|2024-08-14T09:23:48.5190887+08:00;True|2024-08-13T14:04:05.8532501+08:00;True|2024-08-13T11:23:40.5242910+08:00;</History>
+ <History>True|2024-08-15T07:59:59.2769975Z;True|2024-08-15T15:59:33.1518421+08:00;True|2024-08-15T13:42:21.6165189+08:00;True|2024-08-15T13:36:09.3131583+08:00;True|2024-08-15T13:19:16.2478692+08:00;True|2024-08-15T11:05:05.5377207+08:00;True|2024-08-15T10:51:59.8586373+08:00;True|2024-08-15T09:34:19.6954590+08:00;True|2024-08-15T09:27:30.4910263+08:00;True|2024-08-14T17:10:23.3978810+08:00;True|2024-08-14T17:03:22.1530532+08:00;True|2024-08-14T15:01:12.5015047+08:00;True|2024-08-14T10:54:40.0433008+08:00;True|2024-08-14T10:54:29.3944984+08:00;True|2024-08-14T09:39:23.8085209+08:00;True|2024-08-14T09:23:48.5190887+08:00;True|2024-08-13T14:04:05.8532501+08:00;True|2024-08-13T11:23:40.5242910+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -21,28 +21,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>08/15/2024 11:04:55</publishTime>
+ <publishTime>08/15/2024 15:59:08</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>08/15/2024 11:04:55</publishTime>
+ <publishTime>08/15/2024 15:59:08</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>08/15/2024 11:04:54</publishTime>
+ <publishTime>08/15/2024 15:59:07</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>08/15/2024 11:04:54</publishTime>
+ <publishTime>08/15/2024 15:59:07</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>08/15/2024 11:04:51</publishTime>
+ <publishTime>08/15/2024 15:59:04</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>08/15/2024 11:04:51</publishTime>
+ <publishTime>08/15/2024 15:59:04</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -87,10 +87,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>08/15/2024 11:04:51</publishTime>
+ <publishTime>08/15/2024 15:59:05</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>08/15/2024 11:04:51</publishTime>
+ <publishTime>08/15/2024 15:59:05</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>05/25/2024 09:46:41</publishTime>
@@ -123,25 +123,25 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>08/15/2024 11:04:50</publishTime>
+ <publishTime>08/15/2024 15:59:02</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>08/15/2024 11:04:50</publishTime>
+ <publishTime>08/15/2024 15:59:02</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>08/15/2024 11:04:50</publishTime>
+ <publishTime>08/15/2024 15:59:03</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>08/15/2024 11:04:50</publishTime>
+ <publishTime>08/15/2024 15:59:03</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>08/15/2024 11:04:50</publishTime>
+ <publishTime>08/15/2024 15:59:04</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>08/15/2024 11:04:50</publishTime>
+ <publishTime>08/15/2024 15:59:04</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
@@ -255,10 +255,10 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>08/15/2024 11:04:59</publishTime>
+ <publishTime>08/15/2024 15:59:13</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>08/15/2024 11:04:59</publishTime>
+ <publishTime>08/15/2024 15:59:13</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -453,7 +453,7 @@
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/15/2024 11:05:04</publishTime>
+ <publishTime>08/15/2024 15:59:32</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 7d1414e..da29ed4 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:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile19.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
--
Gitblit v1.9.1