From a311452ab264e2c7bd54ad5b9e5512c45fc00529 Mon Sep 17 00:00:00 2001
From: bairubing <nhybrb727@163.com>
Date: Fri, 22 Nov 2024 14:52:16 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=98=AD=E4=BF=AE=E6=94=B9ecn=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Vistar.Application/Entity/Obj119.cs       | 465 ++++++++++++++++++
 .../ChangeNoticeEcn/ChangeNoticeEcnService.cs |   4 +-
 2 files changed, 467 insertions(+), 2 deletions(-)
 create mode 100644 admin.net.pro/Admin.NET/Vistar.Application/Entity/Obj119.cs

diff --git a/admin.net.pro/Admin.NET/Vistar.Application/Entity/Obj119.cs b/admin.net.pro/Admin.NET/Vistar.Application/Entity/Obj119.cs
new file mode 100644
index 0000000..ebe31a5
--- /dev/null
+++ b/admin.net.pro/Admin.NET/Vistar.Application/Entity/Obj119.cs
@@ -0,0 +1,465 @@
+// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
+//
+// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
+//
+// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
+
+using Admin.NET.Core;
+using SqlSugar;
+using System.ComponentModel.DataAnnotations;
+namespace Vistar.Application.Entity;
+
+/// <summary>
+/// 研发采购申请
+/// </summary>
+[SugarTable("OBJ119","")]
+[Tenant("启威星 1.94.4.74")]
+public class Obj119
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Required]
+    [SugarColumn(ColumnName = "idRecord", IsIdentity = true, ColumnDescription = "", IsPrimaryKey = true)]
+    public long idRecord { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "CheckedStatus", ColumnDescription = "")]
+    public bool? CheckedStatus { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "VersionIndex", ColumnDescription = "")]
+    public int? VersionIndex { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "IsLatestVersion", ColumnDescription = "")]
+    public bool? IsLatestVersion { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "CreatedDate", ColumnDescription = "")]
+    public DateTime? CreatedDate { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "VersionCreatedDate", ColumnDescription = "")]
+    public DateTime? VersionCreatedDate { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "dateModified", ColumnDescription = "")]
+    public DateTime? dateModified { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "UserCreatedId", ColumnDescription = "")]
+    public long? UserCreatedId { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "VersionUserCreatedId", ColumnDescription = "")]
+    public long? VersionUserCreatedId { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "UserModifiedId", ColumnDescription = "")]
+    public long? UserModifiedId { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "RecordGuid", ColumnDescription = "", Length = 40)]
+    public string? RecordGuid { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "isVisibilityNormal", ColumnDescription = "")]
+    public bool? isVisibilityNormal { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "deleted", ColumnDescription = "")]
+    public bool? deleted { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "SubObjectGuid", ColumnDescription = "", Length = 40)]
+    public string? SubObjectGuid { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "PreviousStatus", ColumnDescription = "")]
+    public bool? PreviousStatus { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "revision", ColumnDescription = "", Length = 10)]
+    public string? revision { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "Record_image160_160", ColumnDescription = "")]
+    public byte[]? Record_image160_160 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "Record_Image320_240", ColumnDescription = "")]
+    public byte[]? Record_Image320_240 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "Record_ImageMax", ColumnDescription = "")]
+    public byte[]? Record_ImageMax { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "_System_objNBS", ColumnDescription = "", Length = 100)]
+    public string? _System_objNBS { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "_System_ObjDescription", ColumnDescription = "", Length = 200)]
+    public string? _System_ObjDescription { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "_System_Effectivity_Begin", ColumnDescription = "")]
+    public DateTime? _System_Effectivity_Begin { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "_System_Effectivity_End", ColumnDescription = "")]
+    public DateTime? _System_Effectivity_End { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "CheckedOutPc", ColumnDescription = "", Length = 255)]
+    public string? CheckedOutPc { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "StageId", ColumnDescription = "")]
+    public long? StageId { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "ProjectManager", ColumnDescription = "")]
+    public long? ProjectManager { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "ProjectManager_Rec", ColumnDescription = "")]
+    public long? ProjectManager_Rec { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "EnableNotifications", ColumnDescription = "")]
+    public bool? EnableNotifications { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "GroupObjId", ColumnDescription = "")]
+    public long? GroupObjId { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "_CheckOutInProgress", ColumnDescription = "")]
+    public bool? _CheckOutInProgress { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "_System_CurrentStage", ColumnDescription = "", Length = 250)]
+    public string? _System_CurrentStage { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [Required]
+    [SugarColumn(ColumnName = "_System_ObjNbsAuto", ColumnDescription = "", Length = 50)]
+    public string _System_ObjNbsAuto { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "isReleasedVersion", ColumnDescription = "")]
+    public bool? isReleasedVersion { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "_System_WebLink", ColumnDescription = "", Length = 500)]
+    public string? _System_WebLink { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "_System_ObjParentProcess", ColumnDescription = "")]
+    public long? _System_ObjParentProcess { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "_System_ObjParentProcess_Rec", ColumnDescription = "", Length = 40)]
+    public string? _System_ObjParentProcess_Rec { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld004639", ColumnDescription = "")]
+    public long? fld004639 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld004639_Rec", ColumnDescription = "", Length = 40)]
+    public string? fld004639_Rec { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld005922", ColumnDescription = "")]
+    public long? fld005922 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld005922_Rec", ColumnDescription = "", Length = 40)]
+    public string? fld005922_Rec { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld005923", ColumnDescription = "")]
+    public DateTime? fld005923 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld005924", ColumnDescription = "")]
+    public long? fld005924 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld005924_Rec", ColumnDescription = "", Length = 40)]
+    public string? fld005924_Rec { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld005925", ColumnDescription = "")]
+    public DateTime? fld005925 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld005926", ColumnDescription = "", Length = -1)]
+    public string? fld005926 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld005927", ColumnDescription = "", Length = -1)]
+    public string? fld005927 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld005928", ColumnDescription = "")]
+    public long? fld005928 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld005928_Rec", ColumnDescription = "", Length = 40)]
+    public string? fld005928_Rec { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld005929", ColumnDescription = "")]
+    public DateTime? fld005929 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld005930", ColumnDescription = "", Length = -1)]
+    public string? fld005930 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld005931", ColumnDescription = "", Length = -1)]
+    public string? fld005931 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld005932", ColumnDescription = "")]
+    public long? fld005932 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld005932_Rec", ColumnDescription = "", Length = 40)]
+    public string? fld005932_Rec { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld005933", ColumnDescription = "", Length = -1)]
+    public string? fld005933 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld005934", ColumnDescription = "")]
+    public DateTime? fld005934 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld005935", ColumnDescription = "", Length = -1)]
+    public string? fld005935 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld005936", ColumnDescription = "")]
+    public DateTime? fld005936 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld005944", ColumnDescription = "", Length = -1)]
+    public string? fld005944 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld005971", ColumnDescription = "")]
+    public double? fld005971 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld005972", ColumnDescription = "", Length = -1)]
+    public string? fld005972 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld006039", ColumnDescription = "")]
+    public long? fld006039 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld006039_Rec", ColumnDescription = "", Length = 40)]
+    public string? fld006039_Rec { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld006040", ColumnDescription = "")]
+    public DateTime? fld006040 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld006041", ColumnDescription = "", Length = -1)]
+    public string? fld006041 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld006054", ColumnDescription = "", Length = -1)]
+    public string? fld006054 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld006125", ColumnDescription = "", Length = -1)]
+    public string? fld006125 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld006126", ColumnDescription = "", Length = -1)]
+    public string? fld006126 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld006137", ColumnDescription = "", Length = -1)]
+    public string? fld006137 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld006138", ColumnDescription = "", Length = -1)]
+    public string? fld006138 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld006139", ColumnDescription = "", Length = -1)]
+    public string? fld006139 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld006311", ColumnDescription = "", Length = -1)]
+    public string? fld006311 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld006312", ColumnDescription = "", Length = -1)]
+    public string? fld006312 { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld006313", ColumnDescription = "", Length = -1)]
+    public string? fld006313 { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarColumn(ColumnName = "fld006416", ColumnDescription = "", Length = -1)]
+    public string? fld006416 { get; set; }
+    
+}
diff --git a/admin.net.pro/Admin.NET/Vistar.Application/Service/ChangeNoticeEcn/ChangeNoticeEcnService.cs b/admin.net.pro/Admin.NET/Vistar.Application/Service/ChangeNoticeEcn/ChangeNoticeEcnService.cs
index de6fdc2..c73e4c0 100644
--- a/admin.net.pro/Admin.NET/Vistar.Application/Service/ChangeNoticeEcn/ChangeNoticeEcnService.cs
+++ b/admin.net.pro/Admin.NET/Vistar.Application/Service/ChangeNoticeEcn/ChangeNoticeEcnService.cs
@@ -59,7 +59,7 @@ public class ChangeNoticeEcnService : IDynamicApiController, ITransient
     public async Task<SqlSugarPagedList<ChangeNoticeEcnOutput>> Page(PageChangeNoticeEcnInput input)
     {
         var query = await _obj118Rep.AsQueryable()
-            .Where(x => (x.CheckedStatus == 1 || x.CheckedStatus == 0) && x.deleted == false && x.IsLatestVersion == true && x._System_CurrentStage == "结束")
+            .Where(x => x.CheckedStatus == 0 && x.deleted == false && x.IsLatestVersion == true && x._System_CurrentStage == "结束")
             .WhereIF(!string.IsNullOrWhiteSpace(input._System_objNBS), u => u._System_objNBS.Contains(input._System_objNBS.Trim()))
             .WhereIF(input.fld004693Range != null && input.fld004693Range.Length == 2, u => u.fld004693 >= input.fld004693Range[0] && u.fld004693 <= input.fld004693Range[1])
             .Select<ChangeNoticeEcnOutput>()
@@ -199,7 +199,7 @@ public class ChangeNoticeEcnService : IDynamicApiController, ITransient
     public async Task<List<SapOutput>> TimingSyncToSAP()
     {
         var input = await _obj118Rep.AsQueryable()
-            .Where(x => (x.CheckedStatus == 1 || x.CheckedStatus == 0) && x._System_CurrentStage == "结束" && x.deleted == false && x.IsLatestVersion == true && x.fld005292 == "A")
+            .Where(x => x.CheckedStatus == 0 && x._System_CurrentStage == "结束" && x.deleted == false && x.IsLatestVersion == true && x.fld005292 == "A")
             .ToListAsync();
         var SapOutputList = new List<SapOutput>();
         var Requser = await _sysConfigService.GetConfigValueByCode<string>(ConfigConst.SapUserName);