diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/ADJ_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/ADJ_SERVICE.cs
index 21ff965b..10192c0c 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/ADJ_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/ADJ_SERVICE.cs
@@ -182,7 +182,7 @@ public class ADJ_SERVICE : BASE_SERVICE
     {
         if (p_list.Count == 0)
         {
-            throw new UserFriendlyException($"导入数据为空");
+            throw new UserFriendlyException($"导入数据为空","400");
         }
 
         foreach (var itm in p_list)
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs
index 19a8939b..a5a73071 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs
@@ -105,7 +105,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
 
             if (settle == null)
             {
-                throw new UserFriendlyException($"选择发票:{p_invbillnum}对应的可结算单不在请检查！");
+                throw new UserFriendlyException($"选择发票:{p_invbillnum}对应的可结算单不在请检查！","400");
 
             }
             version = settle.Version;
@@ -113,11 +113,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             {
                 if (inv.InvoiceState == InvoiceBillState.报废)
                 {
-                    throw new UserFriendlyException($"选择发票:{p_invbillnum}状态为报废状态不能重开！");
+                    throw new UserFriendlyException($"选择发票:{p_invbillnum}状态为报废状态不能重开！", "400");
                 }
                 if (inv.State == SettleBillState.商务已审核 || inv.State == SettleBillState.已开票)
                 {
-                    throw new UserFriendlyException($"选择发票:{p_invbillnum}状态在财务审核后可以报废重开,之前不能重开可以退回！");
+                    throw new UserFriendlyException($"选择发票:{p_invbillnum}状态在财务审核后可以报废重开,之前不能重开可以退回！", "400");
                 }
                 var bbaclist = await _bbacMng.GetContainsAsync(inv.InvbillNum);//结算分组对应结算零件
                 var adjlist = await _adjRepository.Where(p => p.OldInvBillNum == inv.InvbillNum).ToListAsync();//调整表明细
@@ -206,7 +206,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             }
             else
             {
-                throw new UserFriendlyException($"不存发票号为:{p_invbillnum}发票");
+                throw new UserFriendlyException($"不存发票号为:{p_invbillnum}发票", "400");
             }
             //}
             //else
@@ -228,7 +228,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             var adjlist = ObjectMapper.Map<List<PUB_ADJ_DETAIL_DTO>, List<PUB_ADJ_DETAIL>>(p_list);
             if (adjlist == null && adjlist.Count == 0)
             {
-                throw new UserFriendlyException($"调整表无数据!");
+                throw new UserFriendlyException($"调整表无数据!", "400");
             }
             var first = p_list.FirstOrDefault();
             var invbillnum = first.InvBillNum;
@@ -241,7 +241,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
 
                 if(settle==null)
                 {
-                    throw new UserFriendlyException( $"选择发票:{invbillnum}对应的可结算单不粗拿在在请检查！");
+                    throw new UserFriendlyException( $"选择发票:{invbillnum}对应的可结算单不粗拿在在请检查！", "400");
                 }
 
                 version=settle.Version;
@@ -249,11 +249,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 {
                     if (inv.InvoiceState == InvoiceBillState.报废)
                     {
-                        throw new UserFriendlyException( $"选择发票:{invbillnum}状态为报废状态不能重开！");
+                        throw new UserFriendlyException( $"选择发票:{invbillnum}状态为报废状态不能重开！", "400");
                     }
                     if (inv.State == SettleBillState.商务已审核 || inv.State == SettleBillState.已开票)
                     {
-                        throw new UserFriendlyException( $"选择发票:{invbillnum}状态在财务审核后可以报废重开,之前不能重开可以退回！");
+                        throw new UserFriendlyException( $"选择发票:{invbillnum}状态在财务审核后可以报废重开,之前不能重开可以退回！", "400");
                     }
                     var bbaclist = await _bbacMng.GetContainsAsync(inv.InvbillNum);//发票对应结算零件
                    // var adjlist = await _adjRepository.Where(p => p.OldInvBillNum == inv.InvbillNum).ToListAsync();//调整表明细
@@ -334,7 +334,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 }
                 else
                 {
-                    throw new UserFriendlyException( $"不存发票号为:{invbillnum}发票");
+                    throw new UserFriendlyException( $"不存发票号为:{invbillnum}发票", "400");
                 }
             //}
             //else
@@ -364,7 +364,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             var adjlist=ObjectMapper.Map<List<PUB_ADJ_DETAIL_DTO>, List<PUB_ADJ_DETAIL>>(p_list);
             if (adjlist == null && adjlist.Count==0)
             {
-                throw new UserFriendlyException($"调整表无数据!");
+                throw new UserFriendlyException($"调整表无数据!", "400");
             }
             var first = p_list.FirstOrDefault();
             var invbillnum = first.InvBillNum;
@@ -379,21 +379,21 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
 
                 if (settle == null)
                 {
-                    throw new UserFriendlyException($"选择发票:{invbillnum}对应的可结算单不在请检查！");
+                    throw new UserFriendlyException($"选择发票:{invbillnum}对应的可结算单不在请检查！", "400");
                 }
                 version = settle.Version;
             if (inv != null)
             {
                 if (inv.InvoiceState == InvoiceBillState.报废)
                 {
-                    throw new UserFriendlyException($"选择发票:{invbillnum}状态为报废状态不能重开！");
+                    throw new UserFriendlyException($"选择发票:{invbillnum}状态为报废状态不能重开！", "400");
                 }
                 if (inv.State == SettleBillState.商务已审核 || inv.State == SettleBillState.已开票)
                 {
-                    throw new UserFriendlyException($"选择发票:{invbillnum}状态在财务审核后可以报废重开,之前请退回重开！");
+                    throw new UserFriendlyException($"选择发票:{invbillnum}状态在财务审核后可以报废重开,之前请退回重开！", "400");
                 }
 
-                var bbaclist = await _bbacMng.GetContainsAsync(inv.InvbillNum);//结算分组对应结算零件
+                var bbaclist = await _bbacMng.GetContainsAsync(inv.InvbillNum, "400");//结算分组对应结算零件
                                                                                //var adjlist = await _adjRepository.Where(p => p.OldInvBillNum == inv.InvbillNum).ToListAsync();//调整表明细
                 if (adjlist != null && adjlist.Count() > 0)
                 {
@@ -473,7 +473,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 }
                 else
                 {
-                    throw new UserFriendlyException($"不存发票号为:{invbillnum}发票");
+                    throw new UserFriendlyException($"不存发票号为:{invbillnum}发票", "400");
                 }
             }
 
@@ -499,7 +499,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             var adjlist = ObjectMapper.Map<List<PUB_ADJ_DETAIL_DTO>, List<PUB_ADJ_DETAIL>>(p_list);
             if (adjlist == null && adjlist.Count == 0)
             {
-                throw new UserFriendlyException($"调整表无数据!");
+                throw new UserFriendlyException($"调整表无数据!", "400");
             }
             var first = p_list.FirstOrDefault();
             var invbillnum = first.InvBillNum;
@@ -514,18 +514,18 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
 
             if (settle == null)
             {
-                throw new UserFriendlyException($"选择发票:{invbillnum}对应的可结算单不在请检查！");
+                throw new UserFriendlyException($"选择发票:{invbillnum}对应的可结算单不在请检查！", "400");
             }
             version = settle.Version;
             if (inv != null)
             {
                 if (inv.InvoiceState == InvoiceBillState.报废)
                 {
-                    throw new UserFriendlyException($"选择发票:{invbillnum}状态为报废状态不能重开！");
+                    throw new UserFriendlyException($"选择发票:{invbillnum}状态为报废状态不能重开！", "400");
                 }
                 if (inv.State == SettleBillState.商务已审核 || inv.State == SettleBillState.已开票)
                 {
-                    throw new UserFriendlyException($"选择发票:{invbillnum}状态在财务审核后可以报废重开,之前请退回重开！");
+                    throw new UserFriendlyException($"选择发票:{invbillnum}状态在财务审核后可以报废重开,之前请退回重开！", "400");
                 }
                 var bbaclist = await _bbacMng.GetContainsAsync(inv.InvbillNum);//结算分组对应结算零件                                                               //var adjlist = await _adjRepository.Where(p => p.OldInvBillNum == inv.InvbillNum).ToListAsync();//调整表明细
                 if (adjlist != null && adjlist.Count() > 0)
@@ -641,7 +641,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             }
             else
             {
-                throw new UserFriendlyException($"不存发票号为:{invbillnum}发票");
+                throw new UserFriendlyException($"不存发票号为:{invbillnum}发票", "400");
             }
             //}
             //else
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs
index 08ceebf3..f0f6b483 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs
@@ -58,7 +58,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             var lst = ls.Where(p => (p.State == SettleBillState.已提交扣减 || p.State == SettleBillState.已扣减));
             if (lst.Count() > 0)
             {
-                throw new UserFriendlyException("当前状态是已提交状态，不能重复已提交");
+                throw new UserFriendlyException("当前状态是已提交状态，不能重复已提交", "400");
             }
             foreach (var item in ls)
             {
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs
index 4614b6d6..cbc42227 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs
@@ -70,18 +70,18 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 var settle = await _hbpoMng.GetMainAsync(inv.InvGroupNum);
                 if (settle == null)
                 {
-                    throw new UserFriendlyException( $"选择发票:{p_invbillnum}对应的可结算单不存在请检查！");
+                    throw new UserFriendlyException( $"选择发票:{p_invbillnum}对应的可结算单不存在请检查！","400");
                 }
                 version = settle.Version;
                 if (inv != null)
                 {
                     if (inv.InvoiceState == InvoiceBillState.报废)
                     {
-                        throw new UserFriendlyException( $"选择发票:{p_invbillnum}状态为报废状态不能重开！");
+                        throw new UserFriendlyException( $"选择发票:{p_invbillnum}状态为报废状态不能重开！", "400");
                     }
                     if (inv.State == SettleBillState.商务已审核 || inv.State == SettleBillState.已开票)
                     {
-                        throw new UserFriendlyException( $"选择发票:{p_invbillnum}状态在财务审核后可以报废重开,之前请退回重开！");
+                        throw new UserFriendlyException( $"选择发票:{p_invbillnum}状态在财务审核后可以报废重开,之前请退回重开！", "400");
                     }
                     var hbpolist = await _hbpoMng.GetContainsAsync(inv.InvbillNum);//结算分组对应结算零件
                     var adjlist = await _adjRepository.Where(p => p.OldInvBillNum == inv.InvbillNum).ToListAsync();//调整表明细
@@ -162,7 +162,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 }
                 else
                 {
-                    throw new UserFriendlyException( $"不存发票号为:{p_invbillnum}发票");
+                    throw new UserFriendlyException( $"不存发票号为:{p_invbillnum}发票", "400");
                 }
             //}
             //else
@@ -186,7 +186,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             var adjlist = ObjectMapper.Map<List<PUB_ADJ_DETAIL_DTO>, List<PUB_ADJ_DETAIL>>(p_list);
             if (adjlist == null && adjlist.Count == 0)
             {
-                throw new UserFriendlyException($"调整表无数据!");
+                throw new UserFriendlyException($"调整表无数据!", "400");
             }
             var first = p_list.FirstOrDefault();
             var invbillnum = first.InvBillNum;
@@ -201,18 +201,18 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             var settle = await _hbpoMng.GetMainAsync(inv.InvGroupNum);
             if (settle == null)
             {
-                throw new UserFriendlyException($"选择发票:{invbillnum}对应的可结算单不存在请检查！");
+                throw new UserFriendlyException($"选择发票:{invbillnum}对应的可结算单不存在请检查！", "400");
             }
             version = settle.Version;
             if (inv != null)
             {
                 if (inv.InvoiceState == InvoiceBillState.报废)
                 {
-                    throw new UserFriendlyException($"选择发票:{invbillnum}状态为报废状态不能重开！");
+                    throw new UserFriendlyException($"选择发票:{invbillnum}状态为报废状态不能重开！", "400");
                 }
                 if (inv.State == SettleBillState.商务已审核 || inv.State == SettleBillState.已开票)
                 {
-                    throw new UserFriendlyException($"选择发票:{invbillnum}状态在财务审核后可以报废重开,之前请退回重开！");
+                    throw new UserFriendlyException($"选择发票:{invbillnum}状态在财务审核后可以报废重开,之前请退回重开！", "400");
                 }
                 var hbpolist = await _hbpoMng.GetContainsAsync(inv.InvbillNum);//结算分组对应结算零件
                // var adjlist = await _adjRepository.Where(p => p.OldInvBillNum == inv.InvbillNum).ToListAsync();//调整表明细
@@ -290,7 +290,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             }
             else
             {
-                throw new UserFriendlyException($"不存发票号为:{invbillnum}发票");
+                throw new UserFriendlyException($"不存发票号为:{invbillnum}发票", "400");
             }
             //}
             //else
@@ -302,6 +302,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
 
 
         [HttpPost]
+        [UnitOfWork(false)]
         /// 发票重开列表
         /// </summary>
         /// <param name="input"></param>
@@ -314,11 +315,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             {
                 return new JsonResult(new { Code = 400, Message = "请下载错误模版", fileName = result });
             }
-
-
-
             var invBilllist = new List<INVOICE_WAIT_DETAIL_DTO>();
-
             var adjlist = ObjectMapper.Map<List<PUB_ADJ_DETAIL_DTO>, List<PUB_ADJ_DETAIL>>(p_list);
             if (adjlist == null && adjlist.Count == 0)
             {
@@ -370,7 +367,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                         qty: itm.Qty,
                         price: itm.Price,
                         businessType: itm.BusinessType,
-
                         settleDate: itm.SettleDate,
                         groupNum: itm.GroupNum,
                         invGroupNum: itm.InvGroupNum,
@@ -451,6 +447,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
 
 
         [HttpPost]
+        [UnitOfWork(false)]
         /// 发票重开列表
         /// </summary>
         /// <param name="input"></param>
@@ -620,11 +617,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             {
                 throw new UserFriendlyException($"不存发票号为:{invbillnum}发票", "400");
             }
-            //}
-            //else
-            //{
-            //    throw new UserFriendlyException($"不存发票号:{invbillnum}对应的结算分组号");
-            //}
+           
 
             return new JsonResult(new { Code = 200, Message = "生成成功", Data = invBilllist });
 
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs
index 5f8e2709..0a83ba5e 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs
@@ -454,19 +454,16 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                     ls.Add(invnot);
                 }
                 var entity= nolist.FirstOrDefault();
-                var disList = lsC.Select(p => p.SettleGroupNum).Distinct().ToList();
+                var disList = mgroup.Select(p => p.SettleGroupNum).Distinct().ToList();
                 
-                for (int i = 0; i < disList.Count; i++)
-                {
-                    ls[i].SettleGroupNum = disList[i];
-                }
+              
                 for (int i = 0; i < lineC; i++)
                 {
                     ls[i].RealInvBillNum = entity.RealInvBillNum;
                     ls[i].InvDate = entity.InvDate;
                     ls[i].InvBillNum = entity.InvBillNum;
                     ls[i].InvGroupNum = entity.InvGroupNum;
-                    ls[i].SettleGroupNum = entity.SettleGroupNum;
+                   // ls[i].SettleGroupNum = entity.SettleGroupNum;
                     ls[i].SettleLU = lsC[i].LU;
                     ls[i].SettleQty = lsC[i].Qty == null ? string.Empty : lsC[i].Qty.ToString();
                 }
@@ -476,11 +473,17 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                     ls[i].InvDate = entity.InvDate;
                     ls[i].InvBillNum = entity.InvBillNum;
                     ls[i].InvGroupNum = entity.InvGroupNum;
-                    ls[i].SettleGroupNum = entity.SettleGroupNum;
+                   // ls[i].SettleGroupNum = entity.SettleGroupNum;
                     ls[i].NotSettleLU = lsN[i].LU;
                     ls[i].Qty = lsN[i].Qty == null ? string.Empty : lsN[i].Qty.ToString();
                 }
 
+                for (int i = 0; i < disList.Count; i++)
+                {
+                    ls[i].SettleGroupNum = disList[i];
+                }
+
+
 
 
                 //if (lineC > lineN)//可结大于不可结行数时
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs
index 55f78ad9..8abb4418 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs
@@ -30,8 +30,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
     [Route("api/settleaccount/[controller]/[action]")]
     public class PUB_BA_SERVICE : BA_SERVICE
     {
-
-
         private readonly INormalEfCoreRepository<PriceList, Guid> _priceRepository;
         private readonly INormalEfCoreRepository<PriceListBJ, Guid> _pricebjRepository;
         private readonly ADJ_SERVICE _adjservice;
@@ -49,7 +47,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             _priceRepository = priceRepository;
             _pricebjRepository = pricebjRepository;
             _adjservice= adjservice;
-
         }
 
         /// <summary>
@@ -83,18 +80,18 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
 
             if (settle == null)
             {
-                throw new BusinessException("8989", $"选择发票:{invbillnum}对应的可结算单不在请检查！");
+                throw new UserFriendlyException( $"选择发票:{invbillnum}对应的可结算单不在请检查！","400");
             }
             version = settle.Version;
             if (inv != null)
             {
                 if (inv.InvoiceState == InvoiceBillState.报废)
                 {
-                    throw new BusinessException("8989", $"选择发票:{invbillnum}状态为报废状态不能重开！");
+                    throw new UserFriendlyException($"选择发票:{invbillnum}状态为报废状态不能重开！","400");
                 }
                 if (inv.State == SettleBillState.商务已审核 || inv.State == SettleBillState.已开票)
                 {
-                    throw new BusinessException("8989", $"选择发票:{invbillnum}状态在财务审核后可以报废重开,之前不能重开可以退回！");
+                    throw new UserFriendlyException($"选择发票:{invbillnum}状态在财务审核后可以报废重开,之前不能重开可以退回！","400");
                 }
                 var publist = await _pubMng.GetContainsAsync(inv.InvbillNum);//结算分组对应结算零件
                 //var adjlist = await _adjRepository.Where(p => p.OldInvBillNum == inv.InvbillNum).ToListAsync();//调整表明细
@@ -144,11 +141,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 {
                     priceList = _priceRepository.ToList();//价格单
                 }
-
-
-
                 var errorList = await CheckInvoiceGenerationRules(entitys, priceList, inv.BusinessType);
-
                 if (errorList.Count > 0)
                 {
                     return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "请下载错误信息", fileName = await ExportErrorReportAsync(errorList) });
@@ -207,17 +200,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             //}
             return new JsonResult(new { Code = 200, Message = "发票重开成功" });
         }
