From 16eaf0b884318180229da1dd158d4517301ea3a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Wed, 20 Sep 2023 17:17:53 +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 | 14 ++++++----
.../Bases/BA_SERVICE.cs | 4 +--
.../Entities/BQ/INVOICE_SERVICE.cs | 27 ++++++++++---------
3 files changed, 26 insertions(+), 19 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 5df737fd..9571dc1d 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
@@ -387,11 +387,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
public string LU { get; set; }
[Display(Name = "零件名称")]
public string PartDesc { get; set; }
- ///
- ///发票分组号
- ///
- [Display(Name = "发票分组号")]
- public string InvGroupNum { get; set; }
+ /////
+ /////发票分组号
+ /////
+ //[Display(Name = "发票分组号")]
+ //public string InvGroupNum { get; set; }
///
///单价
@@ -438,6 +438,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
public DateTime EndDate { get; set; }
+ [Display(Name = "行号")]
+ public int LineCode { get; set; }
+
+
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 bb39cf6d..683fb095 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
@@ -178,7 +178,7 @@ namespace Win.Sfs.SettleAccount.Bases
bj.LU = itm.LU;
bj.LU = itm.PartCode;
bj.PRICE = itm.PRICE;
- bj.InvGroupNum = itm.InvGroupNum;
+ // bj.InvGroupNum = itm.InvGroupNum;
bj.DeliveryNumber = itm.ExtraProperties["DeliveryIndexNumber"].ToSqlValue();
//bj.DeliveryNumber = itm.GetProperty("DeliveryNumber", "");//交货号
@@ -205,7 +205,7 @@ namespace Win.Sfs.SettleAccount.Bases
RealInvbillNum = string.IsNullOrEmpty(itm1.RealnvBillNum) ? string.Empty : itm1.RealnvBillNum,
//Version = itm.Version,
InvbillNum = itm.InvbillNum,
- InvGroupNum = itm.InvGroupNum,
+ //InvGroupNum = itm.InvGroupNum,
LU = itm.LU,
// LU = itm.PartCode,
PRICE = itm.PRICE,
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 ac547d53..bc53188b 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
@@ -18,6 +18,7 @@ using Shouldly;
using SqlSugar;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Application.Services;
+using Volo.Abp.Data;
using Volo.Abp.Domain.Entities;
using Volo.Abp.Uow;
using Win.Abp.Snowflakes;
@@ -197,21 +198,21 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
bj.LU = itm.LU;
bj.InvbillNum=itm.InvbillNum;
bj.PRICE = itm.PRICE;
- bj.InvGroupNum = itm.InvGroupNum;
- bj.DeliveryIndexNumber =itm.ExtraProperties["DeliveryIndexNumber"].ToSqlValue();
+ // bj.InvGroupNum = itm.InvGroupNum;
+ bj.DeliveryIndexNumber =itm.GetProperty("DeliveryIndexNumber","");
bj.Qty = itm.Qty;
bj.PRICE = itm.PRICE;
bj.Amt = Math.Round(itm.PRICE * itm.Qty, 2);
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.VendorCode = itm.GetProperty("VendorCode","");//供应商代码
+ bj.VendorName = itm.GetProperty("VendorName","");//供应商名称
+ bj.DeliveryNumber = itm.GetProperty("DeliveryNumber","");//交货号;
+ bj.PN = itm.GetProperty("PN","");//
+ bj.PO= itm.GetProperty("PO","");
+ bj.ProductionGroup = itm.GetProperty("PartGroup","");
+ bj.LineCode = itm.LineCode;
bj.BeginDate=itm.BeginDate;
bj.EndDate = itm.EndDate;
//bj.DeliveryNumber = itm.GetProperty("DeliveryNumber", "");//交货号
@@ -250,16 +251,18 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
VendorCode = itm.VendorCode,
VendorName = itm.VendorName,
// PurchaseOrderNumber = itm.PurchaseOrderNumber,
- DeliveryIndexNumber = itm.DeliveryIndexNumber,
+ DeliveryIndexNumber = itm.DeliveryIndexNumber ,
Extend1 = itm.Extend1,
BeginDate = itm.BeginDate,
EndDate = itm.EndDate,
RealAmt=itm.RealAmt,
TaxAmt=itm.TaxAmt,
SettleDate = itm.SettleDate,
- ProductionGroup=itm.ProductionGroup
+ ProductionGroup=itm.ProductionGroup,
+ LineCode=itm.LineCode
+
};
- entity.INVOICE_WAIT_DETAIL_BJ = bjquery.ToList();
+ entity.INVOICE_WAIT_DETAIL_BJ = bjquery.OrderBy(p=>p.LineCode).ToList();