فهرست منبع

数据库转换同步,租户id变更

Pengxy 1 ماه پیش
والد
کامیت
5318628d85
49فایلهای تغییر یافته به همراه1089 افزوده شده و 368 حذف شده
  1. 152 152
      MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs
  2. 137 137
      MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs
  3. 36 19
      MicroServices/Business/Business.Application/SystemJobManagement/SystemJobAppService.cs
  4. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ASNBOLShipperDetail.cs
  5. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ASNBOLShipperMaster.cs
  6. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ConfigurationItem.cs
  7. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/MES/IC/CustMaster.cs
  8. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/MES/IC/GeneralizedCodeMaster.cs
  9. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/MES/IC/InvMaster.cs
  10. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/MES/IC/InvTransHist.cs
  11. 8 2
      MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ItemMaster.cs
  12. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ItemPackMaster.cs
  13. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/MES/IC/LocationDetail.cs
  14. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/MES/IC/NbrDetail.cs
  15. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/MES/IC/NbrMaster.cs
  16. 9 3
      MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ProductStructureMaster.cs
  17. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ProductStructureOp.cs
  18. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/MES/IC/PurOrdDetail.cs
  19. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/MES/IC/PurOrdDetailBatch.cs
  20. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/MES/IC/PurOrdMaster.cs
  21. 4 5
      MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ic_bom.cs
  22. 237 3
      MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ic_item.cs
  23. 3 3
      MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ic_substitute_group_detail.cs
  24. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/MES/IC/srm_polist_ds.cs
  25. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/Production/DeliveryExceptionMaster.cs
  26. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/Production/HolidayMaster.cs
  27. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/Production/LineMaster.cs
  28. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/Production/PeriodSequenceDet.cs
  29. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/Production/PriorityCode.cs
  30. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/Production/ProdLineDetail.cs
  31. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/Production/QualityLineWorkDetail.cs
  32. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/Production/RoutingOpDetail.cs
  33. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/Production/ScheduleResultOpMaster.cs
  34. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/Production/ShopCalendarWorkCtr.cs
  35. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/Production/WorkOrdDetail.cs
  36. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/Production/WorkOrdMaster.cs
  37. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/Production/WorkOrdRouting.cs
  38. 6 0
      MicroServices/Business/Business.Domain/StructuredDB/Production/mes_moentry.cs
  39. 12 4
      MicroServices/Business/Business.Domain/StructuredDB/Production/mes_morder.cs
  40. 46 0
      MicroServices/Business/Business.Domain/StructuredDB/SRM/srm_purchase.cs
  41. 6 0
      MicroServices/Business/Business.Domain/StructuredDB/SRM/srm_supplier.cs
  42. 5 1
      MicroServices/Business/Business.Domain/StructuredDB/Sale/TagMaster.cs
  43. 35 1
      MicroServices/Business/Business.Domain/StructuredDB/Sale/crm_seorder.cs
  44. 6 0
      MicroServices/Business/Business.Domain/StructuredDB/Sale/crm_seorderentry.cs
  45. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/WMS/EmpWorkDutyMaster.cs
  46. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/WMS/EmployeeMaster.cs
  47. 7 1
      MicroServices/Business/Business.Domain/StructuredDB/WMS/SAPInv.cs
  48. 13 6
      MicroServices/Business/Business.Host/appsettings.json
  49. 150 0
      MicroServices/Business/QuartzSettings/logs/logs.txt

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 152 - 152
MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 137 - 137
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs


+ 36 - 19
MicroServices/Business/Business.Application/SystemJobManagement/SystemJobAppService.cs

@@ -283,8 +283,25 @@ namespace Business.SystemJobManagement
                     //先清空表数据
                     await MongoHelper<mo_srm_purchase>.DeleteManyAsync(p => p.mysql_id != -1);
                     var mosrm_purchase = ObjectMapper.Map<List<srm_purchase>, List<mo_srm_purchase>>(srm_purchases);
-                    mosrm_purchase.ForEach(s => s.GenerateNewId(help.NextId()));
-                    await MongoHelper<mo_srm_purchase>.InsertManyAsync(mosrm_purchase);
+                    //Mongo 唯一索引: number + supplier_number + tenant_id + factory_id,先过滤空键并去重
+                    var validSrmPurchase = mosrm_purchase
+                        .Where(p => !string.IsNullOrWhiteSpace(p.number)
+                                    && !string.IsNullOrWhiteSpace(p.supplier_number)
+                                    && p.factory_id.HasValue)
+                        .GroupBy(p => new
+                        {
+                            number = p.number.Trim(),
+                            supplier_number = p.supplier_number.Trim(),
+                            p.tenant_id,
+                            factory_id = p.factory_id.GetValueOrDefault()
+                        })
+                        .Select(g => g.OrderByDescending(x => x.update_time ?? x.create_time ?? DateTime.MinValue).First())
+                        .ToList();
+                    if (validSrmPurchase.Any())
+                    {
+                        validSrmPurchase.ForEach(s => s.GenerateNewId(help.NextId()));
+                        await MongoHelper<mo_srm_purchase>.InsertManyAsync(validSrmPurchase);
+                    }
                 }
                 //同步物料BOM明细数据
                 var icbom_childs = _mysql_ic_bom_child.GetListAsync().Result;
