Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yangle

2022-08-08 8560519c52cede92c33b89184f39844934c71de4

 WebAPI/Controllers/WebAPIController.cs

@@ -79,6 +79,116 @@
                return objjson;
            }
        }

        [Route("Web/GetMAXNumPDA")]
        [HttpGet]
        public object GetMAXNumPDA(string HBillType)
        {
            try
            {
                string HBillNo = "";
                string sErrMsg = "";
                Int64 HInterID = 0;//显示的字段
                HInterID = DBUtility.ClsPub.CreateBillID_Prod(HBillType, ref sErrMsg);
                HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(HBillType, ref sErrMsg, true);

                DataSet ds;
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn("exec h_p_IF_CheckBillIDExists_WMS  " + HInterID + ",'" + HBillNo + "'", "h_p_IF_CheckBillIDExists_WMS");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    sErrMsg = "存在重复单据内码或单据号的单据，不允许新增，请退出后重新登录！";
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = sErrMsg;
                    objjson.data = null;
                    return objjson;
                }
                else if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0][0]) == "1")
                {
                    sErrMsg = "存在重复单据内码或单据号的单据，不允许新增，请退出后重新登录！";
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = sErrMsg;
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    //----------创建虚表------------------------
                    DataTable dt_Main = new DataTable("Json");
                    dt_Main.Columns.Add("HBillNo", typeof(string));
                    dt_Main.Columns.Add("HInterID", typeof(int));
                    //---------创建新行------------------------
                    DataRow dr_main = dt_Main.NewRow();//创建新行 
                    dt_Main.Rows.Add(dr_main);//将新行加入到表中
                    dr_main["HBillNo"] = DBUtility.ClsPub.isStrNull(HBillNo);
                    dr_main["HInterID"] = DBUtility.ClsPub.isLong(HInterID);
                    //返回数据
                    objjson.code = "0";
                    objjson.count = 1;
                    objjson.Message = "获取成功";
                    objjson.data = dt_Main;
                    return objjson;
                }
            }
            catch (Exception e)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + e.ToString();
                objjson.data = null;
                return objjson;
            }
        }


        //[Route("Web/Get_MaxBillNoAndID")]
        //[HttpGet]
        //public object Get_MaxBillNoAndID(string HBillType)
        //{
        //    try
        //    {
        //        string HBillNo = "";
        //        Int64 HInterID = 0;//显示的字段
        //        HInterID = DBUtility.ClsPub.CreateBillID(HBillType, ref DBUtility.ClsPub.sExeReturnInfo);
        //        HBillNo = DBUtility.ClsPub.CreateBillCode(HBillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
        //        //----------创建虚表------------------------
        //        DataTable dt_Main = new DataTable("Json");
        //        dt_Main.Columns.Add("HBillNo", typeof(string));
        //        dt_Main.Columns.Add("HInterID", typeof(int));
        //        //---------创建新行------------------------
        //        DataRow dr_main = dt_Main.NewRow();//创建新行 
        //        dt_Main.Rows.Add(dr_main);//将新行加入到表中
        //        dr_main["HBillNo"] = DBUtility.ClsPub.isStrNull(HBillNo);
        //        dr_main["HInterID"] = DBUtility.ClsPub.isLong(HInterID);

        //        if (HBillNo == null || HInterID == 0)
        //        {
        //            objjson.code = "0";
        //            objjson.count = 0;
        //            objjson.Message = "获取失败";
        //            objjson.data = null;
        //            return objjson;
        //        }
        //        else
        //        {
        //            objjson.code = "0";
        //            objjson.count = 1;
        //            objjson.Message = "获取成功";
        //            objjson.data = dt_Main;
        //            return objjson;
        //        }
        //    }
        //    catch (Exception e)
        //    {
        //        objjson.code = "0";
        //        objjson.count = 0;
        //        objjson.Message = "获取失败" + e.ToString();
        //        objjson.data = null;
        //        return objjson;
        //    }
        //}
        /// <summary>
        /// 登录
        /// </summary>
@@ -128,7 +238,7 @@

                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "登录异常！"+e.Message;
                objjson.Message = "登录异常！" + e.Message;
                objjson.data = null;
                return objjson; ;
            }
@@ -209,7 +319,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "删除失败！"; 
                    objJsonResult.Message = "删除失败！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -729,7 +839,7 @@
        /// <returns></returns>
        [Route("Web/GetStockPlaceList_Json_NEW")]
        [HttpGet]
        public object GetStockPlaceList_Json_NEW(string StockPlace, Int64 HWhID,Int64 HOrgID)
        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 + "";
