PG
/
Win.Sfs.SmartSettlementSystem.PG
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更新版本

FoShanPG
Administrator 3 years ago
parent
2e9e1621f7
commit
5ae4d61858
8 changed files with 92 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
  2. 8
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs
  3. 8
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs
  4. 16
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs
  5. 14
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs
  6. 56
      src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs
  7. 2
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpPartDapperRepository.cs
  8. 2
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/KanbanUnSettledDapperRepository.cs

4
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
View File

@ -128,6 +128,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
GuidGenerator.Create() GuidGenerator.Create()
, string.Empty , string.Empty
, itm.Qty , itm.Qty
,itm.Price
,itm.Amt
); );
_lsCopy.Add(_detail); _lsCopy.Add(_detail);
} }
@ -382,6 +384,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
GuidGenerator.Create() GuidGenerator.Create()
,string.Empty ,string.Empty
, itm.Qty , itm.Qty
,itm.Price
,itm.Amt
); );
_lsCopy.Add(_detail); _lsCopy.Add(_detail);
} }

8
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs
View File

@ -533,7 +533,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
string.Empty, string.Empty,
_billNum, _billNum,
0, 0,
0 0,
itm.InvoicePrice
,itm.InvoiceAmt
); );
@ -686,7 +688,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
itm.BillNum, itm.BillNum,
GuidGenerator.Create() GuidGenerator.Create()
, string.Empty , string.Empty
, itm.Qty , itm.Qty,
itm.Price,
itm.Amt
); );
_lsCopy.Add(_detail); _lsCopy.Add(_detail);
} }

8
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs
View File

@ -184,7 +184,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
string.Empty, string.Empty,
itm.BillNum, itm.BillNum,
itm.State, itm.State,
itm.RealityNumber itm.RealityNumber,
itm.Price,
itm.Amt
); );
return new PagedResultDto<WmsWithOutKanbanOutPutDetial>(totalCount, entities); return new PagedResultDto<WmsWithOutKanbanOutPutDetial>(totalCount, entities);
@ -265,7 +267,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
string.Empty, string.Empty,
_billNum, _billNum,
0, 0,
0 0,
itm.InvoicePrice,
itm.InvoiceAmt
); );

16
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs
View File

@ -175,7 +175,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
itm.Remark, itm.Remark,
itm.Qty, itm.Qty,
tm1 == null ? 0 : tm1.Qty, tm1 == null ? 0 : tm1.Qty,
itm.OutPutQty != 0 ? itm.OutPutQty : itm.Qty itm.OutPutQty != 0 ? itm.OutPutQty : itm.Qty,
itm.Price,
itm.Amt
); );
@ -244,7 +246,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
string.Empty, string.Empty,
p.Qty, p.Qty,
p.StockQty, p.StockQty,
p.Qty p.Qty,
p.Price,
p.Amt
)); ));
_lst.AddRange(_list.ToArray()); _lst.AddRange(_list.ToArray());
} }
@ -291,7 +295,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
string.Empty, string.Empty,
p.Qty, p.Qty,
p.StockQty, p.StockQty,
p.Qty p.Qty,
p.Price,
p.Amt
)).ToList(); )).ToList();
await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
@ -469,7 +475,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
, string.Empty , string.Empty
, itm.Qty , itm.Qty
, 0 , 0
, itm.Qty , itm.Qty,
itm.Price,
itm.Amt
); );
_lsCopy.Add(_detail); _lsCopy.Add(_detail);
} }

14
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs
View File

@ -170,7 +170,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
itm.Remark, itm.Remark,
itm.Qty, itm.Qty,
tm1 == null ? 0 : tm1.Qty, tm1 == null ? 0 : tm1.Qty,
itm.OutPutQty itm.OutPutQty,
itm.Price,
itm.Amt
); );
@ -240,7 +242,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
string.Empty, string.Empty,
p.Qty, p.Qty,
p.StockQty, p.StockQty,
p.Qty p.Qty,
p.Price,
p.Amt
)); ));
_lst.AddRange(_list.ToArray()); _lst.AddRange(_list.ToArray());
} }
@ -287,7 +291,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
string.Empty, string.Empty,
p.Qty, p.Qty,
p.StockQty, p.StockQty,
p.Qty p.Qty,
p.Price,
p.Amt
)).ToList(); )).ToList();
await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
@ -485,6 +491,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
, itm.Qty , itm.Qty
, 0 , 0
, itm.Qty , itm.Qty
,itm.Price
,itm.Amt
); );
_lsCopy.Add(_detail); _lsCopy.Add(_detail);
} }

