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
e06b482a7d
commit
0ff364c731
8 changed files with 142 additions and 111 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. 3
      src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsJitOutPutDetialDto.cs
  2. 61
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs
  3. 53
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs
  4. 3
      src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
  5. 111
      src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs
  6. 18
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQFSettledDetailDiffExportService.cs
  7. 2
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHShippingExportService.cs
  8. 2
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMSettledDetailDiffExportService.cs

3
src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsJitOutPutDetialDto.cs
View File

@ -296,6 +296,9 @@ namespace Win.Sfs.SettleAccount.Entities.Wms
[ImporterHeader(Name = "物料组(车型)")]
//物料组(车型)
public string MaterialGroup { set; get; }
[ImporterHeader(Name = "物料组(车型)")]
//物料组(车型)
public string Version { set; get; }

61
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs
View File

@ -63,7 +63,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
private readonly ISettleAccountBranchEfCoreRepository<WmsHQFSharePartOutPutDetial, Guid> _wmsRepository;
private readonly ISettleAccountBranchEfCoreRepository<WmsHQFSharePartOutPut, Guid> _wmsVersionRepository;
private readonly WMSEfCoreRepository<WmsHQFSharePartOutPutDetial> _wmsefRespository;
private readonly WmsDapperRepository _wmsDapper;
private readonly WMSEfCoreRepository<TB_BILL> _wmstbRespository;
private readonly ISettleAccountBranchEfCoreRepository<TaskJob, Guid> _job;
private readonly IExcelImportAppService _excelImportService;
@ -78,8 +78,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
/// <param name="wmsefRespository"></param>
/// <param name="wmstbRespository"></param>
public WMSHQFSharePartAppService(
ISettleAccountBranchEfCoreRepository<WmsHQFSharePartOutPutDetial, Guid> wmsRepository,
WmsDapperRepository wmsDapper,
ISettleAccountBranchEfCoreRepository<WmsHQFSharePartOutPutDetial, Guid> wmsRepository,
ISettleAccountBranchEfCoreRepository<TaskJob, Guid> job,
ISettleAccountBranchEfCoreRepository<WmsHQFSharePartOutPut, Guid> wmsVersionRepository,
WMSEfCoreRepository<WmsHQFSharePartOutPutDetial> wmsefRespository,
@ -96,6 +96,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
_wmsRepository = wmsRepository;
_wmsVersionRepository = wmsVersionRepository;
_wmsefRespository = wmsefRespository;
_wmsDapper = wmsDapper;
}
private async Task<long> GetCountAsync(WmsSharePartOutPutDetialRequestDto input)
@ -142,6 +143,31 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
input.SkipCount, true);
var totalCount = await GetCountAsync(input);
var stockList = _wmsDapper.GetSalesStock();
var query = from itm in entities
join itm1 in stockList on itm.MaterialCode equals itm1.SapCode
into temp1
from tm1 in temp1.DefaultIfEmpty()
select new WmsHQHSharePartOutPutDetial(
itm.Id,
itm.WmsBillNum,
itm.OrderBillNum,
itm.MaterialCode,
itm.MaterialDesc,
itm.MaterialGroup,
itm.OutPut,
itm.InPut,
itm.State,
itm.Extend1,
itm.Extend2,
itm.Version,
itm.ParentMaterialCode,
itm.BillNum,
itm.TaskId,
itm.Remark,
itm.Qty,
tm1.Qty
);
return new PagedResultDto<WmsHQFSharePartOutPutDetial>(totalCount, entities);
}
/// <summary>
@ -213,6 +239,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
GuidGenerator.Create(),
string.Empty,
p.结算数量
,0
));
_lst.AddRange(_lsAry.ToArray());
}
@ -237,27 +264,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
await _job.UpdateAsync(job);
}
}
//return _billNum;
//else
//{
// StringBuilder _buffer = new StringBuilder();
// foreach (var itm in errList)
// {
// _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number);
// }
// var _errinfo = _buffer.ToString();
// foreach (var job in _joblist)
// {
// job.FileName = _errinfo;
// await _job.UpdateAsync(job);
// }
// //}
//}
//else
//{
// _billNum = string.Empty;
//}
return ApplicationConsts.SuccessStr;
}
/// <summary>
@ -363,7 +370,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
GuidGenerator.Create()
, string.Empty
, itm.Qty
,0
);
_lsCopy.Add(_detail);
}
@ -391,9 +398,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
}
var query = from itm1 in _lst
join itm2 in outPutDetail on
new { itm1.MaterialCode, itm1.OrderBillNum }
new { itm1.MaterialCode }
equals
new { itm2.MaterialCode, itm2.OrderBillNum } into temp1
new { itm2.MaterialCode } into temp1
from tm1 in temp1.DefaultIfEmpty()
where tm1 == null
select itm1;