@@ -913,7 +1023,8 @@
            }
            try
            {
                ds = webserver.GetEmployeeList(sWhere, ref DBUtility.ClsPub.sErrInfo);
                string sql = $"Select * from h_v_IF_Emp {sWhere} Order by HNumber";
                ds = oCN.RunProcReturn(sql, "h_v_IF_Emp");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
@@ -1637,7 +1748,7 @@
        /// <returns></returns>
        [Route("DeltetGy_BadReason")]
        [HttpGet]
        public object DeltetGy_BadReason(string HItemID,string user)
        public object DeltetGy_BadReason(string HItemID, string user)
        {
            DataSet ds;
            //string ModRightNameCheck = "Sc_ProcessReport_check";
@@ -2099,7 +2210,7 @@

        [Route("Web/GetClassTimePrjGroupBillList_Json")]
        [HttpGet]
        public object GetClassTimePrjGroupBillList_Json(string sWhere,string user)
        public object GetClassTimePrjGroupBillList_Json(string sWhere, string user)
        {
            if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj", 1, false, user))
            {
@@ -2153,6 +2264,58 @@
                return objjson;
            }
        }
        /// <summary>
        /// 核算方式组编辑
        /// </summary>
        /// <param name="sWhere"></param>
        /// <param name="user"></param>
        /// <returns></returns>
        [Route("Web/GetClassTimePrjGroupBillEdit_Json")]
        [HttpGet]
        public object GetClassTimePrjGroupBillEdit_Json(string sWhere)
        {
            //if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj", 1, false, user))
            //{
            //    objJsonResult.code = "0";
            //    objJsonResult.count = 0;
            //    objJsonResult.Message = "没有查看权限";
            //    objJsonResult.data = null;
            //    return objJsonResult;
            //}
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = "select a.HNumber,a.HName,a.HDeptID,b.HName as 仓库名称 from  Gy_ClassTimePrjGroup a left join Gy_Department b on a.HDeptID = b.HItemID where a.hitemid = " + sWhere;
                ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
                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;
            }
        }


        #region 删除核算方式组
        /// <summary>
        /// 核算方式列表删除按钮
@@ -2201,9 +2364,9 @@
        /// <returns></returns>
        [Route("Web/SaveGetClassTimePrjGroupList")]
        [HttpGet]
        public object SaveGetClassTimePrjGroupList(string HNumber,string HName,string HDeptID,string refSav,string user,string HItem)
        public object SaveGetClassTimePrjGroupList(string HNumber, string HName, string HDeptID, string refSav, string user, string HItem)
        {
           

            try
            {
                int HItemID = int.Parse(HItem);
@@ -2216,18 +2379,18 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql="";
                if (refSav== "Add")
                string sql = "";
                if (refSav == "Add")
                {
                  sql = "Insert Into Gy_ClassTimePrjGroup   " +
                "(HNumber,HName,HStopflag,HRemark,HShortNumber,HParentID,HLevel" +
                ",HEndFlag,HHelpCode,HDeptID,HGroupID,HUseFlag" +
                ") " +
                " values('" + HNumber + "','" + HName + "','','',0,0,0,0,''," + HDeptID + ",0,'未使用'" + ") ";
                    sql = "Insert Into Gy_ClassTimePrjGroup   " +
                  "(HNumber,HName,HStopflag,HRemark,HShortNumber,HParentID,HLevel" +
                  ",HEndFlag,HHelpCode,HDeptID,HGroupID,HUseFlag" +
                  ") " +
                  " values('" + HNumber + "','" + HName + "','','',0,0,0,0,''," + HDeptID + ",0,'未使用'" + ") ";
                }
                else
                {
                    sql = "UpDate Gy_ClassTimePrjGroup set HNumber='" + HNumber + "',HName='" + HName + "',HDeptID=" + HDeptID+ " where HItemID="+ HItemID;
                    sql = "UpDate Gy_ClassTimePrjGroup set HNumber='" + HNumber + "',HName='" + HName + "',HDeptID=" + HDeptID + " where HItemID=" + HItemID;
                }
                oCN.RunProc(sql);
                objJsonResult.code = "1";
@@ -2713,7 +2876,7 @@
        [HttpGet]
        public object GetMaintainItemtemByMouldProjectID(int MouldProjectID)
        {
            

            if (MouldProjectID <= 0)
            {
                objjson.code = "0";
@@ -2825,7 +2988,7 @@
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = string.Format(@"select * from h_v_Sc_MouldDotCheckRuleBillList ");
                ds = oCN.RunProcReturn(sql+sWhere, "h_v_Sc_MouldDotCheckRuleBillList");
                ds = oCN.RunProcReturn(sql + sWhere, "h_v_Sc_MouldDotCheckRuleBillList");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
@@ -2853,7 +3016,7 @@
            }
        }

         /// <summary>
        /// <summary>
        /// 根据设备显示设备保养规程项目
        /// </summary>
        /// <returns></returns>
@@ -2931,7 +3094,7 @@
                                                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 );
                                                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
@@ -2979,7 +3142,7 @@
            {
                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 
                                    b.HManagerID,e.HNumber HManagerCode,e.HName HManagerName,b.HRemark,a.HInterID,a.HBillNo 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
@@ -3063,8 +3226,8 @@
                return objjson;
            }
        }
        
        


        /// <summary>
        /// 获取维修项目列表
        /// </summary>
@@ -3289,7 +3452,7 @@
            WebS.WebService1 oWebs = new WebS.WebService1();
            try
            {
                ds = oWebs.GetKf_PonderationBillMain_TempList_New (HBillType, sHMaker, HOrgID);
                ds = oWebs.GetKf_PonderationBillMain_TempList_New(HBillType, sHMaker, HOrgID);
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
@@ -3319,7 +3482,62 @@
        }


        #region PDA其他入库列表模块
        /// <summary>
        /// 其他入库缓存列表刷新信息
        /// </summary>
        /// <param name="HBillType"></param>
        /// <param name="sHMaker"></param>
        /// <param name="HOrgID"></param>
        /// <returns></returns>
        [Route("Web/GetOtherInBillMain_TempList_New")]
        [HttpGet]
        public object GetOtherInBillMain_TempList_New (string HBillType, string sHMaker, Int64 HOrgID)
        {
            WebS.WebService1 oWebs = new WebS.WebService1();
            try
            {
                List<object> columnNameList = new List<object>();
                
                DataSet ds = oCN.RunProcReturn("exec h_p_KF_GetPonderationBillMain_TempList_New1 '" + HBillType + "','" + sHMaker + "'," + HOrgID.ToString(), "h_p_KF_GetPonderationBillMain_TempList_New1");
                
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.data = 0;
                    return objJsonResult;
                    //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }

}