-
-
-
-
-
         // <summary>
         /// 发票重开
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-
+        [HttpPost]
+        [UnitOfWork(false)]
         public override async Task<IActionResult> ReissueInvoice([FromBody] string p_invbillnum)
         {
             //var mappingList = await GetMapGroupAsync(p_invbillnum);//发票对应结算分组
@@ -331,6 +320,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             return   new JsonResult(new { Code = 200, Message = "发票重开成功" }); ;
         }
         [HttpPost]
+        [UnitOfWork(false)]
         /// 发票重开列表
         /// </summary>
         /// <param name="input"></param>
@@ -512,6 +502,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
 
 
         [HttpPost]
+        [UnitOfWork(false)]
         public virtual async Task<IActionResult> ReissueInvoiceList(List<PUB_ADJ_DETAIL_DTO> p_list)
         {
 
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs
index f3d83a47..66c8f827 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs
@@ -72,7 +72,7 @@ namespace SettleAccount.Job.Services.Report
             var seStartDateTime = DateTime.Parse(strSeStartDateTime);
             var seEndDateTime = DateTime.Parse(strSeEndDateTime);
             var filename = exportName.FirstOrDefault();
-            var pubSaSeCompareDiffs = GetSaSeCompareData(version, seStartDateTime, seEndDateTime);
+            var pubSaSeCompareDiffs = GetSaSeCompareDataJis<BBAC_SA_DETAIL, BBAC_SE_DETAIL>(EnumBusinessType.MaiDanJianBBAC, version, seStartDateTime, seEndDateTime);
 
             HandlePubSaSeCompareDiffList(pubSaSeCompareDiffs);
 
@@ -93,6 +93,7 @@ namespace SettleAccount.Job.Services.Report
 
             #region 结算数据处理
             HandleSaDetails<BBAC_CAN_SA_DETAIL, BBAC_NOT_SA_DETAIL>(pubSaSeCompareDiffs, businessType, version);
+            HandleSaDetailsMain<BBAC_SA_DETAIL>(pubSaSeCompareDiffs, businessType, version);
             #endregion
 
             if (string.IsNullOrEmpty(lu) == false)
@@ -115,87 +116,5 @@ namespace SettleAccount.Job.Services.Report
             Notify();
             return id.ToString();
         }
