Merge branch 'master' of http://123.60.180.165:4647/ZZYDOP/DOPCore

MicroServices/Business/Business.Application/ScheduleTaskManagement/ScheduleTaskAppService.cs

@@ -177,7 +177,7 @@ namespace Business.ScheduleTaskManagement
             try
             {
                 //同步物料Bom数据
-                var icBoms = _mysql_ic_bom.GetListAsync().Result;
+                var icBoms = await _mysql_ic_bom.GetListAsync();
                 if (icBoms.Count > 0)
                 {
                     //先清空表数据(删除mongodb中的集合)
@@ -187,7 +187,7 @@ namespace Business.ScheduleTaskManagement
                 }
 
                 //同步物料BOM明细数据
-                var icbom_childs = _mysql_ic_bom_child.GetListAsync().Result;
+                var icbom_childs = await _mysql_ic_bom_child.GetListAsync();
                 if (icbom_childs.Count > 0)
                 {
                     //先清空表数据(删除mongodb中的集合)
@@ -197,7 +197,7 @@ namespace Business.ScheduleTaskManagement
                 }
 
                 //同步物料数据
-                var icItems = _mysql_ic_item.GetListAsync().Result;
+                var icItems = await _mysql_ic_item.GetListAsync();
                 if (icItems.Count > 0)
                 {
                     //先清空表数据(删除mongodb中的集合)
@@ -207,7 +207,7 @@ namespace Business.ScheduleTaskManagement
                 }
 
                 //同步替代群组数据
-                var subtitutes = _mysql_ic_substitute.GetListAsync().Result;
+                var subtitutes = await _mysql_ic_substitute.GetListAsync();
                 if (subtitutes.Count > 0)
                 {
                     //先清空表数据(删除mongodb中的集合)
@@ -217,7 +217,7 @@ namespace Business.ScheduleTaskManagement
                 }
 
                 //同步物料替代多群组数据
-                var subAlls = _mysql_ic_substitute_all.GetListAsync().Result;
+                var subAlls = await _mysql_ic_substitute_all.GetListAsync();
                 if (subAlls.Count > 0)
                 {
                     //先清空表数据(删除mongodb中的集合)
@@ -227,7 +227,7 @@ namespace Business.ScheduleTaskManagement
                 }
 
                 //同步物料替代多群组明细数据
-                var subAllDtls = _mysql_ic_substitute_all_dtl.GetListAsync().Result;
+                var subAllDtls = await _mysql_ic_substitute_all_dtl.GetListAsync();
                 if (subAllDtls.Count > 0)
                 {
                     //先清空表数据(删除mongodb中的集合)
@@ -237,7 +237,7 @@ namespace Business.ScheduleTaskManagement
                 }
 
                 //同步供应商数据
-                var suppliers = _mysql_srm_supplier.GetListAsync().Result;
+                var suppliers = await _mysql_srm_supplier.GetListAsync();
                 if (suppliers.Count > 0)
                 {
                     //先清空表数据(删除mongodb中的集合)
@@ -247,7 +247,7 @@ namespace Business.ScheduleTaskManagement
                 }
 
                 //同步工艺路径数据
-                var techs = _mysql_mes_technique.GetListAsync().Result;
+                var techs = await _mysql_mes_technique.GetListAsync();
                 if (techs.Count > 0)
                 {
                     //先清空表数据(删除mongodb中的集合)
@@ -257,7 +257,7 @@ namespace Business.ScheduleTaskManagement
                 }
 
                 //同步工序数据
-                var processes = _mysql_mes_process.GetListAsync().Result;
+                var processes = await _mysql_mes_process.GetListAsync();
                 if (suppliers.Count > 0)
                 {
                     //先清空表数据(删除mongodb中的集合)
@@ -267,7 +267,7 @@ namespace Business.ScheduleTaskManagement
                 }
 
                 //同步工艺关联工序数据
-                var tech_procs = _mysql_mes_tech_process.GetListAsync().Result;
+                var tech_procs = await _mysql_mes_tech_process.GetListAsync();
                 if (tech_procs.Count > 0)
                 {
                     //先清空表数据(删除mongodb中的集合)

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

@@ -1,6 +1,7 @@
 using Business.Core.Attributes;
 using Business.Model;
 using Microsoft.EntityFrameworkCore;
+using MongoDB.Bson.Serialization.Attributes;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -28,6 +29,7 @@ namespace Bussiness.Model.MES.IC
         /// </summary>
         [StringLength(20)]
         [Description("群组代码")]
+        [BsonRepresentation(MongoDB.Bson.BsonType.String)]
         public string? substitute_code { get; set; }
         /// <summary>
         /// 物料主键
@@ -39,7 +41,7 @@ namespace Bussiness.Model.MES.IC
         /// 主/替
         /// </summary>
         [Description("主/替")]
-        public int ismain { get; set; }
+        public int? ismain { get; set; }
 
         /*/// <summary>
         /// 使用数量
@@ -52,7 +54,7 @@ namespace Bussiness.Model.MES.IC
         /// 序号
         /// </summary>
         [Description("序号")]
-        public int num { get; set; }
+        public int? num { get; set; }
 
         /// <summary>
         /// 替代数量

MicroServices/Business/Bussiness.Model/Tech/mes_process.cs

@@ -9,6 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using MongoDB.Driver.Core;
 using Business.Core.Attributes;
+using MongoDB.Bson.Serialization.Attributes;
 
 namespace Bussiness.Model.Tech
 {
@@ -31,6 +32,7 @@ namespace Bussiness.Model.Tech
         [Required]
         [StringLength(100)]
         [Description("工序名称")]
+        [BsonRepresentation(MongoDB.Bson.BsonType.String)]
         public string proc_name { get; set; }
 
         /// <summary>
@@ -38,6 +40,7 @@ namespace Bussiness.Model.Tech
         /// </summary>
         [StringLength(500)]
         [Description("简述")]
+        [BsonRepresentation(MongoDB.Bson.BsonType.String)]
         public string? short_desc { get; set; }
 
         /// <summary>
@@ -45,6 +48,7 @@ namespace Bussiness.Model.Tech
         /// </summary>
         [StringLength(2000)]
         [Description("详细描述")]
+        [BsonRepresentation(MongoDB.Bson.BsonType.String)]
         public string? long_desc { get; set; }
 
         /// <summary>
@@ -52,6 +56,7 @@ namespace Bussiness.Model.Tech
         /// </summary>
         [StringLength(2000)]
         [Description("组合工序id")]
+        [BsonRepresentation(MongoDB.Bson.BsonType.String)]
         public string? subids { get; set; }
 
     }

MicroServices/Business/Bussiness.Model/Tech/mes_technique.cs

@@ -25,6 +25,7 @@ namespace Bussiness.Model.Tech
         [Required]
         [StringLength(100)]
         [Description("工艺路径名称")]
+        [BsonRepresentation(MongoDB.Bson.BsonType.String)]
         public string tech_name { get; set; }
 
         /// <summary>
@@ -39,6 +40,7 @@ namespace Bussiness.Model.Tech
         /// </summary>
         [StringLength(100)]
         [Description("产品")]
+        [BsonRepresentation(MongoDB.Bson.BsonType.String)]
         public string? bom { get; set; }
 
         /// <summary>
@@ -46,6 +48,7 @@ namespace Bussiness.Model.Tech
         /// </summary>
         [StringLength(100)]
         [Description("产品版本")]
+        [BsonRepresentation(MongoDB.Bson.BsonType.String)]
         public string? bomver { get; set; }
 
         /// <summary>
@@ -53,6 +56,7 @@ namespace Bussiness.Model.Tech
         /// </summary>
         [StringLength(100)]
         [Description("描述")]
+        [BsonRepresentation(MongoDB.Bson.BsonType.String)]
         public string? desc { get; set; }
     }
 }