From dfdc3a3db4de9c1e379e811d3e18392c075a6741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Sat, 2 Sep 2023 16:06:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/BQ/PUB_PD_SERVICE.cs             |  6 +++-
 .../BQ/Syncs/PendingDeductionService.cs       | 33 ++++++++++++++++---
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_PD_SERVICE.cs
index 9ee4a41a..e7dac0fa 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_PD_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_PD_SERVICE.cs
@@ -43,7 +43,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             var detailist = _detailRepository.Where(p => p_list.Contains(p.BillNum)).ToList();
             List<CustomCondition> customConditionList = new List<CustomCondition>();
             customConditionList.Add(new CustomCondition() { Name = "BillNumList", Value = string.Join(",", p_list) });
-            customConditionList.Add(new CustomCondition() { Name = "Type", Value = "PUB" });
+            var first=detailist.FirstOrDefault();
+
+
+
+            customConditionList.Add(new CustomCondition() { Name = "Type", Value = first.BusinessType.ToString()});
             customConditionList.Add(new CustomCondition() { Name = "IsOut", Value = "out" });
             var ls = _repository.Where(p => p_list.Contains(p.BillNum)).ToList();
             var lst = ls.Where(p => (p.State == SettleBillState.已提交扣减 || p.State == SettleBillState.已扣减));
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs
index 3e099d13..07b71e79 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs
@@ -5,11 +5,13 @@ using System.ServiceModel.Channels;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using DocumentFormat.OpenXml.Office2010.Excel;
 using EFCore.BulkExtensions;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.EntityFrameworkCore.Metadata.Conventions;
 using Newtonsoft.Json;
 using Nito.AsyncEx;
+using NPOI.HSSF.Util;
 using NPOI.OpenXmlFormats;
 using NPOI.SS.Formula.Functions;
 using SettleAccount.Bases;
@@ -58,7 +60,7 @@ public class PendingDeductionService : ApplicationService, ITransientDependency,
         //MaiDanJianHBPO 
         //BeiJian
         //YinDuJian
-        if (type == "JisBBAC" || type == "ZhiGongJianBBAC" || type == "MaiDanJianBBAC" )
+        if (type == "JisBBAC" || type == "ZhiGongJianBBAC" || type == "MaiDanJianBBAC" || type== "BeiJian")
         {
             var jisdetail = _dbcontext.Set<BBAC_PD_DETAIL>().Where(p => list.Contains(p.BillNum) && p.BusinessType == EnumBusinessType.JisBBAC);//jis
             if (jisdetail != null && jisdetail.Count() > 0)
@@ -123,6 +125,22 @@ public class PendingDeductionService : ApplicationService, ITransientDependency,
                     }
                     Sync(ydlist, EnumDeliverBjBmpBillType.印度件, isout == "out" ? true : false);
                 }
+                var bjlist = detailist1.Where(p => p.BusinessType == EnumBusinessType.BeiJian).ToList();
+                if (bjlist.Count > 0)
+                {
+                    foreach (var itm in bjlist)
+                    {
+                        if (string.IsNullOrEmpty(itm.Extend2))
+                        {
+                            itm.Extend2 = projectList.FirstOrDefault(p => p.Value == "BeiJian").Description;
+                        }
+                    }
+                    Sync(bjlist, EnumDeliverBjBmpBillType.北汽4S备件, isout == "out" ? true : false);
+                }
+
+
+
+
             }
         }
         else if (type == "JisHBPO" || type == "ZhiGongJianHBPO" || type == "MaiDanJianHBPO")
@@ -179,7 +197,8 @@ public class PendingDeductionService : ApplicationService, ITransientDependency,
     {
         var query = from itm in p_ls
                     select  new VmiLog()
-                    {                
+                    {
+                       
                         CodeType=string.Empty,
                         BillTime = DateTime.Now,
                         ChangedTime = DateTime.Now,
@@ -199,7 +218,12 @@ public class PendingDeductionService : ApplicationService, ITransientDependency,
                         ErpToLoc =   itm.Extend2,  //寄售库
                     };
         var ls = query.ToList();
-       
+
+
+        foreach (var itm in ls)
+        {
+            itm.SetId(GuidGenerator.Create());
+        }
         var _first= p_ls.FirstOrDefault();
         using (var transaction =_dbcontext.Database.BeginTransaction())
         {
@@ -212,8 +236,7 @@ public class PendingDeductionService : ApplicationService, ITransientDependency,
 
                     var messagelist = new List<VmiMessage>();
 
-                    _dbcontext.BulkInsert(ls);
-
+                
                     foreach (var item in ls)
                     {
                         var message = new VmiMessage