代码提交。

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

@@ -1333,7 +1333,7 @@ namespace Business.ResourceExamineManagement
                             _purOrdMaster.Insert(poaction.poMasterList);
                             //快开平台用自增列RecId关联，所以需要插入后再查给明细表赋相应的值
                             List<string> nbrs = poaction.poMasterList.Select(a => a.PurOrd).ToList();
-                            var nbrList = _purOrdMaster.Select(a => a.Domain == "1001" && nbrs.Contains(a.PurOrd));
+                            var nbrList = _purOrdMaster.Select(a => a.Domain == poaction.poMasterList[0].Domain && nbrs.Contains(a.PurOrd));
                             poaction.poDetailList.ForEach(c =>
                             {
                                 c.PurOrdRecID = nbrList.Where(a => a.PurOrd == c.PurOrd).First().RecID;
@@ -1418,7 +1418,7 @@ namespace Business.ResourceExamineManagement
                         _purOrdMaster.Insert(poaction.poMasterList);
                         //快开平台用自增列RecId关联，所以需要插入后再查给明细表赋相应的值
                         List<string> nbrs = poaction.poMasterList.Select(a => a.PurOrd).ToList();
-                        var nbrList = _purOrdMaster.Select(a => a.Domain == "1001" && nbrs.Contains(a.PurOrd));
+                        var nbrList = _purOrdMaster.Select(a => a.Domain == poaction.poMasterList[0].Domain && nbrs.Contains(a.PurOrd));
                         poaction.poDetailList.ForEach(c =>
                         {
                             c.PurOrdRecID = nbrList.Where(a => a.PurOrd == c.PurOrd).First().RecID;
@@ -2076,7 +2076,7 @@ namespace Business.ResourceExamineManagement
             List<POGroupDto> pOGroupDtos = new List<POGroupDto>();
 
             var occupyList = _mysql_srm_po_occupy.GetListAsync(s => list.Select(c => c.Id).Contains(s.polist_id.GetValueOrDefault()) && s.company_id == list[0].company_id && s.factory_id == list[0].factory_id && s.IsDeleted == false).Result;
-
+            string domain = list[0].factory_id.ToString();
             //合并条件：目前传入的数据是一周的数据，暂时不考虑多周数据合并。
             //标准类 1.销售订单产生 2.计划工单产生
             //物料属性 委外  外购
@@ -2227,7 +2227,7 @@ namespace Business.ResourceExamineManagement
             {
                 purOrdMasters.Add(new PurOrdMaster
                 {
-                    Domain = "1001",
+                    Domain = domain,
                     Potype = poType==1?"po":"pw",
                     PurOrd = a.po_billno,
                     Buyer = a.po_purchaser,
@@ -2249,7 +2249,7 @@ namespace Business.ResourceExamineManagement
             {
                 purOrdDetails.Add(new PurOrdDetail
                 {
-                    Domain = "1001",
+                    Domain = domain,
                     Potype = poType == 1 ? "po" : "pw",
                     PurOrd = a.po_billno,
                     IsActive = true,
@@ -3348,7 +3348,7 @@ namespace Business.ResourceExamineManagement
         /// </summary>
         public void AutoCreateBomBill(string companyid,List<mo_ic_bom> ic_Boms = null)
         {
-            ic_Boms ??= _ic_bom.GetListAsync(p => p.company_id.ToString() == companyid && (p.bom_number == "10100012_V1.0" || p.bom_number == "10100241_V1.0" || p.bom_number == "BOM00042070") && !p.IsDeleted).Result.ToList();
+            ic_Boms ??= _ic_bom.GetListAsync(p => p.company_id.ToString() == companyid && !p.IsDeleted).Result.ToList();
             var pretreatment = _mysql_b_bom_pretreatment.GetListAsync(s => ic_Boms.Select(c => c.mysql_id).ToList().Contains(s.sourceid)).Result;
 
             param.company_id = long.Parse(companyid);