tangdi před 2 roky
rodič
revize
1a9cfcc4f6

+ 2 - 2
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -543,7 +543,7 @@ namespace Business.ResourceExamineManagement
                 }
                 
                 //获取订单行数据
-                sentrys = await _mysql_crm_seorderentry.GetListAsync(p => input.sorderId.Contains(p.seorder_id.GetValueOrDefault()) && !p.IsDeleted);
+                sentrys = await _mysql_crm_seorderentry.GetListAsync(p => input.sorderId.Contains(p.seorder_id.GetValueOrDefault()) && (p.progress=="1" || p.progress == "2") && !p.IsDeleted);
                 if (!sentrys.Any())
                 {
                     new NLogHelper("ResourceExamineAppService").WriteLog("ReceiveResult", "订单行数据不存在", _currentTenant.Id.ToString());
@@ -553,7 +553,7 @@ namespace Business.ResourceExamineManagement
             }
             else {
                 //获取订单行数据
-                sentrys = await _mysql_crm_seorderentry.GetListAsync(p => input.sorderId.Contains(p.Id) && !p.IsDeleted);
+                sentrys = await _mysql_crm_seorderentry.GetListAsync(p => input.sorderId.Contains(p.Id) && (p.progress == "1" || p.progress == "2") && !p.IsDeleted);
                 if (!sentrys.Any())
                 {
                     new NLogHelper("ResourceExamineAppService").WriteLog("ReceiveResult", "订单行数据不存在", _currentTenant.Id.ToString());

+ 2 - 2
MicroServices/Business/Bussiness.Model/Base/BaseEntity.cs

@@ -76,12 +76,12 @@ namespace Business.Model
         [Comment("租户ID")]
         public virtual long tenant_id { get; set; }
 
-        /// <summary>
+       /* /// <summary>
         /// 公司ID
         /// </summary>
         [Required]
         [Comment("公司ID")]
-        public virtual long company_id { get; set; }
+        public virtual long company_id { get; set; }*/
 
         /// <summary>
         /// 工厂ID