53
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs
View File

@ -63,7 +63,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
private readonly ISettleAccountBranchEfCoreRepository<WmsHQHSharePartOutPutDetial, Guid> _wmsRepository;
private readonly ISettleAccountBranchEfCoreRepository<WmsHQHSharePartOutPut, Guid> _wmsVersionRepository;
private readonly WMSEfCoreRepository<WmsHQHSharePartOutPutDetial> _wmsefRespository;
private readonly WmsDapperRepository _wmsDapper;
private readonly WMSEfCoreRepository<TB_BILL> _wmstbRespository;
private readonly ISettleAccountBranchEfCoreRepository<TaskJob, Guid> _job;
private readonly IExcelImportAppService _excelImportService;
@ -87,7 +87,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
IExcelImportAppService excelImportService,
IDistributedCache<WmsHQHSharePartOutPutDetial> cache,
ISnowflakeIdGenerator snowflakeIdGenerator,
ICommonManager commonManager
ICommonManager commonManager,
WmsDapperRepository wmsDapper
) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
{
_excelImportService = excelImportService;
@ -96,6 +97,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
_wmsRepository = wmsRepository;
_wmsVersionRepository = wmsVersionRepository;
_wmsefRespository = wmsefRespository;
_wmsDapper = wmsDapper;
}
private async Task<long> GetCountAsync(WmsSharePartOutPutDetialRequestDto input)
@ -142,7 +144,39 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
input.SkipCount, true);
var totalCount = await GetCountAsync(input);
return new PagedResultDto<WmsHQHSharePartOutPutDetial>(totalCount, entities);
var stockList = _wmsDapper.GetSalesStock();
var query= from itm in entities
join itm1 in stockList on itm.MaterialCode equals itm1.SapCode
into temp1
from tm1 in temp1.DefaultIfEmpty()
select new WmsHQHSharePartOutPutDetial(
itm.Id,
itm.WmsBillNum,
itm.OrderBillNum,
itm.MaterialCode,
itm.MaterialDesc,
itm.MaterialGroup,
itm.OutPut,
itm.InPut,
itm.State,
itm.Extend1,
itm.Extend2,
itm.Version,
itm.ParentMaterialCode,
itm.BillNum,
itm.TaskId,
itm.Remark,
itm.Qty,
tm1.Qty
);
return new PagedResultDto<WmsHQHSharePartOutPutDetial>(totalCount, query.ToList());
}
/// <summary>
/// 任务明细标记已确认
@ -212,7 +246,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
_billNum,
GuidGenerator.Create(),
string.Empty,
p.结算数量
p.结算数量,
0
));
_lst.AddRange(_lsAry.ToArray());
}
@ -363,7 +398,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
GuidGenerator.Create()
, string.Empty
, itm.Qty
,0
);
_lsCopy.Add(_detail);
}
@ -374,9 +409,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
var error = from itm1 in outPutDetail
join itm2 in _lst on
new { itm1.MaterialCode, itm1.OrderBillNum }
new { itm1.MaterialCode }
equals
new { itm2.MaterialCode, itm2.OrderBillNum }
new { itm2.MaterialCode }
select itm1;
var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
@ -391,9 +426,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
}
var query = from itm1 in _lst
join itm2 in outPutDetail on
new { itm1.MaterialCode, itm1.OrderBillNum }
new { itm1.MaterialCode}
equals
new { itm2.MaterialCode, itm2.OrderBillNum } into temp1
new { itm2.MaterialCode} into temp1
from tm1 in temp1.DefaultIfEmpty()
where tm1 == null
select itm1;