-
-        #region 私有方法
-        /// <summary>
-        /// 获取结算与发运比对数据
-        /// </summary>
-        public List<SaSeCompareDiff> GetSaSeCompareData(int version, DateTime seStartDateTime, DateTime seEndDateTime)
-        {
-            //结算
-            var saGroup = from sa in _settleAccountDbContext.Set<BBAC_SA_DETAIL>()
-                          where sa.BusinessType == businessType && sa.Version == version
-                          group sa by new { sa.PN, sa.CustomerPartCodeNoSpace } into groupItem
-                          select new
-                          {
-                              groupItem.Key.PN,
-                              groupItem.Key.CustomerPartCodeNoSpace,
-                              Qty = groupItem.Sum(t => t.Qty),
-                              LU = groupItem.Max(t => t.LU),
-                              SettleDate = groupItem.Max(t => t.SettleDate),
-                              PartCode = groupItem.Max(t => t.PartCode),
-                          };
-            //发运
-            var seGroup = from se in _settleAccountDbContext.Set<BBAC_SE_DETAIL>()
-                          where se.BusinessType == businessType && se.BillTime >= seStartDateTime && se.BillTime <= seEndDateTime
-                          group se by new { se.PN, se.CustomerPartCodeNoSpace } into groupItem
-                          select new
-                          {
-                              groupItem.Key.PN,
-                              groupItem.Key.CustomerPartCodeNoSpace,
-                              Qty = groupItem.Sum(t => t.Qty),
-                              LU = groupItem.Max(t => t.LU),
-                              WmsBillNum = groupItem.Max(t => t.WmsBillNum),
-                              ShippingDate = groupItem.Max(t => t.ShippingDate),
-                              FactoryPartCode = groupItem.Max(t => t.FactoryPartCode),
-                              ToLoc = groupItem.Max(t => t.ToLoc),
-                              ErpToLoc = groupItem.Max(t => t.ErpToLoc)
-                          };
-            var saSeCompareLeft = from sa in saGroup
-                                  join se in seGroup
-                                  on new { sa.PN, sa.CustomerPartCodeNoSpace } equals new { se.PN, se.CustomerPartCodeNoSpace }
-                                  into temp
-                                  from se in temp.DefaultIfEmpty()
-                                  select new SaSeCompareDiff()
-                                  {
-                                      WmsBillNum = se.WmsBillNum,
-                                      ShippingDate = se.ShippingDate,
-                                      CustomerOfflineTime = sa.SettleDate,
-                                      PN = sa.PN,
-                                      SAQty = sa.Qty,
-                                      SEQty = se.Qty,
-                                      ToLocCode = se.ToLoc,
-                                      ToErpLocCode = se.ErpToLoc,
-                                      SeCustomerPartCode = se.CustomerPartCodeNoSpace,
-                                      SeFactoryPartCode = se.FactoryPartCode,
-                                      SaCustomerPartCode = sa.CustomerPartCodeNoSpace,
-                                      SaFactoryPartCode = sa.PartCode,
-                                      CustomerPartCode = sa.LU,
-                                  };
-            var saSeCompareRight = from se in seGroup
-                                   join sa in saGroup
-                                   on new { se.PN, se.CustomerPartCodeNoSpace } equals new { sa.PN, sa.CustomerPartCodeNoSpace }
-                                   into temp
-                                   from sa in temp.DefaultIfEmpty()
-                                   select new SaSeCompareDiff()
-                                   {
-                                       WmsBillNum = se.WmsBillNum,
-                                       ShippingDate = se.ShippingDate,
-                                       CustomerOfflineTime = sa.SettleDate,
-                                       PN = se.PN,
-                                       SAQty = sa.Qty,
-                                       SEQty = se.Qty,
-                                       ToLocCode = se.ToLoc,
-                                       ToErpLocCode = se.ErpToLoc,
-                                       SeCustomerPartCode = se.CustomerPartCodeNoSpace,
-                                       SeFactoryPartCode = se.FactoryPartCode,
-                                       SaCustomerPartCode = sa.CustomerPartCodeNoSpace,
-                                       SaFactoryPartCode = sa.PartCode,
-                                       CustomerPartCode = sa.LU ?? se.LU
-                                   };
-            var saSeCompareFullJoin = saSeCompareLeft.Union(saSeCompareRight).ToList();
-            return saSeCompareFullJoin;
-        }
-        #endregion
     }
 }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanHBPOSaSeCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanHBPOSaSeCompareExportService.cs
