修改了 夏宝 车间看板 采购看板 缺料看板 根据系统设置默认车间过滤功能

ch

2022-07-12 08665ff78fbc131fd647fad4ba48742faec53529

 WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs

@@ -26,36 +26,47 @@
        /// </summary>
        [Route("Gy_WorkCenter/list")]
        [HttpGet]
        public object list(string sWhere)
        public object list(string sWhere,string user)
        {
            try
            {
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Gy_WorkCenter", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_WorkCenterList " + sWhere, "h_v_WorkCenterList");
                    ds = oCN.RunProcReturn("select * from h_v_WorkCenterList order by 工作中心代码 ", "h_v_WorkCenterList");
                }
                else
                {
                    string sql1 = "select * from h_v_WorkCenterList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by 工作中心代码 ";
                    ds = oCN.RunProcReturn(sql, "h_v_WorkCenterList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }

                //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 e)
            {
@@ -227,15 +238,26 @@
                DAL.ClsGy_WorkCenter_View oDeptHlp = new DAL.ClsGy_WorkCenter_View();

                var _value = oMain["oMain"].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();
                //string msg4 = sArray[2].ToString();
                //string msg5 = sArray[3].ToString();

                //判断是否有编辑权限
                if (!DBUtility.ClsPub.Security_Log("Gy_WorkCenter_Edit", 1, false, msg2))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无编辑权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
                List<Gy_WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkCenter>>(msg2);
                msg1 = "[" + msg1.ToString() + "]";
                List<Gy_WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkCenter>>(msg1);

                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
@@ -255,16 +277,17 @@
                var HProcID = list[0].HProcID;
                var HLevel = list[0].HLevel;
                var HWorkTimes = list[0].HWorkTimes;
                int HUSEORGID = list[0].HUSEORGID;

                ////判断权限
                //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "没有找到该功能模块！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //判断权限
                if (!ClsPub.Security_Log("Gy_WorkCenter_Edit", 1, false, msg2))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有找到该功能模块！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //if (!DBUtility.ClsPub.AllowNumber(HNumber))
                //{
@@ -292,11 +315,11 @@
                   " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                   ",HDeptNumber,HWorkTimes,HQty" +
                   ",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase" +
                   ",HProcID,HDayMoney) " +
                   ",HProcID,HDayMoney,HUSEORGID) " +
                   " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
                    ",'" + HDeptNumber + "'," + HWorkTimes + "," + HQty +
                    "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) +
                    ",'" + HRemark + "'," + HDeptID + ",'" + HBarCodeForBase + "'," + HProcID + "," + HDayMoney + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    ",'" + HRemark + "'," + HDeptID + ",'" + HBarCodeForBase + "'," + HProcID + "," + HDayMoney + ","+ HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCN.RunProc("Update  Gy_WorkCenter set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();
@@ -375,7 +398,7 @@
        //var HWorkTimes = list[0].HWorkTimes;

        //        //判断权限
        //        //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
        //        //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
        //        //{
        //        //    objJsonResult.code = "0";
        //        //    objJsonResult.count = 0;
@@ -442,22 +465,21 @@
        /// <returns></returns>
        [Route("DeltetGy_WorkCenter")]
        [HttpGet]
        public object DeltetGy_WorkCenter(string HItemID)
        public object DeltetGy_WorkCenter(string HItemID,string user)
        {
            DataSet ds;
            DataSet ds1;
            //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_WorkCenter_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))
@@ -568,7 +590,7 @@
            DAL.ClsGy_WorkCenter_View oDeptHlp = new DAL.ClsGy_WorkCenter_View();
            try
            {
                if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
                if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;