@@ -381,9 +398,9 @@ namespace Business.SystemJobManagement
             {
                 for (int i = 0; i < custList.Count; i++)
                 {
-                    long domain = Convert.ToInt64(custList[i].Domain);
-                    long factory_id = domain;
-                    long tenant_id = 1000;
+                    //long domain = Convert.ToInt64((string.IsNullOrEmpty(custList[i].Domain)?"8010": custList[i].Domain));
+                    //long factory_id = domain;
+                    long tenant_id = custList[i].tenant_id.GetValueOrDefault();
                     var cust = customerList.Find(x => x.customer_no == custList[i].Cust);
                     if (cust is null)
                     {
@@ -405,7 +422,7 @@ namespace Business.SystemJobManagement
                             carrying_aos = custList[i].CustShippingLT.GetValueOrDefault(),
                             currency = custList[i].Curr,
                             employee_name = custList[i].Salesperson1,
-                            factory_id = factory_id,
+                            //factory_id = factory_id,
                             tenant_id = tenant_id,
                             company_id = tenant_id
                         };
@@ -952,11 +969,11 @@ namespace Business.SystemJobManagement
                             allowserial = custList[i].LotSerialControl ? 1 : 0,//序列号管理
                             photo = "",//图片
                             enable_warning = 1,//启用预警
-                            factory_id = long.Parse(custList[i].Domain),
+                            //factory_id = long.Parse(custList[i].Domain),
                             company_id = 1000,
-                            tenant_id = 1000,
+                            tenant_id = custList[i].tenant_id,
                             IsDeleted = false,
-                            clean_leadtime = custList[i].MFGMTTR,
+                            clean_leadtime = custList[i].MFGMTTR.GetValueOrDefault(),
                             is_clean = custList[i].IssuePolicy ? 1 : 0,
                             batch_manager = custList[i].LotSerialControl ? 1 : 0,
                             minorderqty = custList[i].MinOrd,
@@ -992,7 +1009,7 @@ namespace Business.SystemJobManagement
                         ic_item.erp_cls_name = erpclsText;//物料属性名称
                         ic_item.unit = custList[i].UM;//单位
                         ic_item.is_clean = custList[i].IssuePolicy ? 1 : 0;
-                        ic_item.clean_leadtime = custList[i].MFGMTTR;
+                        ic_item.clean_leadtime = custList[i].MFGMTTR.GetValueOrDefault();
                         ic_item.PurLT = custList[i].PurLT;
                         ic_item.BOMDesignTime = custList[i].BOMDesignTime;
                         ic_item.RoutingDesignTime = custList[i].RoutingDesignTime;
@@ -1010,9 +1027,9 @@ namespace Business.SystemJobManagement
                         addStock.sqty = 0;
                         addStock.quantity_in_transit = 0;
                         addStock.fversion = "";
-                        addStock.factory_id = long.Parse(custList[i].Domain);
+                        //addStock.factory_id = long.Parse(custList[i].Domain);
                         addStock.company_id = 1000;
-                        addStock.tenant_id = 1000;
+                        addStock.tenant_id = custList[i].tenant_id;
                         addStock.create_time = DateTime.Now;
                         addStock.update_time = DateTime.Now;
                         addStock.create_by_name = "admin";
@@ -1053,8 +1070,8 @@ namespace Business.SystemJobManagement
                     }
                     if (icbom == null)
                     {
-                        long domain = Convert.ToInt64(ItemList.First().Domain);
-                        long factory_id = domain % 8010;
+                        //long domain = Convert.ToInt64(ItemList.First().Domain);
+                        //long factory_id = domain % 8010;
                         //long tenant_id = domain - factory_id;
                         var bom = new ic_bom(help.NextId())
                         {
@@ -1065,7 +1082,7 @@ namespace Business.SystemJobManagement
                             version = ItemList.First().Refs,
                             factory_id = item.factory_id,
                             company_id = item.company_id,
-                            tenant_id = item.company_id,
+                            tenant_id = item.tenant_id,
                             IsDeleted = false,
                             use_status = 1
                         };
@@ -1099,7 +1116,7 @@ namespace Business.SystemJobManagement
                                 version = child.Refs,
                                 factory_id = item.factory_id,
                                 company_id = item.company_id,
-                                tenant_id = item.company_id,
+                                tenant_id = item.tenant_id,
                                 IsDeleted = false,
                                 Op = child.Op,
                                 use_status = 1,
@@ -1146,7 +1163,7 @@ namespace Business.SystemJobManagement
                                     version = child.Refs,
                                     factory_id = item.factory_id,
                                     company_id = item.company_id,
-                                    tenant_id = item.company_id,
+                                    tenant_id = item.tenant_id,
                                     IsDeleted = false,
                                     Op = child.Op,
                                     use_status = 1,
@@ -1165,7 +1182,7 @@ namespace Business.SystemJobManagement
                                 icbomchild.version = child.Refs;
                                 icbomchild.factory_id = item.factory_id;
                                 icbomchild.company_id = item.company_id;
-                                icbomchild.tenant_id = item.company_id;
+                                icbomchild.tenant_id = item.tenant_id;
                                 icbomchild.Op = child.Op;
                                 //icbomchild.scrap = child.Scrap;
                                 icbomchild.scrap = scrap;
@@ -1230,7 +1247,7 @@ namespace Business.SystemJobManagement
                 //{
                 //    sysResult = SyncPurOrd(domain, companyid).Result;
                 //}
-                //return sysResult;
+                return sysResult;
             }
             catch (Exception ex)
             {

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ASNBOLShipperDetail.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -57,6 +57,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 发货日期
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ASNBOLShipperMaster.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// Id
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ConfigurationItem.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 配置Key
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/CustMaster.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 客户代码
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/GeneralizedCodeMaster.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 配置模块,DOP用DopConfig
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/InvMaster.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 库位
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/InvTransHist.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 类型
         /// </summary>

+ 8 - 2
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ItemMaster.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 物料编号
         /// </summary>
@@ -74,7 +80,7 @@ namespace Business.Domain
         /// <summary>
         /// 前处理天数
         /// </summary>
-        public decimal MFGMTTR { get; set; }
+        public int? MFGMTTR { get; set; }
         /// <summary>
         /// 是否前处理
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ItemPackMaster.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 物料编号
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/LocationDetail.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 库位
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/NbrDetail.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 类型
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/NbrMaster.cs

@@ -1,4 +1,4 @@
-using Amazon.Runtime.Internal.Util;
+using Amazon.Runtime.Internal.Util;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
@@ -28,6 +28,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 类型
         /// </summary>

+ 9 - 3
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ProductStructureMaster.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -23,8 +23,14 @@ namespace Business.Domain
         /// <summary>
         /// 域名
         /// </summary>
-        [Comment("域名")]
-        public string Domain { get; set; }
+       // [Comment("域名")]
+        //public string Domain { get; set; }
+
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
 
         /// <summary>
         /// 父零件

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ProductStructureOp.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -26,6 +26,12 @@ namespace Business.StructuredDB.MES.IC
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 父零件
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/PurOrdDetail.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -30,6 +30,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 类型
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/PurOrdDetailBatch.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -30,6 +30,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 类型
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/PurOrdMaster.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 类型
         /// </summary>

+ 4 - 5
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ic_bom.cs

@@ -60,18 +60,17 @@ namespace Business.Domain
         /// </summary>
         [Comment("失效日期")]
         public DateTime? end_day { get; set; }
-        /*/// <summary>
+        /// <summary>
         /// 工艺主键
         /// </summary>
-        [Required]
         [Comment("工艺主键")]
-        public long tech_id { get; set; }
+        public long? tech_id { get; set; }
         /// <summary>
         /// 工艺名称
         /// </summary>
-        [StringLength(20)]
+        [StringLength(255)]
         [Comment("工艺名称")]
-        public string? tech_name { get; set; }*/
+        public string tech_name { get; set; }
 
         /// <summary>
         /// 生产负责人

+ 237 - 3
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ic_item.cs

@@ -1,5 +1,6 @@
 using Business.Core.Attributes;
 using Microsoft.EntityFrameworkCore;
+using System;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
@@ -412,9 +413,242 @@ namespace Business.Domain
         /// <summary>
         /// 计算ID
         /// </summary>
-        //[Comment("计算id")]
-        //[NotMapped]
-        //public long? bang_id { get; set; }
+        [Comment("计算id")]
+        public long? bang_id { get; set; }
+
+        /// <summary>
+        /// 批量数量
+        /// </summary>
+        [Precision(18, 8)]
+        [Comment("批量数量")]
+        public decimal? batch_qty { get; set; }
+
+        /// <summary>
+        /// 物料业务id
+        /// </summary>
+        [Comment("物料业务id")]
+        public long? icitem_id { get; set; }
+
+        /// <summary>
+        /// 物料业务名称
+        /// </summary>
+        [StringLength(255)]
+        [Comment("物料业务名称")]
+        public string? icitem_name { get; set; }
+
+        /// <summary>
+        /// 计划员
+        /// </summary>
+        [StringLength(255)]
+        [Comment("计划员")]
+        public string? planner_name { get; set; }
+
+        /// <summary>
+        /// 计划员工号
+        /// </summary>
+        [StringLength(255)]
+        [Comment("计划员工号")]
+        public string? planner_num { get; set; }
+
+        /// <summary>
+        /// 工厂编码
+        /// </summary>
+        [StringLength(255)]
+        [Comment("工厂编码")]
+        public string? factory_code { get; set; }
+
+        /// <summary>
+        /// 是否参与订补货计划运算
+        /// </summary>
+        [Comment("是否参与订补货计划运算")]
+        public int? book_plan { get; set; }
+
+        /// <summary>
+        /// 辅助属性参与计划运算
+        /// </summary>
+        [Comment("辅助属性参与计划运算")]
+        public int? aux_prop_plan { get; set; }
+
+        /// <summary>
+        /// 计划备注
+        /// </summary>
+        [StringLength(255)]
+        [Comment("计划备注")]
+        public string? plannote { get; set; }
+
+        /// <summary>
+        /// 工厂代码
+        /// </summary>
+        [StringLength(255)]
+        [Comment("工厂代码")]
+        public string? factory_fode { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [StringLength(255)]
+        [Comment("备注")]
+        public string? note { get; set; }
+
+        /// <summary>
+        /// 领料类型
+        /// </summary>
+        [Comment("领料类型")]
+        public long? pick_type { get; set; }
+
+        /// <summary>
+        /// 是否需要库龄管理
+        /// </summary>
+        [Comment("是否需要库龄管理")]
+        public int? stock_time { get; set; }
+
+        /// <summary>
+        /// 盘点周期单位
+        /// </summary>
+        [StringLength(255)]
+        [Comment("盘点周期单位")]
+        public string? check_cycunit { get; set; }
+
+        /// <summary>
+        /// 盘点周期
+        /// </summary>
+        [Precision(18, 6)]
+        [Comment("盘点周期")]
+        public decimal? check_cycle { get; set; }
+
+        /// <summary>
+        /// 每周或每月第几天
+        /// </summary>
+        [Comment("每周或每月第几天")]
+        public int? days_per { get; set; }
+
+        /// <summary>
+        /// 上次盘点日期
+        /// </summary>
+        [Comment("上次盘点日期")]
+        public DateTime? last_checkdate { get; set; }
+
+        /// <summary>
+        /// 默认待检仓库
+        /// </summary>
+        [Comment("默认待检仓库")]
+        public long? default_chkloc { get; set; }
+
+        /// <summary>
+        /// 默认待检仓位
+        /// </summary>
+        [Comment("默认待检仓位")]
+        public long? default_chksp { get; set; }
+
+        /// <summary>
+        /// 默认仓库
+        /// </summary>
+        [Comment("默认仓库")]
+        public long? default_loc { get; set; }
+
+        /// <summary>
+        /// 默认仓位
+        /// </summary>
+        [Comment("默认仓位")]
+        public long? default_sp { get; set; }
+
+        /// <summary>
+        /// 货架信息
+        /// </summary>
+        [StringLength(255)]
+        [Comment("货架信息")]
+        public string? item_shelve { get; set; }
+
+        /// <summary>
+        /// 默认仓管员
+        /// </summary>
+        [StringLength(255)]
+        [Comment("默认仓管员")]
+        public string? default_manager { get; set; }
+
+        /// <summary>
+        /// 最低存量
+        /// </summary>
+        [Precision(18, 6)]
+        [Comment("最低存量")]
+        public decimal? low_limit { get; set; }
+
+        /// <summary>
+        /// 最高存量
+        /// </summary>
+        [Precision(18, 6)]
+        [Comment("最高存量")]
+        public decimal? high_limit { get; set; }
+
+        /// <summary>
+        /// 最大订货量
+        /// </summary>
+        [Precision(18, 6)]
+        [Comment("最大订货量")]
+        public decimal? qty_max { get; set; }
+
+        /// <summary>
+        /// 日消耗量
+        /// </summary>
+        [Precision(18, 6)]
+        [Comment("日消耗量")]
+        public decimal? daily_consume { get; set; }
+
+        /// <summary>
+        /// 库存备注
+        /// </summary>
+        [StringLength(255)]
+        [Comment("库存备注")]
+        public string? warehouse_note { get; set; }
+
+        /// <summary>
+        /// 原材料收货处理时间
+        /// </summary>
+        [Precision(18, 6)]
+        [Comment("原材料收货处理时间")]
+        public decimal? raw_matreceiv_days { get; set; }
+
+        /// <summary>
+        /// 成品入库时间
+        /// </summary>
+        [Precision(18, 6)]
+        [Comment("成品入库时间")]
+        public decimal? prdenter_days { get; set; }
+
+        /// <summary>
+        /// 原材料入库时间
+        /// </summary>
+        [Precision(18, 6)]
+        [Comment("原材料入库时间")]
+        public decimal? mat_enter_days { get; set; }
+
+        /// <summary>
+        /// 成品发货时间
+        /// </summary>
+        [Precision(18, 6)]
+        [Comment("成品发货时间")]
+        public decimal? prd_out_days { get; set; }
+
+        /// <summary>
+        /// 生产负责人
+        /// </summary>
+        [StringLength(255)]
+        [Comment("生产负责人")]
+        public string? product_principal { get; set; }
+
+        /// <summary>
+        /// 倒冲仓库
+        /// </summary>
+        [StringLength(255)]
+        [Comment("倒冲仓库")]
+        public string? back_flush_stock { get; set; }
+
+        /// <summary>
+        /// 倒冲仓位
+        /// </summary>
+        [StringLength(255)]
+        [Comment("倒冲仓位")]
+        public string? back_flush_sp { get; set; }
         /// <summary>
         /// 自检提前期
         /// </summary>

+ 3 - 3
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ic_substitute_group_detail.cs

@@ -52,12 +52,12 @@ namespace Business.Domain
         [Comment("主/替")]
         public int? ismain { get; set; }
 
-        /*/// <summary>
+        /// <summary>
         /// 使用数量
         /// </summary>
-        [Precision(23, 10)]
+        [Precision(18, 6)]
         [Comment("使用数量")]
-        public decimal? use_amount { get; set; }*/
+        public decimal? use_amount { get; set; }
 
         /// <summary>
         /// 序号

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/srm_polist_ds.cs

@@ -1,4 +1,4 @@
-using Business.Core.Attributes;
+using Business.Core.Attributes;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.ComponentModel.DataAnnotations;
@@ -25,6 +25,12 @@ namespace Business.Domain
         [Comment("工厂编码")]
         public string domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 交货计划id
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/Production/DeliveryExceptionMaster.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.StructuredDB.Production
         [Comment("工厂编码")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 交货计划ID
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/Production/HolidayMaster.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 日期
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/Production/LineMaster.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 生产线
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/Production/PeriodSequenceDet.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 生产线
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/Production/PriorityCode.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 名称
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/Production/ProdLineDetail.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 生产线
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/Production/QualityLineWorkDetail.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 生产线
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/Production/RoutingOpDetail.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -26,6 +26,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 物料编码
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/Production/ScheduleResultOpMaster.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 工单
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/Production/ShopCalendarWorkCtr.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 产线
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/Production/WorkOrdDetail.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 工单
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/Production/WorkOrdMaster.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 计划开始日期
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/Production/WorkOrdRouting.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.Domain
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 描述
         /// </summary>

+ 6 - 0
MicroServices/Business/Business.Domain/StructuredDB/Production/mes_moentry.cs

@@ -76,5 +76,11 @@ namespace Business.Domain
         [NotMapped]
         public long? bang_id { get; set; }
 
+        /// <summary>
+        /// 工单明细业务id
+        /// </summary>
+        [Comment("工单明细业务id")]
+        public long? moentry_id { get; set; }
+
     }
 }

+ 12 - 4
MicroServices/Business/Business.Domain/StructuredDB/Production/mes_morder.cs

@@ -245,10 +245,12 @@ namespace Business.Domain
         [Precision(23, 10)]
         [Comment("入库数量")]
         public decimal? inventory_number { get; set; }
-        ///// <summary>
-        ///// 扩展
-        ///// </summary>
-        //public string ext { get; set; }
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        [StringLength(255)]
+        [Comment("扩展")]
+        public string ext { get; set; }
         /// <summary>
         /// 已开入库通知单数量
         /// </summary>
@@ -335,5 +337,11 @@ namespace Business.Domain
         [Comment("模拟计算版本号,不为空为年度长周期,为空为周计划")]
         [StringLength(80)]
         public string analogcalcversion { get; set; }
+
+        /// <summary>
+        /// 工单业务id
+        /// </summary>
+        [Comment("工单业务id")]
+        public long? morder_id { get; set; }
     }
 }

