修复companyId可为空引起的代码问题

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

@@ -15,7 +15,7 @@ namespace Business.ResourceExamineManagement.Dto
         /// <summary>
         /// 企业id
         /// </summary>
-        public long company_id { get; set; }
+        public long? company_id { get; set; }
 
         /// <summary>
         /// 工厂id

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

@@ -30,6 +30,6 @@ namespace Business.ResourceExamineManagement.Dto
         /// <summary>
         /// 企业id
         /// </summary>
-        public long company_id { get; set; }
+        public long? company_id { get; set; }
     }
 }

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

@@ -26,7 +26,7 @@ namespace Business.ResourceExamineManagement.Dto
         /// <summary>
         /// ¹«Ë¾ID
         /// </summary>
-        public long company_id { get; set; }
+        public long? company_id { get; set; }
         /// <summary>
         /// ×éÖ¯ID
         /// </summary>

MicroServices/Business/Business.Application/ResourceExamineManagement/CalcBomViewAppService.cs

@@ -1178,7 +1178,7 @@ namespace Business.ResourceExamineManagement
         /// <param name="returnlist"></param>
         /// <param name="factoryid"></param>
         /// <param name="orderType">2委外采购申请单，3采购申请单</param>
-        private SRMPRDto CreateSRMPR(BomChildExamineDto returnlist, long tenantId, long factoryid, long bangId, int orderType, List<ICItemLeadTimeDto> iCItemLeadTimes, List<mo_srm_purchase> supplierList, List<mo_ic_item> planList, crm_seorderentry sentrys)
+        private SRMPRDto CreateSRMPR(BomChildExamineDto returnlist, long? companyId, long factoryid, long bangId, int orderType, List<ICItemLeadTimeDto> iCItemLeadTimes, List<mo_srm_purchase> supplierList, List<mo_ic_item> planList, crm_seorderentry sentrys)
         {
             SRMPRDto sRMPR = new SRMPRDto();
             var supplier = supplierList.Where(x => x.icitem_id == returnlist.item_id).ToList();//默认取第一个供应商
@@ -1232,7 +1232,7 @@ namespace Business.ResourceExamineManagement
                 srm_Pr.pr_type = orderType;//申请类型
                 srm_Pr.currencytype = x.currency_type == null ? 1 : x.currency_type.Value;//币种
                 srm_Pr.secInv_ratio = plan.secinv_ratio;//安全库存触发采购比例
-                srm_Pr.company_id = tenantId;
+                srm_Pr.company_id = companyId;
                 srm_Pr.factory_id = factoryid;
                 srm_Pr.bang_id = bangId;
                 if (sentrys != null)
@@ -1273,7 +1273,7 @@ namespace Business.ResourceExamineManagement
         /// </summary>
         /// <param name="returnlist"></param>
         /// <param name="factoryid"></param>
-        private mo_mes_oorder CreateMesOOder(BomChildExamineDto returnlist, long tenantId, long factoryid, long bangId, List<ICItemLeadTimeDto> iCItemLeadTimes, List<mo_srm_purchase> supplierList, DateTime deliveryDate)
+        private mo_mes_oorder CreateMesOOder(BomChildExamineDto returnlist, long? companyId, long factoryid, long bangId, List<ICItemLeadTimeDto> iCItemLeadTimes, List<mo_srm_purchase> supplierList, DateTime deliveryDate)
         {
             mo_mes_oorder oOrder = new mo_mes_oorder();
             oOrder.GenerateNewId(help.NextId());
@@ -1314,7 +1314,7 @@ namespace Business.ResourceExamineManagement
             oOrder.production_unit = returnlist.unit;//加工单位
             oOrder.production_unit_code = "";//加工单位编码
             oOrder.need_icitem_status = 1;//所需物料是否充足  1-充足 0-缺料
-            oOrder.company_id = tenantId;
+            oOrder.company_id = companyId;
             oOrder.factory_id = factoryid;
             oOrder.bang_id = bangId;
             oOrder.sentry_id = returnlist.sentry_id;

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

@@ -1698,7 +1698,7 @@ namespace Business.ResourceExamineManagement
         /// 数据库快照
         /// </summary>
         /// <returns></returns>
-        public async Task DbSnapShot(long tenantId, long factoryId, long bangid,List<b_bom_pretreatment> pretreatments)
+        public async Task DbSnapShot(long? companyId, long factoryId, long bangid,List<b_bom_pretreatment> pretreatments)
         {
             //TODO:申老师明确后续需要调整 根据需要使用的字段，来同步表数据。
             
@@ -1724,7 +1724,7 @@ namespace Business.ResourceExamineManagement
                 await _ic_item_stock.InsertManyAsync(moIcitemStokc);
             }
             //在制工单占用记录表
-            var mes_mooccupy = _mysql_mes_mooccupy.GetListAsync(x => x.company_id == tenantId && x.factory_id == factoryId).Result;
+            var mes_mooccupy = _mysql_mes_mooccupy.GetListAsync(x => x.company_id == companyId && x.factory_id == factoryId).Result;
             if (mes_mooccupy.Count > 0)
             {
                 mes_mooccupy.ForEach(item => { item.bang_id = bangid; });
@@ -1733,7 +1733,7 @@ namespace Business.ResourceExamineManagement
                 await _mes_mooccupy.InsertManyAsync(moMes_mooccupy);
             }
             //工单主表
-            var mes_morder = _mysql_mes_morder.GetListAsync(x => x.company_id == tenantId && x.factory_id == factoryId).Result;
+            var mes_morder = _mysql_mes_morder.GetListAsync(x => x.company_id == companyId && x.factory_id == factoryId).Result;
             if (mes_morder.Count > 0)
             {
                 mes_morder.ForEach(item => { item.bang_id = bangid; });
@@ -1742,7 +1742,7 @@ namespace Business.ResourceExamineManagement
                 await _mes_morder.InsertManyAsync(moMes_morder);
             }
             //工单子表
-            var mes_moentry = _mysql_mes_moentry.GetListAsync(x => x.company_id == tenantId && x.factory_id == factoryId).Result;
+            var mes_moentry = _mysql_mes_moentry.GetListAsync(x => x.company_id == companyId && x.factory_id == factoryId).Result;
             if (mes_moentry.Count > 0)
             {
                 mes_moentry.ForEach(item => { item.bang_id = bangid; });
@@ -1753,7 +1753,7 @@ namespace Business.ResourceExamineManagement
 
             //TODO:要不要根据某些条件只同步有效的数据
             //采购订单
-            var srm_po_main = _mysql_srm_po_main.GetListAsync(x => x.company_id == tenantId && x.factory_id == factoryId).Result;
+            var srm_po_main = _mysql_srm_po_main.GetListAsync(x => x.company_id == companyId && x.factory_id == factoryId).Result;
             if (srm_po_main.Count > 0)
             {
                 srm_po_main.ForEach(item => { item.bang_id = bangid; });
@@ -1763,7 +1763,7 @@ namespace Business.ResourceExamineManagement
             }
 
             //采购订单明细
-            var srm_po_list = _mysql_srm_po_list.GetListAsync(x => x.company_id == tenantId && x.factory_id == factoryId).Result;
+            var srm_po_list = _mysql_srm_po_list.GetListAsync(x => x.company_id == companyId && x.factory_id == factoryId).Result;
             if (srm_po_list.Count > 0)
             {
                 srm_po_list.ForEach(item => { item.bang_id = bangid; });
@@ -1773,7 +1773,7 @@ namespace Business.ResourceExamineManagement
             }
 
             //采购订单占用详情
-            var srm_po_occupy = _mysql_srm_po_occupy.GetListAsync(x => x.company_id == tenantId && x.factory_id == factoryId).Result;
+            var srm_po_occupy = _mysql_srm_po_occupy.GetListAsync(x => x.company_id == companyId && x.factory_id == factoryId).Result;
             if (srm_po_occupy.Count > 0)
             {
                 srm_po_occupy.ForEach(item => { item.bang_id = bangid; });
@@ -1818,9 +1818,9 @@ namespace Business.ResourceExamineManagement
         /// <param name="tenantId">企业id</param>
         /// <param name="factoryid">工厂id</param>
         /// <returns></returns>
-        private List<ICItemLeadTimeDto> GetLeadTime(List<mo_ic_item> icItemIds, long tenantId, long factoryid)
+        private List<ICItemLeadTimeDto> GetLeadTime(List<mo_ic_item> icItemIds, long? companyId, long factoryid)
         {
-            return icItemIds.Where(p => p.factory_id == factoryid && p.company_id == tenantId && !p.IsDeleted).
+            return icItemIds.Where(p => p.factory_id == factoryid && p.company_id == companyId && !p.IsDeleted).
                 Select(x => new ICItemLeadTimeDto
                 {
                     item_id = x.mysql_id,
@@ -1836,9 +1836,9 @@ namespace Business.ResourceExamineManagement
         }
 
         //根据物料id获取物料供应商
-        private List<mo_srm_purchase> GetSupplier(List<long> icItemIds, long tenantId, long factoryid)
+        private List<mo_srm_purchase> GetSupplier(List<long> icItemIds, long? companyId, long factoryid)
         {
-            return _srm_purchase.GetListAsync(p => icItemIds.Contains(p.icitem_id) && p.company_id == tenantId && p.factory_id == factoryid && !p.IsDeleted).Result;
+            return _srm_purchase.GetListAsync(p => icItemIds.Contains(p.icitem_id) && p.company_id == companyId && p.factory_id == factoryid && !p.IsDeleted).Result;
         }
 
         /// <summary>