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

杨乐

2022-02-07 e92bfb9489b512afeec6869647c6101601b45ce3

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

@@ -40,10 +40,19 @@

        [Route("Sc_MESBeginStepWorkBill/GetMESBeginStepWorkBill")]
        [HttpGet]
        public object GetMESBeginStepWorkBill(string sWhere)
        public object GetMESBeginStepWorkBill(string sWhere,string user)
        {
            try
            {
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("MES_MESBeginWorkBill_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查询权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = Sc_GetMESBeginStepWorkBill(sWhere);
                objJsonResult.code = "1";
@@ -107,7 +116,7 @@
        {
            DBUtility.ClsPub.CurUserName = UserName;
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log_second("MES_MESBeginWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
            if (!DBUtility.ClsPub.Security_Log_second("MES_MESBeginWorkBill_Drop", 1, false, DBUtility.ClsPub.CurUserName))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -1003,6 +1012,16 @@
        {
            try
            {
                //判断是否有删除权限
                if (!DBUtility.ClsPub.Security_Log("MES_ProcExchReport_Drop", 1, false, UserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限删除!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCN.BeginTran();
                //删除工序汇报子表
                string sql1 = string.Format(@"delete Sc_ProcessReportSub  where HInterID='"+HInterID+"' and   HICMOInterID='" + HICMOInterID + "' and HICMOEntryID='" + HICMOEntryID + "'");
@@ -1153,10 +1172,21 @@
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string refSav = sArray[1].ToString();
            string user = sArray[2].ToString();//用户名
            string s = "";
            ListModels oListModels = new ListModels();
            try
            {
                //判断是否有编辑权限
                if (!DBUtility.ClsPub.Security_Log("MES_ProcExchReport_Edit",1,false,user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限编辑!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                DLL.ClsSc_ICMOStepBillWorkQtyStatus_Tmp oBill = new DLL.ClsSc_ICMOStepBillWorkQtyStatus_Tmp();
                List<Models.ClsSc_ICMOBillWorkQtyStatus_Tmp> lsmain = new List<Models.ClsSc_ICMOBillWorkQtyStatus_Tmp>();
                msg2 = msg2.Replace("\\", "");