合并

ch

2022-02-07 f440eeb72f93587ae29089209710582cda9f384e

 WebAPI/Controllers/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Sc_MESStopStepWorkBillController.cs

@@ -30,10 +30,20 @@
        #region åœå·¥å•(走工序)列表
        [Route("Sc_MESStopStepWorkBill/list")]
        [HttpGet]
        public object list(string sWhere)
        public object list(string sWhere,string user)
        {
            try
            {
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("MES_MESStopWorkBill_Query", 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_Sc_MESStopWorkBillList_NEW " + sWhere, "h_v_Sc_MESStopWorkBillList_NEW");
@@ -192,7 +202,7 @@
        {
            DBUtility.ClsPub.CurUserName = UserName;
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log_second("MES_MESStopWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
            if (!DBUtility.ClsPub.Security_Log_second("MES_MESStopWorkBill_Drop", 1, false, DBUtility.ClsPub.CurUserName))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;