nothing

YL

2022-02-21 97bbd786a9fbdd2a1219f9db8a1e4c9e91875b75

 WebAPI/Controllers/WebAPIController.cs

@@ -106,14 +106,14 @@
                string sql = string.Format(@" select a.* from Gy_UserByOrgRelation a
                                              where a.HUserID = '{0}' and a.HOrgID = '{1}'", UserName, HOrgName);
                DataSet _ds = oCnLoc.RunProcReturn(sql, "h_p_Xt_UserRelationOrg_Check");
                if (_ds == null || _ds.Tables[0].Rows.Count == 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "用户" + UserName + "没有该组织权限";
                    objjson.data = null;
                    return objjson;
                }
                //if (_ds == null || _ds.Tables[0].Rows.Count == 0)
                //{
                //    objjson.code = "0";
                //    objjson.count = 0;
                //    objjson.Message = "用户" + UserName + "没有该组织权限";
                //    objjson.data = null;
                //    return objjson;
                //}

                objjson.code = "0";
                objjson.count = 1;
@@ -122,12 +122,12 @@
                return objjson;

            }
            catch (Exception)
            catch (Exception e)
            {

                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "登录异常！";
                objjson.Message = "登录异常！"+e.Message;
                objjson.data = null;
                return objjson; ;
            }
@@ -184,6 +184,45 @@
                objjson.data = null;
                return objjson; ;
            }
        }



        //撤销缓存列表记录
        [Route("Web/Rescind_Json")]
        [HttpGet]
        public object Rescind_Json(long sHInterID, string sBillNo, string sBillType)
        {
            string sErrMsg = string.Empty;
            try
            {
                if (webserver.RescindBillList(sHInterID, sBillNo, sBillType, ref sErrMsg))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "删除成功！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "删除失败！"; 
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception)
            {

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败！";
                objJsonResult.data = null;
                return objJsonResult;
            }

        }


@@ -417,6 +456,53 @@
            }
        }

        /// <summary>
        /// 获取仓库列表
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetWarehouseList_Json_New")]
        [HttpGet]
        public object GetWarehouseList_Json_New(string Warehouse, Int64 HOrgID)
        {
            sWhere = " Where HStopFlag=0  and HEndFlag=1 and HUSEORGID =" + HOrgID + "";
            //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
            if (Warehouse != "")
            {
                sWhere = sWhere + " and ( HNumber like '%" + Warehouse + "%' or HName like '%" + Warehouse + "%'  or HUSEORGID like '%" + Warehouse + "%' ) ";
            }

            try
            {
                WebS.WebService1 oWeb = new WebS.WebService1();
                ds = oWeb.GetWarehouseList(sWhere, ref DBUtility.ClsPub.sErrInfo);
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "0";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            }
            catch (Exception ex)
            {

                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }



        /// <summary>
@@ -454,6 +540,72 @@
            try
            {
                ds = webserver.GetStockPlaceList(sWhere, ref DBUtility.ClsPub.sErrInfo);
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "0";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            }
            catch (Exception ex)
            {

                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }


        /// <summary>
        /// 获取仓位列表
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetStockPlaceList_Json_NEW")]
        [HttpGet]
        public object GetStockPlaceList_Json_NEW(string StockPlace, Int64 HWhID,Int64 HOrgID)
        {
            WebS.WebService1 oWeb = new WebS.WebService1();
            sWhere = " Where HStopFlag=0  and HEndFlag=1 and HUSEORGID = " + HOrgID + "";
            //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
            if (HWhID == 0)
            {
                if (StockPlace != "")
                {
                    sWhere = " Where HStopFlag=0  and ( HNumber like '%" + StockPlace + "%' or HName like '%" + StockPlace + "%' ) ";
                }
                else
                {
                    sWhere = " Where HStopFlag=0 ";
                }
            }
            else
            {
                if (StockPlace != "")
                {
                    sWhere = " Where HStopFlag=0 and HWHID=" + HWhID.ToString() + " and HWHID=" + HWhID.ToString() + " and ( HNumber like '%" + StockPlace + "%' or HName like '%" + StockPlace + "%' ) ";
                }
                else
                {
                    sWhere = " Where HStopFlag=0 and HWHID=" + HWhID.ToString();
                }
            }
            try
            {
                //ds = webserver.GetStockPlaceList(sWhere, ref DBUtility.ClsPub.sErrInfo);
                ds = oWeb.GetStockPlaceList(sWhere, ref DBUtility.ClsPub.sErrInfo);
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
@@ -720,6 +872,53 @@
            }
        }


        /// <summary>
        /// 获取组织列表
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetOrganizationList_Json")]
        [HttpGet]
        public object GetOrganizationList_Json()
        {
            WebS.WebService1 oWebs1 = new WebS.WebService1();
            //sWhere = " Where HStopFlag=0  and HEndFlag=1";
            ////sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
            //if (Organization != "")
            //{
            //    sWhere = sWhere + " and ( HNumber like '%" + Organization + "%' or HName like '%" + Organization + "%' ) ";
            //}
            try
            {
                ds = oWebs1.get_ORGANIZATIONSList();
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "0";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            }
            catch (Exception ex)
            {

                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }

        /// <summary>
        /// 获取物料列表
        /// </summary>
@@ -943,6 +1142,61 @@
            }
        }

        #region 产线中心列表查询
        [Route("Web/Gy_LineCenter_Json")]
        [HttpGet]
        public object Gy_LineCenter_Json(string BadReason)
        {
            if (BadReason != "")
            {
                sWhere = sWhere + " and ( HNumber like '%" + BadReason + "%' or HName like '%" + BadReason + "%' ) ";
            }
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))

                {
                    ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName  from Gy_LineCenter where HStopflag=0 Order by HItemID ", "Gy_LineCenter");
                }
                else
                {
                    string sql1 = "Select HItemID,HNumber ,HName  from Gy_LineCenter where HStopflag=0 and HEndFlag=1 ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "Gy_LineCenter");
                    sWhere = "";
                }

                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "0";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            }
            catch (Exception ex)
            {

                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }

        #endregion

        #region 不良原因设置列表/保存/编辑/删除方法
        /// <summary>
        /// 获取不良原因列表