+ 46 - 0
MicroServices/Business/Business.Domain/StructuredDB/SRM/srm_purchase.cs

@@ -25,6 +25,25 @@ namespace Business.Domain
         [Comment("物料id")]
         public long icitem_id { get; set; }
 
+        /// <summary>
+        /// 公司引用id
+        /// </summary>
+        [Comment("公司引用id")]
+        public long company_ref_id { get; set; }
+
+        /// <summary>
+        /// 工厂引用id
+        /// </summary>
+        [Comment("工厂引用id")]
+        public long factory_ref_id { get; set; }
+
+        /// <summary>
+        /// 域编码
+        /// </summary>
+        [StringLength(50)]
+        [Comment("域编码")]
+        public string domain_code { get; set; }
+
         /// <summary>
         /// 物料编码
         /// </summary>]
@@ -247,5 +266,32 @@ namespace Business.Domain
         [StringLength(64)]
         [Comment("失效")]
         public string? is_active { get; set; }
+
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        [StringLength(100)]
+        [Comment("创建用户")]
+        public string? create_user { get; set; }
+
+        /// <summary>
+        /// 更新用户
+        /// </summary>
+        [StringLength(100)]
+        [Comment("更新用户")]
+        public string? update_user { get; set; }
+
+        /// <summary>
+        /// 是否按周送货
+        /// </summary>
+        [Comment("是否按周送货")]
+        public bool? is_week { get; set; }
+
+        /// <summary>
+        /// 周期送货日
+        /// </summary>
+        [StringLength(255)]
+        [Comment("周期送货日")]
+        public string? is_days { get; set; }
     }
 }

