MES-WEB-API.git

			@@ -37,24 +37,14 @@
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			ds = oCN.RunProcReturn("select HItemID,HParentID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_EquipFileType where 1=1 " + sWhere+ " order by HItemID ", "Gy_EquipFileType");
			ds = oCN.RunProcReturn("select HItemID,HParentID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag,HMakeEmp,HMakeTime,HCheckEmp,HCheckTime,HModifyEmp,HModifyTime,HCloseEmp,HCloseTime from Gy_EquipFileType where 1=1 " + sWhere+ " order by HItemID ", "Gy_EquipFileType");

			//if (ds.Tables[0].Rows.Count != 0 \|\| ds != null)
			//{

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			//}
			//else
			//{
			//objJsonResult.code = "0";
			//objJsonResult.count = 0;
			//objJsonResult.Message = "无数据";
			//objJsonResult.data = null;
			//return objJsonResult;
			//}
			}
			catch (Exception ex)
			{
			@@ -94,8 +84,18 @@
			return objJsonResult;
			}
			DLL.ClsGy_EquipTypeBill oBill = new DLL.ClsGy_EquipTypeBill();
			if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
			ds = oCN.RunProcReturn("select * from Gy_EquipFileType where HItemID=" + HItemID, "Gy_EquipFileType");
			if (ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HCloseEmp"].ToString() != "" \|\| ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据当前处于不能删除状态！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCN.RunProc("Delete From Gy_EquipFileType where HItemID=" + lngBillKey);
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -174,9 +174,9 @@
			//主表
			oCN.RunProc("Insert into Gy_EquipFileType " +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime) " +
			",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HMakeEmp) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID +
			"," + HLevel + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
			"," + HLevel + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',getdate(),'" + msg4 + "')", ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			oCN.RunProc("Update Gy_EquipFileType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			oCN.Commit();
			@@ -269,6 +269,8 @@
			",HShortNumber='" + HShortNumber + "'" +
			",HHelpCode='" + HHelpCode + "'" +
			",HParentID=" + HParentID +
			",HModifyTime=getdate()" +
			",HModifyEmp='" + msg4 + "'" +
			",HStopflag='" + HStopflag + "'" +
			",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			//修改子项目代码