Merge branch 'dev' of http://123.60.180.165:4647/ZZYDOP/DOPCore into dev

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/DOP/SyncDOPAppService.cs

@@ -21,11 +21,11 @@ namespace Business.DOP
         /// <summary>
         /// 平台规格型号对照表
         /// </summary>
-        private readonly IRepository<PlatformSpecificationComparison, long> _PlatformSpecificationComparison;
+        private readonly IRepository<WMS_PlatformSpecificationComparison, long> _PlatformSpecificationComparison;
         /// <summary>
         /// 平台库存表
         /// </summary>
-        private readonly IRepository<PlatformInventory, long> _PlatformInventory;
+        private readonly IRepository<WMS_PlatformInventory, long> _PlatformInventory;
         /// <summary>
         ///  雪花算法
         /// </summary>
@@ -40,8 +40,8 @@ namespace Business.DOP
         /// 构造函数
         /// </summary>
         public SyncDOPAppService(
-            IRepository<PlatformSpecificationComparison, long> PlatformSpecificationComparison,
-            IRepository<PlatformInventory, long> PlatformInventory,
+            IRepository<WMS_PlatformSpecificationComparison, long> PlatformSpecificationComparison,
+            IRepository<WMS_PlatformInventory, long> PlatformInventory,
              IUnitOfWorkManager unitOfWorkManager,
         ICurrentTenant currentTenant
             )
@@ -82,8 +82,8 @@ namespace Business.DOP
             {
                 return JsonConvert.SerializeObject("成品库存为空！");
             }
-            List<PlatformInventory> platformInventoryInsert = new List<PlatformInventory>();
-            List<PlatformInventory> platformInventoryDel;
+            List<WMS_PlatformInventory> platformInventoryInsert = new List<WMS_PlatformInventory>();
+            List<WMS_PlatformInventory> platformInventoryDel;
             if (type == 1)
             {
                 platformInventoryDel = _PlatformInventory.GetListAsync(x => x.Code == "HW0001").Result;
@@ -94,13 +94,13 @@ namespace Business.DOP
             }
             foreach (var item in platformInventoryDtoList)
             {
-                PlatformInventory platformInventory = new PlatformInventory();
+                WMS_PlatformInventory platformInventory = new WMS_PlatformInventory();
                 platformInventory.GenerateNewId(snowFlake.NextId());
                 platformInventory.Location = item.Location;
                 platformInventory.SpecificationModel = item.SpecificationModel;
                 platformInventory.BatchNumber = item.BatchNumber;
-                platformInventory.InventoryQuantity = item.InventoryQuantity;
-                platformInventory.PeriodOfValidity = item.PeriodOfValidity;
+                platformInventory.InventoryQuantity = item.InventoryQuantity.GetValueOrDefault();
+                platformInventory.PeriodOfValidity = item.PeriodOfValidity.GetValueOrDefault();
                 if (type == 1)
                 {
                     platformInventory.Code = "HW0001";

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();
@@ -1452,7 +1452,7 @@ namespace Business.ResourceExamineManagement
             }
 
             //获取订单行数据  progress == "2"已做检查但是未评审的订单行
-            //sentrys = sentrys.Where(s => s.progress == "2").ToList();
+            sentrys = sentrys.Where(s => s.progress == "2").ToList();
             if (!sentrys.Any())
             {
                 new NLogHelper("ResourceExamineAppService").WriteLog("ReceiveResult", "订单行数据不存在", _currentTenant.Id.ToString());
@@ -1508,16 +1508,6 @@ namespace Business.ResourceExamineManagement
             WriteMorder = WriteMorder.Where(x => !dborders.Select(c => c.Id).Contains(x.mysql_id)).ToList();
             #endregion
 
-            List<mo_ic_item_stockoccupy> item_stockoccupy1 = await _ic_item_stockoccupy.GetListAsync(s => seIds.Contains(s.orderentry_id.Value) && bangidList.Contains(s.bang_id));
-            if (item_stockoccupy1.Any())
-            {
-                item_stockoccupy1.ForEach(s => { s.mysql_id = help.NextId(); });
-                var sklist = ObjectMapper.Map<List<mo_ic_item_stockoccupy>, List<ic_item_stockoccupy>>(item_stockoccupy1);
-                sklist.ForEach(s => { s.create_time = DateTime.Now; });
-                _businessDbContext.BulkInsert(sklist);
-                return "ok";
-            }
-
             //批量保存 后期考虑子工单
             List<mes_morder> moderlist = new List<mes_morder>();
             List<WorkOrdMaster> workOrds = new List<WorkOrdMaster>();
@@ -1541,7 +1531,6 @@ namespace Business.ResourceExamineManagement
             List<mo_srm_pr_main> prmainlist = await _srm_pr_main.GetListAsync(s => seIds.Contains(s.sentry_id.Value) && bangidList.Contains(s.bang_id.Value));
             List<mo_ic_item_stockoccupy> item_stockoccupy = await _ic_item_stockoccupy.GetListAsync(s => seIds.Contains(s.orderentry_id.Value) && bangidList.Contains(s.bang_id));
 
-
             using (var unitOfWork = _unitOfWorkManager.Begin(false, true))
             {
                 try
@@ -1585,7 +1574,7 @@ namespace Business.ResourceExamineManagement
                     if (item_stockoccupy.Any())
                     {
                         var sklist = ObjectMapper.Map<List<mo_ic_item_stockoccupy>, List<ic_item_stockoccupy>>(item_stockoccupy);
-                        sklist.ForEach(s => { s.create_time = DateTime.Now; });
+                        sklist.ForEach(s => { s.GenerateNewId(help.NextId()); s.create_time = DateTime.Now; });
                         _businessDbContext.BulkInsert(sklist);
                     }
                     if (po_occupy.Any())
@@ -2358,7 +2347,7 @@ namespace Business.ResourceExamineManagement
                 }
                 mo_Mes_Morders = _mysql_mes_morder.GetListAsync(x => companyid == x.company_id.ToString() && workOrds.Contains(x.morder_no)).Result;
                 //如果工单有今天和之前的，则提示不处理
-                if (mo_Mes_Morders.Where(s => s.moentry_sys_stime >= DateTime.Now.Date).Count() > 0)
+                if (mo_Mes_Morders.Where(s => s.moentry_sys_stime <= DateTime.Now.Date).Count() > 0)
                 {
                     return "请选择开工时间在今天之后的工单。";
                 }
@@ -2387,19 +2376,19 @@ namespace Business.ResourceExamineManagement
                             if (nbr.Ufld1 == "completed")
                             {
                                 //工单状态为  “生产齐套”
-                                mo.MaterialSituation = "生产齐套";
+                                mo.MaterialSituation = MorderEnum.ProduceComplete;
                             }
                             else
                             {
                                 //工单状态为  “备料滞后”
-                                mo.MaterialSituation = "备料滞后";
+                                mo.MaterialSituation = MorderEnum.Lag;
                             }
                         }
                         //完成时间未到
                         else if (nbr.EffDate.GetValueOrDefault().Date > DateTime.Now.Date)
                         {
                             //工单状态为  “备料中”
-                            mo.MaterialSituation = "备料中";
+                            mo.MaterialSituation = MorderEnum.Preparation;
                         }
                         //完成时间已经过去，则不做处理
                     }