+ 6 - 0
MicroServices/Business/Business.Domain/StructuredDB/SRM/srm_supplier.cs

@@ -339,5 +339,11 @@ namespace Business.Domain
         /// </summary>
         [Comment("操作时间")]
         public DateTime? op_time { get; set; }
+
+        /// <summary>
+        /// 供应商业务id
+        /// </summary>
+        [Comment("供应商业务id")]
+        public long? supplier_id { get; set; }
     }
 }

+ 5 - 1
MicroServices/Business/Business.Domain/StructuredDB/Sale/TagMaster.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using System;
 using System.Collections.Generic;
@@ -23,6 +23,10 @@ namespace Business.Domain
         ///</summary>
         public string Domain { get; set; }
         /// <summary>
+        /// 租户ID
+        ///</summary>
+        public long? tenant_id { get; set; }
+        /// <summary>
         /// 单号 
         /// 默认值: ('')
         ///</summary>

+ 35 - 1
MicroServices/Business/Business.Domain/StructuredDB/Sale/crm_seorder.cs

@@ -160,7 +160,7 @@ namespace Business.Domain
         /// </summary>
         [DefaultValue(false)]
         [Comment("是否关闭1关闭0未关闭")]
-        public bool closed { get; set; }
+        public bool closed { get; set; } = false;
 
         /// <summary>
         /// 操作时间
