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

红旗未结

FoShanPG
44673626 3 years ago
parent
5c5c18f640
commit
4359c57719
2 changed files with 15 additions and 14 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. 27
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs
  2. 2
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHUnSettledDetailDiffExportService.cs

27
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs
View File

@ -563,7 +563,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
}
/// <summary>
/// 红旗未结比对（包含有发货有结算中发货大于结算的数据）
/// </summary>
@ -600,7 +600,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
{
contion += " WHERE 1=1 ";
}
//更改：按照财务要求，将有发货有结算中发货数量大于结算数据的数据整合到未结报表中20220324
//更改：按照财务要求，将有发货有结算中发货数量大于结算数据的数据整合到未结报表中20220324,sum求和不带交货单号，后算出来
string str = "SELECT\n" +
" * \n" +
"FROM\n" +
@ -628,7 +628,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" FROM\n" +
" (\n" +
" SELECT\n" +
" a.WmsBillNum AS 交货单号,\n" +
" '' AS 交货单号,\n" +
" CONVERT ( VARCHAR ( 100 ), a.LastModificationTime, 23 ) AS 交货时间 ,\n" +
" a.Kanban AS 订货看板编号,\n" +
" b.MaterialCode AS 订货零件号,\n" +
@ -642,7 +642,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" 0 AS 结算金额 ,\n" +
" C.EstimateTypeDesc AS 物料组 \n" +
" FROM\n" +
" ( SELECT SUM ( Qty ) Qty, Kanban, MaterialCode, WmsBillNum, LastModificationTime FROM Set_HQ_H_Kanban GROUP BY kanban, MaterialCode, WmsBillNum, LastModificationTime ) AS a\n" +
" ( SELECT SUM ( Qty ) Qty, Kanban, MaterialCode, LastModificationTime FROM Set_HQ_H_Kanban GROUP BY kanban, MaterialCode, LastModificationTime ) AS a\n" +
" LEFT OUTER JOIN ( SELECT SUM ( Qty ) Qty, HQHKanBan, MaterialCode FROM Set_HQ_H_Platform {0} GROUP BY HQHKanBan, MaterialCode ) AS b ON a.Kanban = b.HQHKanBan \n" +
" AND a.MaterialCode = b.MaterialCode\n" +
" LEFT OUTER JOIN Set_material AS c ON a.MaterialCode = c.CustomerPartCode \n" +
@ -681,7 +681,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" FROM\n" +
" (\n" +
" SELECT\n" +
" a.WmsBillNum AS 交货单号,\n" +
" '' AS 交货单号,\n" +
" CONVERT ( VARCHAR ( 100 ), a.LastModificationTime, 23 ) AS 交货时间 ,\n" +
" a.Kanban AS 订货看板编号,\n" +
" b.MaterialCode AS 订货零件号,\n" +
@ -695,7 +695,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" 0 AS 结算金额 ,\n" +
" C.EstimateTypeDesc AS 物料组 \n" +
" FROM\n" +
" ( SELECT SUM ( Qty ) Qty, Kanban, MaterialCode, WmsBillNum, LastModificationTime FROM Set_HQ_H_Kanban GROUP BY kanban, MaterialCode, WmsBillNum, LastModificationTime ) AS a\n" +
" ( SELECT SUM ( Qty ) Qty, Kanban, MaterialCode, LastModificationTime FROM Set_HQ_H_Kanban GROUP BY kanban, MaterialCode, LastModificationTime ) AS a\n" +
" INNER JOIN ( SELECT SUM ( Qty ) Qty, HQHKanBan, MaterialCode FROM Set_HQ_H_Platform {0} GROUP BY HQHKanBan, MaterialCode ) AS b ON a.Kanban = b.HQHKanBan \n" +
" AND a.MaterialCode = b.MaterialCode\n" +
" LEFT OUTER JOIN Set_material AS c ON a.MaterialCode = c.CustomerPartCode \n" +
@ -748,7 +748,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
//红旗结算数据中，看板号+物料号没有重复的
//红旗结算数据中，看板号+物料号没有重复的数据
var sql10 = "SELECT DISTINCT\n" +
" t1.* \n" +
"FROM\n" +
@ -774,7 +774,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" t2.HQHKanBan IS NULL";
var list11 = DbConnection.Query<CompareExtend1>(string.Format(sql10, version));
var list_leftjoin_hplatform = DbConnection.Query<CompareExtend1>(string.Format(sql10, version));
@ -804,7 +804,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
"ORDER BY\n" +
" t1.HQHKanBan,\n" +
" t1.MaterialCode";
var list12 = DbConnection.Query<CompareExtend1>(string.Format(sql11, version));
var list_innerjoin_hplatform = DbConnection.Query<CompareExtend1>(string.Format(sql11, version));
var sql12 = "SELECT\n" +
@ -821,13 +821,13 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" Version = '{0}' \n" +
" AND HQHKanBan = 'BJ'";
var list13 = DbConnection.Query<CompareExtend1>(string.Format(sql12, version));
var list_hplaform_bj = DbConnection.Query<CompareExtend1>(string.Format(sql12, version));
//结算数据比较
List<CompareExtend1> _lscopy = new List<CompareExtend1>();
foreach (var itm in list11)
foreach (var itm in list_leftjoin_hplatform)
{
var first = _lscopy.FirstOrDefault(p => p.HQHKanBan == itm.HQHKanBan && p.MaterialCode == itm.MaterialCode);
if (first != null)
@ -841,11 +841,11 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
_lscopy.Add(itm);
}
}
foreach (var itm in list12)
foreach (var itm in list_innerjoin_hplatform)
{
_lscopy.Add(itm);
}
foreach (var itm in list13)
foreach (var itm in list_hplaform_bj)
{
_lscopy.Add(itm);
}
@ -889,6 +889,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
var _query = DbConnection.Query<HQHUnSettledDetailDiff>(_sql, null, null, true, 1200, null);
_list = _query.ToList();
//数据整合，相同看板号+物料号的交货单号合并成一行中以逗号分隔
foreach (var itm1 in _list)
{
var itm = _ls.FirstOrDefault(p => p.Kanban == itm1.订货看板编号 && p.MaterialCode == itm1.Sap编码);

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

@ -66,7 +66,7 @@ namespace SettleAccount.Job.Services.Report
//原始正常的红旗未结数据（不包含有发货有结算中发货大于结算的数据，数量也未求和）
var _ls_original = _dapperRepository.GetOriginalSettledDetailDiffReportList(version, materialCode, begin, end, materialGroup, iscontionversion);
//有发货有结算，发货数量大于结算数量
//有发货有结算，且发货数量大于结算数量的数据汇总
var _ls_innerjoin = _dapperRepository.GetInnerJoinSettledDetailDiffReportList(version, materialCode, begin, end, materialGroup, iscontionversion);

Write Preview
Loading…
Cancel
Save