接口增加公司ID传入。

MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/IResourceExamineAppService.cs

@@ -18,14 +18,14 @@ namespace Business.ResourceExamineManagement
         /// </summary>
         /// <param name="workOrds"></param>
         /// <returns></returns>
-        Task<string> ProductionSchedule(string workOrds);
+        Task<string> ProductionSchedule(string workOrds, string domain);
 
         /// <summary>
         /// 下达领料
         /// </summary>
         /// <param name="workOrds"></param>
         /// <returns></returns>
-        Task<string> CreatePickBill(string workOrds);
+        Task<string> CreatePickBill(string workOrds, string domain);
 
         /// <summary>
         /// 资源检查
@@ -67,14 +67,14 @@ namespace Business.ResourceExamineManagement
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        void AutoCreateBomBillInterface();
+        void AutoCreateBomBillInterface(string companyid);
 
         /// <summary>
         /// Pr自动合并
         /// </summary>
         /// <param name="workOrds"></param>
         /// <returns></returns>
-        void PrAutoMerge();
+        void PrAutoMerge(string companyid);
 
         /// <summary>
         /// Pr手动合并
@@ -88,7 +88,7 @@ namespace Business.ResourceExamineManagement
         /// </summary>
         /// <param name="ids"></param>
         /// <returns></returns>
-        Task<string> PrAutoApprove();
+        Task<string> PrAutoApprove(string companyid);
 
         /// <summary>
         /// Pr手动审核

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

@@ -609,7 +609,7 @@ namespace Business.ResourceExamineManagement
             });
             if (autoCreates.Any())
             {
-                AutoCreateBomBill(autoCreates);
+                AutoCreateBomBill(param.company_id.ToString(), autoCreates);
                 pretreatments = _mysql_b_bom_pretreatment.GetListAsync(s => boms.Select(c => c.mysql_id).ToList().Contains(s.sourceid)).Result;
             }
 
@@ -1027,7 +1027,7 @@ namespace Business.ResourceExamineManagement
         }
 
         //PR自动合并
-        public void PrAutoMerge()
+        public void PrAutoMerge(string companyid)
         {
             //TODO:先按每周四调度任务循环，周五下单处理
 
@@ -1037,8 +1037,8 @@ namespace Business.ResourceExamineManagement
             DateTime toTime = DateTime.Now; //new DateTime(2023, 7, 6);
             DateTime starttime = toTime.Date.AddDays(8);
             DateTime endtime = toTime.Date.AddDays(14);
-            List<srm_pr_main> prlist = _mysql_srm_pr_main.GetListAsync(s => s.pr_ssend_date >= starttime && s.pr_ssend_date <= endtime && (s.state == 1 || s.state == 3)).Result;
-            List<ic_item> ic_Items = _mysql_ic_item.GetListAsync(s => prlist.Select(c => c.icitem_id).Contains(s.Id)).Result;
+            List<srm_pr_main> prlist = _mysql_srm_pr_main.GetListAsync(s => s.company_id.ToString() == companyid && s.pr_ssend_date >= starttime && s.pr_ssend_date <= endtime && (s.state == 1 || s.state == 3)).Result;
+            List<ic_item> ic_Items = _mysql_ic_item.GetListAsync(s => s.company_id.ToString() == companyid && prlist.Select(c => c.icitem_id).Contains(s.Id)).Result;
             List<PrWeekDto> prWeekDtos = new List<PrWeekDto>();
 
             List<srm_pr_main> insetPrList = new List<srm_pr_main>();
@@ -1235,19 +1235,19 @@ namespace Business.ResourceExamineManagement
         }*/
 
         //PR自动审核