index 42d1f5cf..a443cf23 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanHBPOSaSeCompareExportService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanHBPOSaSeCompareExportService.cs
@@ -72,7 +72,7 @@ namespace SettleAccount.Job.Services.Report
             var seStartDateTime = DateTime.Parse(strSeStartDateTime);
             var seEndDateTime = DateTime.Parse(strSeEndDateTime);
             var filename = exportName.FirstOrDefault();
-            var pubSaSeCompareDiffs = GetSaSeCompareData(version, seStartDateTime, seEndDateTime);
+            var pubSaSeCompareDiffs = GetSaSeCompareDataJis<HBPO_SA_DETAIL, HBPO_SE_DETAIL>(EnumBusinessType.MaiDanJianHBPO, version, seStartDateTime, seEndDateTime);
 
             HandlePubSaSeCompareDiffList(pubSaSeCompareDiffs);
 
@@ -93,6 +93,7 @@ namespace SettleAccount.Job.Services.Report
 
             #region 结算数据处理
             HandleSaDetails<HBPO_CAN_SA_DETAIL, HBPO_NOT_SA_DETAIL>(pubSaSeCompareDiffs, businessType, version);
+            HandleSaDetailsMain<HBPO_SA_DETAIL>(pubSaSeCompareDiffs, businessType, version);
             #endregion
 
             if (string.IsNullOrEmpty(lu) == false)
@@ -115,87 +116,5 @@ namespace SettleAccount.Job.Services.Report
             Notify();
             return id.ToString();
         }
-
-        #region 私有方法
-        /// <summary>
-        /// 获取结算与发运比对数据
-        /// </summary>
-        public List<SaSeCompareDiff> GetSaSeCompareData(int version, DateTime seStartDateTime, DateTime seEndDateTime)
-        {
-            //结算
-            var saGroup = from sa in _settleAccountDbContext.Set<HBPO_SA_DETAIL>()
-                          where sa.BusinessType == businessType && sa.Version == version
-                          group sa by new { sa.PN, sa.CustomerPartCodeNoSpace } into groupItem
-                          select new
-                          {
-                              groupItem.Key.PN,
-                              groupItem.Key.CustomerPartCodeNoSpace,
-                              Qty = groupItem.Sum(t => t.Qty),
-                              LU = groupItem.Max(t => t.LU),
-                              SettleDate = groupItem.Max(t => t.SettleDate),
-                              PartCode = groupItem.Max(t => t.PartCode),
-                          };
-            //发运
-            var seGroup = from se in _settleAccountDbContext.Set<HBPO_SE_DETAIL>()
-                          where se.BusinessType == businessType && se.BillTime >= seStartDateTime && se.BillTime <= seEndDateTime
-                          group se by new { se.PN, se.CustomerPartCodeNoSpace } into groupItem
-                          select new
-                          {
-                              groupItem.Key.PN,
-                              groupItem.Key.CustomerPartCodeNoSpace,
-                              Qty = groupItem.Sum(t => t.Qty),
-                              LU = groupItem.Max(t => t.LU),
-                              WmsBillNum = groupItem.Max(t => t.WmsBillNum),
-                              ShippingDate = groupItem.Max(t => t.ShippingDate),
-                              FactoryPartCode = groupItem.Max(t => t.FactoryPartCode),
-                              ToLoc = groupItem.Max(t => t.ToLoc),
-                              ErpToLoc = groupItem.Max(t => t.ErpToLoc)
-                          };
-            var saSeCompareLeft = from sa in saGroup
-                                  join se in seGroup
-                                  on new { sa.PN, sa.CustomerPartCodeNoSpace } equals new { se.PN, se.CustomerPartCodeNoSpace }
-                                  into temp
-                                  from se in temp.DefaultIfEmpty()
-                                  select new SaSeCompareDiff()
-                                  {
-                                      WmsBillNum = se.WmsBillNum,
-                                      ShippingDate = se.ShippingDate,
-                                      CustomerOfflineTime = sa.SettleDate,
-                                      PN = sa.PN,
-                                      SAQty = sa.Qty,
-                                      SEQty = se.Qty,
-                                      ToLocCode = se.ToLoc,
-                                      ToErpLocCode = se.ErpToLoc,
-                                      SeCustomerPartCode = se.CustomerPartCodeNoSpace,
-                                      SeFactoryPartCode = se.FactoryPartCode,
-                                      SaCustomerPartCode = sa.CustomerPartCodeNoSpace,
-                                      SaFactoryPartCode = sa.PartCode,
-                                      CustomerPartCode = sa.LU
-                                  };
-            var saSeCompareRight = from se in seGroup
-                                   join sa in saGroup
-                                   on new { se.PN, se.LU } equals new { sa.PN, sa.LU }
-                                   into temp
-                                   from sa in temp.DefaultIfEmpty()
-                                   select new SaSeCompareDiff()
-                                   {
-                                       WmsBillNum = se.WmsBillNum,
-                                       ShippingDate = se.ShippingDate,
-                                       CustomerOfflineTime = sa.SettleDate,
-                                       PN = se.PN,
-                                       SAQty = sa.Qty,
-                                       SEQty = se.Qty,
-                                       ToLocCode = se.ToLoc,
-                                       ToErpLocCode = se.ErpToLoc,
-                                       SeCustomerPartCode = se.CustomerPartCodeNoSpace,
-                                       SeFactoryPartCode = se.FactoryPartCode,
-                                       SaCustomerPartCode = sa.CustomerPartCodeNoSpace,
-                                       SaFactoryPartCode = sa.PartCode,
-                                       CustomerPartCode = sa.LU ?? se.LU
-                                   };
-            var saSeCompareFullJoin = saSeCompareLeft.Union(saSeCompareRight).ToList();
-            return saSeCompareFullJoin;
-        }
-        #endregion
     }
 }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs
