BoXu.Zheng
/
BeiJinSettleAccount
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount
continuous-integration/drone/push Build is failing
Details

master
wanggang 1 year ago
parent
afc7935764 d487f4c8e3
commit
81303c5cbd
4 changed files with 27 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs
  2. 4
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs
  3. 29
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs
  4. 1
      code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeEdiCompareExportBaseService.cs

14
code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs
View File

@ -387,11 +387,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
public string LU { get; set; }
[Display(Name = "零件名称")]
public string PartDesc { get; set; }
/// <summary>
///发票分组号
/// </summary>
[Display(Name = "发票分组号")]
public string InvGroupNum { get; set; }
///// <summary>
/////发票分组号
///// </summary>
//[Display(Name = "发票分组号")]
//public string InvGroupNum { get; set; }
/// <summary>
///单价
@ -438,6 +438,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
public DateTime EndDate { get; set; }
[Display(Name = "行号")]
public int LineCode { get; set; }

4
code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs
View File

@ -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,

29
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs
View File

@ -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", "");//交货号
@ -238,7 +239,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
RealInvbillNum = string.IsNullOrEmpty(itm1.RealnvBillNum) ? string.Empty : itm1.RealnvBillNum,
//Version = itm.Version,
InvbillNum = itm.InvbillNum,
InvGroupNum = itm.InvGroupNum,
//InvGroupNum = itm.InvGroupNum,
LU = itm.LU,
//PartCode = itm.PartCode,
PO=itm.PO,
@ -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();

1
code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeEdiCompareExportBaseService.cs
View File

@ -181,7 +181,6 @@ namespace SettleAccount.Job.Services.Report
/// </summary>
public virtual void HandleSaDetailsMain<T>(List<SaSeEdiCompareDiff> saSeEdiCompareDiff, EnumBusinessType businessType, int version) where T : SA_BASE
{
return;
var haveSaHaveSes = saSeEdiCompareDiff.FindAll(t => t.Category == EnumSaSeEdiCompareCategory.HaveSaHaveSeHaveEdi || t.Category == EnumSaSeEdiCompareCategory.HaveSaHaveSeNotHaveEdi);
if (haveSaHaveSes.Any())
{

Write Preview
Loading…
Cancel
Save