跟新版本

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs

@@ -173,7 +173,28 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                         }
                         else//二次开票
                         {
-                            var flag = await SecInvoice(entitys, new List<PUB_ADJ_DETAIL>(), dtos, main.Version, main.InvGroupNum, string.Empty, main.BusinessType).ConfigureAwait(false);
+                            var notlist = notQuery.Select(p => new TEMP_NOT_SA_DETAIL
+                            {
+                                KeyCode = p.KeyCode,
+                                Version = p.Version,
+                                SettleBillNum = p.SettleBillNum,
+                                LU = p.LU,
+                                PN = p.PN,
+                                Site = p.Site,
+                                Qty = p.Qty,
+                                Price = p.Price,
+                                BusinessType = p.BusinessType,
+                                IsReturn = "",
+                                InvGroupNum = p.InvGroupNum,
+                                SettleDate = p.SettleDate,
+                                GroupNum = p.GroupNum,
+                                ContractDocID = string.Empty,
+                                PartCode = p.PartCode
+
+                            }).ToList();//不能结算
+
+                            var falg = await FirstInvoice(entitys, new List<PUB_ADJ_DETAIL>(), dtos, notlist, main.Version, main.InvGroupNum, string.Empty, main.BusinessType).ConfigureAwait(false);
+                            //var flag = await SecInvoice(entitys, new List<PUB_ADJ_DETAIL>(), dtos, main.Version, main.InvGroupNum, string.Empty, main.BusinessType).ConfigureAwait(false);
                         }
                     }
                 }

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs

@@ -1845,8 +1845,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 {
                     if (first.BusinessType == EnumBusinessType.ZhiGongJianBBAC)
                     {
-                        unsettle = unsettle.Where(p => p.State == "可结算").ToList();
+                        jitunsettle = jitunsettle.Where(p => p.State == "可结算").ToList();
-                        _excel.Append(unsettle, "未结零件汇总");
+                        _excel.Append(jitunsettle, "未结零件汇总");
                     }
                     else
                     {

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/GenerateJisInvoiceService.cs

@@ -129,7 +129,27 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                                             LU = g.Key.LU,
                                             Qty = g.Sum(p => p.Qty),
                                         };
-                            var invs = SecInvoice(entitys, new List<PUB_ADJ_DETAIL>(), dtos, main.Version, main.InvGroupNum, string.Empty, main.BusinessType, query.ToList());
+                            var notlist = notQuery.Select(p => new TEMP_NOT_SA_DETAIL
+                            {
+                                KeyCode = p.KeyCode,
+                                Version = p.Version,
+                                SettleBillNum = p.SettleBillNum,
+                                LU = p.LU,
+                                PN = p.PN,
+                                Site = p.Site,
+                                Qty = p.Qty,
+                                Price = p.Price,
+                                BusinessType = p.BusinessType,
+                                IsReturn = "",
+                                InvGroupNum = p.InvGroupNum,
+                                SettleDate = p.SettleDate,
+                                GroupNum = p.GroupNum,
+                                ContractDocID = string.Empty,
+                                PartCode = p.PartCode
+
+                            }).ToList();//不能结算
+                            var invs = FirstInvoice(entitys, new List<PUB_ADJ_DETAIL>(), dtos, notlist, main.Version, main.InvGroupNum, string.Empty, main.BusinessType);
+                            //var invs = SecInvoice(entitys, new List<PUB_ADJ_DETAIL>(), dtos, main.Version, main.InvGroupNum, string.Empty, main.BusinessType, query.ToList());
                             if (invs.Count > 0)
                             {
                                 main.State = SettleBillState.已开票;

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs

@@ -128,6 +128,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
             }
             var result1 = notlist.Where(p => p.Price != 0);
 
+
+
+            if (!result1.Any())
+            {
+                throw new UserFriendlyException("都是没有价格数据！","400");
+            }
+
             //if (first.BusinessType == EnumBusinessType.ZhiGongJianBBAC || first.BusinessType == EnumBusinessType.YinDuJian  || first.BusinessType == EnumBusinessType.ZhiGongJianHBPO)
             //{
             //    var ls = p_list.Select(p => p.GroupNum).Distinct().ToList();