@@ -1016,10 +1270,21 @@
        {
            DataSet ds;
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            //string msg2 = sArray[0].ToString();
            //string msg3 = sArray[1].ToString();
            string msg3 = _value.ToString();
            string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg1 = sArray[0].ToString();
            string msg2 = sArray[1].ToString();

            //查看权限
            if (!DBUtility.ClsPub.Security_Log("Gy_BadReason_Edit", 1, false, msg2))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无保存权限！";
                objJsonResult.data = null;
                return objJsonResult;
            }

            Int64 HItemID = 0;
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            //获取最大ID值赋值
@@ -1215,21 +1480,21 @@
        /// <returns></returns>
        [Route("DeltetGy_BadReason")]
        [HttpGet]
        public object DeltetGy_BadReason(string HItemID)
        public object DeltetGy_BadReason(string HItemID,string user)
        {
            DataSet ds;
            //string ModRightNameCheck = "Sc_ProcessReport_check";
            try
            {
                //删除权限
                //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "审核失败！无权限！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                if (!DBUtility.ClsPub.Security_Log("Gy_BadReason_Delete", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (string.IsNullOrWhiteSpace(HItemID))
@@ -1617,7 +1882,7 @@
        }

        /// <summary>
        /// 获取核算方式列表
        /// 获取核算方式组列表
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetClassTimePrjGroupList_Json")]
@@ -1844,50 +2109,99 @@
        /// <returns></returns>
        [Route("Web/GetSc_ICMOBillListView2")]
        [HttpGet]
        public object GetSc_ICMOBillListView2(string ICMOBill, int OrganizationID)
        public object GetSc_ICMOBillListView2(int page, int limit, string ICMOBill, int OrganizationID)
        {
            if (ICMOBill != "")
            {
                sWhere = " where 1=1 and 单据号 like '%" + ICMOBill + "%' ";
            }
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                int count = 0;
                int pageNum = page;
                int pageSize = limit;
                string sWhere = "";
                if (ICMOBill == null || ICMOBill.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillList where 1=1 and isnull(审核人,'')<>'' order by 单据号 desc,hsubid ", "h_v_Sc_ICMOBillList");
                    sWhere = " where 1=1";
                }
                else
                {
                    string sql = "select * from h_v_Sc_ICMOBillList " + sWhere + " and isnull(审核人,'')<>'' order by 单据号 desc,hsubid ";
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_ICMOBillList");
                    sWhere = " where 1=1 and 单据号 like '%" + ICMOBill + "%'";
                }
                if (ds == null || ds.Tables[0].Rows.Count <= 0)

                DataSet ds0 = oCn.RunProcReturn("select count(*) CountNum from h_v_Sc_ICMOBillList " + sWhere + "", "h_v_Sc_ICMOBillList");
                count = int.Parse(ds0.Tables[0].Rows[0]["CountNum"].ToString());
                //string sql = string.Format(@"select top " + pageSize + " hmainid,日期,单据号,箱号条形码,净重,毛重,皮重,生产组织,部门,操作员,客户标签号,物料代码,物料名称,计量单位代码,计量单位名称,数量,制单人,制单日期 from(select row_number() over (order by hmainid desc) as RowNumber,hmainid,日期,单据号,箱号条形码,净重,毛重,皮重,生产组织,部门,操作员,客户标签号,物料代码,物料名称,计量单位代码,计量单位名称,数量,制单人,制单日期 from h_v_PackUnionBillList " + sWhere + ")   as A where RowNumber >" + pageSize + " *(" + pageNum + "-1)");
                string sql = string.Format(@"select * from h_v_Sc_ICMOBillList " + sWhere + " and isnull(审核人,'')<>''  order by hmainid   offset ((" + pageNum + "-1)*" + pageSize + ") rows fetch next " + pageSize + " rows only");
                ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_ICMOBillList");
                string aa = ds.Tables[0].Columns[0].ToString();

                if (ds.Tables[0].Rows.Count > 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                    objJsonResult.code = "1";
                    objJsonResult.count = count;
                    objJsonResult.Message = "返回记录成功！";
                    objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" }));  //序列化DataSet中的时间格式，然后再反序列化回来
                    return objJsonResult;
                }
                else
                {
                    objjson.code = "0";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "暂无记录！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception ex)
            {

                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + ex.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }

            //if (ICMOBill != "")
            //{
            //    sWhere = " where 1=1 and 单据号 like '%" + ICMOBill + "%' ";
            //}
            //try
            //{
            //    SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            //    if (sWhere == null || sWhere.Equals(""))
            //    {
            //        ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillList where 1=1 and isnull(审核人,'')<>'' order by 单据号 desc,hsubid ", "h_v_Sc_ICMOBillList");
            //    }
            //    else
            //    {
            //        string sql = "select * from h_v_Sc_ICMOBillList " + sWhere + " and isnull(审核人,'')<>'' order by 单据号 desc,hsubid ";
            //        ds = oCN.RunProcReturn(sql, "h_v_Sc_ICMOBillList");
            //    }
            //    if (ds == null || ds.Tables[0].Rows.Count <= 0)
            //    {
            //        objjson.code = "0";
            //        objjson.count = 0;
            //        objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
            //        objjson.data = null;
            //        return objjson;
            //    }
            //    else
            //    {
            //        objjson.code = "0";
            //        objjson.count = 1;
            //        objjson.Message = "获取成功!";
            //        objjson.data = ds.Tables[0];
            //        return objjson;
            //    }
            //}
            //catch (Exception ex)
            //{

            //    objjson.code = "0";
            //    objjson.count = 0;
            //    objjson.Message = "获取失败" + ex.ToString();
            //    objjson.data = null;
            //    return objjson;
            //}
        }

        /// <summary>
@@ -2093,6 +2407,7 @@
        [HttpGet]
        public object GetMaintainItemtemByMouldProjectID(int MouldProjectID)
        {
            
            if (MouldProjectID <= 0)
            {
                objjson.code = "0";
@@ -2104,28 +2419,82 @@
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
                List<object> list = new List<object>();
                DataSet ds2;
                DataSet ds1;
                string sql1 = string.Format(@"select t.HMaintainItemID ,m.HNumber HMaintainItemNumber,t.HMaintainItem,t.HMaintainPart,t.HClaim,t.HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
                                                from Sc_MouldMaintainRuleBillMain a left join Sc_MouldMaintainRuleBillSub_Item t on a.HInterID=t.HInterID 
                                                left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
                                                left join Gy_Employee e on e.HItemID=t.HManagerID
                                                where a.HInterID=(select HMouldMaintainRuleInterID from Gy_MouldFileMain where HInterID=" + MouldProjectID + ") ");
                ds = oCN.RunProcReturn(sql, "Sc_MouldMaintainRuleBillMain");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "1";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }

                string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName, m.HModel HMaterSpec,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HQtyMust,b.HRemark from Sc_MouldMaintainRuleBillMain a  
                                    left join Sc_MouldMaintainRuleBillSub b on a.HInterID=b.HInterID 
                                                left join h_v_IF_Material m on b.HMaterID=m.HItemID
                                    left join h_v_IF_Unit u on b.HUnitID=u.HItemID
                                                where a.HInterID=(select HMouldMaintainRuleInterID from Gy_MouldFileMain  where HInterID=" + MouldProjectID + ") ");
                ds1 = oCN.RunProcReturn(sql1, "Sc_MouldMaintainRuleBillMain");//保养
                ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//配件
                list.Add(ds1.Tables[0]);
                list.Add(ds2.Tables[0]);
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功！";
                objJsonResult.list = list;
                return objJsonResult;
            }
            catch (Exception ex)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }
        /// <summary>
        /// 根据器具主内码获取器具保养检验项目
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetMouldMaintainItemtemByMaintainRuleID")]
        [HttpGet]
        public object GetMouldMaintainItemtemByMaintainRuleID(int MouldMaintainRuleID)
        {

            if (MouldMaintainRuleID <= 0)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "器具保养规程未选择";
                objjson.data = null;
                return objjson;
            }
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                List<object> list = new List<object>();
                DataSet ds2;
                DataSet ds1;
                string sql1 = string.Format(@"select t.HMaintainItemID ,m.HNumber HMaintainItemNumber,t.HMaintainItem,t.HMaintainPart,t.HClaim,t.HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
                                                from Sc_MouldMaintainRuleBillMain a left join Sc_MouldMaintainRuleBillSub_Item t on a.HInterID=t.HInterID 
                                                left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
                                                left join Gy_Employee e on e.HItemID=t.HManagerID
                                                where a.HInterID=" + MouldMaintainRuleID);

                string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName, m.HModel HMaterSpec,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HQtyMust,b.HRemark from Sc_MouldMaintainRuleBillMain a  
                                    left join Sc_MouldMaintainRuleBillSub b on a.HInterID=b.HInterID 
                                                left join h_v_IF_Material m on b.HMaterID=m.HItemID
                                    left join h_v_IF_Unit u on b.HUnitID=u.HItemID
                                                where a.HInterID=" + MouldMaintainRuleID);
                ds1 = oCN.RunProcReturn(sql1, "Sc_MouldMaintainRuleBillMain");//保养
                ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//配件
                list.Add(ds1.Tables[0]);
                list.Add(ds2.Tables[0]);
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功！";
                objJsonResult.list = list;
                return objJsonResult;
            }
            catch (Exception ex)
            {
@@ -2197,28 +2566,29 @@
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
                List<object> list = new List<object>();
                DataSet ds2;
                DataSet ds1;
                string sql1 = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
                                                from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID 
                                                left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
                                                left join Gy_Employee e on e.HItemID=t.HManagerID
                                                where a.HInterID=(select HEquipMaintainRuleInterID from Gy_EquipFileBillMain where HInterID=" + EquipProjectID + ") ");
                ds = oCN.RunProcReturn(sql, "Sb_EquipMaintainRuleBillMain");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "1";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
                string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a  
                                    left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID 
                                                left join h_v_IF_Material m on b.HMaterID=m.HItemID
                                    left join h_v_IF_Unit u on b.HUnitID=u.HItemID
                                                where a.HInterID=(select HEquipMaintainRuleInterID from Gy_EquipFileBillMain  where HInterID=" + EquipProjectID + ") ");

                ds1 = oCN.RunProcReturn(sql1, "Sb_EquipMaintainRuleBillMain");//保养
                ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//配件
                list.Add(ds1.Tables[0]);
                list.Add(ds2.Tables[0]);
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功！";
                objJsonResult.list = list;
                return objJsonResult;
            }
            catch (Exception ex)
            {
@@ -2229,6 +2599,59 @@
                return objjson;
            }
        }
        /// <summary>
        /// 根据设备保养规程显示设备保养规程项目
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetMaintainItemtemByMaintainRuleID")]
        [HttpGet]
        public object GetMaintainItemtemByMaintainRuleID(int EquipProjectID)
        {
            if (EquipProjectID <= 0)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "设备保养规程未选择";
                objjson.data = null;
                return objjson;
            }
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                List<object> list = new List<object>();
                DataSet ds2;
                DataSet ds1;
                string sql1 = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
                                                from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID 
                                                left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
                                                left join Gy_Employee e on e.HItemID=t.HManagerID
                                                where a.HInterID=" + EquipProjectID );
                string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a  
                                    left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID 
                                                left join h_v_IF_Material m on b.HMaterID=m.HItemID
                                    left join h_v_IF_Unit u on b.HUnitID=u.HItemID
                                                where a.HInterID=" + EquipProjectID);

                ds1 = oCN.RunProcReturn(sql1, "Sb_EquipMaintainRuleBillMain");//保养
                ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//配件
                list.Add(ds1.Tables[0]);
                list.Add(ds2.Tables[0]);
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功！";
                objJsonResult.list = list;
                return objJsonResult;
            }
            catch (Exception ex)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }


        /// <summary>
        /// 根据设备显示设备点检程项目
