From 2bc24245838af613a6101a1e835bedf29ad8b8cf Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 11 十一月 2021 19:07:12 +0800
Subject: [PATCH] 1、器具档案新增编辑页面增加货主类型、预警寿命 2、新增器具保养规程单
---
WebAPI/Controllers/BaseSet/Gy_MaintenanceItemController.cs | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaintenanceItemController.cs b/WebAPI/Controllers/BaseSet/Gy_MaintenanceItemController.cs
index ba2b86d..b6c240b 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaintenanceItemController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaintenanceItemController.cs
@@ -31,11 +31,11 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from Gy_Repair " + sWhere, "Gy_Repair");
+ ds = oCN.RunProcReturn("select HParentID ParentID, * from Gy_Repair" + sWhere, "Gy_Repair");
}
else
{
- string sql1 = "select * from Gy_Repair where 1 = 1 ";
+ string sql1 = "select HParentID ParentID,* from Gy_Repair where 1 = 1 ";
string sql = sql1 + sWhere;
ds = oCN.RunProcReturn(sql, "Gy_Repair");
}
@@ -202,7 +202,7 @@
DAL.ClsGy_Repair_Ctl oDept = new DAL.ClsGy_Repair_Ctl();
DAL.ClsGy_Repair_View oDeptHlp = new DAL.ClsGy_Repair_View();
List<MaintenanceMode> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MaintenanceMode>>(msg1);
- long HItemID = list[0].HItemID;
+ long HItemID = list[0].HItemID.ToString() == "" ? 0 : list[0].HItemID;
string HNumber = list[0].HNumber;
string HName = list[0].HName;
string HShortNumber = list[0].HNumber;
@@ -211,8 +211,6 @@
string HRemark = list[0].HRemark;
string HStopflag = list[0].HStopflag;
string HUseFlag = list[0].HUseFlag;
-
-
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
objJsonResult.code = "0";
@@ -230,10 +228,13 @@
oCN.RunProc("Insert Into Gy_Repair " +
"(HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HLevel,HEndFlag,HStopflag,HRemark) " +
- " values('" + HNumber + "','"+ HName + "','"+ HHelpCode + "','" + HShortNumber + "','0'" +
+ " values('" + HNumber + "','"+ HName + "','"+ HHelpCode + "','" + HShortNumber + "','"+ HItemID + "'" +
",'1',0,'" + HStopflag + "','"+ HRemark + "')");
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCN.RunProc("Update Gy_Repair set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (list[0].HItemID.ToString() != "")
+ {
+ oCN.RunProc("Update Gy_Repair set HEndflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -281,7 +282,7 @@
string HNumber = list[0].HNumber;
string HName = list[0].HName;
string HShortNumber = list[0].HNumber;
- long HParentID = list[0].HParentID;
+ long HParentID = list[0].HParentID.ToString() == "" ? 0 : list[0].HParentID;
string HHelpCode = list[0].HHelpCode;
string HRemark = list[0].HRemark;
string HStopflag = list[0].HStopflag;
@@ -362,7 +363,7 @@
{
try
{
- ds = oCN.RunProcReturn("select max(hitemid)+1 hitemid from Gy_RepairType", "Gy_RepairType");
+ ds = oCN.RunProcReturn("select max(hitemid)+1 hitemid from Gy_Repair", "Gy_Repair");
objJsonResult.code = "1";
objJsonResult.count = 1;
--
Gitblit v1.9.1