antissoft / lvqianmeiye_ERP

Commit e09804e2cb1d4459f3c141d43b3727cfe9d62773

Authored by “wangming”
1 parent 3ab6f199

fix: 更新消耗服务相关代码

Inline Side-by-side
Showing 1 changed file with 6 additions and 2 deletions
netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs
  View file @e09804e
@@ -136,6 +136,8 @@ namespace NCC.Extend.LqXhHyhk @@ -136,6 +136,8 @@ namespace NCC.Extend.LqXhHyhk
136 sourceType = pxmx.SourceType, 136 sourceType = pxmx.SourceType,
137 totalPrice = pxmx.TotalPrice, 137 totalPrice = pxmx.TotalPrice,
138 isEffective = pxmx.IsEffective, 138 isEffective = pxmx.IsEffective,
  139 + originalProjectNumber = pxmx.OriginalProjectNumber,
  140 + overtimeProjectNumber = pxmx.OvertimeProjectNumber
139 }; 141 };
140 142
141 // 关联该品项的健康师业绩 143 // 关联该品项的健康师业绩
@@ -606,7 +608,7 @@ namespace NCC.Extend.LqXhHyhk @@ -606,7 +608,7 @@ namespace NCC.Extend.LqXhHyhk
606 entity.OvertimeCoefficient = input.overtimeCoefficient; 608 entity.OvertimeCoefficient = input.overtimeCoefficient;
607 entity.OriginalSgfy = input.sgfy; 609 entity.OriginalSgfy = input.sgfy;
608 entity.OvertimeSgfy = (decimal)(entity.OvertimeCoefficient * input.sgfy); 610 entity.OvertimeSgfy = (decimal)(entity.OvertimeCoefficient * input.sgfy);
609 - entity.Sgfy = (decimal)(input.sgfy + (entity.OvertimeCoefficient * input.sgfy)); 611 + entity.Sgfy = entity.OriginalSgfy + entity.OvertimeSgfy;
610 //更新会员耗卡记录 612 //更新会员耗卡记录
611 await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); 613 await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
612 614
@@ -660,10 +662,12 @@ namespace NCC.Extend.LqXhHyhk @@ -660,10 +662,12 @@ namespace NCC.Extend.LqXhHyhk
660 Yjsj = DateTime.Now, 662 Yjsj = DateTime.Now,
661 JsjId = ijks_tem.jsjId, 663 JsjId = ijks_tem.jsjId,
662 Kdpxid = lqXhPxmxEntity.Id, 664 Kdpxid = lqXhPxmxEntity.Id,
663 - LaborCost = ijks_tem.laborCost,  
664 OriginalKdpxNumber = ijks_tem.kdpxNumber, 665 OriginalKdpxNumber = ijks_tem.kdpxNumber,
665 OvertimeKdpxNumber = (decimal)(entity.OvertimeCoefficient * (ijks_tem.kdpxNumber ?? 0)), 666 OvertimeKdpxNumber = (decimal)(entity.OvertimeCoefficient * (ijks_tem.kdpxNumber ?? 0)),
666 KdpxNumber = (decimal)((ijks_tem.kdpxNumber ?? 0) + (entity.OvertimeCoefficient * (ijks_tem.kdpxNumber ?? 0))) + (ijks_tem.accompaniedProjectNumber ?? 0), 667 KdpxNumber = (decimal)((ijks_tem.kdpxNumber ?? 0) + (entity.OvertimeCoefficient * (ijks_tem.kdpxNumber ?? 0))) + (ijks_tem.accompaniedProjectNumber ?? 0),
  668 + OvertimeLaborCost = (decimal)(entity.OvertimeCoefficient * (ijks_tem.laborCost ?? 0)),
  669 + LaborCost = ijks_tem.laborCost + (entity.OvertimeCoefficient * (ijks_tem.laborCost ?? 0)),
  670 + OriginalLaborCost = ijks_tem.laborCost,
667 IsEffective = StatusEnum.有效.GetHashCode(), 671 IsEffective = StatusEnum.有效.GetHashCode(),
668 IsAccompanied = ijks_tem.isAccompanied, 672 IsAccompanied = ijks_tem.isAccompanied,
669 AccompaniedProjectNumber = ijks_tem.accompaniedProjectNumber, 673 AccompaniedProjectNumber = ijks_tem.accompaniedProjectNumber,