56
src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs
View File

@ -97,7 +97,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
public WmsJitOutPutDetial(Guid id, string wmsBillNum, string kennCode, string chassisNumber, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode,string billNum,Guid taskId,string remark,decimal qty):base(id) public WmsJitOutPutDetial(Guid id, string wmsBillNum, string kennCode, string chassisNumber, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode,string billNum,Guid taskId,string remark,decimal qty, decimal price, decimal amt) :base(id)
{ {
Id = id; Id = id;
WmsBillNum = wmsBillNum; WmsBillNum = wmsBillNum;
@ -117,6 +117,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
TaskId = taskId; TaskId = taskId;
Remark = remark; Remark = remark;
Qty = qty; Qty = qty;
Amt = amt;
Price = price;
} }
@ -142,7 +144,13 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
public string InPut { set; get; } public string InPut { set; get; }
[ImporterHeader(Name = "状态")] [ImporterHeader(Name = "状态")]
public int State { get; set; } public int State { get; set; }
[ImporterHeader(Name = "开票单价")] [ImporterHeader(Name = "开票单价")]
public decimal Price { set; get; }
[ImporterHeader(Name = "开票金额")]
public decimal Amt { set; get; }
[ImporterHeader(Name = "开票单价",IsIgnore =true)]
/// <summary> /// <summary>
/// 扩展字段1 /// 扩展字段1
/// </summary> /// </summary>
@ -242,7 +250,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
{ {
} }
public WmsKanbanOutPutDetial(Guid id, string wmsBillNum, string kanban, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId,string remark,decimal qty) public WmsKanbanOutPutDetial(Guid id, string wmsBillNum, string kanban, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId,string remark,decimal qty, decimal price, decimal amt)
{ {
Id = id; Id = id;
WmsBillNum = wmsBillNum; WmsBillNum = wmsBillNum;
@ -261,8 +269,13 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
TaskId = taskId; TaskId = taskId;
Remark = remark; Remark = remark;
Qty = qty; Qty = qty;
Price = price;
Amt = amt;
} }
public void SetData(Guid id,string remark,string wmsbillnum,string version,Guid taskId) public void SetData(Guid id,string remark,string wmsbillnum,string version,Guid taskId)
{ {
Id = id; Id = id;
@ -271,8 +284,6 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
Version = version; Version = version;
TaskId = taskId; TaskId = taskId;
} }
// 交货单号 实际发货日期 KENN号 底盘号 物料号 物料描述 客户物料 组件组物料 组件组物料描述 物料组(车型) 定价 金额 结算平台未结数量 大众R3未结数量 差异金额 差异数量 漏结标识 漏结期间 说明 // 交货单号 实际发货日期 KENN号 底盘号 物料号 物料描述 客户物料 组件组物料 组件组物料描述 物料组(车型) 定价 金额 结算平台未结数量 大众R3未结数量 差异金额 差异数量 漏结标识 漏结期间 说明
[ImporterHeader(Name = "组件组物料",IsIgnore =true)] [ImporterHeader(Name = "组件组物料",IsIgnore =true)]
@ -323,6 +334,12 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
[ImporterHeader(Name = "任务", IsIgnore = true)] [ImporterHeader(Name = "任务", IsIgnore = true)]
public Guid TaskId { set; get; } public Guid TaskId { set; get; }
[ImporterHeader(Name = "开票单价")]
public decimal Price { set; get; }
[ImporterHeader(Name = "开票金额")]
public decimal Amt { set; get; }
} }
@ -364,7 +381,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
public WmsWithOutKanbanOutPutDetial(Guid id ,string type, string sapMaterialCode, string materialDesc, string version, string isBack, string remark, decimal qty, decimal sockQty, decimal outputQty, string extend,string billnum,int state,decimal realqty):base(id) public WmsWithOutKanbanOutPutDetial(Guid id ,string type, string sapMaterialCode, string materialDesc, string version, string isBack, string remark, decimal qty, decimal sockQty, decimal outputQty, string extend,string billnum,int state,decimal realqty, decimal price, decimal amt) :base(id)
{ {
Type = type; Type = type;
SapMaterialCode = sapMaterialCode; SapMaterialCode = sapMaterialCode;
@ -381,8 +398,12 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
BillNum = billnum; BillNum = billnum;
State = state; State = state;
RealityNumber = realqty; RealityNumber = realqty;
Price = price;
Amt = amt;
} }
[ImporterHeader(Name = "单据类型")] [ImporterHeader(Name = "单据类型")]
public string Type { set; get; } public string Type { set; get; }
[ImporterHeader(Name = "物料号")] [ImporterHeader(Name = "物料号")]
@ -409,6 +430,11 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
public string BillNum { set; get; } public string BillNum { set; get; }
[ImporterHeader(Name = "状态", IsIgnore = true)] [ImporterHeader(Name = "状态", IsIgnore = true)]
public int State { set; get; } public int State { set; get; }
[ImporterHeader(Name = "开票单价")]
public decimal Price { set; get; }
[ImporterHeader(Name = "开票金额")]
public decimal Amt { set; get; }
} }
@ -1389,7 +1415,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
{ {
} }
public WmsSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty, decimal outputQty) public WmsSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty, decimal outputQty, decimal price, decimal amt)
{ {
Id = id; Id = id;
WmsBillNum = wmsBillNum; WmsBillNum = wmsBillNum;
@ -1410,9 +1436,12 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
Qty = qty; Qty = qty;
StockQty = stockQty; StockQty = stockQty;
OutPutQty = outputQty; OutPutQty = outputQty;
Price = price;
Amt = amt;
} }
public void SetId(Guid id) public void SetId(Guid id)
{ {
Id = id; Id = id;
@ -1476,6 +1505,11 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
[ImporterHeader(Name = "出库数量", IsIgnore = true)] [ImporterHeader(Name = "出库数量", IsIgnore = true)]
public decimal OutPutQty { set; get; } public decimal OutPutQty { set; get; }
[ImporterHeader(Name = "开票单价")]
public decimal Price { set; get; }
[ImporterHeader(Name = "开票金额")]
public decimal Amt { set; get; }
} }
@ -1652,7 +1686,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
{ {
} }
public WmsSharePart90OutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty, decimal outputQty) public WmsSharePart90OutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty, decimal outputQty, decimal price, decimal amt)
{ {
Id = id; Id = id;
WmsBillNum = wmsBillNum; WmsBillNum = wmsBillNum;
@ -1673,9 +1707,12 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
Qty = qty; Qty = qty;
StockQty = stockQty; StockQty = stockQty;
OutPutQty = outputQty; OutPutQty = outputQty;
Price = price;
Amt = amt;
} }
public void SetId(Guid id) public void SetId(Guid id)
{ {
Id = id; Id = id;
@ -1740,6 +1777,11 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
[ImporterHeader(Name = "任务代码", IsIgnore = true)] [ImporterHeader(Name = "任务代码", IsIgnore = true)]
public Guid TaskId { set; get; } public Guid TaskId { set; get; }
[ImporterHeader(Name = "开票单价")]
public decimal Price { set; get; }
[ImporterHeader(Name = "开票金额")]
public decimal Amt { set; get; }
} }

