From dc2a2d957cceba96de5e46514e08ea52c9d51374 Mon Sep 17 00:00:00 2001
From: 仲国强 <519541279@qq.com>
Date: 星期一, 30 八月 2021 17:20:10 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs | 39 ++++++++++++++++++---------------------
WebAPI/WebAPI.csproj.user | 2 +-
WebAPI/Controllers/ReportPlatFormController.cs | 2 +-
3 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/WebAPI/Controllers/ReportPlatFormController.cs b/WebAPI/Controllers/ReportPlatFormController.cs
index 072aca9..bfc89cd 100644
--- a/WebAPI/Controllers/ReportPlatFormController.cs
+++ b/WebAPI/Controllers/ReportPlatFormController.cs
@@ -80,7 +80,7 @@
// objJsonResult.data = null;
// return objJsonResult;
//}
- //oCN.BeginTran();
+ oCN.BeginTran();
//鍐欏叆浜х嚎缁戝畾
string sql = string.Format(@"insert into Gy_SourceRelationSet (HSourceID,HUserName,HGroupID,HManagerID,HRemark,HCreateDate,HCreator,HNowFlag,HCheckManID)
values('" + HSourceID + "','" + HUserName + "','" + HGroupID + "','" + HManagerID + "','" + HRemark + "','" + DateTime.Parse(HCreateDate).ToShortDateString() + "','" + HUserName + "','0','')");
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
index d576b54..eb49fec 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
@@ -443,22 +443,11 @@
{
ds = Sc_MouldConkBookBillList_s(sWhere);
- if (ds == null || ds.Tables[0].Rows.Count <= 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
}
catch (Exception ex)
{
@@ -475,11 +464,18 @@
public static DataSet Sc_MouldConkBookBillList_s(string sWhere)
{
- if (sWhere != "" || sWhere != null)
+ DataSet ds;
+ if (sWhere == null || sWhere.Equals(""))
{
- sWhere = " where 1=1 " + sWhere;
+ ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldConkBookBillList " + sWhere, "h_v_Sc_MouldConkBookBillList");
}
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldConkBookBillList "+sWhere+"", "h_v_Sc_MouldConkBookBillList");
+ else
+ {
+ string sql1 = "select * from h_v_Sc_MouldConkBookBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldConkBookBillList");
+ }
+ return ds;
}
#endregion
@@ -1937,6 +1933,7 @@
{
//oItem.HMaker = "";
UserName = oItem.HMaker; //鍒跺崟浜�
+ DBUtility.ClsPub.CurUserName = UserName;
oItem.HBillType = "3815";
oItem.HBillSubType = "3815";
//oItem.HBillNo = ""; //鍗曟嵁鍙�
@@ -2072,7 +2069,7 @@
{
//ds = oCN.RunProcReturn("select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub", "Sc_MouldRepairCheckBillSub");
- ds = oCN.RunProcReturn("select HConkReasonID,鏁呴殰鍘熷洜浠ｇ爜 HConkReasonCode,鏁呴殰鍘熷洜 HHConkReasonName,鏁呴殰鍘熷洜鎻忚堪 HConkExplanation,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,澶囨敞 HRemark from h_v_Sc_MouldConkBookBillList_Edit", "h_v_Sc_MouldConkBookBillList_Edit");
+ ds = oCN.RunProcReturn("select HConkReasonID,鏁呴殰鍘熷洜浠ｇ爜 HConkReasonCode,鏁呴殰鍘熷洜 HConkReasonName,鏁呴殰鍘熷洜鎻忚堪 HConkExplanation,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,澶囨敞 HRemark from h_v_Sc_MouldConkBookBillList_Edit", "h_v_Sc_MouldConkBookBillList_Edit");
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -2083,7 +2080,7 @@
{
//string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
- string sql1 = "select HConkReasonID,鏁呴殰鍘熷洜浠ｇ爜 HConkReasonCode,鏁呴殰鍘熷洜 HHConkReasonName,鏁呴殰鍘熷洜鎻忚堪 HConkExplanation,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,澶囨敞 HRemark from h_v_Sc_MouldConkBookBillList_Edit where 1 = 1 ";
+ string sql1 = "select HConkReasonID,鏁呴殰鍘熷洜浠ｇ爜 HConkReasonCode,鏁呴殰鍘熷洜 HConkReasonName,鏁呴殰鍘熷洜鎻忚堪 HConkExplanation,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,澶囨敞 HRemark from h_v_Sc_MouldConkBookBillList_Edit where 1 = 1 ";
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldConkBookBillList_Edit");
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 8d7bb3f..c934955 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -7,7 +7,7 @@
<WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
<WebStackScaffolding_LayoutPageFile />
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
- <NameOfLastUsedPublishProfile>D:\Git浠撳簱\MESWMS\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
--
Gitblit v1.9.1