index f2ff3796..5d26eb4c 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using Magicodes.ExporterAndImporter.Excel;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.OpenApi.Extensions;
+using SettleAccount.Bases;
 using SettleAccount.Domain.BQ;
 using SettleAccount.Job.SignalR;
 using ShardingCore.Extensions;
@@ -34,18 +35,6 @@ namespace SettleAccount.Job.Services.Report
         /// </summary>
         private readonly SettleAccountDbContext _settleAccountDbContext;
         /// <summary>
-        /// 替换件关系仓储
-        /// </summary>
-        private readonly INormalEfCoreRepository<TB_RePartsRelationship, Guid> _tbRePartsRelationshipRepository;
-        /// <summary>
-        /// PUB二次比对仓储
-        /// </summary>
-        private readonly INormalEfCoreRepository<PUB_SEC_DETAIL, Guid> _pubSeCDetailRepository;
-        /// <summary>
-        /// Pub结算发运对比Dapper
-        /// </summary>
-        private readonly PubSaSeCompareDapperRepository _pubSaSeCompareDapperRepository;
-        /// <summary>
         /// 文件容器
         /// </summary>
         private readonly IBlobContainer<MyFileContainer> _fileContainer;
@@ -60,16 +49,10 @@ namespace SettleAccount.Job.Services.Report
         public PubSaSeCompareExportService(
             IHubContext<PageHub> hubContext,
             SettleAccountDbContext settleAccountDbContext,
-            INormalEfCoreRepository<TB_RePartsRelationship, Guid> tbRePartsRelationshipRepository,
-            INormalEfCoreRepository<PUB_SEC_DETAIL, Guid> pubSeCDetailRepository,
-            PubSaSeCompareDapperRepository pubSaSeCompareDapperRepository,
             IBlobContainer<MyFileContainer> fileContainer,
             IObjectMapper objectMapper) : base(hubContext, settleAccountDbContext)
         {
             _settleAccountDbContext = settleAccountDbContext;
-            _tbRePartsRelationshipRepository = tbRePartsRelationshipRepository;
-            _pubSeCDetailRepository = pubSeCDetailRepository;
-            _pubSaSeCompareDapperRepository = pubSaSeCompareDapperRepository;
             _fileContainer = fileContainer;
             _objectMapper = objectMapper;
         }
@@ -102,7 +85,7 @@ namespace SettleAccount.Job.Services.Report
             }
             var filename = exportName.FirstOrDefault();
             //var pubSaSeCompareDiffs = _pubSaSeCompareDapperRepository.GetDetailDiffReportList(strBusinessType, version, seStartDateTime, seEndDateTime);
-            var pubSaSeCompareDiffs = GetSaSeCompareData(businessType, version, DateTime.Parse(seStartDateTime), DateTime.Parse(seEndDateTime));
+            var pubSaSeCompareDiffs = GetSaSeCompareData(businessType, version);
 
             HandlePubSaSeCompareDiffList(pubSaSeCompareDiffs);
 
@@ -123,7 +106,6 @@ namespace SettleAccount.Job.Services.Report
 
             #region 结算数据处理
             HandleSaDetails<PUB_CAN_SA_DETAIL, PUB_NOT_SA_DETAIL>(pubSaSeCompareDiffs, businessType, version);
-
             HandleSaDetailsMain<PUB_SA_DETAIL>(pubSaSeCompareDiffs, businessType, version);
             #endregion
 
@@ -183,99 +165,12 @@ namespace SettleAccount.Job.Services.Report
         /// <summary>
         /// 获取比对数据
         /// </summary>
