在途在制代码调整。

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

@@ -14,5 +14,6 @@ namespace Business.ResourceExamineManagement.Dto
         public List<srm_po_list> polist { get; set; } = new List<srm_po_list>();
         public List<mo_srm_po_main> mopoMain { get; set; } = new List<mo_srm_po_main>();
         public List<mo_srm_po_list> mopolist { get; set; } = new List<mo_srm_po_list>();
+        public List<mo_srm_po_occupy> poOccupiesList { get; set; } = new List<mo_srm_po_occupy>();
     }
 }

MicroServices/Business/Business.Application/BusinessApplicationAutoMapperProfile.cs

@@ -66,6 +66,8 @@ namespace Business
                 .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
             CreateMap<srm_po_occupy, mo_srm_po_occupy>()
                 .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+            CreateMap<mo_srm_po_occupy,srm_po_occupy>()
+                .ForMember(d => d.Id, map => map.MapFrom(o => o.mysql_id));
             CreateMap<srm_pr_main, mo_srm_pr_main>()
                .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
             CreateMap<mo_srm_pr_main, srm_pr_main>()
@@ -92,6 +94,8 @@ namespace Business
 
             CreateMap<mes_mooccupy, mo_mes_mooccupy>()
                .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+            CreateMap<mo_mes_mooccupy, mes_mooccupy>()
+               .ForMember(d => d.Id, map => map.MapFrom(o => o.mysql_id));
 
             CreateMap<mes_morder, mo_mes_morder>()
                .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));

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

@@ -42,6 +42,8 @@ using Business.Dto;
 using NetTopologySuite.Simplify;
 using System.Transactions;
 using Spire.Pdf.General.Render.Decode.Jpeg2000.j2k.codestream;
+using Volo.Abp.ObjectMapping;
+using SixLabors.ImageSharp;
 
 namespace Business.ResourceExamineManagement
 {
@@ -731,6 +733,8 @@ namespace Business.ResourceExamineManagement
                     {
                         _CalcBomViewAppService.mooccupyAllInsertList.ForEach(s => { s.tenant_id = param.tenantId; s.factory_id = param.factoryId; });
                         await _mes_mooccupy.InsertMany(_CalcBomViewAppService.mooccupyAllInsertList);
+                        var moOccupy = ObjectMapper.Map<List<mo_mes_mooccupy>, List<mes_mooccupy>>(_CalcBomViewAppService.mooccupyAllInsertList);
+                        _businessDbContext.BulkInsert(moOccupy);
                         rtn.mooccupyAllList = _CalcBomViewAppService.mooccupyAllInsertList;
                     }
                     if (_CalcBomViewAppService.moentriesInsertList.Any())
@@ -757,6 +761,8 @@ namespace Business.ResourceExamineManagement
                     {
                         _CalcBomViewAppService.srm_Po_OccupiesInsert.ForEach(s => { s.tenant_id = param.tenantId; s.factory_id = param.factoryId; });
                         await _srm_po_occupy.InsertMany(_CalcBomViewAppService.srm_Po_OccupiesInsert);
+                        var poOccupies = ObjectMapper.Map<List<mo_srm_po_occupy>, List<srm_po_occupy>>(_CalcBomViewAppService.srm_Po_OccupiesInsert);
+                        _businessDbContext.BulkInsert(poOccupies);
                     }
                     scope.Complete();
                 }
@@ -811,6 +817,11 @@ namespace Business.ResourceExamineManagement
                         {
                             _businessDbContext.BulkInsert(poaction.polist);
                         }
+                        if (poaction.poOccupiesList.Any())
+                        {
+                            var poOccupies = ObjectMapper.Map<List<mo_srm_po_occupy>, List<srm_po_occupy>>(poaction.poOccupiesList);
+                            _businessDbContext.BulkInsert(poOccupies);
+                        }
                         scope.Complete();
                     }
                     catch (Exception e)
@@ -1510,6 +1521,32 @@ namespace Business.ResourceExamineManagement
             List<srm_po_main> po_mainlist = ObjectMapper.Map<List<mo_srm_po_main>, List<srm_po_main>>(polist);
             var po_listlist = ObjectMapper.Map<List<mo_srm_po_list>, List<srm_po_list>>(podetaillist);
 
