同步数据修改

MicroServices/Business/Business.Application/SyncDataManagement/SyncWMSDataAppService.cs

@@ -459,8 +459,10 @@ namespace Business.SyncDataManagement
                             model = custList[i].Descr1,//规格型号
                             fversion = "",//版本号
                             //ext.FErpClsID == "配置类" ? 0 : ext.FErpClsID == "自制" ? 1 : ext.FErpClsID == "委外" ? 2 : ext.FErpClsID == "外购" ? 3 : ext.FErpClsID == "虚拟" ? 4 : ext.FErpClsID == "费用" ? 5 : ext.FErpClsID == "服务" ? 6 : -1;
-                            erp_cls = custList[i].PurMfg == "P" ? 3 : 1,//物料属性
-                            erp_cls_name = custList[i].PurMfg == "P" ? "外购" : "自制",//物料属性名称
+                            //erp_cls = custList[i].PurMfg == "P" ? 3 : 1,//物料属性
+                            erp_cls = custList[i].ItemNum == "1.SD1.D.0056-F" || custList[i].ItemNum == "1.ZC1.D.0001" || custList[i].ItemNum == "1.BW1.D.0030" ? 1 : 3,
+                            //erp_cls_name = custList[i].PurMfg == "P" ? "外购" : "自制",//物料属性名称
+                            erp_cls_name = custList[i].ItemNum == "1.SD1.D.0056-F" || custList[i].ItemNum == "1.ZC1.D.0001" || custList[i].ItemNum == "1.BW1.D.0030" ? "自制" : "外购",
                             unit = custList[i].UM,//单位
                             item_level = 0,//物料等级
                             source = "",//来源
@@ -480,8 +482,8 @@ namespace Business.SyncDataManagement
                             enable_warning = 1,//启用预警
                             factory_id = 1001,
                             tenant_id = 1000,
-                            IsDeleted=false
-                        });
+                            IsDeleted = false
+                        }); 
                     }
                 }
             }
@@ -505,7 +507,7 @@ namespace Business.SyncDataManagement
                     long domain = Convert.ToInt64(ItemList.First().Domain);
                     long factory_id = domain % 1000;
                     long tenant_id = domain - factory_id;
-                    var bom = new ic_bom()
+                    var bom = new ic_bom(help.NextId())
                     {
                         bom_number = c,
                         icitem_id = item==null ? help.NextId() : item.Id,
@@ -514,19 +516,18 @@ namespace Business.SyncDataManagement
                         version= ItemList.First().Refs,
                         factory_id = 1001,
                         tenant_id = 1000,
-                        IsDeleted=false
+                        IsDeleted=false,
                     };
-                    bom.GenerateNewId();
                     ItemsAdd.Add(bom);
 
                     foreach(var child in ItemList)
                     {
                         var itemchild = ic_itemList.Find(a => a.number == child.ComponentItem);
-                        var bomchild = new ic_bom_child()
+                        var bomchild = new ic_bom_child(help.NextId())
                         {
                             bom_id= bom.Id,
                             bom_number=bom.bom_number,
-                            icitem_id= itemchild==null ?long.MinValue : item.Id,
+                            icitem_id= itemchild==null ?long.MinValue : itemchild.Id,
                             item_number= child.ComponentItem,
                             item_name= itemchild==null? "" : item.name,
                             unit=child.UM,
@@ -541,7 +542,6 @@ namespace Business.SyncDataManagement
                             tenant_id = 1000,
                             IsDeleted=false
                         };
-                        bomchild.GenerateNewId();
                         childItemsAdd.Add(bomchild);
                     }
                 }

MicroServices/Business/Business.Host/BusinessHostModule.cs

@@ -113,7 +113,7 @@ namespace Business
                 q.AddTrigger(opts => opts
                     .ForJob(jobKey)
                     .WithIdentity("SyncDataJob-trigger")
-                    .WithCronSchedule("0 40 9 * * ?")
+                    .WithCronSchedule("0 54 15 * * ?")
                     .WithDescription("定时同步MySQL基础数据到MongoDB"));
 
                 var NLogJobKey = new JobKey("NLogJob");
@@ -140,7 +140,7 @@ namespace Business
                 q.AddTrigger(opts => opts
                     .ForJob(WMSJobKey)
                     .WithIdentity("WMSJob-trigger")
-                    .WithCronSchedule("0 34 11 * * ?")
+                    .WithCronSchedule("0 02 15 * * ?")
                     .WithDescription("定时同步WMS物料订单等基础数据到MySQL"));
 
                 //var ProductionScheduleJobKey = new JobKey("ProductionScheduleJob");

MicroServices/Business/Bussiness.Model/MES/IC/ic_bom.cs

@@ -20,6 +20,9 @@ namespace Business.Model.MES.IC
     [Comment("物料BOM")]
     public class ic_bom : BaseEntity
     {
+        public ic_bom(long Id) : base(Id)
+        {
+        }
         /// <summary>
         /// bom单编号
         /// </summary>

MicroServices/Business/Bussiness.Model/MES/IC/ic_bom_child.cs

@@ -15,6 +15,9 @@ namespace Business.Model.MES.IC
     [Comment("物料BOM明细")]
     public class ic_bom_child : BaseEntity
     {
+        public ic_bom_child(long Id) : base(Id)
+        {
+        }
         /// <summary>
         /// bom主键
         /// </summary>