-        [Obsolete]
-        private List<SaSeCompareDiff> GetSaSeCompareDataOld(EnumBusinessType businessType, int version, DateTime seStartDateTime, DateTime seEndDateTime)
-        {
-            //印度件LU对比
-            if (businessType == EnumBusinessType.YinDuJian)
-            {
-                return GetSaSeCompareDataYinDu(version, seStartDateTime, seEndDateTime);
-            }
-            //结算
-            var saGroup = from sa in _settleAccountDbContext.Set<PUB_SA_DETAIL>()
-                          where sa.BusinessType == businessType && sa.Version == version
-                          group sa by new { sa.PN, sa.CustomerPartCodeNoSpace } into groupItem
-                          select new
-                          {
-                              groupItem.Key.PN,
-                              groupItem.Key.CustomerPartCodeNoSpace,
-                              Qty = groupItem.Sum(t => t.Qty),
-                              LU = groupItem.Max(t => t.LU),
-                              SettleDate = groupItem.Max(t => t.SettleDate),
-                              PartCode = groupItem.Max(t => t.PartCode),
-                          };
-            //发运
-            var seGroup = from se in _settleAccountDbContext.Set<PUB_SE_DETAIL>()
-                          where se.BusinessType == businessType && se.BillTime >= seStartDateTime && se.BillTime <= seEndDateTime
-                          group se by new { se.PN, se.CustomerPartCodeNoSpace } into groupItem
-                          select new
-                          {
-                              groupItem.Key.PN,
-                              groupItem.Key.CustomerPartCodeNoSpace,
-                              Qty = groupItem.Sum(t => t.Qty),
-                              LU = groupItem.Max(t => t.LU),
-                              WmsBillNum = groupItem.Max(t => t.WmsBillNum),
-                              ShippingDate = groupItem.Max(t => t.ShippingDate),
-                              FactoryPartCode = groupItem.Max(t => t.FactoryPartCode),
-                              ToLocCode = groupItem.Max(t => t.ToLocCode),
-                              ToErpLocCode = groupItem.Max(t => t.ToErpLocCode)
-                          };
-            var saSeCompareLeft = from sa in saGroup
-                                  join se in seGroup
-                                  on new { sa.PN, sa.CustomerPartCodeNoSpace } equals new { se.PN, se.CustomerPartCodeNoSpace }
-                                  into temp
-                                  from se in temp.DefaultIfEmpty()
-                                  select new SaSeCompareDiff()
-                                  {
-                                      WmsBillNum = se.WmsBillNum,
-                                      ShippingDate = se.ShippingDate,
-                                      CustomerOfflineTime = sa.SettleDate,
-                                      PN = sa.PN,
-                                      SAQty = sa.Qty,
-                                      SEQty = se.Qty,
-                                      ToLocCode = se.ToLocCode,
-                                      ToErpLocCode = se.ToErpLocCode,
-                                      SeCustomerPartCode = se.CustomerPartCodeNoSpace,
-                                      SeFactoryPartCode = se.FactoryPartCode,
-                                      SaCustomerPartCode = sa.CustomerPartCodeNoSpace,
-                                      SaFactoryPartCode = sa.PartCode,
-                                      CustomerPartCode = sa.LU
-                                  };
-            var saSeCompareRight = from se in seGroup
-                                   join sa in saGroup
-                                   on new { se.PN, se.CustomerPartCodeNoSpace } equals new { sa.PN, sa.CustomerPartCodeNoSpace }
-                                   into temp
-                                   from sa in temp.DefaultIfEmpty()
-                                   select new SaSeCompareDiff()
-                                   {
-                                       WmsBillNum = se.WmsBillNum,
-                                       ShippingDate = se.ShippingDate,
-                                       CustomerOfflineTime = sa.SettleDate,
-                                       PN = se.PN,
-                                       SAQty = sa.Qty,
-                                       SEQty = se.Qty,
-                                       ToLocCode = se.ToLocCode,
-                                       ToErpLocCode = se.ToErpLocCode,
-                                       SeCustomerPartCode = se.CustomerPartCodeNoSpace,
-                                       SeFactoryPartCode = se.FactoryPartCode,
-                                       SaCustomerPartCode = sa.CustomerPartCodeNoSpace,
-                                       SaFactoryPartCode = sa.PartCode,
-                                       CustomerPartCode = sa.LU ?? se.LU
-                                   };
-
-            var saSeCompareFullJoin = saSeCompareLeft.Union(saSeCompareRight).ToList();
-            return saSeCompareFullJoin;
-        }
-
-        /// <summary>
-        /// 获取比对数据
-        /// </summary>
-        private List<SaSeCompareDiff> GetSaSeCompareData(EnumBusinessType businessType, int version, DateTime seStartDateTime, DateTime seEndDateTime)
+        private List<SaSeCompareDiff> GetSaSeCompareData(EnumBusinessType businessType, int version)
         {
             //印度件LU对比
             if (businessType == EnumBusinessType.YinDuJian)
             {
-                return GetSaSeCompareDataYinDu(version, seStartDateTime, seEndDateTime);
+                return GetSaSeCompareDataYinDu(version);
             }
             //结算
             var saGroup = from sa in _settleAccountDbContext.Set<PUB_SA_DETAIL>()
@@ -289,7 +184,7 @@ namespace SettleAccount.Job.Services.Report
                               Version = groupItem.Max(t => t.Version),
                               LU = groupItem.Max(t => t.LU),
                               SettleDate = groupItem.Max(t => t.SettleDate),
-                              PartCode = groupItem.Max(t => t.PartCode),
+                              PartCode = groupItem.Max(t => t.PartCode)
                           };
             var saGroupByVersion = from sa in _settleAccountDbContext.Set<PUB_SA_DETAIL>()
                                    where sa.BusinessType == businessType && sa.Version == version
@@ -302,7 +197,7 @@ namespace SettleAccount.Job.Services.Report
                                        Version = groupItem.Max(t => t.Version),
                                        LU = groupItem.Max(t => t.LU),
                                        SettleDate = groupItem.Max(t => t.SettleDate),
-                                       PartCode = groupItem.Max(t => t.PartCode),
+                                       PartCode = groupItem.Max(t => t.PartCode)
                                    };
             //发运
             var seGroup = from se in _settleAccountDbContext.Set<PUB_SE_DETAIL>()
@@ -384,21 +279,35 @@ namespace SettleAccount.Job.Services.Report
         /// <summary>
         /// 获取比对数据
         /// </summary>
