From 6a14f78a188e99230efe9a004f0c9b73a70aaa52 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 17 十一月 2021 08:48:23 +0800
Subject: [PATCH] nothing
---
WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs | 104 +++++++++++++++++++++++-----------------------------
1 files changed, 46 insertions(+), 58 deletions(-)
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs
index b3372e0..33ae118 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs
@@ -227,9 +227,9 @@
else
{
string sql1 = "select * from h_v_Sc_MouldMaintain where 1 = 1 ";
- string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldMaintain");
-
+
}
//return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintainBillList ", "h_v_Sc_MouldMaintainBillList");
}
@@ -329,7 +329,7 @@
public static DataSet Sc_MouldDotCheckBillList_s(string sWhere)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckBillList where 1=1 "+sWhere+ "order by 鏃ユ湡 desc", "h_v_Sc_MouldDotCheckBillList");
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckBillList where 1=1 " + sWhere + "order by 鏃ユ湡 desc", "h_v_Sc_MouldDotCheckBillList");
}
#endregion
@@ -468,12 +468,12 @@
DataSet ds;
if (sWhere == null || sWhere.Equals(""))
{
- ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldConkBookBillList order by 鏃ユ湡 desc" + sWhere, "h_v_Sc_MouldConkBookBillList");
+ ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldConkBookBillList order by 鏃ユ湡 desc" + sWhere, "h_v_Sc_MouldConkBookBillList");
}
else
{
string sql1 = "select * from h_v_Sc_MouldConkBookBillList where 1 = 1 ";
- string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldConkBookBillList");
}
return ds;
@@ -523,7 +523,7 @@
else
{
string sql1 = "select * from h_v_Sc_MouldRepairCheckBillList_Edit where 1 = 1 ";
- string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairCheckBillList_Edit");
}
return ds;
@@ -639,7 +639,7 @@
else
{
string sql1 = "select * from h_v_Sc_MouldRepairWorkBillList where 1 = 1 ";
- string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairWorkBillList");
}
}
@@ -802,24 +802,12 @@
{
try
{
-
ds = Sc_GetMateOutBillList(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 = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
}
catch (Exception ex)
{
@@ -1506,7 +1494,7 @@
public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName)
{
string ModRightNameCheck = "Sb_MouldRepairWorkBill_Check";
- DBUtility.ClsPub.CurUserName=CurUserName;
+ DBUtility.ClsPub.CurUserName = CurUserName;
try
{
//瀹℃牳鏉冮檺
@@ -1580,7 +1568,7 @@
return objJsonResult;
}
if (IsAudit == 0) //瀹℃牳鎻愪氦
- {
+ {
//瀹℃牳鎻愪氦
if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
@@ -2576,12 +2564,12 @@
//oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
//oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
Sub.HRelationQty = 0; //鍏宠仈鏁伴噺
- //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- //HMaterID = "";//閰嶄欢浠ｇ爜
- //HUnitID = "";//鍗曚綅浠ｇ爜
- //HQty = "";//瀹為檯鐢ㄩ噺
- //HQtyMust = "";//鍗曚綅鐢ㄩ噺
- //HRemark = "";//澶囨敞
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ //HMaterID = "";//閰嶄欢浠ｇ爜
+ //HUnitID = "";//鍗曚綅浠ｇ爜
+ //HQty = "";//瀹為檯鐢ㄩ噺
+ //HQtyMust = "";//鍗曚綅鐢ㄩ噺
+ //HRemark = "";//澶囨敞
oBill.DetailColl.Add(Sub);
@@ -2687,7 +2675,7 @@
public object Sc_MouldMaintainBillListProjectDetaiNew(string HInterID)
{
- DataSet ds,ds1;
+ DataSet ds, ds1;
List<object> list = new List<object>();
string Swhere = "";
try
@@ -2696,7 +2684,7 @@
{
Swhere = " and hmainid='" + HInterID + "'";
}
- else
+ else
{
Swhere = HInterID;
}
@@ -2704,7 +2692,7 @@
//鑾峰彇淇濆吇椤圭洰缂栬緫鏁版嵁
string sql = "select HMaintainItemID, 淇濆吇椤圭洰浠ｇ爜 HMaintainItemNumber,淇濆吇椤圭洰鍚嶇О HMaintainItem,淇濆吇閮ㄤ綅 HMaintainPart,鍏蜂綋瑕佹眰 HClaim,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName,琛ㄤ綋澶囨敞 HRemark from h_v_Sc_MouldMaintainBillListItem where 1 = 1 " + Swhere + "";
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMaintainBillListItem");
- //鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
+ //鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
string sql1 = "select HMaterID, 閰嶄欢浠ｇ爜 HMaterNumber,閰嶄欢鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HUnitID,鍗曚綅浠ｇ爜 HUnitNumber,鍗曚綅鍚嶇О HUnitName,瀹為檯鐢ㄩ噺 HQty,鏍囧噯鐢ㄩ噺 HQtyMust,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName,琛ㄤ綋澶囨敞 HRemark from h_v_Sc_MouldMaintainBillList where 1 = 1 " + Swhere + "";
ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldMaintainBillList");
list.Add(ds.Tables[0]);
@@ -2726,11 +2714,11 @@
#endregion
#region [妯″叿淇濆吇璁板綍琛ㄥ垹闄ゅ姛鑳絔
- /// <summary>
- /// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
- /// </summary>
- /// <returns></returns>
- [Route("Sc_MouldMaintainBill/DeltetSc_MouldMaintainBill")]
+ /// <summary>
+ /// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_MouldMaintainBill/DeltetSc_MouldMaintainBill")]
[HttpGet]
public object DeltetSc_MouldMaintainBill(string HInterID)
{
@@ -3679,7 +3667,7 @@
oBill.omodel = oItem;
}
//瀛愯〃浣撴暟鎹�
-
+
List<Models.ClsSc_MouldStockBillSub> ls = new List<Models.ClsSc_MouldStockBillSub>();
ls = oListModels.getObjectByJson_Gy_MouldScrapInHouseBillSub(msg2);
int i = 0;
@@ -3757,7 +3745,7 @@
[Route("Sc_MouldScrapOutHouseBill/GetMouldScrapOutHouseBill")]
[HttpGet]
- public object GetMouldScrapOutHouseBill(string sWhere,string user, string Organization)
+ public object GetMouldScrapOutHouseBill(string sWhere, string user, string Organization)
{
try
{
@@ -3771,7 +3759,7 @@
return objJsonResult;
}
- ds = Sc_GetMouldScrapOutHouseBill(sWhere,Organization);
+ ds = Sc_GetMouldScrapOutHouseBill(sWhere, Organization);
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -3793,11 +3781,11 @@
string sql1 = string.Format(@"select * from h_v_Sc_MouldScrapOutHouseBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 鏃ユ湡 desc", "h_v_Sc_MouldScrapOutHouseBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 鏃ユ湡 desc", "h_v_Sc_MouldScrapOutHouseBillList");
}
else
{
- string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldScrapOutHouseBillList");
}
}
@@ -3838,7 +3826,7 @@
HSecUnitID, 杈呭姪璁￠噺鍗曚綅浠ｇ爜 HSecUnitCode, 杈呭姪璁￠噺鍗曚綅鍚嶇О HSecUnitName, 鎹㈢畻鐜� HSecUnitRate, HUnitID, 璁￠噺鍗曚綅浠ｇ爜 HUnitCode, 璁￠噺鍗曚綅鍚嶇О HUnitName, 鎵规 HBatchNo,
璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife, 瀹炲彂鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney, HWHID, 鍙戣揣浠撳簱浠ｇ爜 HWHCode, 鍙戣揣浠撳簱鍚嶇О HWHName,
HSPID, 浠撲綅浠ｇ爜 HSPCode, 浠撲綅鍚嶇О HSPName, 澶囨敞 HRemark,HStockOrgID FROM h_v_Sc_MouldScrapOutHouseBillList"), "h_v_Sc_MouldScrapOutHouseBillList");
-
+
}
else
{
@@ -4027,7 +4015,7 @@
/// <returns></returns>
[Route("Sc_MouldScrapOutHouseBill/DeltetMouldScrapOutHouseBill")]
[HttpGet]
- public object DeltetMouldScrapOutHouseBill(string HInterID,string user)
+ public object DeltetMouldScrapOutHouseBill(string HInterID, string user)
{
//缂栬緫鏉冮檺
if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBill_Delete", 1, true, user))
@@ -4331,7 +4319,7 @@
[Route("Sc_MouldProdBackBill/GetMouldProdBackBill")]
[HttpGet]
- public object GetMouldProdBackBill(string sWhere,string user, string Organization)
+ public object GetMouldProdBackBill(string sWhere, string user, string Organization)
{
try
{
@@ -4344,7 +4332,7 @@
return objJsonResult;
}
- ds = Sc_GetMouldProdBackBill(sWhere,Organization);
+ ds = Sc_GetMouldProdBackBill(sWhere, Organization);
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -4361,7 +4349,7 @@
}
}
- public static DataSet Sc_GetMouldProdBackBill(string sWhere,string Organization)
+ public static DataSet Sc_GetMouldProdBackBill(string sWhere, string Organization)
{
string sql1 = string.Format(@"select * from h_v_Sc_MouldProdBackBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
@@ -4370,7 +4358,7 @@
}
else
{
- string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdBackBillList");
}
@@ -4600,7 +4588,7 @@
/// <returns></returns>
[Route("Sc_MouldProdBackBill/DeltetMouldProdBackBill")]
[HttpGet]
- public object DeltetMouldProdBackBill(string HInterID,string user)
+ public object DeltetMouldProdBackBill(string HInterID, string user)
{
//缂栬緫鏉冮檺
if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Delete", 1, true, user))
@@ -4764,7 +4752,7 @@
[Route("Sc_MouldProdOutBill/GetMouldProdOutBill")]
[HttpGet]
- public object GetMouldProdOutBill(string sWhere, string user,string Organization)
+ public object GetMouldProdOutBill(string sWhere, string user, string Organization)
{
try
{
@@ -4777,7 +4765,7 @@
return objJsonResult;
}
- ds = Sc_GetMouldProdOutBill(sWhere,Organization);
+ ds = Sc_GetMouldProdOutBill(sWhere, Organization);
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -4799,11 +4787,11 @@
string sql1 = string.Format(@"select * from h_v_Sc_MouldProdOutHouseBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 鏃ユ湡 desc", "h_v_Sc_MouldProdOutHouseBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 鏃ユ湡 desc", "h_v_Sc_MouldProdOutHouseBillList");
}
else
{
- string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdOutHouseBillList");
}
@@ -4896,7 +4884,7 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
- string msg4= sArray[2].ToString();
+ string msg4 = sArray[2].ToString();
string UserName = "";
@@ -5227,7 +5215,7 @@
else
{
string sql1 = "select * from h_v_Sc_MouldLifeChangeBillList where 1 = 1 ";
- string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldLifeChangeBillList");
}
--
Gitblit v1.9.1