+            //生成mo_srm_po_occupy采购占用表数据。 
+            foreach (var pol in po_listlist)
+            {
+                mo_srm_po_occupy srm_Po_Occupy = new mo_srm_po_occupy();
+                srm_Po_Occupy.id = help.NextId();
+                srm_Po_Occupy.mysql_id = help.NextId();
+                srm_Po_Occupy.bang_id = bangid;
+                srm_Po_Occupy.polist_id = pol.Id;
+                srm_Po_Occupy.polist_row = pol.polist_row;
+                /*if (seorderentry != null)
+                {
+                    srm_Po_Occupy.eid = seorderentry.entry_seq.Value;
+                    srm_Po_Occupy.bill_no = seorderentry.seorder_id;
+                    srm_Po_Occupy.entry_id = seorderentry.entry_seq.GetValueOrDefault();
+                    srm_Po_Occupy.org_id = seorderentry.org_id;
+                }*/
+                srm_Po_Occupy.qty = pol.qty;
+                srm_Po_Occupy.type = MorderEnum.Zyjc_Type;//TODO:类型未知
+                srm_Po_Occupy.stime = pol.create_time;
+                srm_Po_Occupy.etime = pol.rarrdate;
+                srm_Po_Occupy.state = 1;
+                srm_Po_Occupy.tenant_id = param.tenantId;//取销售子表企业ID
+                srm_Po_Occupy.factory_id = param.factoryId;
+                poaction.poOccupiesList.Add(srm_Po_Occupy);
+            }
+
             poaction.poMain.AddRange(po_mainlist);
             poaction.polist.AddRange(po_listlist);
             poaction.mopoMain.AddRange(polist);
@@ -1730,6 +1767,32 @@ namespace Business.ResourceExamineManagement
             List<srm_po_main> po_mainlist = ObjectMapper.Map<List<mo_srm_po_main>, List<srm_po_main>>(polist);
             var po_listlist = ObjectMapper.Map<List<mo_srm_po_list>, List<srm_po_list>>(podetaillist);
 
+            //生成mo_srm_po_occupy采购占用表数据。 
+            foreach (var pol in po_listlist)
+            {
+                mo_srm_po_occupy srm_Po_Occupy = new mo_srm_po_occupy();
+                srm_Po_Occupy.id = help.NextId();
+                srm_Po_Occupy.mysql_id = help.NextId();
+                srm_Po_Occupy.bang_id = bangid;
+                srm_Po_Occupy.polist_id = pol.Id;
+                srm_Po_Occupy.polist_row = pol.polist_row;
+                /*if (seorderentry != null)
+                {
+                    srm_Po_Occupy.eid = seorderentry.entry_seq.Value;
+                    srm_Po_Occupy.bill_no = seorderentry.seorder_id;
+                    srm_Po_Occupy.entry_id = seorderentry.entry_seq.GetValueOrDefault();
+                    srm_Po_Occupy.org_id = seorderentry.org_id;
+                }*/
+                srm_Po_Occupy.qty = pol.qty;
+                srm_Po_Occupy.type = MorderEnum.Zyjc_Type;//TODO:类型未知
+                srm_Po_Occupy.stime = pol.create_time;
+                srm_Po_Occupy.etime = pol.rarrdate;
+                srm_Po_Occupy.state = 1;
+                srm_Po_Occupy.tenant_id = param.tenantId;//取销售子表企业ID
+                srm_Po_Occupy.factory_id = param.factoryId;
+                poaction.poOccupiesList.Add(srm_Po_Occupy);
+            }
+
             poaction.poMain.AddRange(po_mainlist);
             poaction.polist.AddRange(po_listlist);
             poaction.mopoMain.AddRange(polist);

MicroServices/Business/Bussiness.Model/SRM/srm_po_occupy.cs

@@ -28,13 +28,11 @@ namespace Business.Model.SRM
         /// <summary>
         /// 客户订单行id
         /// </summary>
-        [Required]
         [Comment("客户订单行id")]
         public long? eid { get; set; }
         /// <summary>
         /// 客户订单id
         /// </summary>
-        [Required]
         [Comment("客户订单id")]
         public long? bill_no { get; set; }
         /// <summary>

MicroServices/Business/Bussiness.MongoModel/SRM/mo_srm_po_list.cs

@@ -207,25 +207,25 @@ namespace Business.MongoModel.SRM
         /// </summary>
         [Precision(23, 10)]
         [Comment("采购到货日期")]
-        public decimal? procurement_rarr_date { get; set; }
+        public DateTime? procurement_rarr_date { get; set; }
         /// <summary>
         /// 再计划到货日期
         /// </summary>
         [Precision(23, 10)]
         [Comment("再计划到货日期")]
-        public decimal? rparrive_date { get; set; }
+        public DateTime? rparrive_date { get; set; }
         /// <summary>
         /// 供应商交期
         /// </summary>
         [Precision(23, 10)]
         [Comment("供应商交期")]
-        public decimal? purchase_date { get; set; }
+        public DateTime? purchase_date { get; set; }
         /// <summary>
         /// 采购确认到货日期
         /// </summary>
         [Precision(23, 10)]
         [Comment("采购确认到货日期")]
-        public decimal? pur_affirmdate { get; set; }
+        public DateTime? pur_affirmdate { get; set; }
         /// <summary>
         /// 币别
         /// </summary>

MicroServices/Business/Bussiness.MongoModel/SRM/mo_srm_po_occupy.cs

@@ -28,13 +28,11 @@ namespace Business.MongoModel.SRM
         /// <summary>
         /// 客户订单行id
         /// </summary>
-        [Required]
         [Comment("客户订单行id")]
         public long? eid { get; set; }
         /// <summary>
         /// 客户订单id
         /// </summary>
-        [Required]
         [Comment("客户订单id")]
         public long? bill_no { get; set; }
         /// <summary>