-        private List<SaSeCompareDiff> GetSaSeCompareDataYinDu(int version, DateTime seStartDateTime, DateTime seEndDateTime)
+        private List<SaSeCompareDiff> GetSaSeCompareDataYinDu(int version)
         {
+            //结算
             var saGroup = from sa in _settleAccountDbContext.Set<PUB_SA_DETAIL>()
-                          where sa.BusinessType == EnumBusinessType.YinDuJian && sa.Version == version
+                          where sa.BusinessType == EnumBusinessType.YinDuJian
                           group sa by new { sa.CustomerPartCodeNoSpace } into groupItem
                           select new
                           {
                               groupItem.Key.CustomerPartCodeNoSpace,
                               Qty = groupItem.Sum(t => t.Qty),
+                              Version = groupItem.Max(t => t.Version),
                               LU = groupItem.Max(t => t.LU),
                               SettleDate = groupItem.Max(t => t.SettleDate),
-                              PartCode = groupItem.Max(t => t.PartCode),
+                              PartCode = groupItem.Max(t => t.PartCode)
                           };
+            var saGroupByVersion = from sa in _settleAccountDbContext.Set<PUB_SA_DETAIL>()
+                                   where sa.BusinessType == EnumBusinessType.YinDuJian && sa.Version == version
+                                   group sa by new { sa.CustomerPartCodeNoSpace } into groupItem
+                                   select new
+                                   {
+                                       groupItem.Key.CustomerPartCodeNoSpace,
+                                       Qty = groupItem.Sum(t => t.Qty),
+                                       Version = groupItem.Max(t => t.Version),
+                                       LU = groupItem.Max(t => t.LU),
+                                       SettleDate = groupItem.Max(t => t.SettleDate),
+                                       PartCode = groupItem.Max(t => t.PartCode)
+                                   };
+            //发运
             var seGroup = from se in _settleAccountDbContext.Set<PUB_SE_DETAIL>()
-                          where se.BusinessType == EnumBusinessType.YinDuJian && se.BillTime >= seStartDateTime && se.BillTime <= seEndDateTime
                           group se by new { se.CustomerPartCodeNoSpace } into groupItem
                           select new
                           {
@@ -412,48 +321,62 @@ namespace SettleAccount.Job.Services.Report
                               ToErpLocCode = groupItem.Max(t => t.ToErpLocCode)
                           };
 
-            var saSeCompareLeft = from sa in saGroup
-                                  join se in seGroup
-                                  on sa.CustomerPartCodeNoSpace equals se.CustomerPartCodeNoSpace
-                                  into temp
-                                  from se in temp.DefaultIfEmpty()
-                                  select new SaSeCompareDiff()
-                                  {
-                                      WmsBillNum = se.WmsBillNum,
-                                      ShippingDate = se.ShippingDate,
-                                      CustomerOfflineTime = sa.SettleDate,
-                                      SAQty = sa.Qty,
-                                      SEQty = se.Qty,
-                                      ToLocCode = se.ToLocCode,
-                                      ToErpLocCode = se.ToErpLocCode,
-                                      SeCustomerPartCode = se.CustomerPartCodeNoSpace,
-                                      SeFactoryPartCode = se.FactoryPartCode,
-                                      SaCustomerPartCode = sa.CustomerPartCodeNoSpace,
-                                      SaFactoryPartCode = sa.PartCode,
-                                      CustomerPartCode = sa.LU
-                                  };
-            var saSeCompareRight = from se in seGroup
-                                   join sa in saGroup
-                                   on se.CustomerPartCodeNoSpace equals sa.CustomerPartCodeNoSpace
-                                   into temp
-                                   from sa in temp.DefaultIfEmpty()
-                                   select new SaSeCompareDiff()
-                                   {
-                                       WmsBillNum = se.WmsBillNum,
-                                       ShippingDate = se.ShippingDate,
-                                       CustomerOfflineTime = sa.SettleDate,
-                                       SAQty = sa.Qty,
-                                       SEQty = se.Qty,
-                                       ToLocCode = se.ToLocCode,
-                                       ToErpLocCode = se.ToErpLocCode,
-                                       SeCustomerPartCode = se.CustomerPartCodeNoSpace,
-                                       SeFactoryPartCode = se.FactoryPartCode,
-                                       SaCustomerPartCode = sa.CustomerPartCodeNoSpace,
-                                       SaFactoryPartCode = sa.PartCode,
-                                       CustomerPartCode = sa.LU ?? se.LU
-                                   };
-            var saSeCompareFullJoin = saSeCompareLeft.Union(saSeCompareRight).ToList();
-            return saSeCompareFullJoin;
+            //有结算无发运
+            var haveSaNotHaveSeList = (from sa in saGroup
+                                       join se in seGroup
+                                       on sa.CustomerPartCodeNoSpace equals se.CustomerPartCodeNoSpace
+                                       into temp
+                                       from se in temp.DefaultIfEmpty()
+                                       where se.CustomerPartCodeNoSpace == null
+                                       select new SaSeCompareDiff()
+                                       {
+                                           Version = sa.Version,
+                                           CustomerOfflineTime = sa.SettleDate,
+                                           SAQty = sa.Qty,
+                                           SaCustomerPartCode = sa.CustomerPartCodeNoSpace,
+                                           SaFactoryPartCode = sa.PartCode,
+                                           CustomerPartCode = sa.LU
+                                       }).ToList();
+            //无结算有发运
+            var notHaveSaHaveSeList = (from se in seGroup
+                                       join sa in saGroup
+                                       on se.CustomerPartCodeNoSpace equals sa.CustomerPartCodeNoSpace
+                                       into temp
+                                       from sa in temp.DefaultIfEmpty()
+                                       where sa.CustomerPartCodeNoSpace == null
+                                       select new SaSeCompareDiff()
+                                       {
+                                           WmsBillNum = se.WmsBillNum,
+                                           ShippingDate = se.ShippingDate,
+                                           SEQty = se.Qty,
+                                           ToLocCode = se.ToLocCode,
+                                           ToErpLocCode = se.ToErpLocCode,
+                                           SeCustomerPartCode = se.CustomerPartCodeNoSpace,
+                                           SeFactoryPartCode = se.FactoryPartCode,
+                                           CustomerPartCode = se.LU
+                                       }).ToList();
+
+            //有结算有发运
+            var haveSaHaveSeList = (from sa in saGroupByVersion
+                                    from se in seGroup
+                                    where sa.CustomerPartCodeNoSpace == se.CustomerPartCodeNoSpace
+                                    select new SaSeCompareDiff()
+                                    {
+                                        Version = sa.Version,
+                                        WmsBillNum = se.WmsBillNum,
+                                        ShippingDate = se.ShippingDate,
+                                        CustomerOfflineTime = sa.SettleDate,
+                                        SAQty = sa.Qty,
+                                        SEQty = se.Qty,
+                                        ToLocCode = se.ToLocCode,
+                                        ToErpLocCode = se.ToErpLocCode,
+                                        SeCustomerPartCode = se.CustomerPartCodeNoSpace,
+                                        SeFactoryPartCode = se.FactoryPartCode,
+                                        SaCustomerPartCode = sa.CustomerPartCodeNoSpace,
+                                        SaFactoryPartCode = sa.PartCode,
+                                        CustomerPartCode = sa.LU
+                                    }).ToList();
+            return haveSaHaveSeList.Union(haveSaNotHaveSeList).Union(notHaveSaHaveSeList).ToList();
         }
         #endregion
     }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeCompareExportBaseService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeCompareExportBaseService.cs
index 4ab4e2b9..7e660bcc 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeCompareExportBaseService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeCompareExportBaseService.cs
@@ -1,10 +1,10 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using EFCore.BulkExtensions;
 using Magicodes.ExporterAndImporter.Core.Extension;
 using Magicodes.ExporterAndImporter.Excel;
 using Microsoft.AspNetCore.SignalR;
-using Microsoft.EntityFrameworkCore;
 using SettleAccount.Bases;
 using SettleAccount.Domain.BQ;
 using SettleAccount.Job.SignalR;
@@ -35,9 +35,120 @@ namespace SettleAccount.Job.Services.Report
             _settleAccountDbContext = settleAccountDbContext;
         }
 