-        public async Task<string> PrAutoApprove()
+        public async Task<string> PrAutoApprove(string companyid)
         {
             //直接按间隔多少天一次来处理数据，定时任务按周四来考虑。
             DateTime toTime = new DateTime(2023, 7, 6);
             DateTime starttime = toTime.AddDays(1);
             DateTime endtime = toTime.AddDays(8);
-            List<srm_pr_main> prlist = _mysql_srm_pr_main.GetListAsync(s => s.pr_rarrive_date >= starttime && s.pr_rarrive_date <= endtime && (s.state == 1|| s.state == 2 || s.state == 3)).Result;
+            List<srm_pr_main> prlist = _mysql_srm_pr_main.GetListAsync(s => s.company_id.ToString() == companyid && s.pr_rarrive_date >= starttime && s.pr_rarrive_date <= endtime && (s.state == 1|| s.state == 2 || s.state == 3)).Result;
 
             if (prlist.Any())
             {
-                List<srm_purchase> purchaselist = _mysql_srm_purchase.GetListAsync(s => prlist.Select(c => c.icitem_id).Contains(s.icitem_id) && prlist.Select(c => c.pr_purchaseid).Contains(s.supplier_id)).Result;
-                List<srm_supplier> itemsupplierList = _mysql_srm_supplier.GetListAsync(s => prlist.Select(c => c.pr_purchaseid).Contains(s.Id)).Result;
-                List<ic_item> ic_Items = _mysql_ic_item.GetListAsync(s => prlist.Select(c => c.icitem_id).Contains(s.Id)).Result;
+                List<srm_purchase> purchaselist = _mysql_srm_purchase.GetListAsync(s => s.company_id.ToString() == companyid && prlist.Select(c => c.icitem_id).Contains(s.icitem_id) && prlist.Select(c => c.pr_purchaseid).Contains(s.supplier_id)).Result;
+                List<srm_supplier> itemsupplierList = _mysql_srm_supplier.GetListAsync(s => s.company_id.ToString() == companyid && prlist.Select(c => c.pr_purchaseid).Contains(s.Id)).Result;
+                List<ic_item> ic_Items = _mysql_ic_item.GetListAsync(s => s.company_id.ToString() == companyid && prlist.Select(c => c.icitem_id).Contains(s.Id)).Result;
                 PoActionListDto poaction = new PoActionListDto();
                 param.company_id = prlist[0].company_id;
                 param.factoryId = prlist[0].factory_id.GetValueOrDefault();
@@ -2468,7 +2468,7 @@ namespace Business.ResourceExamineManagement
                 if (workords.Length > 0)
                 {
                     workords = workords.Substring(1, workords.Length - 1);
-                    await CreatePickBill(workords);
+                    await CreatePickBill(workords, mo_Mes_Morders[0].factory_id.GetValueOrDefault().ToString());
                 }
                 return JsonConvert.SerializeObject("ok");
             }
@@ -2724,7 +2724,7 @@ namespace Business.ResourceExamineManagement
             });
             if (autoCreates.Any())
             {
-                AutoCreateBomBill(autoCreates);
+                AutoCreateBomBill(param.company_id.ToString(), autoCreates);
                 pretreatments = _mysql_b_bom_pretreatment.GetListAsync(s => boms.Select(c => c.mysql_id).ToList().Contains(s.sourceid)).Result;
             }
 
@@ -3024,9 +3024,9 @@ namespace Business.ResourceExamineManagement
         /// <summary>
         /// 自动生成BOM预处理清单
         /// </summary>
