From c737780b45a08735555842d044e1b4464284b217 Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期五, 05 十一月 2021 16:54:07 +0800
Subject: [PATCH] 完善出厂检验单
---
WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs | 44 ++++++++++++++------------------------------
1 files changed, 14 insertions(+), 30 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
index 61c2efa..03df50f 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
@@ -26,13 +26,13 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Sc_EquipMaintain " + sWhere + " order by hmainid desc", "h_v_Sc_EquipMaintain");
+ ds = oCN.RunProcReturn("select * from h_v_Sc_EquipMaintainPlan " + sWhere + " order by hmainid desc", "h_v_Sc_EquipMaintainPlan");
}
else
{
- string sql1 = "select * from h_v_Sc_EquipMaintain where 1 = 1";
+ string sql1 = "select * from h_v_Sc_EquipMaintainPlan where 1 = 1";
string sql = sql1 + sWhere + " order by hmainid desc";
- ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipMaintain");
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipMaintainPlan");
}
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
@@ -50,12 +50,6 @@
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
- //ds = Sb_EquipMaintainPlanBillList_s(sWhere);
- //objJsonResult.code = "1";
- //objJsonResult.count = 1;
- //objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- //objJsonResult.data = ds.Tables[0];
- //return objJsonResult;
}
catch (Exception ex)
{
@@ -166,7 +160,7 @@
msg4 = msg4.Substring(1, msg4.Length - 2);
msg4 = msg4.Replace("\\", "");
msg4 = msg4.Replace("\n", ""); //\n
- //msg2 = msg2.Replace("'", "鈥�");
+ //msg2 = msg2.Replace("'", "鈥�");
List<Model.ClsSb_EquipMaintainPlanBillSub> ls1 = new List<Model.ClsSb_EquipMaintainPlanBillSub>();
ls1 = oListModels.getObjectByJson_Sb_EquipMaintainPlanBillSub(msg4);
int j = 0;
@@ -178,11 +172,11 @@
//oItemSub.HCloseMan = ""; //琛屽叧闂�
oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
- //oItemSub.HRemark = ""; //澶囨敞
+ //oItemSub.HRemark = ""; //澶囨敞
oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
- //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
- //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
//oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
//HMaterID = "";//閰嶄欢浠ｇ爜
@@ -236,24 +230,13 @@
#endregion
#region [璁惧淇濆吇璁″垝琛ㄥ垹闄ゅ姛鑳絔
/// <summary>
- /// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
+ /// 璁惧淇濆吇璁″垝琛ㄥ垹闄ゅ姛鑳�
/// </summary>
/// <returns></returns>
[Route("Sb_EquipMaintainPlanBill/DeltetEquipMaintainPlanBillList")]
[HttpGet]
public object DeltetEquipMaintainPlanBillList(string HInterID)
{
- //缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
-
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HInterID);
if (lngBillKey == 0)
@@ -367,9 +350,9 @@
#endregion
#region[璁惧淇濆吇璁″垝琛ㄧ紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁鏂�(淇濆吇椤瑰垪琛ㄣ�侀厤浠堕」鍒楄〃)]
- [Route("Sb_EquipMaintainPlanBill/Sb_EquipMaintainBillListProjectDetaiNew")]
+ [Route("Sb_EquipMaintainPlanBill/Sb_EquipMaintainPlanBillListProjectDetaiNew")]
[HttpGet]
- public object Sb_EquipMaintainBillListProjectDetaiNew(string HInterID)
+ public object Sb_EquipMaintainPlanBillListProjectDetaiNew(string HInterID)
{
DataSet ds, ds1;
@@ -387,11 +370,12 @@
}
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
//鑾峰彇淇濆吇椤圭洰缂栬緫鏁版嵁
- string sql = "select HMaintainItemID, 淇濆吇椤圭洰浠ｇ爜 HMaintainItemNumber,淇濆吇椤圭洰鍚嶇О HMaintainItem,淇濆吇閮ㄤ綅 HMaintainPart,鍏蜂綋瑕佹眰 HClaim,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName,琛ㄤ綋澶囨敞 HRemark from h_v_Sb_EquipMaintainBillSub_Item where 1 = 1 " + Swhere + "";
- ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMaintainBillSub_Item");
+ string sql = "select HMaintainItemID, 淇濆吇椤圭洰浠ｇ爜 HMaintainItemNumber,淇濆吇椤圭洰鍚嶇О HMaintainItem,淇濆吇閮ㄤ綅 HMaintainPart,鍏蜂綋瑕佹眰 HClaim,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName,琛ㄤ綋澶囨敞 HRemark from h_v_Sb_EquipMaintainPlanBillSub_Item where 1 = 1 " + Swhere + "";
+ ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMaintainPlanBillSub_Item");
//鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
- string sql1 = "select HMaterID, 閰嶄欢浠ｇ爜 HMaterNumber,閰嶄欢鍚嶇О HMaterName,鍗曚綅ID,鍗曚綅浠ｇ爜 HUnitNumber,鍗曚綅鍚嶇О HUnitName,鐢ㄩ噺 HQty,鏍囧噯鐢ㄩ噺 HQtyMust,琛ㄤ綋澶囨敞 HRemark from h_v_Sb_EquipMaintainPlanBillList where 1 = 1 " + Swhere + "";
+ string sql1 = "select HMaterID, 閰嶄欢浠ｇ爜 HMaterNumber,閰嶄欢鍚嶇О HMaterName,鍗曚綅ID HUnitID,鍗曚綅浠ｇ爜 HUnitNumber,鍗曚綅鍚嶇О HUnitName,鐢ㄩ噺 HQty,鏍囧噯鐢ㄩ噺 HQtyMust,琛ㄤ綋澶囨敞 HRemark,璐熻矗浜篒D HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName from h_v_Sb_EquipMaintainPlanBillList where 1 = 1 " + Swhere + "";
ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipMaintainPlanBillList");
+
list.Add(ds.Tables[0]);
list.Add(ds1.Tables[0]);
objJsonResult.code = "0";
--
Gitblit v1.9.1