amigotrip 2 lat temu
rodzic
commit
88c29bb23d

+ 3 - 2
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -11371,11 +11371,12 @@ ORDER by  gctggrc.id DESC
                     else transStrRes1 += $"{str1}|";
 
                 }
-                string transStrRes = "0 & Provincial Health & Health Commission Deputy Director | 1 & Provincial People's Hospital & Provincial People's Hospital Chief Accountant | 2 & Secretary of the Party Committee of the Affiliated Hospital of North Sichuan Medical College & North Sichuan Medical College | 3 & Provincial Health Commission Planning & Provincial Health Commission Planning and Information Division Director | 4 &-& Deputy Director | 5 & Provincial Health Commission population and Family Division & Provincial Health Commission population and Family Division Director";
+                //string transStrRes = "0 & Provincial Health & Health Commission Deputy Director | 1 & Provincial People's Hospital & Provincial People's Hospital Chief Accountant | 2 & Secretary of the Party Committee of the Affiliated Hospital of North Sichuan Medical College & North Sichuan Medical College | 3 & Provincial Health Commission Planning & Provincial Health Commission Planning and Information Division Director | 4 &-& Deputy Director | 5 & Provincial Health Commission population and Family Division & Provincial Health Commission population and Family Division Director";
+                string transStrRes = "";
 
                 if (transStrRes1.Length > 0 )
                 {
-                    //transStrRes = await _juHeApi.GetTextTranslateAsync(transStrRes1);
+                    transStrRes = await _juHeApi.GetTextTranslateAsync(transStrRes1);
                 }
                 //0、 Deputy Director of the Provincial Health and Health Commission | 1、 Chief Accountant of the provincial People's Hospital | 2、 Secretary of the Party Committee of the Affiliated Hospital of North Sichuan Medical College | 3、 Director of the Planning and Information Department of the Provincial Health and Health Commission | 4、 Deputy Director | 5、 Director of the population and Family Department of the Provincial Health and Health Commission | 3、 Secretary of the Party Committee of the Affiliated Hospital of North Sichuan Medical College | 4、 Deputy Director of the Planning and Information Department of the Provincial Health and Health Commission | 4、 Deputy Director of the population and Family Department of the Provincial Health and Health Commission | 5、 Director of the population and Family Department of the Provincial Health and Health Commission
                 //await _juHeApi.GetTextTranslateAsync(DcList[i].CompanyFullName.ToString().Trim()) ?? "";

+ 1 - 7
OASystem/OASystem.Domain/Entities/Financial/Fin_ForeignReceivables.cs

@@ -94,13 +94,7 @@ namespace OASystem.Domain.Entities.Financial
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int AddingWay { get; set; }
 
-        /// <summary>
-        /// 是否可审核 AddingWay==2 该项有值
-        /// 0 - 否 1 - 是
-        /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
-        public int IsAudit { get; set; } = 0;
-
+        
         /// <summary>
         /// 审核状态 AddingWay==2该项有值
         /// 0 - 未审核 1 - 审核通过 2 - 审核不通过

+ 1 - 7
OASystem/OASystem.Infrastructure/Repositories/Financial/ForeignReceivablesRepository.cs

@@ -387,7 +387,6 @@ Where ffr.IsDel=0 And ffr.Diid={0}", dto.DiId);
                         Rate = item.Rate,
                         Currency = item.Currency,
                         AddingWay = item.AddingWay,
-                        IsAudit = item.AddingWay == 2 ? 1 : 0,
                         CreateUserId = dto.UserId,
                         CreateTime = DateTime.Now,
                         Remark = item.Remark
@@ -430,12 +429,7 @@ Where ffr.IsDel=0 And ffr.Diid={0}", dto.DiId);
                 result.Msg = "该条数据类型不是“实际报价”类型不可审核!";
                 return result;
             }
-            if (info.IsAudit == 0)
-            {
-                result.Msg = "该条数据类型不可审核!";
-                return result;
-            }
-
+           
             var AuditStatus = await _sqlSugar.Updateable<Fin_ForeignReceivables>()
                                       .SetColumns(a => new Fin_ForeignReceivables
                                       {