-        public void AutoCreateBomBill(List<mo_ic_bom> ic_Boms = null)
+        public void AutoCreateBomBill(string companyid,List<mo_ic_bom> ic_Boms = null)
         {
-            ic_Boms ??= _ic_bom.GetListAsync(p => p.factory_id == 10101 && p.company_id == 101 && !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;
 
             //物料bom
@@ -3083,9 +3083,9 @@ namespace Business.ResourceExamineManagement
         /// <summary>
         /// BOM清单批量预处理
         /// </summary>
-        public void AutoCreateBomBillInterface()
+        public void AutoCreateBomBillInterface(string companyid)
         {
-            AutoCreateBomBill();
+            AutoCreateBomBill(companyid);
         }
 
         public async Task AutoCreatePickBill(List<WorkOrdMaster> workOrdMasters, List<PeriodSequenceDet> dbPeriodSequences, List<NbrMaster> nbrMasterList, List<NbrDetail> nbrDetailList)
@@ -3357,7 +3357,7 @@ namespace Business.ResourceExamineManagement
         /// <param name="workOrd"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public async Task<string> ProductionSchedule(string workOrd)
+        public async Task<string> ProductionSchedule(string workOrd,string domain)
         {
             List<string> workOrds = workOrd.Split(",").ToList();
             if (workOrds.Count == 0)
@@ -3365,7 +3365,7 @@ namespace Business.ResourceExamineManagement
                 return "";
             }
             //获取工单数据
-            var workOrdMasters = _workOrdMaster.Select(p => workOrds.Contains(p.WorkOrd));
+            var workOrdMasters = _workOrdMaster.Select(p => workOrds.Contains(p.WorkOrd) && p.Domain == domain);
             //获取已排产的工单
             List<string> dbWorkOrds = _periodSequenceDet.Select(p => workOrds.Contains(p.WorkOrds)).Select(p => p.WorkOrds).Distinct().ToList();
             //过滤掉已排产的工单
@@ -3384,14 +3384,14 @@ namespace Business.ResourceExamineManagement
         /// 生成领料单
         /// </summary>
         /// <param name="workOrd"></param>
-        public async Task<string> CreatePickBill(string workOrd)
+        public async Task<string> CreatePickBill(string workOrd, string domain)
         {
             List<string> workOrds = new List<string>();
             List<WorkOrdMaster> workOrdMasters = new List<WorkOrdMaster>();
             if (string.IsNullOrEmpty(workOrd))
             {
                 //获取工单数据
-                workOrdMasters = _workOrdMaster.Select(p => p.OrdDate >= DateTime.Now.Date.AddDays(1) && p.OrdDate < DateTime.Now.Date.AddDays(4) && p.Status != "r" && p.Status != "c");
+                workOrdMasters = _workOrdMaster.Select(p => p.Domain == domain && p.OrdDate >= DateTime.Now.Date.AddDays(1) && p.OrdDate < DateTime.Now.Date.AddDays(4) && p.Status != "r" && p.Status != "c");
             }
             else {
                 workOrds = workOrd.Split(",").ToList();
@@ -3399,14 +3399,14 @@ namespace Business.ResourceExamineManagement
                 {
                     return JsonConvert.SerializeObject("没有需要下达的工单。");
                 }
-                workOrdMasters = _workOrdMaster.Select(p => workOrds.Contains(p.WorkOrd) && p.Status != "r" && p.Status != "c");
+                workOrdMasters = _workOrdMaster.Select(p => p.Domain == domain && workOrds.Contains(p.WorkOrd) && p.Status != "r" && p.Status != "c");
             }
             if (workOrdMasters.Count == 0)
             {
                 return "没有需要下达的工单。";
             }
             //获取已排产的工单
-            List<PeriodSequenceDet> dbPeriodSequences = _periodSequenceDet.Select(p => workOrds.Contains(p.WorkOrds) && p.Domain == workOrdMasters[0].Domain && p.IsActive);
+            List<PeriodSequenceDet> dbPeriodSequences = _periodSequenceDet.Select(p => workOrds.Contains(p.WorkOrds) && p.Domain == domain && p.IsActive);
             List<string> dbWorkOrds = dbPeriodSequences.Select(p => p.WorkOrds).Distinct().ToList();
 
             //查出已排产的工单
@@ -3421,7 +3421,7 @@ namespace Business.ResourceExamineManagement
             }
 
             //增加判断当前工单是否进行过齐套检查，并且是仓库齐套
-            var mes_morders = _mysql_mes_morder.GetListAsync(s => dbWorkOrds.Contains(s.morder_no)).Result;
+            var mes_morders = _mysql_mes_morder.GetListAsync(s => dbWorkOrds.Contains(s.morder_no) && s.factory_id.ToString() == domain).Result;
             if (mes_morders.Where(s => s.MaterialSituation != MorderEnum.CarehouseComplete).Any())
             {
                 return "请选择物料情况为“仓库齐套”的工单。";

MicroServices/Business/Business.HttpApi/Controllers/ResourceExamineController.cs

@@ -38,9 +38,9 @@ namespace Business.Controllers
         /// <returns></returns>
         [HttpPost]
         [Route("productionschedule")]
-        public Task<string> ProductionSchedule(string workOrds)
+        public Task<string> ProductionSchedule(string workOrds, string domain)
         {
-            return _ResourceExamineAppService.ProductionSchedule(workOrds);
+            return _ResourceExamineAppService.ProductionSchedule(workOrds, domain);
         }
 
         /// <summary>
@@ -50,9 +50,9 @@ namespace Business.Controllers
         /// <returns></returns>
         [HttpPost]
         [Route("CreatePickBill")]
-        public Task<string> CreatePickBill(string workOrds)
+        public Task<string> CreatePickBill(string workOrds, string domain)
         {
-            return _ResourceExamineAppService.CreatePickBill(workOrds);
+            return _ResourceExamineAppService.CreatePickBill(workOrds, domain);
         }
 
         /// <summary>
@@ -109,9 +109,9 @@ namespace Business.Controllers
         /// <returns></returns>
         [HttpGet]
         [Route("autocreatebombillinterface")]
-        public void AutoCreateBomBillInterface()
+        public void AutoCreateBomBillInterface(string companyid)
         {
-            _ResourceExamineAppService.AutoCreateBomBillInterface();
+            _ResourceExamineAppService.AutoCreateBomBillInterface(companyid);
         }
 
         /// <summary>
@@ -133,9 +133,9 @@ namespace Business.Controllers
         /// <returns></returns>
         [HttpPost]
         [Route("PrAutoMerge")]
-        public void PrAutoMerge()
+        public void PrAutoMerge(string companyid)
         {
-            _ResourceExamineAppService.PrAutoMerge();
+            _ResourceExamineAppService.PrAutoMerge(companyid);
         }
 
         /// <summary>
@@ -157,9 +157,9 @@ namespace Business.Controllers
         /// <returns></returns>
         [HttpPost]
         [Route("PrAutoApprove")]
-        public Task<string> PrAutoApprove()
+        public Task<string> PrAutoApprove(string companyid)
         {
-            return _ResourceExamineAppService.PrAutoApprove();
+            return _ResourceExamineAppService.PrAutoApprove(companyid);
         }
 
         /// <summary>