Browse Source

更新吧

master
学 赵 1 year ago
parent
commit
db3adb6cb3
  1. 13
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json
  2. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs
  3. 4
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs
  4. 9
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs

13
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json

@ -74,13 +74,22 @@
} }
}, },
"AuthServer": { "AuthServer": {
"Authority": "http://dev.ccwin-in.com:16082", //"Authority": "http://dev.ccwin-in.com:10580",
"Authority": "http://localhost:44378",
"ClientId": "basic-web", "ClientId": "basic-web",
"ClientSecret": "1q2w3e*" "ClientSecret": "1q2w3e*"
}, },
//"AuthServer": {
// "Authority": "http://dev.ccwin-in.com:16082",
// "ClientId": "basic-web",
// "ClientSecret": "1q2w3e*"
//},
"Redis": { "Redis": {
"Configuration": "127.0.0.1" "Configuration": "127.0.0.1"
}, },

2
code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs

@ -204,7 +204,7 @@ namespace Win.Sfs.SettleAccount.Bases
PartDesc = tm == null ? string.Empty : itm.PartDesc, PartDesc = tm == null ? string.Empty : itm.PartDesc,
InvDate = itm1.CreationTime, InvDate = itm1.CreationTime,
RealInvbillNum = string.IsNullOrEmpty(itm1.RealnvBillNum) ? string.Empty : itm1.RealnvBillNum, RealInvbillNum = string.IsNullOrEmpty(itm1.RealnvBillNum) ? string.Empty : itm1.RealnvBillNum,
Version = itm.Version, //Version = itm.Version,
InvbillNum = itm.InvbillNum, InvbillNum = itm.InvbillNum,
InvGroupNum = itm.InvGroupNum, InvGroupNum = itm.InvGroupNum,
LU = itm.LU, LU = itm.LU,

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

@ -209,6 +209,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
bj.VendorCode = itm.ExtraProperties["VendorCode"].ToSqlValue();//供应商代码 bj.VendorCode = itm.ExtraProperties["VendorCode"].ToSqlValue();//供应商代码
bj.VendorName = itm.ExtraProperties["VendorName"].ToSqlValue();//供应商名称 bj.VendorName = itm.ExtraProperties["VendorName"].ToSqlValue();//供应商名称
bj.DeliveryNumber = itm.ExtraProperties["DeliveryNumber"].ToSqlValue();//交货号; bj.DeliveryNumber = itm.ExtraProperties["DeliveryNumber"].ToSqlValue();//交货号;
bj.BeginDate=itm.BeginDate;
bj.EndDate = itm.EndDate;
//bj.DeliveryNumber = itm.GetProperty("DeliveryNumber", "");//交货号 //bj.DeliveryNumber = itm.GetProperty("DeliveryNumber", "");//交货号
//bj.InvbillNum = itm.GetProperty("InvoiceNumber", "");//发票号 //bj.InvbillNum = itm.GetProperty("InvoiceNumber", "");//发票号
@ -232,7 +234,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
PartDesc = tm == null ? string.Empty : itm.PartDesc, PartDesc = tm == null ? string.Empty : itm.PartDesc,
InvDate = itm1.CreationTime, InvDate = itm1.CreationTime,
RealInvbillNum = string.IsNullOrEmpty(itm1.RealnvBillNum) ? string.Empty : itm1.RealnvBillNum, RealInvbillNum = string.IsNullOrEmpty(itm1.RealnvBillNum) ? string.Empty : itm1.RealnvBillNum,
Version = itm.Version, //Version = itm.Version,
InvbillNum = itm.InvbillNum, InvbillNum = itm.InvbillNum,
InvGroupNum = itm.InvGroupNum, InvGroupNum = itm.InvGroupNum,
LU = itm.LU, LU = itm.LU,

9
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs

@ -2206,10 +2206,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
groupList.AddRange(mapList); groupList.AddRange(mapList);
} }
List<INVOICE_WAIT_DETAIL> _entityDetailList = new List<INVOICE_WAIT_DETAIL>(); List<INVOICE_WAIT_DETAIL> _entityDetailList = new List<INVOICE_WAIT_DETAIL>();
foreach (var detail in query.ToList()) foreach (var detail in query.ToList())
{ {
var entity = new INVOICE_WAIT_DETAIL( var entity = new INVOICE_WAIT_DETAIL(
guid: GuidGenerator.Create(), guid: GuidGenerator.Create(),
version: p_version, version: p_version,
@ -2226,13 +2224,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
endDate: detail.EndDate, endDate: detail.EndDate,
partcode: detail.PartCode); partcode: detail.PartCode);
entity.LineCode = detail.LineCode; entity.LineCode = detail.LineCode;
entity.SetProperty("DeliveryNumber", detail.DeliveryIndexNumber);//交货号 entity.SetProperty("DeliveryNumber", detail.DeliveryNumber);//交货号
entity.SetProperty("VendorCode", detail.VendorCode);//供应商代码 entity.SetProperty("VendorCode", detail.VendorCode);//供应商代码
entity.SetProperty("VendorName", detail.VendorName);//供应商名称 entity.SetProperty("VendorName", detail.VendorName);//供应商名称
entity.SetProperty("PurchaseOrderNumber", "");//采购订单号 entity.SetProperty("PurchaseOrderNumber", "");//采购订单号
entity.SetProperty("DeliveryIndexNumber", "");//交付索引号 entity.SetProperty("DeliveryIndexNumber", detail.DeliveryIndexNumber);//交付索引号
entity.SetProperty("PartName", "");//零件名称 entity.SetProperty("PartName", detail.PartName);//零件名称
_entityDetailList.Add(entity); _entityDetailList.Add(entity);
} }
if (_entityDetailList.Count > 0) if (_entityDetailList.Count > 0)

Loading…
Cancel
Save