@@ -2456,17 +2445,17 @@ namespace Business.ResourceExamineManagement
                                 {
                                     //生成领料单
                                     workords += "," + cmo.morder_no;
-                                    cmo.MaterialSituation = "备料中";
+                                    cmo.MaterialSituation = MorderEnum.Preparation;
                                     cmo.morder_state = MorderEnum.Xd_state;
                                 }
                                 else {
-                                    cmo.MaterialSituation = "仓库齐套";
+                                    cmo.MaterialSituation = MorderEnum.CarehouseComplete;
                                 }
                             }
                             else
                             {
                                 //工单状态为  “仓库不齐套”
-                                cmo.MaterialSituation = "仓库不齐套";
+                                cmo.MaterialSituation = MorderEnum.NoCarehouseComplete;
                             }
                         }
                     }
@@ -2479,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");
             }
@@ -2735,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;
             }
 
@@ -2764,7 +2753,7 @@ namespace Business.ResourceExamineManagement
                 ExamineResult dtl = new ExamineResult();
                 dtl.morder_id = item.Id;
                 dtl.morder_no = item.morder_no;
-
+                dtl.bangid = bangid;
                 dtl.order_statr_time = item.start_time;
                 dtl.bom_number = item.bom_number;
                 dtl.need_qty = item.need_number.GetValueOrDefault();
@@ -3035,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
@@ -3094,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)
@@ -3368,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)
@@ -3376,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();
             //过滤掉已排产的工单
@@ -3395,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();
@@ -3410,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();
 
             //查出已排产的工单
@@ -3430,6 +3419,14 @@ namespace Business.ResourceExamineManagement
             {
                 return "当前选择的工单已领料或未排产。";
             }
