zzr99
2021-10-08 c058d5c799e122ed77da81dfe37bf877300b9b5d
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)
            {
@@ -356,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;
@@ -376,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 HUnitID,单位代码 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,负责人ID 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";