diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs
index 918eae8f..6d20b540 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs
@@ -780,6 +780,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 var data = ms.ToArray();
                 var tupleList = this.ImportInternal<VmiLog>(data);
 
+
+
                 if (tupleList.Any(o => o.Item2.Count > 0))
                 {
                     using var workbook = new XLWorkbook(new MemoryStream(data));
@@ -874,10 +876,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                             seDetails.Add(seDetail);
                         }
                     }
+
                     var result = await CheckBusinessJISLocation(seDetails,businessType).ConfigureAwait(false);
                     if (result != "ok")
                     {
-                        return new JsonResult(new { code = 400, message = "发运数据有不再" + result + "库位中" });
+                        return new JsonResult(new { code = 400, message = "发运数据有不在" + result + "库位中" });
                     }
 
 
@@ -970,6 +973,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                             seDetails.Add(seDetail);
                         }
                     }
+                    var result = await CheckBusinessJISLocation(seDetails, businessType).ConfigureAwait(false);
+                    if (result != "ok")
+                    {
+                        return new JsonResult(new { code = 400, message = "发运数据有不再" + result + "库位中" });
+                    }
+                    return await BeginTran(seDetails, logList).ConfigureAwait(false);
                 }
 
                 if (businessType == EnumBusinessType.ZhiGongJianBBAC)
@@ -1008,7 +1017,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                             seDetail.Remark = "期初初始化";
                             seDetails.Add(seDetail);
                         }
-
+                    }
+                    var result = await CheckBusinessPUBLocation(seDetails, businessType).ConfigureAwait(false);
+                    if (result != "ok")
+                    {
+                        return new JsonResult(new { code = 400, message = "发运数据有不再" + result + "库位中" });
                     }
                     return await BeginTran(seDetails, logList).ConfigureAwait(false);
                 }
@@ -1049,6 +1062,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                             seDetails.Add(seDetail);
                         }
                     }
+                    var result = await CheckBusinessPUBLocation(seDetails, businessType).ConfigureAwait(false);
+                    if (result != "ok")
+                    {
+                        return new JsonResult(new { code = 400, message = "发运数据有不再" + result + "库位中" });
+                    }
                     return await BeginTran(seDetails, logList).ConfigureAwait(false);
                 }
                 if (businessType == EnumBusinessType.BeiJian)
@@ -1088,6 +1106,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                             seDetails.Add(seDetail);
                         }
                     }
+                    var result = await CheckBusinessPUBLocation(seDetails, businessType).ConfigureAwait(false);
+                    if (result != "ok")
+                    {
+                        return new JsonResult(new { code = 400, message = "发运数据有不再" + result + "库位中" });
+                    }
                     return await BeginTran(seDetails, logList).ConfigureAwait(false);
 
                 }
@@ -1128,6 +1151,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                             seDetails.Add(seDetail);
                         }
                     }
+                    var result = await CheckBusinessPUBLocation(seDetails, businessType).ConfigureAwait(false);
+                    if (result != "ok")
+                    {
+                        return new JsonResult(new { code = 400, message = "发运数据有不再" + result + "库位中" });
+                    }
                     return await BeginTran(seDetails, logList).ConfigureAwait(false);
                 }
                 return new JsonResult(new { code = 200, message = "ok" });
@@ -1209,18 +1237,18 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 case EnumBusinessType.MaiDanJianHBPO:
                     locList = locList.Where(p => p.Value == "MaiDanJianHBPO").ToList();
                     break;
-                case EnumBusinessType.ZhiGongJianBBAC:
-                    locList = locList.Where(p => p.Value == "ZhiGongJianBBAC顺义" || p.Value == "ZhiGongJianBBAC").ToList();
-                    break;
-                case EnumBusinessType.ZhiGongJianHBPO:
-                    locList = locList.Where(p => p.Value == "ZhiGongJianHBPO").ToList();
-                    break;
-                case EnumBusinessType.BeiJian:
-                    locList = locList.Where(p => p.Value =="BeiJian").ToList();
-                    break;
-                case EnumBusinessType.YinDuJian:
-                    locList = locList.Where(p => p.Value == "YinDuJian").ToList();
-                    break;
+                //case EnumBusinessType.ZhiGongJianBBAC:
+                //    locList = locList.Where(p => p.Value == "ZhiGongJianBBAC顺义" || p.Value == "ZhiGongJianBBAC").ToList();
+                //    break;
+                //case EnumBusinessType.ZhiGongJianHBPO:
+                //    locList = locList.Where(p => p.Value == "ZhiGongJianHBPO").ToList();
+                //    break;
+                //case EnumBusinessType.BeiJian:
+                //    locList = locList.Where(p => p.Value =="BeiJian").ToList();
+                //    break;
+                //case EnumBusinessType.YinDuJian:
+                //    locList = locList.Where(p => p.Value == "YinDuJian").ToList();
+                //    break;
 
             }
             var locs = locList.Select(p => p.Description).ToList();
