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

MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/Dto/SeorderentryDto.cs

@@ -12,26 +12,31 @@ namespace Business.ResourceExamineManagement.Dto
         /// <summary>
         /// 땐데id
         /// </summary>
-        private long sorderId;
+        public long sorderId;
 
         /// <summary>
         /// 땐데契id
         /// </summary>
-        private long soentryId;
+        public long soentryId;
 
         /// <summary>
         /// 땐데뵀
         /// </summary>
-        private String fbillNo;
+        public String fbillNo;
 
         /// <summary>
         /// 땐데契뵀
         /// </summary>
-        private int fentryId;
+        public int fentryId;
 
         /// <summary>
         /// 폐撚id
         /// </summary>
-        private long tenantId;
+        public long tenantId;
+
+        /// <summary>
+        /// 묏낍id
+        /// </summary>
+        public long factoryId;
     }
 }

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -245,7 +245,7 @@ namespace Business.ResourceExamineManagement
         public async Task<PschedDto> ReceiveResult(SeorderentryDto input)
         {
             //数据库快照-同步mysql库数据到mongoDB中
-            await SyncData(769202);
+            await SyncData(input.factoryId);
             //生成当前计算bangid
             //SnowFlake snow = new SnowFlake();
             //long bangid = snow.NextId();
@@ -263,7 +263,7 @@ namespace Business.ResourceExamineManagement
         public async Task SyncData(long factoryId)
         {
             //同步物料库存数据
-            var icitemStokc = _mysql_ic_item_stock.WithDetailsAsync( p => p.factory_id == factoryId).Result.ToListAsync().Result;
+            var icitemStokc = _mysql_ic_item_stock.GetListAsync(p => p.factory_id == factoryId).Result;
             if (icitemStokc.Count > 0)
             {
                 await _ic_item_stock.InsertMany(icitemStokc);