2
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpPartDapperRepository.cs
View File

@ -50,7 +50,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
} }
else else
{ {
_materialList = DbConnection.Query<Material>("select * from set_material").ToList(); _materialList = DbConnection.Query<Material>("select max(Id) Factory,MaterialCode,MaterialDesc from Set_material group by MaterialCode,MaterialDesc,EstimateTypeDesc,EstimateType ").ToList();
} }
if (CacheManager.CachePriceList != null) if (CacheManager.CachePriceList != null)
{ {

2
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/KanbanUnSettledDapperRepository.cs
View File

@ -36,7 +36,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
public decimal InvoiceQty { get; set; } public decimal InvoiceQty { get; set; }
[ExporterHeader(DisplayName ="发货数量")] [ExporterHeader(DisplayName ="发货数量")]
public decimal Qty { get; set; } public decimal Qty { get; set; }
[ExporterHeader(DisplayName = "金额")] [ExporterHeader(DisplayName = "开票金额")]
public decimal InvoiceAmt { get; set; } public decimal InvoiceAmt { get; set; }
[ExporterHeader(DisplayName = "开票单价")] [ExporterHeader(DisplayName = "开票单价")]
public decimal InvoicePrice { get; set; } public decimal InvoicePrice { get; set; }

Write Preview
Loading…
Cancel
Save