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 4153c351..5df737fd 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
@@ -324,15 +324,32 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
public class INVOICE_WAIT_DETAIL_BJ_DTO
{
-
-
- [Display(Name = "金税发票号")]
- public string RealInvbillNum { get; set; }
- [Display(Name = "发票日期")]
- public DateTime? InvDate { set; get; }
+ //凭证号
+ //交货号
+ //发票号
+ //开票日期
+ //供应商代码
+ //供应商名称
+ //采购订单号
+ //交付索引号
+ //交付识别号
+ //零件时间
+ //零件号
+ //零件名称
+ //价格
+ //数量
+ //金额
+ //税额
+ //价税合计
+ //协议编号
+ //备注
+ //商品组
///
- ///扩展字段1
+ ///发票号
///
+ [Display(Name = "系统发票号")]
+ public string InvbillNum { get; set; }
+
[Display(Name = "凭证号")]
public string Extend1 { get; set; }
@@ -342,19 +359,32 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
///发票号
///
[Display(Name = "发票号")]
- public string InvbillNum { get; set; }
+ public string RealInvbillNum { get; set; }
+
+ [Display(Name = "开票日期")]
+ public DateTime? InvDate { set; get; }
+
[Display(Name = "供应商代码")]
public string VendorCode { get; set; }
[Display(Name = "供应商名称")]
public string VendorName { get; set; }
-
+
+ [Display(Name = "采购订单号")]
+ public string PO { get; set; }
+
[Display(Name = "交付索引号")]
public string DeliveryIndexNumber { get; set; }
+ [Display(Name = "交付识别号")]
+ public string PN { get; set; }
+
+ [Display(Name = "零件时间")]
+
+ public DateTime SettleDate { get; set; }
///
///零件号
///
[Display(Name = "零件号")]
- public string PartCode { get; set; }
+ public string LU { get; set; }
[Display(Name = "零件名称")]
public string PartDesc { get; set; }
///
@@ -362,11 +392,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
///
[Display(Name = "发票分组号")]
public string InvGroupNum { get; set; }
- ///
- ///零件号
- ///
- [Display(Name = "客户零件号")]
- public string LU { get; set; }
+
///
///单价
///
@@ -383,6 +409,23 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
[Display(Name = "金额")]
public decimal Amt { get; set; }
+ [Display(Name = "税额")]
+ public decimal RealAmt { get; set; }
+
+ [Display(Name = "价税合计")]
+ public decimal TaxAmt { get; set; }
+
+ ///
+ ///扩展字段3
+ ///
+ [Display(Name = "协议编号")]
+ public string ContractID { get; set; }
+ [Display(Name = "商品组")]
+ public string ProductionGroup { get; set; }
+
+
+
+
///
///扩展字段3
///
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs
index afa0da92..bb39cf6d 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs
@@ -176,7 +176,7 @@ namespace Win.Sfs.SettleAccount.Bases
{
INVOICE_WAIT_DETAIL_BJ_DTO bj = new INVOICE_WAIT_DETAIL_BJ_DTO();
bj.LU = itm.LU;
- bj.PartCode = itm.PartCode;
+ bj.LU = itm.PartCode;
bj.PRICE = itm.PRICE;
bj.InvGroupNum = itm.InvGroupNum;
bj.DeliveryNumber = itm.ExtraProperties["DeliveryIndexNumber"].ToSqlValue();
@@ -207,7 +207,7 @@ namespace Win.Sfs.SettleAccount.Bases
InvbillNum = itm.InvbillNum,
InvGroupNum = itm.InvGroupNum,
LU = itm.LU,
- PartCode = itm.PartCode,
+ // LU = itm.PartCode,
PRICE = itm.PRICE,
Qty = itm.Qty,
Amt = itm.Amt,
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 5a8d161a..ac547d53 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
@@ -195,21 +195,25 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
{
INVOICE_WAIT_DETAIL_BJ_DTO bj = new INVOICE_WAIT_DETAIL_BJ_DTO();
bj.LU = itm.LU;
- bj.PartCode = itm.PartCode;
+ bj.InvbillNum=itm.InvbillNum;
bj.PRICE = itm.PRICE;
- bj.InvbillNum = itm.InvbillNum;
bj.InvGroupNum = itm.InvGroupNum;
bj.DeliveryIndexNumber =itm.ExtraProperties["DeliveryIndexNumber"].ToSqlValue();
bj.Qty = itm.Qty;
bj.PRICE = itm.PRICE;
bj.Amt = Math.Round(itm.PRICE * itm.Qty, 2);
- bj.Extend1=itm.Extend1;
+ bj.RealAmt = Math.Round(Math.Round(itm.PRICE * itm.Qty, 2) * 0.13m, 2);
+ bj.TaxAmt = Math.Round(itm.PRICE * itm.Qty, 2) + Math.Round(Math.Round(itm.PRICE * itm.Qty, 2) * 0.13m, 2);
+ bj.Extend1=itm.Extend1;//合同号
bj.VendorCode = itm.ExtraProperties["VendorCode"].ToSqlValue();//供应商代码
bj.VendorName = itm.ExtraProperties["VendorName"].ToSqlValue();//供应商名称
bj.DeliveryNumber = itm.ExtraProperties["DeliveryNumber"].ToSqlValue();//交货号;
+ bj.PN = itm.ExtraProperties["PN"].ToSqlValue();//
+ bj.PO=itm.ExtraProperties["PO"].ToSqlValue();
+ bj.ProductionGroup = itm.ExtraProperties["PartGroup"].ToSqlValue();
+
bj.BeginDate=itm.BeginDate;
bj.EndDate = itm.EndDate;
-
//bj.DeliveryNumber = itm.GetProperty("DeliveryNumber", "");//交货号
//bj.InvbillNum = itm.GetProperty("InvoiceNumber", "");//发票号
//bj.VendorCode = itm.GetProperty("VendorCode", "");//供应商代码
@@ -236,7 +240,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
InvbillNum = itm.InvbillNum,
InvGroupNum = itm.InvGroupNum,
LU = itm.LU,
- PartCode = itm.PartCode,
+ //PartCode = itm.PartCode,
+ PO=itm.PO,
+ PN=itm.PN,
PRICE = itm.PRICE,
Qty = itm.Qty,
Amt = itm.Amt,
@@ -248,8 +254,15 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
Extend1 = itm.Extend1,
BeginDate = itm.BeginDate,
EndDate = itm.EndDate,
+ RealAmt=itm.RealAmt,
+ TaxAmt=itm.TaxAmt,
+ SettleDate = itm.SettleDate,
+ ProductionGroup=itm.ProductionGroup
};
entity.INVOICE_WAIT_DETAIL_BJ = bjquery.ToList();
+
+
+
}
else
{
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 0511c2ec..ea627985 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
@@ -2158,6 +2158,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
}
select new
{
+ PN=inv1.PN,
PartCode = inv1.PartCode,
InvGroupNum = inv1.InvGroupNum,
LU = inv1.LU,
@@ -2172,9 +2173,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
InvoiceNumber = inv1.GetProperty("InvoiceNumber", ""),//发票号
VendorCode = inv1.GetProperty("VendorCode", ""),//供应商代码
VendorName = inv1.GetProperty("VendorName", ""),//供应商名称
-
+ PO= inv1.GetProperty("PO", ""),
DeliveryIndexNumber = inv1.GetProperty("DeliveryIndexNumber", ""),//交付索引号
PartName = inv1.GetProperty("PartName", ""),//零件名称
+ PartGroup=inv1.GetProperty("CommodityGroup","")
+
};
decimal amt = detailDtos.Sum(k => k.Amt);//金额
@@ -2222,9 +2225,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
entity.SetProperty("DeliveryNumber", detail.DeliveryNumber);//交货号
entity.SetProperty("VendorCode", detail.VendorCode);//供应商代码
entity.SetProperty("VendorName", detail.VendorName);//供应商名称
- entity.SetProperty("PurchaseOrderNumber", "");//采购订单号
+ entity.SetProperty("PO", detail.PO);//采购订单号
entity.SetProperty("DeliveryIndexNumber", detail.DeliveryIndexNumber);//交付索引号
entity.SetProperty("PartName", detail.PartName);//零件名称
+ entity.SetProperty("PartGroup", detail.PartGroup);
+ entity.SetProperty("PN", detail.PN);
_entityDetailList.Add(entity);
}
if (_entityDetailList.Count > 0)