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

杨乐

2022-01-19 76ffaf6c0b670ca779523ff22fbfb536bb45bf71

 WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs

@@ -46,7 +46,7 @@
            string refSav = sArray[2].ToString();
            DBUtility.ClsPub.CurUserName = UserName;
            //保存权限
            if (!DBUtility.ClsPub.Security_Log_second("OA_ErrMsgBackBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
            if (!DBUtility.ClsPub.Security_Log_second("OA_ErrMsgBackBill_Edit", 1, false, DBUtility.ClsPub.CurUserName))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -140,14 +140,24 @@
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    string[] arrStr = oItem.HCopyMan.Split(',');
                   
                    //接收人表体数据
                    
                    //string[] arrStr = oItem.HSendMan.Split(','); //发送人
                    //arrStr = oItem.HReceiveMan.Split(',');  //接收人
                    string[] arrStr = oItem.HCopyMan.Split(',');  //抄送人
                    List<string> b = new List<string>(arrStr);
                    b.Add(oItem.HSendMan);
                    b.Add(oItem.HReceiveMan);
                    arrStr = b.ToArray();
                    //抄送人表体数据
                    for (int i = 1; i <= arrStr.Length; i++)
                    {
                        Models.ClsOA_ErrMsgBackBillSub2 sb = new Models.ClsOA_ErrMsgBackBillSub2();
                        sb.HEntryID = i;
                        sb.HReceiveMan = arrStr[i - 1];
                        if (arrStr[i-1].ToString() == oItem.HSendMan)
                        {
                            sb.HReadFlag = true;
                        }
                        oBill.DetailColl2.Add(sb);
                    }
                    oBill.omodel = oItem;
@@ -231,7 +241,7 @@
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -459,7 +469,7 @@
        public object Get_DeleteTransFerBill(string HInterID,string HEntryID, string user)
        {
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log_second("OA_ErrMsgBackBill_Delete", 1, true, user))
            if (!DBUtility.ClsPub.Security_Log_second("OA_ErrMsgBackBill_Delete", 1, false, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;