@@ -221,6 +221,40 @@ namespace Business.Domain
         [Comment("创建部门id")]
         public long? create_dept { get; set; }
 
+        /// <summary>
+        /// 流程实例id
+        /// </summary>
+        [StringLength(64)]
+        [Comment("流程实例id")]
+        public string process_instance_id { get; set; }
+
+        /// <summary>
+        /// 国家
+        /// </summary>
+        [StringLength(64)]
+        [Comment("国家")]
+        public string country { get; set; }
+
+        /// <summary>
+        /// 原因
+        /// </summary>
+        [StringLength(256)]
+        [Comment("原因")]
+        public string Reason { get; set; }
+
+        /// <summary>
+        /// 流程状态
+        /// </summary>
+        [StringLength(64)]
+        [Comment("流程状态")]
+        public string flowstate { get; set; }
+
+        /// <summary>
+        /// 销售订单业务id
+        /// </summary>
+        [Comment("销售订单业务id")]
+        public long? seorder_id { get; set; }
+
         /// <summary>
         /// 计算ID
         /// </summary>

+ 6 - 0
MicroServices/Business/Business.Domain/StructuredDB/Sale/crm_seorderentry.cs

@@ -28,6 +28,12 @@ namespace Business.Domain
         [Comment("销售订单id")]
         public long? seorder_id { get; set; }
 