@@ -2282,7 +2705,60 @@
                return objjson;
            }
        }

        /// <summary>
        /// 根据设备点检规程显示设备点检程项目
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetDotCheckRuleItemByDotCheckRuleID")]
        [HttpGet]
        public object GetDotCheckRuleItemByDotCheckRuleID(int HDotCheckRuleInterID)
        {
            if (HDotCheckRuleInterID <= 0)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "设备点检规程未选择";
                objjson.data = null;
                return objjson;
            }
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = string.Format(@"select b.HDotCheckItemID HDotCheckItemID,c.HNumber HDotCheckCode,b.HDotCheckItem,b.HDotCheckPart,b.HClaim,
                                    b.HManagerID,e.HNumber HManagerCode,e.HName HManagerName,b.HRemark from Sb_EquipDotCheckRuleBillMain  a 
                           left join Sb_EquipDotCheckRuleBillSub b on a.HInterID=b.HInterID 
                                    left join Gy_QCCheckItem c on c.HItemID=b.HDotCheckItemID
                                     left join Gy_Employee e on e.HItemID=b.HManagerID
                                    where a.HInterID=" + HDotCheckRuleInterID);
                ds = oCN.RunProcReturn(sql, "Sb_EquipDotCheckRuleBillMain");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "1";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            }
            catch (Exception ex)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }
        
        
        /// <summary>
        /// 获取维修项目列表
        /// </summary>