3
src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
View File

@ -600,7 +600,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
{
List<CustomCondition> customConditionList = new List<CustomCondition>();
customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version });
customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = input.MaterialCode });
customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin });
customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End });
customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = input.MaterialCode });
@ -632,6 +632,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version });
customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin });
customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End });
customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = input.MaterialCode });
var _taskid = await _service.ExportEnqueueAsync("H平台发运核对输出", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(HQHShippingExportService), customConditionList, (rs) =>
{
});

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

@ -485,7 +485,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
public WmsHQFSharePartOutPutDetial()
{
}
public WmsHQFSharePartOutPutDetial(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 )
public WmsHQFSharePartOutPutDetial(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 )
{
Id = id;
WmsBillNum = wmsBillNum;
@ -511,14 +511,42 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
}
//交货单号
[ImporterHeader(Name = "组件组物料")]
//[ExporterHeader(DisplayName = "收货仓库")]
//public string 收货仓库 { set; get; }
//[ExporterHeader(DisplayName = "收货仓库描述")]
//public string 收货仓库描述 { set; get; }
//[ExporterHeader(DisplayName = "结算物料号")]
//public string 结算物料号 { set; get; }
//[ExporterHeader(DisplayName = "结算物料描述")]
//public string 物料描述 { set; get; }
//[ExporterHeader(DisplayName = "结算数量")]
//public decimal 结算数量 { set; get; }
//[ExporterHeader(DisplayName = "结算单价")]
//public decimal 结算单价 { set; get; }
//[ExporterHeader(DisplayName = "结算金额")]
//public decimal 结算金额 { set; get; }
//[ExporterHeader(DisplayName = "Sap编码")]
//public string Sap编码 { set; get; }
//[ExporterHeader(DisplayName = "物料组(车型)")]
//public string 物料组 { set; get; }
//[ExporterHeader(DisplayName = "寄销库数量")]
//public decimal 寄销库数量 { set; get; }
[ImporterHeader(Name = "寄销库数量",IsIgnore =true)]
public decimal StockQty { set; get; }
[ImporterHeader(Name = "组件组物料",IsIgnore =true)]
public string ParentMaterialCode { set; get; }
[ImporterHeader(Name = "交货单号")]
[ImporterHeader(Name = "交货单号",IsIgnore =true)]
public string WmsBillNum { set; get; }
[ImporterHeader(Name = "看板号")]
[ImporterHeader(Name = "看板号",IsIgnore =true)]
//KENN号
public string OrderBillNum { set; get; }
[ImporterHeader(Name = "SAP编码")]
[ImporterHeader(Name = "Sap编码")]
//物料号
public string MaterialCode { set; get; }
[ImporterHeader(Name = "物料描述")]
@ -535,7 +563,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
public string InPut { set; get; }
[ImporterHeader(Name = "状态",IsIgnore =true)]
public int State { get; set; }
[ImporterHeader(Name = "物料代码")]
[ImporterHeader(Name = "结算物料号")]
/// <summary>
/// 扩展字段1
/// </summary>
@ -543,16 +571,16 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
/// <summary>
/// 扩展字段2
/// </summary>
[ImporterHeader(Name = "扩展字段2",IsIgnore =true)]
[ImporterHeader(Name = "收货仓库")]
public string Extend2 { set; get; }
/// <summary>
/// 扩展字段3
/// </summary>
[ImporterHeader(Name = "版本号",IsIgnore =true)]
public string Version { set; get; }
[ImporterHeader(Name = "开票数量")]
[ImporterHeader(Name = "结算数量")]
public decimal Qty { set; get; }
[ImporterHeader(Name = "数量", IsIgnore = true)]
[ImporterHeader(Name = "单据号", IsIgnore = true)]
public string BillNum { set; get; }
public Guid TaskId { set; get; }
}
@ -704,56 +732,13 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
public class WmsHQHSharePartOutPutDetial : FullAuditedAggregateRootBase<Guid>
{
//[ExporterHeader(DisplayName = "交货单号")]
//public string 交货单号 { set; get; }
//[ExporterHeader(DisplayName = "交货时间")]
//public string 交货时间 { set; get; }
//[ExporterHeader(DisplayName = "手工或自动")]
//public string 手工或自动 { set; get; }
//[ExporterHeader(DisplayName = "收货仓库")]
//public string 收货仓库 { set; get; }
//[ExporterHeader(DisplayName = "收货仓库描述")]
//public string 收货仓库描述 { set; get; }
//[ExporterHeader(DisplayName = "订货看板编号")]
//public string 订货看板编号 { set; get; }
//[ExporterHeader(DisplayName = "订货零件号")]
//public string 订货零件号 { set; get; }
//[ExporterHeader(DisplayName = "发货零件号")]
//public string 发货零件号 { set; get; }
//[ExporterHeader(DisplayName = "零件中文名称")]
//public string 零件中文名称 { set; get; }
//[ExporterHeader(DisplayName = "Sap编码")]
//public string Sap编码 { set; get; }
//[ExporterHeader(DisplayName = "物料组(车型)")]
//public string 物料组 { set; get; }
//[ExporterHeader(DisplayName = "发货数量")]
//public decimal 发货数量 { set; get; }
//[ExporterHeader(DisplayName = "发货状态")]
//public string 发货状态 { set; get; }
//[ExporterHeader(DisplayName = "结算验收单号")]
//public string 结算验收单号 { set; get; }
//[ExporterHeader(DisplayName = "结算数量")]
//public decimal 结算数量 { set; get; }
//[ExporterHeader(DisplayName = "结算单价")]
//public decimal 结算单价 { set; get; }
//[ExporterHeader(DisplayName = "结算金额")]
//public decimal 结算金额 { set; get; }
//[ExporterHeader(DisplayName = "发货定价")]
//public decimal 发货定价 { set; get; }
//[ExporterHeader(DisplayName = "发货总金额")]
//public decimal 发货总金额 { set; get; }
//[ExporterHeader(DisplayName = "数量差异")]
//public decimal 数量差异 { set; get; }
//[ExporterHeader(DisplayName = "单价差异")]
//public decimal 单价差异 { set; get; }
//[ExporterHeader(DisplayName = "差异总金额")]
//public decimal 差异总金额 { set; get; }
public WmsHQHSharePartOutPutDetial()
{
}
public WmsHQHSharePartOutPutDetial(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)
public WmsHQHSharePartOutPutDetial(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)
{
Id = id;
WmsBillNum = wmsBillNum;
@ -772,6 +757,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
TaskId = taskId;
Remark = remark;
Qty = qty;
StockQty = stockQty;
}
public void SetId(Guid id)
{
@ -779,17 +765,20 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
}
//交货单号
[ImporterHeader(Name = "组件组物料",IsIgnore =true)]
[ImporterHeader(Name = "寄销库数量", IsIgnore = true)]
public decimal StockQty { set; get; }
[ImporterHeader(Name = "组件组物料", IsIgnore = true)]
public string ParentMaterialCode { set; get; }
[ImporterHeader(Name = "交货单号")]
[ImporterHeader(Name = "交货单号", IsIgnore = true)]
public string WmsBillNum { set; get; }
[ImporterHeader(Name = "订货看板编号")]
[ImporterHeader(Name = "看板号", IsIgnore = true)]
//KENN号
public string OrderBillNum { set; get; }
[ImporterHeader(Name = "Sap编码")]
//物料号
public string MaterialCode { set; get; }
[ImporterHeader(Name = "零件中文名称")]
[ImporterHeader(Name = "物料描述")]
//物料描述
public string MaterialDesc { set; get; }
[ImporterHeader(Name = "物料组(车型)")]
@ -803,7 +792,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
public string InPut { set; get; }
[ImporterHeader(Name = "状态", IsIgnore = true)]
public int State { get; set; }
[ImporterHeader(Name = "发货零件号")]
[ImporterHeader(Name = "结算物料号")]
/// <summary>
/// 扩展字段1
/// </summary>
@ -820,9 +809,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
public string Version { set; get; }
[ImporterHeader(Name = "结算数量")]
public decimal Qty { set; get; }
[ImporterHeader(Name = "数量", IsIgnore = true)]
[ImporterHeader(Name = "单据号", IsIgnore = true)]
public string BillNum { set; get; }
[ImporterHeader(Name = "任务描述", IsIgnore = true)]
[ImporterHeader(Name = "任务ID", IsIgnore = true)]
public Guid TaskId { set; get; }
}