-        public virtual void HandlePubSaSeCompareDiffList(List<SaSeCompareDiff> pubSaSeCompareDiffs)
+        /// <summary>
+        /// 获取结算、发运比对数据
+        /// </summary>
+        public List<SaSeCompareDiff> GetSaSeCompareDataJis<TSaDetail, TSeDetail>(EnumBusinessType businessType, int version, DateTime seStartDateTime, DateTime seEndDateTime)
+            where TSaDetail : SA_BASE
+            where TSeDetail : JisSeBase
+        {
+            //结算
+            var saGroup = from sa in _settleAccountDbContext.Set<TSaDetail>()
+                          where sa.BusinessType == businessType
+                          group sa by new { sa.PN, sa.CustomerPartCodeNoSpace } into groupItem
+                          select new
+                          {
+                              groupItem.Key.PN,
+                              groupItem.Key.CustomerPartCodeNoSpace,
+                              Qty = groupItem.Sum(t => t.Qty),
+                              Version = groupItem.Max(t => t.Version),
+                              LU = groupItem.Max(t => t.LU),
+                              SettleDate = groupItem.Max(t => t.SettleDate),
+                              PartCode = groupItem.Max(t => t.PartCode)
+                          };
+            var saGroupByVersion = from sa in _settleAccountDbContext.Set<TSaDetail>()
+                                   where sa.BusinessType == businessType && sa.Version == version
+                                   group sa by new { sa.PN, sa.CustomerPartCodeNoSpace } into groupItem
+                                   select new
+                                   {
+                                       groupItem.Key.PN,
+                                       groupItem.Key.CustomerPartCodeNoSpace,
+                                       Qty = groupItem.Sum(t => t.Qty),
+                                       Version = groupItem.Max(t => t.Version),
+                                       LU = groupItem.Max(t => t.LU),
+                                       SettleDate = groupItem.Max(t => t.SettleDate),
+                                       PartCode = groupItem.Max(t => t.PartCode)
+                                   };
+            //发运
+            var seGroup = from se in _settleAccountDbContext.Set<TSeDetail>()
+                          group se by new { se.PN, se.CustomerPartCodeNoSpace } into groupItem
+                          select new
+                          {
+                              groupItem.Key.PN,
+                              groupItem.Key.CustomerPartCodeNoSpace,
+                              Qty = groupItem.Sum(t => t.Qty),
+                              LU = groupItem.Max(t => t.LU),
+                              WmsBillNum = groupItem.Max(t => t.WmsBillNum),
+                              ShippingDate = groupItem.Max(t => t.ShippingDate),
+                              FactoryPartCode = groupItem.Max(t => t.FactoryPartCode),
+                              ToLocCode = groupItem.Max(t => t.ToLoc),
+                              ToErpLocCode = groupItem.Max(t => t.ErpToLoc)
+                          };
+
+            //有结算无发运
+            var haveSaNotHaveSeList = (from sa in saGroup
+                                       join se in seGroup
+                                       on new { sa.PN, sa.CustomerPartCodeNoSpace } equals new { se.PN, se.CustomerPartCodeNoSpace }
+                                       into temp
+                                       from se in temp.DefaultIfEmpty()
+                                       where se.PN == null
+                                       select new SaSeCompareDiff()
+                                       {
+                                           Version = sa.Version,
+                                           CustomerOfflineTime = sa.SettleDate,
+                                           PN = sa.PN,
+                                           SAQty = sa.Qty,
+                                           SaCustomerPartCode = sa.CustomerPartCodeNoSpace,
+                                           SaFactoryPartCode = sa.PartCode,
+                                           CustomerPartCode = sa.LU
+                                       }).ToList();
+            //无结算有发运
+            var notHaveSaHaveSeList = (from se in seGroup
+                                       join sa in saGroup
+                                       on new { se.PN, se.CustomerPartCodeNoSpace } equals new { sa.PN, sa.CustomerPartCodeNoSpace }
+                                       into temp
+                                       from sa in temp.DefaultIfEmpty()
+                                       where sa.PN == null
+                                       select new SaSeCompareDiff()
+                                       {
+                                           WmsBillNum = se.WmsBillNum,
+                                           ShippingDate = se.ShippingDate,
+                                           PN = se.PN,
+                                           SEQty = se.Qty,
+                                           ToLocCode = se.ToLocCode,
+                                           ToErpLocCode = se.ToErpLocCode,
+                                           SeCustomerPartCode = se.CustomerPartCodeNoSpace,
+                                           SeFactoryPartCode = se.FactoryPartCode,
+                                           CustomerPartCode = se.LU
+                                       }).ToList();
+
+            //有结算有发运
+            var haveSaHaveSeList = (from sa in saGroupByVersion
+                                    from se in seGroup
+                                    where sa.PN == se.PN && sa.CustomerPartCodeNoSpace == se.CustomerPartCodeNoSpace
+                                    select new SaSeCompareDiff()
+                                    {
+                                        Version = sa.Version,
+                                        WmsBillNum = se.WmsBillNum,
+                                        ShippingDate = se.ShippingDate,
+                                        CustomerOfflineTime = sa.SettleDate,
+                                        PN = sa.PN,
+                                        SAQty = sa.Qty,
+                                        SEQty = se.Qty,
+                                        ToLocCode = se.ToLocCode,
+                                        ToErpLocCode = se.ToErpLocCode,
+                                        SeCustomerPartCode = se.CustomerPartCodeNoSpace,
+                                        SeFactoryPartCode = se.FactoryPartCode,
+                                        SaCustomerPartCode = sa.CustomerPartCodeNoSpace,
+                                        SaFactoryPartCode = sa.PartCode,
+                                        CustomerPartCode = sa.LU
+                                    }).ToList();
+            return haveSaHaveSeList.Union(haveSaNotHaveSeList).Union(notHaveSaHaveSeList).ToList();
+        }
+
+        public virtual void HandlePubSaSeCompareDiffList(List<SaSeCompareDiff> saSeCompareDiffs)
         {
-            pubSaSeCompareDiffs.ForEach(p =>
+            saSeCompareDiffs.ForEach(p =>
             {
                 p.Category = (string.IsNullOrEmpty(p.SaCustomerPartCode), string.IsNullOrEmpty(p.SeCustomerPartCode)) switch
                 {
@@ -77,16 +188,16 @@ namespace SettleAccount.Job.Services.Report
         /// <summary>
         /// 二次比对
         /// </summary>
-        public virtual List<SaSeCompareDiff> HandleSecondCompare(List<SaSeCompareDiff> pubSaSeCompareDiffs, EnumBusinessType businessType)
+        public virtual List<SaSeCompareDiff> HandleSecondCompare(List<SaSeCompareDiff> saSeCompareDiffs, EnumBusinessType businessType)
         {
             //二次匹配上的记录
             var secondMatchHaveSaHaveSes = new List<SaSeCompareDiff>();
             //有结算无发运 和 无结算有发运
-            var haveSaNotHaveSeUnionNotHaveSaHaveSes = pubSaSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.HaveSaNotHaveSe || t.Category == EnumPubSaSeCompareCategory.NotHaveSaHaveSe);
+            var haveSaNotHaveSeUnionNotHaveSaHaveSes = saSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.HaveSaNotHaveSe || t.Category == EnumPubSaSeCompareCategory.NotHaveSaHaveSe);
             //有结算无发运
-            var haveSaNotHaveSes = pubSaSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.HaveSaNotHaveSe);
+            var haveSaNotHaveSes = saSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.HaveSaNotHaveSe);
             //无结算有发运
-            var notHaveSaHaveSes = pubSaSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.NotHaveSaHaveSe);
+            var notHaveSaHaveSes = saSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.NotHaveSaHaveSe);
 
             //二次对比（替换发运数据的厂内零件号）
             var repFactoryPartCodes = haveSaNotHaveSeUnionNotHaveSaHaveSes.Select(t => t.FactoryPartCode).Distinct().ToList();
@@ -133,12 +244,12 @@ namespace SettleAccount.Job.Services.Report
         /// 结算数据处理
         /// 写入库位、替换零件号
         /// </summary>
-        public virtual void HandleSaDetails<TCanSa, TNotSa>(List<SaSeCompareDiff> pubSaSeCompareDiffs, EnumBusinessType businessType, int version)
+        public virtual void HandleSaDetails<TCanSa, TNotSa>(List<SaSeCompareDiff> saSeCompareDiffs, EnumBusinessType businessType, int version)
             where TCanSa : SA_CAN_BASE
             where TNotSa : SA_NOT_BASE
         {
             //写入库位、替换零件号
-            var haveSaHaveSes = pubSaSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.HaveSaHaveSe);
+            var haveSaHaveSes = saSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.HaveSaHaveSe);
             if (haveSaHaveSes.Any())
             {
                 //可结算单
@@ -174,12 +285,12 @@ namespace SettleAccount.Job.Services.Report
         }
 
         /// <summary>
-        /// 处理发运数据
+        /// 处理结算数据
         /// 结算、发运对比上的数据修改结算数据状态
         /// </summary>
-        public virtual void HandleSaDetailsMain<T>(List<SaSeCompareDiff> pubSaSeCompareDiffs, EnumBusinessType businessType, int version) where T : SA_BASE
+        public virtual void HandleSaDetailsMain<T>(List<SaSeCompareDiff> saSeCompareDiffs, EnumBusinessType businessType, int version) where T : SA_BASE
         {
-            var haveSaHaveSes = pubSaSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.HaveSaHaveSe);
+            var haveSaHaveSes = saSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.HaveSaHaveSe);
             if (haveSaHaveSes.Any())
             {
                 //结算详情