+
+            //增加判断当前工单是否进行过齐套检查，并且是仓库齐套
+            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 "请选择物料情况为“仓库齐套”的工单。";
+            }
+
             List<NbrMaster> nbrMasterList = new List<NbrMaster>();//需要生成领料单列表
             List<NbrDetail> nbrDetailList = new List<NbrDetail>();//需要生成领料单明细列表
 

MicroServices/Business/Business.Core/Enum/MorderEnum.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Numerics;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -72,5 +73,26 @@ namespace Business.Core.Enum
         /// 资源检查
         /// </summary>
         public const string Zyjc_Type = "资源检查";
+
+        /// <summary>
+        /// 生产齐套
+        /// </summary>
+        public const string ProduceComplete = "生产齐套";
+        /// <summary>
+        /// 备料中
+        /// </summary>
+        public const string Preparation = "备料中";
+        /// <summary>
+        /// 仓库不齐套
+        /// </summary>
+        public const string NoCarehouseComplete = "仓库不齐套";
+        /// <summary>
+        /// 仓库齐套
+        /// </summary>
+        public const string CarehouseComplete = "仓库齐套";
+        /// <summary>
+        /// 备料滞后
+        /// </summary>
+        public const string Lag = "备料滞后";
     }
 }

MicroServices/Business/Business.Domain/StructuredDB/WMS/PlatformInventory.cs → MicroServices/Business/Business.Domain/StructuredDB/WMS/WMS_PlatformInventory.cs

@@ -2,6 +2,7 @@
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -12,7 +13,7 @@ namespace Business.StructuredDB.WMS
     /// 平台规格库存对照
     /// </summary>
     [Comment("平台规格库存对照")]
-    public class PlatformInventory : BaseEntity
+    public class WMS_PlatformInventory : BaseEntity
     {
         /// <summary>
         /// 仓库
@@ -33,12 +34,12 @@ namespace Business.StructuredDB.WMS
         /// 数量
         /// </summary>
         [Comment("数量")]
-        public decimal? InventoryQuantity { get; set; }
+        public decimal InventoryQuantity { get; set; }
         /// <summary>
         /// 有效期
         /// </summary>
         [Comment("有效期")]
-        public DateTime? PeriodOfValidity { get; set; }
+        public DateTime PeriodOfValidity { get; set; }
         /// <summary>
         /// 编码
         /// </summary>

MicroServices/Business/Business.Domain/StructuredDB/WMS/PlatformSpecificationComparison.cs → MicroServices/Business/Business.Domain/StructuredDB/WMS/WMS_PlatformSpecificationComparison.cs

@@ -2,6 +2,7 @@
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -11,34 +12,35 @@ namespace Business.StructuredDB.WMS
     /// <summary>
     /// 平台规格库存对照
     /// </summary>
+    [Table("WMS_PlatformSpecificationComparison")]
     [Comment("平台规格库存对照")]
-    public class PlatformSpecificationComparison : BaseEntity
+    public class WMS_PlatformSpecificationComparison : BaseEntity
     {
         /// <summary>
         /// 主键
         /// </summary>
         /// <param name="Id"></param>
-        public PlatformSpecificationComparison(long Id) : base(Id)
+        public WMS_PlatformSpecificationComparison(long Id) : base(Id)
         {
         }
         /// <summary>
         /// 标准规格型号
         /// </summary>
         [Comment("标准规格型号")]
-        public string? StandardSpecifications { get; set; }
+        public string StandardSpecifications { get; set; }
         /// <summary>
         /// 海王规格型号
         /// </summary>
         [Comment("海王规格型号")]
-        public string? HWSpecificationModel { get; set; }
+        public string HWSpecificationModel { get; set; }
         /// <summary>
         /// 国科规格型号
         /// </summary>
         [Comment("国科规格型号")]
-        public string? GKSpecificationModel { get; set; }
+        public string GKSpecificationModel { get; set; }
         /// <summary>
         /// 库存型号
         /// </summary>
-        public string? Type { get; set; }
+        public string Type { get; set; }
     }
 }

MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/BusinessDbContextModelCreatingExtensions.cs

@@ -48,7 +48,7 @@ namespace Business.EntityFrameworkCore
             builder.Entity<ic_item_stockoccupy>(b =>
             {
                 b.ToTable("ic_item_stockoccupy");
-                b.HasIndex(b => new { b.icitem_id, b.tenant_id, b.company_id, b.factory_id });
+                b.HasIndex(b => new { b.orderentry_id,b.icitem_number,b.fversion, b.tenant_id, b.company_id, b.factory_id });
                 //²»Ó³Éäµ½Êý¾Ý¿âÖÐ
                 b.Ignore(x => x.bang_id);
                 b.ConfigureByConvention();

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>