From cac0915668dd0306f2a4bea9ade862c27c83dc9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Thu, 21 Sep 2023 16:17:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Entities/BQ/Dtos/INVOICE_GRP_DTO.cs | 3 ---
.../Entities/BQ/INVOICE_SERVICE.cs | 2 +-
.../Entities/BQ/Managers/BBAC_CAN_SA_MNG.cs | 3 ---
.../Entities/BQ/Managers/INV_MNG.cs | 16 +---------------
4 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs
index 72c6b202..c860f4f1 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs
@@ -300,11 +300,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
{
[Display(Name = "五联单号")]
public string GroupNum { set; get; }
-
[Display(Name = "生产码")]
public string PN { set; get; }
-
-
[Display(Name = "零件号")]
public string LU { set; get; }
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 fba10da7..7342e7d4 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
@@ -389,7 +389,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
foreach (var itm in sdtos)
{
unsettle.Add(new MAIDAN_HBPO_UNSETTLED_DETAIL_DTO() {
- GroupNum=itm.InvGroupNum,
+ GroupNum=itm.SettleGroupNum,
LU=itm.LU,
PN=itm.Extend1,
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/BBAC_CAN_SA_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/BBAC_CAN_SA_MNG.cs
index 05ee1f06..8ca22b50 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/BBAC_CAN_SA_MNG.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/BBAC_CAN_SA_MNG.cs
@@ -48,7 +48,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
///
public virtual async Task SetForwardState(string p_billNum, SettleBillState state)
{
-
var ls = _repository.Where(p => p.InvGroupNum == p_billNum).ToList();
if (ls.Count > 1)
{
@@ -202,9 +201,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
var entity = await GetMainAsync(billNum).ConfigureAwait(false);
if (entity != null)
{
-
entity.State = SettleBillState.未结状态;
-
await _repository.UpdateAsync(entity).ConfigureAwait(false);
return true;
}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs
index 992f2766..09124f65 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs
@@ -1617,14 +1617,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
groupList.AddRange(mapList);
}
-
if (p_first == true)
{
var mng = await _hbpoMng.GetMainAsync(p_InvGroupNum);
-
-
- var notsettle = _nothbpoRepository.Where(p => p.SettleBillNum == mng.SettleBillNum);//一次开票时查找不可结数据，追加需求
-
+ var notsettle = _nothbpoRepository.Where(p => p.SettleBillNum == mng.SettleBillNum);//一次开票时查找不可结数据，追加需求
if (notsettle != null && notsettle.Count() > 0)
{
var innotls = new List();
@@ -1647,16 +1643,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
{
notDetialList.AddRange(innotls);
}
-
}
-
-
-
-
}
-
-
-
//invoiceBillNum = OrderNumberGenerator.GenerateOrderNumber("INV");
}
@@ -1711,10 +1699,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
{
notDetialList.AddRange(innotls);
}
-
}
}
-
decimal amt = detailList.Sum(k => k.Amt);//金额
decimal txtAmt = detailList.Sum(k => k.Amt) + Math.Round(detailList.Sum(k => k.Amt) * 0.13m, 2);//税后金额
decimal realAmt = Math.Round(detailList.Sum(k => k.Amt) * 0.13m, 2);//税额