@@ -1237,28 +1265,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         /// <param name="p_list"></param>
         /// <param name="enumBusinessType"></param>
         /// <returns></returns>
-        private async Task<string> CheckBusinessPUBLocation<T>(List<PUB_SE_DETAIL> p_list, EnumBusinessType enumBusinessType)
+        private async Task<string> CheckBusinessPUBLocation(List<PUB_SE_DETAIL> p_list, EnumBusinessType enumBusinessType)
         {
             var locList = _codeRepository.Where(p => p.Project == "库位").ToList();
             switch (enumBusinessType)
             {
-                case EnumBusinessType.JisBBAC:
-                    locList = locList.Where(p =>
-                    p.Value == "JisBBAC顺义" ||
-                    p.Value == "JisBBAC" ||
-                    p.Value == "MaiDanJianBBAC" ||
-                    p.Value == "MaiDanJianBBAC顺义"
-                    ).ToList();
-                    break;
-                case EnumBusinessType.JisHBPO:
-                    locList = locList.Where(p =>
-                    p.Value == "JisHBPO"
-                    ).ToList();
-                    break;
-
-                case EnumBusinessType.MaiDanJianHBPO:
-                    locList = locList.Where(p => p.Value == "MaiDanJianHBPO").ToList();
-                    break;
+         
                 case EnumBusinessType.ZhiGongJianBBAC:
                     locList = locList.Where(p => p.Value == "ZhiGongJianBBAC顺义" || p.Value == "ZhiGongJianBBAC").ToList();
                     break;
@@ -1322,302 +1334,302 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 }
                 var logList = tupleList.Select(o => o.Item1).ToList();
                 logList.AsParallel().ForEach(Update);
-                List<BBAC_SE_DETAIL> seDetails = new List<BBAC_SE_DETAIL>();
-                List<HBPO_SE_DETAIL> hbpo_seDetails=new List<HBPO_SE_DETAIL>();
-                List<PUB_SE_DETAIL> pub_seDetails=new List<PUB_SE_DETAIL>();    
-
-                foreach (var item  in logList)
-                {
-                    if(item.DeliverBillType== EnumDeliverBjBmpBillType.JIS件&&item.DeliverSubBillType== EnumDeliverSubBillType.保险杠BBAC)
-                    {
-                        BBAC_SE_DETAIL seDetail = new BBAC_SE_DETAIL();
-                        seDetail.SetId(item.Id);
-                        seDetail.BeginDate = DateTime.Now;
-                        seDetail.CreationTime = DateTime.Now;
-                        seDetail.IsDeleted = false;
-                        seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM"));
-                        seDetail.ShippingDate = (DateTime)item.BillTime;
-                        seDetail.Qty = item.Qty;
-                        seDetail.IsHaveEdiData = false;
-                        seDetail.BusinessType = EnumBusinessType.JisBBAC;
-                        seDetail.AssembleData = (DateTime)item.AssembleData;
-                        seDetail.BillType = 0;
-                        seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
-                        seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
-                        seDetail.ProType = 0;
-                        seDetail.State = 0;
-                        seDetail.SubBillType = 0;
-                        seDetail.TransType = EnumDelTransType.发货;
-                        seDetail.UID = 000;
-                        seDetail.FactoryPartCode = item.RealPartCode;
-                        seDetail.CustomerPartCodeNoSpace = item.RealPartCode.Replace("-", "");
-                        seDetail.ErpToLoc= item.ErpToLoc;
-                        seDetail.Qty=item.Qty;
-                        seDetail.VinCode= item.VinCode;
-                        seDetail.PN = item.VinCode;
-                        seDetail.LU = item.CustPartCode;
-                        seDetail.CustPartCode = item.CustPartCode;
-                        seDetail.BillTime= item.BillTime;
-
-                        seDetail.Remark = "期初初始化";
-
-                        seDetails.Add(seDetail);
-                    }
-
-                    if (item.DeliverBillType == EnumDeliverBjBmpBillType.JIS件 && item.DeliverSubBillType == EnumDeliverSubBillType.买单件小件BBAC)
-                    {
-                        BBAC_SE_DETAIL seDetail = new BBAC_SE_DETAIL();
-                        seDetail.SetId(item.Id);
-                        seDetail.BeginDate = DateTime.Now;
-                        seDetail.CreationTime = DateTime.Now;
-                        seDetail.IsDeleted = false;
-                        seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM"));
-                        seDetail.ShippingDate = (DateTime)item.BillTime;
-                        seDetail.Qty = item.Qty;
-                        seDetail.IsHaveEdiData = false;
-                        seDetail.BusinessType = EnumBusinessType.MaiDanJianBBAC;
-                        seDetail.AssembleData = (DateTime)item.AssembleData;
-                        seDetail.BillType = 0;
-                        seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
-                        seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
-                        seDetail.ProType = 0;
-                        seDetail.State = 0;
-                        seDetail.SubBillType = 0;
-                        seDetail.TransType = EnumDelTransType.发货;
-                        seDetail.UID = 000;
-                        seDetail.FactoryPartCode = item.RealPartCode;
-                        seDetail.CustomerPartCodeNoSpace = item.RealPartCode.Replace("-", "");
-                        seDetail.ErpToLoc = item.ErpToLoc;
-                        seDetail.Qty = item.Qty;
-                        seDetail.VinCode = item.VinCode;
-                        seDetail.PN = item.VinCode;
-                        seDetail.LU = item.CustPartCode;
-                        seDetail.CustPartCode = item.CustPartCode;
-                        seDetail.BillTime = item.BillTime;
-
-                        seDetail.Remark = "期初初始化";
-
-                        seDetails.Add(seDetail);
-                    }
-
-                    if (item.DeliverBillType == EnumDeliverBjBmpBillType.JIS件 && item.DeliverSubBillType == EnumDeliverSubBillType.保险杠HBPO)
-                    {
-                        HBPO_SE_DETAIL seDetail = new HBPO_SE_DETAIL();
-                        seDetail.SetId(item.Id);
-                        seDetail.BeginDate = DateTime.Now;
-                        seDetail.CreationTime = DateTime.Now;
-                        seDetail.IsDeleted = false;
-                        seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM"));
-                        seDetail.ShippingDate = (DateTime)item.BillTime;
-                        seDetail.Qty = item.Qty;
-                        seDetail.IsHaveEdiData = false;
-                        seDetail.BusinessType = EnumBusinessType.JisHBPO;
-                        seDetail.AssembleData = (DateTime)item.AssembleData;
-                        seDetail.BillType = 0;
-                        seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
-                        seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
-                        seDetail.ProType = 0;
-                        seDetail.State = 0;
-                        seDetail.SubBillType = 0;
-                        seDetail.TransType = EnumDelTransType.发货;
-                        seDetail.UID = 000;
-                        seDetail.FactoryPartCode = item.RealPartCode;
-                        seDetail.CustomerPartCodeNoSpace = item.RealPartCode.Replace("-", "");
-                        seDetail.ErpToLoc = item.ErpToLoc;
-                        seDetail.Qty = item.Qty;
-                        seDetail.VinCode = item.VinCode;
-                        seDetail.PN = item.VinCode;
-                        seDetail.LU = item.CustPartCode;
-                        seDetail.CustPartCode = item.CustPartCode;
-                        seDetail.BillTime = item.BillTime;
-
-                        seDetail.Remark = "期初初始化";
-
-                        hbpo_seDetails.Add(seDetail);
-                    }
-
-                    if (item.DeliverBillType == EnumDeliverBjBmpBillType.JIS件 && item.DeliverSubBillType == EnumDeliverSubBillType.买单件小件HBPO)
-                    {
-                        HBPO_SE_DETAIL seDetail = new HBPO_SE_DETAIL();
-                        seDetail.SetId(item.Id);
-                        seDetail.BeginDate = DateTime.Now;
-                        seDetail.CreationTime = DateTime.Now;
-                        seDetail.IsDeleted = false;
-                        seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM"));
-                        seDetail.ShippingDate = (DateTime)item.BillTime;
-                        seDetail.Qty = item.Qty;
-                        seDetail.IsHaveEdiData = false;
-                        seDetail.BusinessType = EnumBusinessType.MaiDanJianHBPO;
-                        seDetail.AssembleData = (DateTime)item.AssembleData;
-                        seDetail.BillType = 0;
-                        seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
-                        seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
-                        seDetail.ProType = 0;
-                        seDetail.State = 0;
-                        seDetail.SubBillType = 0;
-                        seDetail.TransType = EnumDelTransType.发货;
-                        seDetail.UID = 000;
-                        seDetail.FactoryPartCode = item.RealPartCode;
-                        seDetail.CustomerPartCodeNoSpace = item.RealPartCode.Replace("-", "");
-                        seDetail.ErpToLoc = item.ErpToLoc;
-                        seDetail.Qty = item.Qty;
-                        seDetail.VinCode = item.VinCode;
-                        seDetail.PN = item.VinCode;
-                        seDetail.LU = item.CustPartCode;
-                        seDetail.CustPartCode = item.CustPartCode;
-                        seDetail.BillTime = item.BillTime;
-
-                        seDetail.Remark = "期初初始化";
-
-                        hbpo_seDetails.Add(seDetail);
-                    }
-
-                    if (item.DeliverBillType == EnumDeliverBjBmpBillType.JIT直供件 && item.DeliverSubBillType == EnumDeliverSubBillType.JIT直供件BBAC)
-                    {
-                        PUB_SE_DETAIL seDetail = new PUB_SE_DETAIL();
-                        seDetail.SetId(item.Id);
-                        seDetail.BeginDate = DateTime.Now;
-                        seDetail.CreationTime = DateTime.Now;
-                        seDetail.IsDeleted = false;
-                        seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM"));
-                        seDetail.ShippingDate = (DateTime)item.BillTime;
-                        seDetail.Qty = item.Qty;
-                        //seDetail.IsHaveEdiData = false;
-                        seDetail.BusinessType = EnumBusinessType.ZhiGongJianBBAC;
-                        seDetail.AssembleData = (DateTime)item.AssembleData;
-                        seDetail.BillType = 0;
-                        seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
-                        seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
-                        seDetail.ProType = 0;
-                        seDetail.State = 0;
-                        seDetail.SubBillType = 0;
-                        seDetail.TransType = EnumDelTransType.发货;
-                        seDetail.UID = 000;
-                        seDetail.FactoryPartCode = item.RealPartCode;
-                        seDetail.CustomerPartCodeNoSpace = item.RealPartCode.Replace("-", "");
-                        seDetail.ToErpLocCode = item.ErpToLoc;
-                        seDetail.Qty = item.Qty;
-                        //seDetail.VinCode = item.VinCode;
-                        seDetail.PN = item.VinCode;
-                        seDetail.LU = item.CustPartCode;
-                        seDetail.CustPartCode = item.CustPartCode;
-                        seDetail.BillTime = item.BillTime;
-
-                        seDetail.Remark = "期初初始化";
-
-                        pub_seDetails.Add(seDetail);
-                    }
-
-                    if (item.DeliverBillType == EnumDeliverBjBmpBillType.JIT直供件 && item.DeliverSubBillType == EnumDeliverSubBillType.JIT直供件HBPO)
-                    {
-                        PUB_SE_DETAIL seDetail = new PUB_SE_DETAIL();
-                        seDetail.SetId(item.Id);
-                        seDetail.BeginDate = DateTime.Now;
-                        seDetail.CreationTime = DateTime.Now;
-                        seDetail.IsDeleted = false;
-                        seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM"));
-                        seDetail.ShippingDate = (DateTime)item.BillTime;
-                        seDetail.Qty = item.Qty;
-                        //seDetail.IsHaveEdiData = false;
-                        seDetail.BusinessType = EnumBusinessType.ZhiGongJianHBPO;
-                        seDetail.AssembleData = (DateTime)item.AssembleData;
-                        seDetail.BillType = 0;
-                        seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
-                        seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
-                        seDetail.ProType = 0;
-                        seDetail.State = 0;
-                        seDetail.SubBillType = 0;
-                        seDetail.TransType = EnumDelTransType.发货;
-                        seDetail.UID = 000;
-                        seDetail.FactoryPartCode = item.RealPartCode;
-                        seDetail.CustomerPartCodeNoSpace = item.RealPartCode.Replace("-", "");
-                        seDetail.ToErpLocCode = item.ErpToLoc;
-                        seDetail.Qty = item.Qty;
-                        //seDetail.VinCode = item.VinCode;
-                        seDetail.PN = item.VinCode;
-                        seDetail.LU = item.CustPartCode;
-                        seDetail.CustPartCode = item.CustPartCode;
-                        seDetail.BillTime = item.BillTime;
-
-                        seDetail.Remark = "期初初始化";
-
-                        pub_seDetails.Add(seDetail);
-                    }
-
-                    if (item.DeliverBillType == EnumDeliverBjBmpBillType.北汽4S备件 && item.DeliverSubBillType == EnumDeliverSubBillType.北汽4S备件BBAC)
-                    {
-                        PUB_SE_DETAIL seDetail = new PUB_SE_DETAIL();
-                        seDetail.SetId(item.Id);
-                        seDetail.BeginDate = DateTime.Now;
-                        seDetail.CreationTime = DateTime.Now;
-                        seDetail.IsDeleted = false;
-                        seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM"));
-                        seDetail.ShippingDate = (DateTime)item.BillTime;
-                        seDetail.Qty = item.Qty;
-                        //seDetail.IsHaveEdiData = false;
-                        seDetail.BusinessType = EnumBusinessType.BeiJian;
-                        seDetail.AssembleData = (DateTime)item.AssembleData;
-                        seDetail.BillType = 0;
-                        seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
-                        seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
-                        seDetail.ProType = 0;
-                        seDetail.State = 0;
-                        seDetail.SubBillType = 0;
-                        seDetail.TransType = EnumDelTransType.发货;
-                        seDetail.UID = 000;
-                        seDetail.FactoryPartCode = item.RealPartCode;
-                        seDetail.CustomerPartCodeNoSpace = item.RealPartCode.Replace("-", "");
-                        seDetail.ToErpLocCode = item.ErpToLoc;
-                        seDetail.Qty = item.Qty;
-                        //seDetail.VinCode = item.VinCode;
-                        seDetail.PN = item.VinCode;
-                        seDetail.LU = item.CustPartCode;
-                        seDetail.CustPartCode = item.CustPartCode;
-                        seDetail.BillTime = item.BillTime;
-
-                        seDetail.Remark = "期初初始化";
-
-                        pub_seDetails.Add(seDetail);
-                    }
-
-                    if (item.DeliverBillType == EnumDeliverBjBmpBillType.印度件 && item.DeliverSubBillType == EnumDeliverSubBillType.印度件BBAC)
-                    {
-                        PUB_SE_DETAIL seDetail = new PUB_SE_DETAIL();
-                        seDetail.SetId(item.Id);
-                        seDetail.BeginDate = DateTime.Now;
-                        seDetail.CreationTime = DateTime.Now;
-                        seDetail.IsDeleted = false;
-                        seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM"));
-                        seDetail.ShippingDate = (DateTime)item.BillTime;
-                        seDetail.Qty = item.Qty;
-                        //seDetail.IsHaveEdiData = false;
-                        seDetail.BusinessType = EnumBusinessType.YinDuJian;
-                        seDetail.AssembleData = (DateTime)item.AssembleData;
-                        seDetail.BillType = 0;
-                        seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
-                        seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
-                        seDetail.ProType = 0;
-                        seDetail.State = 0;
-                        seDetail.SubBillType = 0;
-                        seDetail.TransType = EnumDelTransType.发货;
-                        seDetail.UID = 000;
-                        seDetail.FactoryPartCode = item.RealPartCode;
-                        seDetail.CustomerPartCodeNoSpace = item.RealPartCode.Replace("-", "");
-                        seDetail.ToErpLocCode = item.ErpToLoc;
-                        seDetail.Qty = item.Qty;
-                        //seDetail.VinCode = item.VinCode;
-                        seDetail.PN = item.VinCode;
-                        seDetail.LU = item.CustPartCode;
-                        seDetail.CustPartCode = item.CustPartCode;
-                        seDetail.BillTime = item.BillTime;
-
-                        seDetail.Remark = "期初初始化";
-
-                        pub_seDetails.Add(seDetail);
-                    }
-
-
-                }
+                //List<BBAC_SE_DETAIL> seDetails = new List<BBAC_SE_DETAIL>();
+                //List<HBPO_SE_DETAIL> hbpo_seDetails=new List<HBPO_SE_DETAIL>();
+                //List<PUB_SE_DETAIL> pub_seDetails=new List<PUB_SE_DETAIL>();    
+
+                //foreach (var item  in logList)
+                //{
+                //    if(item.DeliverBillType== EnumDeliverBjBmpBillType.JIS件&&item.DeliverSubBillType== EnumDeliverSubBillType.保险杠BBAC)
+                //    {
+                //        BBAC_SE_DETAIL seDetail = new BBAC_SE_DETAIL();
+                //        seDetail.SetId(item.Id);
+                //        seDetail.BeginDate = DateTime.Now;
+                //        seDetail.CreationTime = DateTime.Now;
+                //        seDetail.IsDeleted = false;
+                //        seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM"));
+                //        seDetail.ShippingDate = (DateTime)item.BillTime;
+                //        seDetail.Qty = item.Qty;
+                //        seDetail.IsHaveEdiData = false;
+                //        seDetail.BusinessType = EnumBusinessType.JisBBAC;
+                //        seDetail.AssembleData = (DateTime)item.AssembleData;
+                //        seDetail.BillType = 0;
+                //        seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
+                //        seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
+                //        seDetail.ProType = 0;
+                //        seDetail.State = 0;
+                //        seDetail.SubBillType = 0;
+                //        seDetail.TransType = EnumDelTransType.发货;
+                //        seDetail.UID = 000;
+                //        seDetail.FactoryPartCode = item.RealPartCode;
+                //        seDetail.CustomerPartCodeNoSpace = item.RealPartCode.Replace("-", "");
+                //        seDetail.ErpToLoc= item.ErpToLoc;
+                //        seDetail.Qty=item.Qty;
+                //        seDetail.VinCode= item.VinCode;
+                //        seDetail.PN = item.VinCode;
+                //        seDetail.LU = item.CustPartCode;
+                //        seDetail.CustPartCode = item.CustPartCode;
+                //        seDetail.BillTime= item.BillTime;
+
+                //        seDetail.Remark = "期初初始化";
+
+                //        seDetails.Add(seDetail);
+                //    }
+
+                //    if (item.DeliverBillType == EnumDeliverBjBmpBillType.JIS件 && item.DeliverSubBillType == EnumDeliverSubBillType.买单件小件BBAC)
+                //    {
+                //        BBAC_SE_DETAIL seDetail = new BBAC_SE_DETAIL();
+                //        seDetail.SetId(item.Id);
+                //        seDetail.BeginDate = DateTime.Now;
+                //        seDetail.CreationTime = DateTime.Now;
+                //        seDetail.IsDeleted = false;
+                //        seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM"));
+                //        seDetail.ShippingDate = (DateTime)item.BillTime;
+                //        seDetail.Qty = item.Qty;
+                //        seDetail.IsHaveEdiData = false;
+                //        seDetail.BusinessType = EnumBusinessType.MaiDanJianBBAC;
+                //        seDetail.AssembleData = (DateTime)item.AssembleData;
+                //        seDetail.BillType = 0;
+                //        seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
+                //        seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
+                //        seDetail.ProType = 0;
+                //        seDetail.State = 0;
+                //        seDetail.SubBillType = 0;
+                //        seDetail.TransType = EnumDelTransType.发货;
+                //        seDetail.UID = 000;
+                //        seDetail.FactoryPartCode = item.RealPartCode;
+                //        seDetail.CustomerPartCodeNoSpace = item.RealPartCode.Replace("-", "");
+                //        seDetail.ErpToLoc = item.ErpToLoc;
+                //        seDetail.Qty = item.Qty;
+                //        seDetail.VinCode = item.VinCode;
+                //        seDetail.PN = item.VinCode;
+                //        seDetail.LU = item.CustPartCode;
+                //        seDetail.CustPartCode = item.CustPartCode;
+                //        seDetail.BillTime = item.BillTime;
+
+                //        seDetail.Remark = "期初初始化";
+
+                //        seDetails.Add(seDetail);
+                //    }
+
+                //    if (item.DeliverBillType == EnumDeliverBjBmpBillType.JIS件 && item.DeliverSubBillType == EnumDeliverSubBillType.保险杠HBPO)
+                //    {
+                //        HBPO_SE_DETAIL seDetail = new HBPO_SE_DETAIL();
+                //        seDetail.SetId(item.Id);
+                //        seDetail.BeginDate = DateTime.Now;
+                //        seDetail.CreationTime = DateTime.Now;
+                //        seDetail.IsDeleted = false;
+                //        seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM"));
+                //        seDetail.ShippingDate = (DateTime)item.BillTime;
+                //        seDetail.Qty = item.Qty;
+                //        seDetail.IsHaveEdiData = false;
+                //        seDetail.BusinessType = EnumBusinessType.JisHBPO;
+                //        seDetail.AssembleData = (DateTime)item.AssembleData;
+                //        seDetail.BillType = 0;
+                //        seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
+                //        seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
+                //        seDetail.ProType = 0;
+                //        seDetail.State = 0;
+                //        seDetail.SubBillType = 0;
+                //        seDetail.TransType = EnumDelTransType.发货;
+                //        seDetail.UID = 000;
+                //        seDetail.FactoryPartCode = item.RealPartCode;
+                //        seDetail.CustomerPartCodeNoSpace = item.RealPartCode.Replace("-", "");
+                //        seDetail.ErpToLoc = item.ErpToLoc;
+                //        seDetail.Qty = item.Qty;
+                //        seDetail.VinCode = item.VinCode;
+                //        seDetail.PN = item.VinCode;
+                //        seDetail.LU = item.CustPartCode;
+                //        seDetail.CustPartCode = item.CustPartCode;
+                //        seDetail.BillTime = item.BillTime;
+
+                //        seDetail.Remark = "期初初始化";
+
+                //        hbpo_seDetails.Add(seDetail);
+                //    }
+
+                //    if (item.DeliverBillType == EnumDeliverBjBmpBillType.JIS件 && item.DeliverSubBillType == EnumDeliverSubBillType.买单件小件HBPO)
+                //    {
+                //        HBPO_SE_DETAIL seDetail = new HBPO_SE_DETAIL();
+                //        seDetail.SetId(item.Id);
+                //        seDetail.BeginDate = DateTime.Now;
+                //        seDetail.CreationTime = DateTime.Now;
+                //        seDetail.IsDeleted = false;
+                //        seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM"));
+                //        seDetail.ShippingDate = (DateTime)item.BillTime;
+                //        seDetail.Qty = item.Qty;
+                //        seDetail.IsHaveEdiData = false;
+                //        seDetail.BusinessType = EnumBusinessType.MaiDanJianHBPO;
+                //        seDetail.AssembleData = (DateTime)item.AssembleData;
+                //        seDetail.BillType = 0;
+                //        seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
+                //        seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
+                //        seDetail.ProType = 0;
+                //        seDetail.State = 0;
+                //        seDetail.SubBillType = 0;
+                //        seDetail.TransType = EnumDelTransType.发货;
+                //        seDetail.UID = 000;
+                //        seDetail.FactoryPartCode = item.RealPartCode;
+                //        seDetail.CustomerPartCodeNoSpace = item.RealPartCode.Replace("-", "");
+                //        seDetail.ErpToLoc = item.ErpToLoc;
+                //        seDetail.Qty = item.Qty;
+                //        seDetail.VinCode = item.VinCode;
+                //        seDetail.PN = item.VinCode;
+                //        seDetail.LU = item.CustPartCode;
+                //        seDetail.CustPartCode = item.CustPartCode;
+                //        seDetail.BillTime = item.BillTime;
+
+                //        seDetail.Remark = "期初初始化";
+
+                //        hbpo_seDetails.Add(seDetail);
+                //    }
+
+                //    if (item.DeliverBillType == EnumDeliverBjBmpBillType.JIT直供件 && item.DeliverSubBillType == EnumDeliverSubBillType.JIT直供件BBAC)
+                //    {
+                //        PUB_SE_DETAIL seDetail = new PUB_SE_DETAIL();
+                //        seDetail.SetId(item.Id);
+                //        seDetail.BeginDate = DateTime.Now;
+                //        seDetail.CreationTime = DateTime.Now;
+                //        seDetail.IsDeleted = false;
+                //        seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM"));
+                //        seDetail.ShippingDate = (DateTime)item.BillTime;
+                //        seDetail.Qty = item.Qty;
+                //        //seDetail.IsHaveEdiData = false;
+                //        seDetail.BusinessType = EnumBusinessType.ZhiGongJianBBAC;
+                //        seDetail.AssembleData = (DateTime)item.AssembleData;
+                //        seDetail.BillType = 0;
+                //        seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
+                //        seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
+                //        seDetail.ProType = 0;
+                //        seDetail.State = 0;
+                //        seDetail.SubBillType = 0;
+                //        seDetail.TransType = EnumDelTransType.发货;
+                //        seDetail.UID = 000;
+                //        seDetail.FactoryPartCode = item.RealPartCode;
+                //        seDetail.CustomerPartCodeNoSpace = item.RealPartCode.Replace("-", "");
+                //        seDetail.ToErpLocCode = item.ErpToLoc;
+                //        seDetail.Qty = item.Qty;
+                //        //seDetail.VinCode = item.VinCode;
+                //        seDetail.PN = item.VinCode;
+                //        seDetail.LU = item.CustPartCode;
+                //        seDetail.CustPartCode = item.CustPartCode;
+                //        seDetail.BillTime = item.BillTime;
+
+                //        seDetail.Remark = "期初初始化";
+
+                //        pub_seDetails.Add(seDetail);
+                //    }
+
+                //    if (item.DeliverBillType == EnumDeliverBjBmpBillType.JIT直供件 && item.DeliverSubBillType == EnumDeliverSubBillType.JIT直供件HBPO)
+                //    {
+                //        PUB_SE_DETAIL seDetail = new PUB_SE_DETAIL();
+                //        seDetail.SetId(item.Id);
+                //        seDetail.BeginDate = DateTime.Now;
+                //        seDetail.CreationTime = DateTime.Now;
+                //        seDetail.IsDeleted = false;
+                //        seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM"));
+                //        seDetail.ShippingDate = (DateTime)item.BillTime;
+                //        seDetail.Qty = item.Qty;
+                //        //seDetail.IsHaveEdiData = false;
+                //        seDetail.BusinessType = EnumBusinessType.ZhiGongJianHBPO;
+                //        seDetail.AssembleData = (DateTime)item.AssembleData;
+                //        seDetail.BillType = 0;
+                //        seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
+                //        seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
+                //        seDetail.ProType = 0;
+                //        seDetail.State = 0;
+                //        seDetail.SubBillType = 0;
+                //        seDetail.TransType = EnumDelTransType.发货;
+                //        seDetail.UID = 000;
+                //        seDetail.FactoryPartCode = item.RealPartCode;
+                //        seDetail.CustomerPartCodeNoSpace = item.RealPartCode.Replace("-", "");
+                //        seDetail.ToErpLocCode = item.ErpToLoc;
+                //        seDetail.Qty = item.Qty;
+                //        //seDetail.VinCode = item.VinCode;
+                //        seDetail.PN = item.VinCode;
+                //        seDetail.LU = item.CustPartCode;
+                //        seDetail.CustPartCode = item.CustPartCode;
+                //        seDetail.BillTime = item.BillTime;
+
+                //        seDetail.Remark = "期初初始化";
+
+                //        pub_seDetails.Add(seDetail);
+                //    }
+
+                //    if (item.DeliverBillType == EnumDeliverBjBmpBillType.北汽4S备件 && item.DeliverSubBillType == EnumDeliverSubBillType.北汽4S备件BBAC)
+                //    {
+                //        PUB_SE_DETAIL seDetail = new PUB_SE_DETAIL();
+                //        seDetail.SetId(item.Id);
+                //        seDetail.BeginDate = DateTime.Now;
+                //        seDetail.CreationTime = DateTime.Now;
+                //        seDetail.IsDeleted = false;
+                //        seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM"));
+                //        seDetail.ShippingDate = (DateTime)item.BillTime;
+                //        seDetail.Qty = item.Qty;
+                //        //seDetail.IsHaveEdiData = false;
+                //        seDetail.BusinessType = EnumBusinessType.BeiJian;
+                //        seDetail.AssembleData = (DateTime)item.AssembleData;
+                //        seDetail.BillType = 0;
+                //        seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
+                //        seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
+                //        seDetail.ProType = 0;
+                //        seDetail.State = 0;
+                //        seDetail.SubBillType = 0;
+                //        seDetail.TransType = EnumDelTransType.发货;
+                //        seDetail.UID = 000;
+                //        seDetail.FactoryPartCode = item.RealPartCode;
+                //        seDetail.CustomerPartCodeNoSpace = item.RealPartCode.Replace("-", "");
+                //        seDetail.ToErpLocCode = item.ErpToLoc;
+                //        seDetail.Qty = item.Qty;
+                //        //seDetail.VinCode = item.VinCode;
+                //        seDetail.PN = item.VinCode;
+                //        seDetail.LU = item.CustPartCode;
+                //        seDetail.CustPartCode = item.CustPartCode;
+                //        seDetail.BillTime = item.BillTime;
+
+                //        seDetail.Remark = "期初初始化";
+
+                //        pub_seDetails.Add(seDetail);
+                //    }
+
+                //    if (item.DeliverBillType == EnumDeliverBjBmpBillType.印度件 && item.DeliverSubBillType == EnumDeliverSubBillType.印度件BBAC)
+                //    {
+                //        PUB_SE_DETAIL seDetail = new PUB_SE_DETAIL();
+                //        seDetail.SetId(item.Id);
+                //        seDetail.BeginDate = DateTime.Now;
+                //        seDetail.CreationTime = DateTime.Now;
+                //        seDetail.IsDeleted = false;
+                //        seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM"));
+                //        seDetail.ShippingDate = (DateTime)item.BillTime;
+                //        seDetail.Qty = item.Qty;
+                //        //seDetail.IsHaveEdiData = false;
+                //        seDetail.BusinessType = EnumBusinessType.YinDuJian;
+                //        seDetail.AssembleData = (DateTime)item.AssembleData;
+                //        seDetail.BillType = 0;
+                //        seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
+                //        seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
+                //        seDetail.ProType = 0;
+                //        seDetail.State = 0;
+                //        seDetail.SubBillType = 0;
+                //        seDetail.TransType = EnumDelTransType.发货;
+                //        seDetail.UID = 000;
+                //        seDetail.FactoryPartCode = item.RealPartCode;
+                //        seDetail.CustomerPartCodeNoSpace = item.RealPartCode.Replace("-", "");
+                //        seDetail.ToErpLocCode = item.ErpToLoc;
+                //        seDetail.Qty = item.Qty;
+                //        //seDetail.VinCode = item.VinCode;
+                //        seDetail.PN = item.VinCode;
+                //        seDetail.LU = item.CustPartCode;
+                //        seDetail.CustPartCode = item.CustPartCode;
+                //        seDetail.BillTime = item.BillTime;
+
+                //        seDetail.Remark = "期初初始化";
+
+                //        pub_seDetails.Add(seDetail);
+                //    }
+
+
+                //}
 
                 //var messageList = logList.Select(log => new VmiMessage { Message = JsonSerializer.Serialize(log) }).ToList();
                 var connectionString = this._serviceProvider.GetRequiredService<IConfiguration>().GetConnectionString("SettleAccountService");
@@ -1640,9 +1652,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
 
                     await context.BulkInsertAsync(logList).ConfigureAwait(false);
                     //await context.BulkInsertAsync(messageList).ConfigureAwait(false);
-                    await context.BulkInsertAsync(seDetails).ConfigureAwait(false);
-                    await context.BulkInsertAsync(hbpo_seDetails).ConfigureAwait(false);
-                    await context.BulkInsertAsync(pub_seDetails).ConfigureAwait(false);
+                    //await context.BulkInsertAsync(seDetails).ConfigureAwait(false);
+                    //await context.BulkInsertAsync(hbpo_seDetails).ConfigureAwait(false);
+                    //await context.BulkInsertAsync(pub_seDetails).ConfigureAwait(false);
 
                     transaction.Commit();
                 }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/VmiLog.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/VmiLog.cs
index 5ac71974..38b39d6c 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/VmiLog.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/VmiLog.cs
@@ -38,6 +38,16 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Vmi
             {
                 yield return new ValidationResult("客户客户订单号不能为空", new string[] { nameof(this.OrderNum) });
             }
+            if (this.DeliverSubBillType!=null && this.DeliverSubBillType>0)
+            {
+                yield return new ValidationResult("发货子类型", new string[] { nameof(this.DeliverSubBillType) });
+            }
+
+            if (this.DeliverBillType != null && this.DeliverBillType > 0)
+            {
+                yield return new ValidationResult("发货类型", new string[] { nameof(this.DeliverBillType) });
+            }
+
         }
         [ExporterHeader(DisplayName = "库存事务分类")]
         [Display(Name = "库存事务分类", Order = 0)]