18
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQFSettledDetailDiffExportService.cs
View File

@ -51,17 +51,16 @@ namespace SettleAccount.Job.Services
var acceptNo = p_list.Where(p => p.Name == "AcceptNo").FirstOrDefault().Value;
var sapCode = p_list.Where(p => p.Name == "SapCode").FirstOrDefault().Value;
var warehouseDesc = p_list.Where(p => p.Name == "WarehouseDesc").FirstOrDefault().Value;
var _ls = _dapperRepository.GetInvoiceSettledDetailDiffReportList(version, materialCode, begin, end, materialGroup);
var _lst=_dapperRepository.GetDiffQtyList(version);
var _ls = _dapperRepository.GetInvoiceSettledDetailDiffReportList(version, materialCode, begin, end, materialGroup);
var _lst = _dapperRepository.GetDiffQtyList(version);
foreach (var itm in _lst)
{
var _first = _ls.FirstOrDefault(p => p.订货看板编号 == itm.看板号 && p.订货零件号==itm.客户物料号);
if(_first!=null)
var _first = _ls.FirstOrDefault(p => p.订货看板编号 == itm.看板号 && p.订货零件号 == itm.客户物料号);
if (_first != null)
{
_first.发货数量 = _first.结算数量+ itm.差异数量;
_first.结算数量 = _first.发货数量 + itm.差异数量;
_first.数量差异 = itm.差异数量;
}
}
}
if (!string.IsNullOrEmpty(kanban))
{
@ -71,9 +70,7 @@ namespace SettleAccount.Job.Services
_ls = _ls.Where(p => _groupList.Contains(p.订货看板编号)).ToList();
}
}
if (!string.IsNullOrEmpty(warehouseDesc))
if (!string.IsNullOrEmpty(warehouseDesc))
{
var _groupList = warehouseDesc.Split(new char[] { '\n' }).Distinct().ToList();
if (_groupList.Count() > 0)
@ -81,7 +78,6 @@ namespace SettleAccount.Job.Services
_ls = _ls.Where(p => _groupList.Contains(p.收货仓库描述)).ToList();
}
}
if (!string.IsNullOrEmpty(acceptNo))
{
var _groupList = acceptNo.Split(new char[] { '\n' }).Distinct().ToList();

2
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHShippingExportService.cs
View File

@ -43,7 +43,7 @@ namespace SettleAccount.Job.Services.Report
var begin = p_list.Where(p => p.Name == "BeginTime").FirstOrDefault().Value;
var end = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value;
var materialGroup = p_list.Where(p => p.Name == "MaterialGroup").FirstOrDefault().Value;
var acceptNo = p_list.Where(p => p.Name == "AcceptNo").FirstOrDefault().Value;
//var acceptNo = p_list.Where(p => p.Name == "AcceptNo").FirstOrDefault().Value;
var sapCode = p_list.Where(p => p.Name == "SapCode").FirstOrDefault().Value;
var warehouseDesc = p_list.Where(p => p.Name == "WarehouseDesc").FirstOrDefault().Value;
var _ls = _dapperRepository.GetHQHShippingReportList(version, materialCode, begin, end, materialGroup);

2
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMSettledDetailDiffExportService.cs
View File

@ -57,7 +57,7 @@ namespace SettleAccount.Job.Services.Report
var _first = _ls.FirstOrDefault(p => p.订货看板编号 == itm.看板号 && p.订货零件号 == itm.客户物料号);
if (_first != null)
{
_first.发货数量 = _first.结算数量 + itm.差异数量;
_first.结算数量 = _first.发货数量 + itm.差异数量;
_first.数量差异 = itm.差异数量;
}
}

Write Preview
Loading…
Cancel
Save