@@ -2455,6 +2931,89 @@
        }
        #endregion


        ///// <summary>
        ///// 产品入库缓存列表刷新信息
        ///// </summary>
        ///// <returns></returns>
        //[Route("Web/chanpinruk")]
        //[HttpGet]
        //public object chanpinruk(string HBillType, string sHMaker, Int64 HOrgID)
        //{
        //    try
        //    {
        //        ds = webserver.GetKf_PonderationBillMain_TempList_New(HBillType, sHMaker, HOrgID);
        //        if (ds == null || ds.Tables[0].Rows.Count <= 0)
        //        {
        //            objJsonResult.code = "0";
        //            objJsonResult.count = 0;
        //            objJsonResult.Message = "没有返回任何记录！";
        //            objJsonResult.data = null;
        //            return objJsonResult;
        //            //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
        //        }
        //        else
        //        {
        //            objJsonResult.code = "0";
        //            objJsonResult.count = 1;
        //            objJsonResult.Message = "获取信息成功！";
        //            objJsonResult.data = ds.Tables[0];
        //            return objJsonResult;
        //        }
        //    }
        //    catch (Exception e)
        //    {
        //        objJsonResult.code = "0";
        //        objJsonResult.count = 0;
        //        objJsonResult.Message = "没有返回任何记录！" + e.ToString();
        //        objJsonResult.data = null;
        //        return objJsonResult;
        //    }
        //}


        /// <summary>
        /// 产品入库缓存列表刷新信息
        /// </summary>
        /// <returns></returns>
        [Route("Web/chanpinruk")]
        [HttpGet]
        public object chanpinruk(string HBillType, string sHMaker, Int64 HOrgID)
        {
            WebS.WebService1 oWebs = new WebS.WebService1();
            try
            {
                ds = oWebs.GetKf_PonderationBillMain_TempList_New (HBillType, sHMaker, HOrgID);
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.data = null;
                    return objJsonResult;
                    //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }



    }

}