+        /// <summary>
+        /// 销售订单明细业务id
+        /// </summary>
+        [Comment("销售订单明细业务id")]
+        public long? seorderentry_id { get; set; }
+
         /// <summary>
         /// 销售订单编号
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/WMS/EmpWorkDutyMaster.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.StructuredDB.WMS
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 账号
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/WMS/EmployeeMaster.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -27,6 +27,12 @@ namespace Business.StructuredDB.WMS
         [Comment("域名")]
         public string Domain { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 账号
         /// </summary>

+ 7 - 1
MicroServices/Business/Business.Domain/StructuredDB/WMS/SAPInv.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -26,6 +26,12 @@ namespace Business.StructuredDB.WMS
         [Comment("域名")]
         public string WERKS { get; set; }
 
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        [Comment("租户ID")]
+        public long? tenant_id { get; set; }
+
         /// <summary>
         /// 物料编码
         /// </summary>

+ 13 - 6
MicroServices/Business/Business.Host/appsettings.json

@@ -1,6 +1,6 @@
 {
   "App": {
-    "CorsOrigins": "https://*.abc.com,http://localhost:9527,http://123.60.181.157:8020,http://123.60.181.157:8022,http://123.60.181.157:8024,http://123.60.180.165:8020,http://123.60.180.165:8022,http://123.60.180.165:8024,http://172.16.8.154:8020"
+    "CorsOrigins": "https://*.abc.com,http://localhost:9527,http://localhost:8888,http://123.60.181.157:8020,http://123.60.181.157:8022,http://123.60.181.157:8024,http://123.60.180.165:8020,http://123.60.180.165:8022,http://123.60.180.165:8024,http://172.16.8.154:8020"
   },
   "JWT": {
     "Issuer": "zzy2025@qq.com",
@@ -20,11 +20,18 @@
     //"DOPSqe": "Server=123.60.180.165;Database=dopdemorq;uid=sa;pwd=5h3n9)uN;Trusted_Connection=false;TrustServerCertificate=True",
     //"MongoDB": "mongodb://zzydop:h1Q$us3r@123.60.180.165/dopbase",
 
-    "Default": "server=123.60.180.165;port=3306;database=dopdemo;uid=root;pwd=5heng=uN;Command Timeout=300;",
-    "DOPLog": "server=123.60.180.165;port=3306;database=dopdemo;uid=root;pwd=5heng=uN;Command Timeout=300;",
-    "DOPBang": "server=123.60.180.165;port=3306;database=dopdemo;uid=root;pwd=5heng=uN;Command Timeout=300;",
-    "DOPExt": "server=123.60.180.165;port=3306;database=dopdemo;uid=root;pwd=5heng=uN;Command Timeout=300;",
-    "DOPSqe": "server=123.60.180.165;port=3306;database=dopdemo;uid=root;pwd=5heng=uN;Command Timeout=300;",
+    //"Default": "server=123.60.180.165;port=3306;database=dopdemo;uid=root;pwd=5heng=uN;Command Timeout=300;",
+    //"DOPLog": "server=123.60.180.165;port=3306;database=dopdemo;uid=root;pwd=5heng=uN;Command Timeout=300;",
+    //"DOPBang": "server=123.60.180.165;port=3306;database=dopdemo;uid=root;pwd=5heng=uN;Command Timeout=300;",
+    //"DOPExt": "server=123.60.180.165;port=3306;database=dopdemo;uid=root;pwd=5heng=uN;Command Timeout=300;",
+    //"DOPSqe": "server=123.60.180.165;port=3306;database=dopdemo;uid=root;pwd=5heng=uN;Command Timeout=300;",
+    //"MongoDB": "mongodb://zzydop:h1Q$us3r@123.60.180.165/dopbase",
+
+    "Default": "server=123.60.180.165;port=3306;database=aidopdev;uid=root;pwd=5heng=uN;Command Timeout=300;",
+    "DOPLog": "server=123.60.180.165;port=3306;database=aidopdev;uid=root;pwd=5heng=uN;Command Timeout=300;",
+    "DOPBang": "server=123.60.180.165;port=3306;database=aidopdev;uid=root;pwd=5heng=uN;Command Timeout=300;",
+    "DOPExt": "server=123.60.180.165;port=3306;database=aidopdev;uid=root;pwd=5heng=uN;Command Timeout=300;",
+    "DOPSqe": "server=123.60.180.165;port=3306;database=aidopdev;uid=root;pwd=5heng=uN;Command Timeout=300;",
     "MongoDB": "mongodb://zzydop:h1Q$us3r@123.60.180.165/dopbase",
 
 

+ 150 - 0
MicroServices/Business/QuartzSettings/logs/logs.txt

@@ -4990,3 +4990,153 @@
 {"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-02-05T16:10:20.9985004+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-02-05T16:10:21.0036105+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-02-05T16:10:21.0054559+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-17T16:02:51.3029317+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-17T16:02:51.3357714+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-17T16:02:51.3386842+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-17T16:02:51.3402177+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-17T16:02:51.3448504+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-17T16:02:51.3475091+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-23T11:32:14.3589121+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-23T11:32:14.3977811+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-23T11:32:14.4009358+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-23T11:32:14.4024589+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-23T11:32:14.4069367+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-23T11:32:14.4087219+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-23T12:03:14.5951567+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-23T12:03:14.633824+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-23T12:03:14.6374263+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-23T12:03:14.6391726+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-23T12:03:14.6441731+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-23T12:03:14.6464305+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-23T15:13:31.5498092+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-23T15:13:31.5882759+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-23T15:13:31.5914178+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-23T15:13:31.5934382+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-23T15:13:31.5992646+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-23T15:13:31.6017814+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-23T15:25:36.7707737+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-23T15:25:36.8065267+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-23T15:25:36.8105632+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-23T15:25:36.8128117+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-23T15:25:36.8180369+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-23T15:25:36.8204304+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-23T15:40:22.7992951+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-23T15:40:22.8434459+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-23T15:40:22.8478521+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-23T15:40:22.8498933+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-23T15:40:22.854811+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-23T15:40:22.8577425+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-23T15:46:25.6036751+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-23T15:46:25.645269+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-23T15:46:25.64911+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-23T15:46:25.6557469+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-23T15:46:25.6582704+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-23T15:46:25.6598483+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-24T11:41:54.6473131+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-24T11:41:54.6813876+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-24T11:41:54.6838956+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-24T11:41:54.6853775+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-24T11:41:54.6898499+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-24T11:41:54.6914333+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-24T13:41:09.2863751+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-24T13:41:09.3232142+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-24T13:41:09.3262138+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-24T13:41:09.3278506+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-24T13:41:09.3323834+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-24T13:41:09.3340507+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-24T13:57:51.5027494+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-24T13:57:51.5425076+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-24T13:57:51.5457476+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-24T13:57:51.547511+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-24T13:57:51.5513278+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-24T13:57:51.5531354+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-24T14:03:42.2935886+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-24T14:03:42.3310035+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-24T14:03:42.335027+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-24T14:03:42.3368872+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-24T14:03:42.3424773+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-24T14:03:42.345124+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-24T14:53:34.4089994+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-24T14:53:34.4459623+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-24T14:53:34.4496284+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-24T14:53:34.4550874+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-24T14:53:34.4570852+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-24T14:53:34.4586424+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-24T15:16:51.2977329+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-24T15:16:51.3312232+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-24T15:16:51.3344714+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-24T15:16:51.3362398+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-24T15:16:51.3407667+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-24T15:16:51.3433153+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-24T15:32:35.8651183+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-24T15:32:35.9052327+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-24T15:32:35.9092803+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-24T15:32:35.9112975+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-24T15:32:35.9164633+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-24T15:32:35.9184482+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-24T15:38:09.3574989+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-24T15:38:09.3921451+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-24T15:38:09.3948383+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-24T15:38:09.3964601+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-24T15:38:09.4006032+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-24T15:38:09.4028998+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-24T15:46:33.0363291+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-24T15:46:33.0875962+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-24T15:46:33.0906003+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-24T15:46:33.0922871+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-24T15:46:33.0980033+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-24T15:46:33.1006242+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:00:56.4155934+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:00:56.4618186+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:00:56.4656642+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:00:56.4674895+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:00:56.4735421+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-24T16:00:56.4759528+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:18:30.8234746+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:18:30.8638576+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:18:30.8668313+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:18:30.8685726+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:18:30.8734571+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-24T16:18:30.8764551+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:22:27.1193678+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:22:27.1573565+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:22:27.1612627+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:22:27.1631954+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:22:27.1678036+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-24T16:22:27.1698476+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:28:52.0343918+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:28:52.0674934+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:28:52.0700578+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:28:52.0715772+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:28:52.0758128+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-24T16:28:52.0776541+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:34:44.5585622+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:34:44.595877+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:34:44.5987503+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:34:44.6003604+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:34:44.6055696+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-24T16:34:44.6076582+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:42:17.7936449+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:42:17.8381691+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:42:17.8418739+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:42:17.8440709+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:42:17.8486336+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-24T16:42:17.8505767+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:50:58.1111267+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:50:58.1452104+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:50:58.1477695+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:50:58.1490441+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:50:58.1543977+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-24T16:50:58.1563762+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:53:49.998299+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:53:50.0397398+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:53:50.0442116+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:53:50.0461509+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:53:50.0512032+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-24T16:53:50.0530651+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:56:25.4798864+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:56:25.5178661+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:56:25.5210454+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:56:25.5225686+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2026-04-24T16:56:25.5278777+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2026-04-24T16:56:25.530754+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است