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
3dc8d5138f
commit
bcd912f3d3
9 changed files with 480 additions and 330 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. 17
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSCusomerKanbanAppService.cs
  2. 7
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs
  3. 16
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs
  4. 6
      src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
  5. 5
      src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs
  6. 719
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs
  7. 6
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleKBWithCodeDapperReportRepository.cs
  8. 32
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleSparePartDapperReportRepository.cs
  9. 2
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleUnSparePartExportService.cs

17
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSCusomerKanbanAppService.cs
View File

@ -468,6 +468,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
[HttpPost]
[Route("ExcelImport")]
[DisableRequestSizeLimit]
[UnitOfWork(false)]
//[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
public async Task<string> ExcelImport([FromForm] IFormFileCollection files, string version,string customerCode)
{
@ -482,12 +483,6 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
checkList.Add(new ErrorExportDto(version, "自定义出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, "导入模板中第一页签没有数据，请检查！", string.Empty));
}
if (checkList.Count > 0)
{
return await ExportErrorReportAsync(checkList);
}
var filteResult = result.Where(p =>!string.IsNullOrEmpty(p.SapMaterialCode));//过滤掉物料号为空的数据
//和物料主数据中SAP物料号检验是否存在
@ -508,6 +503,11 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
}
}
if (checkList.Count > 0)
{
return await ExportErrorReportAsync(checkList);
}
List<WmsCustomerKanbanOutPutDetial> _lst = new List<WmsCustomerKanbanOutPutDetial>();
var _lsCopy = new List<WmsCustomerKanbanOutPutDetial>();
@ -581,6 +581,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
{
checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) });
}
if (checkList.Count > 0)
{
@ -624,11 +625,13 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
0, true);
var dtos = ObjectMapper.Map<List<WmsCustomerKanbanOutPutDetial>, List<WmsCustomerKanbanOutPutDetialDTO>>(entities);
IExporter _excel = new ExcelExporter();
byte[] result = null;
var _fileName = string.Format("自定义客户出库单_{0}.xlsx", Guid.NewGuid().ToString());
result = await _excel.ExportAsByteArray(entities);
result = await _excel.ExportAsByteArray(dtos);
result.ShouldNotBeNull();

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

@ -68,7 +68,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
private readonly ISettleAccountBranchEfCoreRepository<WmsSharePart90OutPut, Guid> _wmsVersionRepository90;
private readonly WMSEfCoreRepository<WmsSharePartOutPutDetial> _wmsefRespository;
private readonly WMSEfCoreRepository<WmsSharePartOutPutDetial> _wmsefRespository
;
private readonly WmsDapperRepository _wmsDapper;
private readonly WMSEfCoreRepository<TB_BILL> _wmstbRespository;
private readonly ISettleAccountBranchEfCoreRepository<TaskJob, Guid> _job;
@ -651,6 +652,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
[HttpPost]
[Route("ExcelImport")]
[DisableRequestSizeLimit]
[UnitOfWork(false)]
//[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
public async Task<string> ExcelImport([FromForm] IFormFileCollection files, string version)
{
@ -677,6 +679,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
checkList.Add(new ErrorExportDto(version, "大众备件出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中物料号{0}结算数量为０，影响出库请检查！", itm.MaterialCode), string.Empty));
}
}
//和物料主数据中SAP物料号检验是否存在
foreach (var itm in result)
{
@ -686,6 +689,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
}
}
if (checkList.Count > 0)
{
return await ExportErrorReportAsync(checkList);
@ -796,6 +800,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
//有采购单号
if (result_withbill != null)
{
var _billNum = "B" + DateTime.Now.ToString("yyyyMMddhhmmss");
List<WmsSharePart90OutPutDetial> _lst = new List<WmsSharePart90OutPutDetial>();

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

@ -189,13 +189,27 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
if (!string.IsNullOrEmpty(input.BillNum))
{
input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Like, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
}
if (input.State!=4)
{
input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "State", Logic = EnumFilterLogic.And, Value = input.State.ToString() });
}
//20220613 新增物料号+销售渠道
if (!string.IsNullOrEmpty(input.MaterialCode))
{
input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Like, Column = "MaterialCode", Logic = EnumFilterLogic.And, Value = input.MaterialCode });
}
//20220613 新增物料号+销售渠道
if (!string.IsNullOrEmpty(input.SaleCode))
{
input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Like, Column = "SaleCode", Logic = EnumFilterLogic.And, Value = input.SaleCode });
}
input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,

6
src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
View File

@ -265,6 +265,7 @@ namespace Win.Sfs.SettleAccount
CreateMapWmsHQCar();
CreateMapWmsOneTimeSale();
CreateMapWMSOutputSum();
CreateMapCustomerKanban();
CreateMapWMSDiffOutputSum();
CreateMapWMSWithCodeOutputSum();
CreateMapWMSCacelOutputSum();
@ -273,7 +274,10 @@ namespace Win.Sfs.SettleAccount
#region 派格出库单
private void CreateMapCustomerKanban()
{
CreateMap<WmsCustomerKanbanOutPutDetial, WmsCustomerKanbanOutPutDetialDTO>().ReverseMap();
}
private void CreateMapWMSOutputSum()
{
CreateMap<WmsDetailReport, WmsDetailReportDto>().ReverseMap();

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

@ -1845,8 +1845,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
[ImporterHeader(Name = "状态", IsIgnore = true)]
[ExporterHeader(DisplayName = "状态", IsIgnore = true)]
public int State { get; set; }
[ImporterHeader(Name = "发货零件号")]
[ExporterHeader(DisplayName = "发货零件号")]
[ImporterHeader(Name = "订货零件号")]
[ExporterHeader(DisplayName = "订货零件号")]
/// <summary>
/// 扩展字段1
/// </summary>

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

@ -54,257 +54,429 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
/// <param name="end"></param>
/// <param name="materialGroup"></param>
/// <returns></returns>
//[UnitOfWork(false)]
//public virtual List<HQHSettledDetailDiff> GetInvoiceSettledDetailDiffReportList(string version, string materialCode, string begin, string end, string materialGroup)
//{
// List<HQHSettledDetailDiff> _list = new List<HQHSettledDetailDiff>();
// //string condition = " ";
// //if (!string.IsNullOrEmpty(begin))
// //{
// // condition += string.Format(" and b.LastModificationTime>='{0}' ", begin);
// //}
// //if (!string.IsNullOrEmpty(end))
// //{
// // condition += string.Format(" and b.LastModificationTime<='{0}' ", end);
// //}
// #region 第二次更改
// //string str = "SELECT\n" +
// //" isnull( temp1.交货单号, '' ) 交货单号,\n" +
// //" temp1.交货时间,\n" +
// //" temp1.[工厂],\n" +
// //" temp1.收货仓库,\n" +
// //" temp1.收货仓库描述,\n" +
// //" temp1.订货看板编号,\n" +
// //" temp1.订货零件号,\n" +
// //" temp1.验收单日期,\n" +
// //" temp1.Sap编码,\n" +
// //" temp1.看板编号,\n" +
// //" temp1.物料组,\n" +
// //" temp1.零件中文名称,\n" +
// //" temp1.发货数量,\n" +
// //" temp1.外部单号,\n" +
// //" temp1.结算数量,\n" +
// //" temp3.Price AS 结算单价,\n" +
// //" --( temp1.[结算数量] * ISNULL( temp3.Price, 0 ) ) AS 结算金额,\n" +
// //" ISNULL( temp1.结算金额, 0 ) AS 结算金额,\n" +
// //" isnull( TEMP2.Price, 0 ) AS 发货定价,\n" +
// //" isnull( temp1.发货数量, 0 ) - ISNULL( temp4.Qty, 0 ) AS 实际发货数量,\n" +
// //" ( isnull( temp1.发货数量, 0 ) - ISNULL( temp4.Qty, 0 ) ) * isnull( TEMP2.Price, 0 ) AS 实际发货总金额,\n" +
// //" ( isnull( temp1.发货数量, 0 ) - ISNULL( temp4.Qty, 0 ) - isnull( temp1.[结算数量], 0 ) ) AS 量差,\n" +
// //" ISNULL( temp3.Price, 0 ) - ISNULL( TEMP2.Price, 0 ) AS 单价差异,\n" +
// //" ( ISNULL( temp3.Price, 0 ) - ISNULL( TEMP2.Price, 0 ) ) * temp1.结算数量 AS 差异总金额 ,\n" +
// //" temp4.Qty 退货数量 \n" +
// //"FROM\n" +
// //" (\n" +
// //" SELECT\n" +
// //" '' AS 交货单号,\n" +
// //" NULL AS 交货时间,\n" +
// //" a.StorageLocation AS 收货仓库,\n" +
// //" a.StorageLocationDesc AS 收货仓库描述,\n" +
// //" a.HQHKanBan AS 订货看板编号,\n" +
// //" a.MaterialCode AS 订货零件号,\n" +
// //" c.MaterialCode Sap编码,\n" +
// //" a.MaterialCode 结算物料代码,\n" +
// //" c.MaterialDesc AS 零件中文名称,\n" +
// //" isnull( b.Qty, 0 ) AS 发货数量,\n" +
// //" a.[ExternalKanbanNumber] AS 外部单号,\n" +
// //" isnull( a.Qty, 0 ) AS 结算数量,\n" +
// //" C.EstimateTypeDesc AS 物料组,\n" +
// //" a.Factory AS 工厂,\n" +
// //" '' AS 看板编号,\n" +
// //" '' AS 验收单日期, \n" +
// //" isnull( a.Amt, 0 ) AS 结算金额\n" +
// //" FROM\n" +
// //" (\n" +
// //" SELECT SUM\n" +
// //" ( Qty ) AS Qty,\n" +
// //" HQHKanBan,\n" +
// //" MaterialCode,\n" +
// //" Version,\n" +
// //" StorageLocation,\n" +
// //" StorageLocationDesc,\n" +
// //" Factory,\n" +
// //" ExternalKanbanNumber,Amt \n" +
// //" FROM\n" +
// //" Set_HQ_H_Platform \n" +
// //" GROUP BY\n" +
// //" HQHKanBan,\n" +
// //" MaterialCode,\n" +
// //" Version,\n" +
// //" StorageLocation,\n" +
// //" StorageLocationDesc,\n" +
// //" Factory,\n" +
// //" ExternalKanbanNumber,Amt \n" +
// //" ) AS a\n" +
// //" INNER JOIN ( SELECT SUM ( Qty ) AS Qty, Kanban, MaterialCode FROM Set_HQ_H_Kanban GROUP BY Kanban, MaterialCode ) AS b ON a.HQHKanBan = b.Kanban \n" +
// //" AND a.MaterialCode = b.MaterialCode\n" +
// //" LEFT OUTER JOIN Set_material AS c ON a.MaterialCode = c.CustomerPartCode \n" +
// //" WHERE\n" +
// //" ( a.Version= '{0}' AND a.HQHKanBan IS NOT NULL ) \n" +
// //" AND a.HQHKanBan <> 'BJ' \n" +
// //" ) AS temp1\n" +
// //" LEFT OUTER JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE Version = '202110' ) AS TEMP2 ON temp1.Sap编码 = TEMP2.MaterialCode\n" +
// //" LEFT JOIN (\n" +
// //" SELECT\n" +
// //" ROUND( SUM ( Amt ) / SUM ( Qty ), 4 ) price,\n" +
// //" HQHKanBan,\n" +
// //" MaterialCode,\n" +
// //" Version \n" +
// //" FROM\n" +
// //" Set_HQ_H_Platform \n" +
// //" WHERE\n" +
// //" Version = '{0}' \n" +
// //" AND HQHKanBan <> 'BJ' \n" +
// //" GROUP BY\n" +
// //" HQHKanBan,\n" +
// //" MaterialCode,\n" +
// //" Version \n" +
// //" ) AS TEMP3 ON temp1.[结算物料代码] = TEMP3.MaterialCode \n" +
// //" AND temp1.订货看板编号 = TEMP3.HQHKanBan\n" +
// //" LEFT JOIN set_backQty temp4 ON temp1.订货看板编号 = temp4.Code \n" +
// //" AND temp1.Sap编码= temp4.MaterialCode";
// //string str = "SELECT\n" +
// //" isnull( temp1.交货单号, '' ) 交货单号,\n" +
// //" temp1.交货时间,\n" +
// //" temp1.[工厂],\n" +
// //" temp1.收货仓库,\n" +
// //" temp1.收货仓库描述,\n" +
// //" temp1.订货看板编号,\n" +
// //" temp1.订货零件号,\n" +
// //" temp1.验收单日期,\n" +
// //" temp1.Sap编码,\n" +
// //" temp1.看板编号,\n" +
// //" temp1.物料组,\n" +
// //" temp1.零件中文名称,\n" +
// //" temp1.发货数量,\n" +
// //" temp1.外部单号,\n" +
// //" temp1.结算数量,\n" +
// //" temp3.Price AS 结算单价,\n" +
// //" ( temp1.[结算数量] * ISNULL( temp3.Price, 0 ) ) AS 结算金额,\n" +
// //" isnull( TEMP2.Price, 0 ) AS 发货定价,\n" +
// //" isnull( temp1.发货数量, 0 ) - ISNULL( temp4.Qty, 0 ) AS 实际发货数量,\n" +
// //" ( isnull( temp1.发货数量, 0 ) - ISNULL( temp4.Qty, 0 ) ) * isnull( TEMP2.Price, 0 ) AS 实际发货总金额,\n" +
// //" ( isnull( temp1.发货数量, 0 ) - ISNULL( temp4.Qty, 0 ) - isnull( temp1.[结算数量], 0 ) ) AS 量差,\n" +
// //" ISNULL( temp3.Price, 0 ) - ISNULL( TEMP2.Price, 0 ) AS 单价差异,\n" +
// //" ( ISNULL( temp3.Price, 0 ) - ISNULL( TEMP2.Price, 0 ) ) * temp1.结算数量 AS 差异总金额 ,\n" +
// //" temp4.Qty 退货数量 \n" +
// //"FROM\n" +
// //" (\n" +
// //" SELECT\n" +
// //" '' AS 交货单号,\n" +
// //" NULL AS 交货时间,\n" +
// //" a.StorageLocation AS 收货仓库,\n" +
// //" a.StorageLocationDesc AS 收货仓库描述,\n" +
// //" a.HQHKanBan AS 订货看板编号,\n" +
// //" a.MaterialCode AS 订货零件号,\n" +
// //" c.MaterialCode Sap编码,\n" +
// //" a.MaterialCode 结算物料代码,\n" +
// //" c.MaterialDesc AS 零件中文名称,\n" +
// //" isnull( b.Qty, 0 ) AS 发货数量,\n" +
// //" a.[ExternalKanbanNumber] AS 外部单号,\n" +
// //" isnull( a.Qty, 0 ) AS 结算数量,\n" +
// //" C.EstimateTypeDesc AS 物料组,\n" +
// //" a.Factory AS 工厂,\n" +
// //" '' AS 看板编号,\n" +
// //" '' AS 验收单日期 \n" +
// //" FROM\n" +
// //" (\n" +
// //" SELECT SUM\n" +
// //" ( Qty ) AS Qty,\n" +
// //" HQHKanBan,\n" +
// //" MaterialCode,\n" +
// //" Version,\n" +
// //" StorageLocation,\n" +
// //" StorageLocationDesc,\n" +
// //" Factory,\n" +
// //" ExternalKanbanNumber \n" +
// //" FROM\n" +
// //" Set_HQ_H_Platform \n" +
// //" GROUP BY\n" +
// //" HQHKanBan,\n" +
// //" MaterialCode,\n" +
// //" Version,\n" +
// //" StorageLocation,\n" +
// //" StorageLocationDesc,\n" +
// //" Factory,\n" +
// //" ExternalKanbanNumber \n" +
// //" ) AS a\n" +
// //" INNER JOIN ( SELECT SUM ( Qty ) AS Qty, Kanban, MaterialCode FROM Set_HQ_H_Kanban GROUP BY Kanban, MaterialCode ) AS b ON a.HQHKanBan = b.Kanban \n" +
// //" AND a.MaterialCode = b.MaterialCode\n" +
// //" LEFT OUTER JOIN Set_material AS c ON a.MaterialCode = c.CustomerPartCode \n" +
// //" WHERE\n" +
// //" ( a.Version= '{0}' AND a.HQHKanBan IS NOT NULL ) \n" +
// //" AND a.HQHKanBan <> 'BJ' \n" +
// //" ) AS temp1\n" +
// //" LEFT OUTER JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE Version = '202110' ) AS TEMP2 ON temp1.Sap编码 = TEMP2.MaterialCode\n" +
// //" LEFT JOIN (\n" +
// //" SELECT\n" +
// //" ROUND( SUM ( Amt ) / SUM ( Qty ), 4 ) price,\n" +
// //" HQHKanBan,\n" +
// //" MaterialCode,\n" +
// //" Version \n" +
// //" FROM\n" +
// //" Set_HQ_H_Platform \n" +
// //" WHERE\n" +
// //" Version = '{0}' \n" +
// //" AND HQHKanBan <> 'BJ' \n" +
// //" GROUP BY\n" +
// //" HQHKanBan,\n" +
// //" MaterialCode,\n" +
// //" Version \n" +
// //" ) AS TEMP3 ON temp1.[结算物料代码] = TEMP3.MaterialCode \n" +
// //" AND temp1.订货看板编号 = TEMP3.HQHKanBan\n" +
// //" LEFT JOIN set_backQty temp4 ON temp1.订货看板编号 = temp4.Code \n" +
// //" AND temp1.Sap编码= temp4.MaterialCode";
// #endregion
// //var sql2 = "SELECT\n" +
// //" a.WmsBillNum,\n" +
// //" t1.MaterialCode MaterialCode,\n" +
// //" a.Kanban ,\n" +
// // " A.LastModificationTime WmsDate \n" +
// //"FROM\n" +
// //" Set_HQ_H_Kanban A\n" +
// //" INNER JOIN ( SELECT MaterialCode, Kanban FROM Set_HQ_H_Kanban GROUP BY MaterialCode, Kanban HAVING COUNT(*)> 1 ) B ON A.Kanban = B.Kanban \n" +
// //" AND A.MaterialCode = B.MaterialCode " +
// //" left join Set_material t1 on a.MaterialCode=t1.CustomerPartCode ";
// //var listCompare = DbConnection.Query<CompareExtend>(sql2);
// //var listCompare = DbConnection.Query<CompareExtend>("[dbo].[p_hq_unsettle_inner_1]", new { begin = begin, end = end }, null, true, 1200, CommandType.StoredProcedure);
// //var sql3 = "SELECT\n" +
// //" a.WmsBillNum,\n" +
// //" t1.MaterialCode MaterialCode,\n" +
// //" a.Kanban,\n" +
// //" A.LastModificationTime WmsDate \n" +
// //"FROM\n" +
// //" Set_HQ_H_Kanban A\n" +
// //" LEFT JOIN ( SELECT MaterialCode, Kanban FROM Set_HQ_H_Kanban GROUP BY MaterialCode, Kanban HAVING COUNT(*)> 1 ) B ON A.Kanban = B.Kanban \n" +
// //" AND A.MaterialCode = B.MaterialCode \n" +
// //" left join Set_material t1 on a.MaterialCode=t1.CustomerPartCode \n" +
// //"WHERE\n" +
// //" B.Kanban IS NULL";
// // var listCompare1 = DbConnection.Query<CompareExtend>("[dbo].[p_hq_unsettle_leftjoin_1]", new { begin = begin, end = end }, null, true, 1200, CommandType.StoredProcedure);
// var sql10 = "SELECT DISTINCT\n" +
// " t1.* \n" +
// "FROM\n" +
// " (\n" +
// " SELECT\n" +
// " a.ExternalKanbanNumber AS ExternalKanbanNumber,\n" +
// " a.KanbanNumber AS KanbanNumber,\n" +
// " CONVERT ( VARCHAR ( 100 ), a.AcceptanceDate, 23 ) AS AcceptanceDate,\n" +
// " HQHKanBan,\n" +
// " b2.MaterialCode \n" +
// " FROM\n" +
// " Set_HQ_H_Platform a \n" +
// " left join Set_material b2 on a.MaterialCode = b2.CustomerPartCode \n" +
// " WHERE\n" +
// " Version = '{0}' \n" +
// " AND HQHKanBan <> 'BJ' \n" +
// " ) t1\n" +
// " LEFT JOIN ( SELECT HQHKanBan, MaterialCode FROM Set_HQ_H_Platform a WHERE Version = '{0}' AND HQHKanBan <> 'BJ' GROUP BY HQHKanBan, MaterialCode HAVING count(*)> 1 ) t2 ON t1.HQHKanBan = t2.HQHKanBan \n" +
// " AND t1.MaterialCode = t2.MaterialCode \n" +
// "WHERE\n" +
// " t2.HQHKanBan IS NULL";
// var list11 = DbConnection.Query<CompareExtend1>(string.Format(sql10, version));
// var sql11 = "SELECT DISTINCT\n" +
// " t1.* \n" +
// "FROM\n" +
// " (\n" +
// " SELECT\n" +
// " a.ExternalKanbanNumber AS ExternalKanbanNumber,\n" +
// " a.KanbanNumber AS KanbanNumber,\n" +
// " CONVERT ( VARCHAR ( 100 ), a.AcceptanceDate, 23 ) AS AcceptanceDate,\n" +
// " HQHKanBan,\n" +
// " b2.MaterialCode \n" +
// " FROM\n" +
// " Set_HQ_H_Platform a \n" +
// " left join Set_material b2 on a.MaterialCode = b2.CustomerPartCode \n" +
// " WHERE\n" +
// " Version = '{0}' \n" +
// " AND HQHKanBan <> 'BJ' \n" +
// " ) t1\n" +
// " INNER JOIN ( SELECT HQHKanBan, MaterialCode FROM Set_HQ_H_Platform a WHERE Version = '{0}' AND HQHKanBan <> 'BJ' GROUP BY HQHKanBan, MaterialCode HAVING count(*)> 1 ) t2 ON t1.HQHKanBan = t2.HQHKanBan \n" +
// " AND t1.MaterialCode = t2.MaterialCode \n" +
// "ORDER BY\n" +
// " t1.HQHKanBan,\n" +
// " t1.MaterialCode";
// var list12 = DbConnection.Query<CompareExtend1>(string.Format(sql11, version));
// var sql12 = "SELECT\n" +
// " a.ExternalKanbanNumber AS ExternalKanbanNumber,\n" +
// " a.KanbanNumber AS KanbanNumber,\n" +
// " CONVERT ( VARCHAR ( 100 ), a.AcceptanceDate, 23 ) AS AcceptanceDate,\n" +
// " HQHKanBan,\n" +
// " b2.MaterialCode \n" +
// "FROM\n" +
// " Set_HQ_H_Platform a \n" +
// " left join Set_material b2 on a.MaterialCode = b2.CustomerPartCode \n" +
// "WHERE\n" +
// " Version = '{0}' \n" +
// " AND HQHKanBan = 'BJ'";
// var list13 = DbConnection.Query<CompareExtend1>(string.Format(sql12, version));
// List<CompareExtend1> _lscopy = new List<CompareExtend1>();
// foreach (var itm in list11)
// {
// var first = _lscopy.FirstOrDefault(p => p.HQHKanBan == itm.HQHKanBan && p.MaterialCode == itm.MaterialCode);
// if (first != null)
// {
// first.KanbanNumber += "," + itm.KanbanNumber;
// first.AcceptanceDate += "," + itm.AcceptanceDate;
// first.ExternalKanbanNumber += "," + itm.ExternalKanbanNumber;
// }
// else
// {
// _lscopy.Add(itm);
// }
// }
// foreach (var itm in list12)
// {
// _lscopy.Add(itm);
// }
// foreach (var itm in list13)
// {
// _lscopy.Add(itm);
// }
// //List<CompareExtend> _ls = new List<CompareExtend>();
// //foreach (var itm in listCompare.ToList())
// //{
// // var first = _ls.FirstOrDefault(p => p.Kanban == itm.Kanban && p.MaterialCode == itm.MaterialCode);
// // if (first != null)
// // {
// // if (!string.IsNullOrEmpty(itm.WmsDate))
// // {
// // itm.WmsDate = DateTime.Parse(itm.WmsDate).ToShortDateString();
// // }
// // first.WmsBillNum += "," + itm.WmsBillNum;
// // first.WmsDate += "," + itm.WmsDate;
// // }
// // else
// // {
// // if (!string.IsNullOrEmpty(itm.WmsDate))
// // {
// // itm.WmsDate = DateTime.Parse(itm.WmsDate).ToShortDateString();
// // }
// // _ls.Add(itm);
// // }
// //}
// //foreach (var itm in listCompare1.ToList())
// //{
// // if (!string.IsNullOrEmpty(itm.WmsDate))
// // {
// // itm.WmsDate = DateTime.Parse(itm.WmsDate).ToShortDateString();
// // }
// // _ls.Add(itm);
// //}
// //var _query = DbConnection.Query<HQHSettledDetailDiff>(_sql, null, null, true, 1200, null);
// //又变了，要求发运和退货直接去比对WMS发运和退货视图
// var _query = DbConnection.Query<HQHSettledDetailDiff>("[dbo].[p_hq_unsettle_1]", new { version = version }, null, true, 1200, CommandType.StoredProcedure);
// _list = _query.ToList();
// foreach (var itm1 in _list)
// {
// //var itm = _ls.FirstOrDefault(p => p.Kanban == itm1.订货看板编号 && p.MaterialCode == itm1.Sap编码);
// //if (itm != null)
// //{
// // itm1.交货单号 = itm.WmsBillNum;
// // itm1.交货时间 = itm.WmsDate;
// //}
// var itmcopy = _lscopy.FirstOrDefault(p => p.HQHKanBan == itm1.订货看板编号 && p.MaterialCode == itm1.Sap编码);
// if (itmcopy != null)
// {
// itm1.看板编号 = itmcopy.KanbanNumber;
// itm1.验收单日期 = itmcopy.AcceptanceDate;
// itm1.外部单号 = itmcopy.ExternalKanbanNumber;
// }
// }
// return _list;
//}
[UnitOfWork(false)]
public virtual List<HQHSettledDetailDiff> GetInvoiceSettledDetailDiffReportList(string version, string materialCode, string begin, string end, string materialGroup)
{
List<HQHSettledDetailDiff> _list = new List<HQHSettledDetailDiff>();
//string condition = " ";
//if (!string.IsNullOrEmpty(begin))
//{
// condition += string.Format(" and b.LastModificationTime>='{0}' ", begin);
//}
//if (!string.IsNullOrEmpty(end))
//{
// condition += string.Format(" and b.LastModificationTime<='{0}' ", end);
//}
#region 第二次更改
//string str = "SELECT\n" +
//" isnull( temp1.交货单号, '' ) 交货单号,\n" +
//" temp1.交货时间,\n" +
//" temp1.[工厂],\n" +
//" temp1.收货仓库,\n" +
//" temp1.收货仓库描述,\n" +
//" temp1.订货看板编号,\n" +
//" temp1.订货零件号,\n" +
//" temp1.验收单日期,\n" +
//" temp1.Sap编码,\n" +
//" temp1.看板编号,\n" +
//" temp1.物料组,\n" +
//" temp1.零件中文名称,\n" +
//" temp1.发货数量,\n" +
//" temp1.外部单号,\n" +
//" temp1.结算数量,\n" +
//" temp3.Price AS 结算单价,\n" +
//" --( temp1.[结算数量] * ISNULL( temp3.Price, 0 ) ) AS 结算金额,\n" +
//" ISNULL( temp1.结算金额, 0 ) AS 结算金额,\n" +
//" isnull( TEMP2.Price, 0 ) AS 发货定价,\n" +
//" isnull( temp1.发货数量, 0 ) - ISNULL( temp4.Qty, 0 ) AS 实际发货数量,\n" +
//" ( isnull( temp1.发货数量, 0 ) - ISNULL( temp4.Qty, 0 ) ) * isnull( TEMP2.Price, 0 ) AS 实际发货总金额,\n" +
//" ( isnull( temp1.发货数量, 0 ) - ISNULL( temp4.Qty, 0 ) - isnull( temp1.[结算数量], 0 ) ) AS 量差,\n" +
//" ISNULL( temp3.Price, 0 ) - ISNULL( TEMP2.Price, 0 ) AS 单价差异,\n" +
//" ( ISNULL( temp3.Price, 0 ) - ISNULL( TEMP2.Price, 0 ) ) * temp1.结算数量 AS 差异总金额 ,\n" +
//" temp4.Qty 退货数量 \n" +
//"FROM\n" +
//" (\n" +
//" SELECT\n" +
//" '' AS 交货单号,\n" +
//" NULL AS 交货时间,\n" +
//" a.StorageLocation AS 收货仓库,\n" +
//" a.StorageLocationDesc AS 收货仓库描述,\n" +
//" a.HQHKanBan AS 订货看板编号,\n" +
//" a.MaterialCode AS 订货零件号,\n" +
//" c.MaterialCode Sap编码,\n" +
//" a.MaterialCode 结算物料代码,\n" +
//" c.MaterialDesc AS 零件中文名称,\n" +
//" isnull( b.Qty, 0 ) AS 发货数量,\n" +
//" a.[ExternalKanbanNumber] AS 外部单号,\n" +
//" isnull( a.Qty, 0 ) AS 结算数量,\n" +
//" C.EstimateTypeDesc AS 物料组,\n" +
//" a.Factory AS 工厂,\n" +
//" '' AS 看板编号,\n" +
//" '' AS 验收单日期, \n" +
//" isnull( a.Amt, 0 ) AS 结算金额\n" +
//" FROM\n" +
//" (\n" +
//" SELECT SUM\n" +
//" ( Qty ) AS Qty,\n" +
//" HQHKanBan,\n" +
//" MaterialCode,\n" +
//" Version,\n" +
//" StorageLocation,\n" +
//" StorageLocationDesc,\n" +
//" Factory,\n" +
//" ExternalKanbanNumber,Amt \n" +
//" FROM\n" +
//" Set_HQ_H_Platform \n" +
//" GROUP BY\n" +
//" HQHKanBan,\n" +
//" MaterialCode,\n" +
//" Version,\n" +
//" StorageLocation,\n" +
//" StorageLocationDesc,\n" +
//" Factory,\n" +
//" ExternalKanbanNumber,Amt \n" +
//" ) AS a\n" +
//" INNER JOIN ( SELECT SUM ( Qty ) AS Qty, Kanban, MaterialCode FROM Set_HQ_H_Kanban GROUP BY Kanban, MaterialCode ) AS b ON a.HQHKanBan = b.Kanban \n" +
//" AND a.MaterialCode = b.MaterialCode\n" +
//" LEFT OUTER JOIN Set_material AS c ON a.MaterialCode = c.CustomerPartCode \n" +
//" WHERE\n" +
//" ( a.Version= '{0}' AND a.HQHKanBan IS NOT NULL ) \n" +
//" AND a.HQHKanBan <> 'BJ' \n" +
//" ) AS temp1\n" +
//" LEFT OUTER JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE Version = '202110' ) AS TEMP2 ON temp1.Sap编码 = TEMP2.MaterialCode\n" +
//" LEFT JOIN (\n" +
//" SELECT\n" +
//" ROUND( SUM ( Amt ) / SUM ( Qty ), 4 ) price,\n" +
//" HQHKanBan,\n" +
//" MaterialCode,\n" +
//" Version \n" +
//" FROM\n" +
//" Set_HQ_H_Platform \n" +
//" WHERE\n" +
//" Version = '{0}' \n" +
//" AND HQHKanBan <> 'BJ' \n" +
//" GROUP BY\n" +
//" HQHKanBan,\n" +
//" MaterialCode,\n" +
//" Version \n" +
//" ) AS TEMP3 ON temp1.[结算物料代码] = TEMP3.MaterialCode \n" +
//" AND temp1.订货看板编号 = TEMP3.HQHKanBan\n" +
//" LEFT JOIN set_backQty temp4 ON temp1.订货看板编号 = temp4.Code \n" +
//" AND temp1.Sap编码= temp4.MaterialCode";
//string str = "SELECT\n" +
//" isnull( temp1.交货单号, '' ) 交货单号,\n" +
//" temp1.交货时间,\n" +
//" temp1.[工厂],\n" +
//" temp1.收货仓库,\n" +
//" temp1.收货仓库描述,\n" +
//" temp1.订货看板编号,\n" +
//" temp1.订货零件号,\n" +
//" temp1.验收单日期,\n" +
//" temp1.Sap编码,\n" +
//" temp1.看板编号,\n" +
//" temp1.物料组,\n" +
//" temp1.零件中文名称,\n" +
//" temp1.发货数量,\n" +
//" temp1.外部单号,\n" +
//" temp1.结算数量,\n" +
//" temp3.Price AS 结算单价,\n" +
//" ( temp1.[结算数量] * ISNULL( temp3.Price, 0 ) ) AS 结算金额,\n" +
//" isnull( TEMP2.Price, 0 ) AS 发货定价,\n" +
//" isnull( temp1.发货数量, 0 ) - ISNULL( temp4.Qty, 0 ) AS 实际发货数量,\n" +
//" ( isnull( temp1.发货数量, 0 ) - ISNULL( temp4.Qty, 0 ) ) * isnull( TEMP2.Price, 0 ) AS 实际发货总金额,\n" +
//" ( isnull( temp1.发货数量, 0 ) - ISNULL( temp4.Qty, 0 ) - isnull( temp1.[结算数量], 0 ) ) AS 量差,\n" +
//" ISNULL( temp3.Price, 0 ) - ISNULL( TEMP2.Price, 0 ) AS 单价差异,\n" +
//" ( ISNULL( temp3.Price, 0 ) - ISNULL( TEMP2.Price, 0 ) ) * temp1.结算数量 AS 差异总金额 ,\n" +
//" temp4.Qty 退货数量 \n" +
//"FROM\n" +
//" (\n" +
//" SELECT\n" +
//" '' AS 交货单号,\n" +
//" NULL AS 交货时间,\n" +
//" a.StorageLocation AS 收货仓库,\n" +
//" a.StorageLocationDesc AS 收货仓库描述,\n" +
//" a.HQHKanBan AS 订货看板编号,\n" +
//" a.MaterialCode AS 订货零件号,\n" +
//" c.MaterialCode Sap编码,\n" +
//" a.MaterialCode 结算物料代码,\n" +
//" c.MaterialDesc AS 零件中文名称,\n" +
//" isnull( b.Qty, 0 ) AS 发货数量,\n" +
//" a.[ExternalKanbanNumber] AS 外部单号,\n" +
//" isnull( a.Qty, 0 ) AS 结算数量,\n" +
//" C.EstimateTypeDesc AS 物料组,\n" +
//" a.Factory AS 工厂,\n" +
//" '' AS 看板编号,\n" +
//" '' AS 验收单日期 \n" +
//" FROM\n" +
//" (\n" +
//" SELECT SUM\n" +
//" ( Qty ) AS Qty,\n" +
//" HQHKanBan,\n" +
//" MaterialCode,\n" +
//" Version,\n" +
//" StorageLocation,\n" +
//" StorageLocationDesc,\n" +
//" Factory,\n" +
//" ExternalKanbanNumber \n" +
//" FROM\n" +
//" Set_HQ_H_Platform \n" +
//" GROUP BY\n" +
//" HQHKanBan,\n" +
//" MaterialCode,\n" +
//" Version,\n" +
//" StorageLocation,\n" +
//" StorageLocationDesc,\n" +
//" Factory,\n" +
//" ExternalKanbanNumber \n" +
//" ) AS a\n" +
//" INNER JOIN ( SELECT SUM ( Qty ) AS Qty, Kanban, MaterialCode FROM Set_HQ_H_Kanban GROUP BY Kanban, MaterialCode ) AS b ON a.HQHKanBan = b.Kanban \n" +
//" AND a.MaterialCode = b.MaterialCode\n" +
//" LEFT OUTER JOIN Set_material AS c ON a.MaterialCode = c.CustomerPartCode \n" +
//" WHERE\n" +
//" ( a.Version= '{0}' AND a.HQHKanBan IS NOT NULL ) \n" +
//" AND a.HQHKanBan <> 'BJ' \n" +
//" ) AS temp1\n" +
//" LEFT OUTER JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE Version = '202110' ) AS TEMP2 ON temp1.Sap编码 = TEMP2.MaterialCode\n" +
//" LEFT JOIN (\n" +
//" SELECT\n" +
//" ROUND( SUM ( Amt ) / SUM ( Qty ), 4 ) price,\n" +
//" HQHKanBan,\n" +
//" MaterialCode,\n" +
//" Version \n" +
//" FROM\n" +
//" Set_HQ_H_Platform \n" +
//" WHERE\n" +
//" Version = '{0}' \n" +
//" AND HQHKanBan <> 'BJ' \n" +
//" GROUP BY\n" +
//" HQHKanBan,\n" +
//" MaterialCode,\n" +
//" Version \n" +
//" ) AS TEMP3 ON temp1.[结算物料代码] = TEMP3.MaterialCode \n" +
//" AND temp1.订货看板编号 = TEMP3.HQHKanBan\n" +
//" LEFT JOIN set_backQty temp4 ON temp1.订货看板编号 = temp4.Code \n" +
//" AND temp1.Sap编码= temp4.MaterialCode";
#endregion
//var sql2 = "SELECT\n" +
//" a.WmsBillNum,\n" +
//" t1.MaterialCode MaterialCode,\n" +
//" a.Kanban ,\n" +
// " A.LastModificationTime WmsDate \n" +
//"FROM\n" +
//" Set_HQ_H_Kanban A\n" +
//" INNER JOIN ( SELECT MaterialCode, Kanban FROM Set_HQ_H_Kanban GROUP BY MaterialCode, Kanban HAVING COUNT(*)> 1 ) B ON A.Kanban = B.Kanban \n" +
//" AND A.MaterialCode = B.MaterialCode " +
//" left join Set_material t1 on a.MaterialCode=t1.CustomerPartCode ";
//var listCompare = DbConnection.Query<CompareExtend>(sql2);
//var listCompare = DbConnection.Query<CompareExtend>("[dbo].[p_hq_unsettle_inner_1]", new { begin = begin, end = end }, null, true, 1200, CommandType.StoredProcedure);
//var sql3 = "SELECT\n" +
//" a.WmsBillNum,\n" +
//" t1.MaterialCode MaterialCode,\n" +
//" a.Kanban,\n" +
//" A.LastModificationTime WmsDate \n" +
//"FROM\n" +
//" Set_HQ_H_Kanban A\n" +
//" LEFT JOIN ( SELECT MaterialCode, Kanban FROM Set_HQ_H_Kanban GROUP BY MaterialCode, Kanban HAVING COUNT(*)> 1 ) B ON A.Kanban = B.Kanban \n" +
//" AND A.MaterialCode = B.MaterialCode \n" +
//" left join Set_material t1 on a.MaterialCode=t1.CustomerPartCode \n" +
//"WHERE\n" +
//" B.Kanban IS NULL";
// var listCompare1 = DbConnection.Query<CompareExtend>("[dbo].[p_hq_unsettle_leftjoin_1]", new { begin = begin, end = end }, null, true, 1200, CommandType.StoredProcedure);
var sql10 = "SELECT DISTINCT\n" +
" t1.* \n" +
"FROM\n" +
@ -333,9 +505,6 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
var list11 = DbConnection.Query<CompareExtend1>(string.Format(sql10, version));
var sql11 = "SELECT DISTINCT\n" +
" t1.* \n" +
"FROM\n" +
@ -406,43 +575,6 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
{
_lscopy.Add(itm);
}
//List<CompareExtend> _ls = new List<CompareExtend>();
//foreach (var itm in listCompare.ToList())
//{
// var first = _ls.FirstOrDefault(p => p.Kanban == itm.Kanban && p.MaterialCode == itm.MaterialCode);
// if (first != null)
// {
// if (!string.IsNullOrEmpty(itm.WmsDate))
// {
// itm.WmsDate = DateTime.Parse(itm.WmsDate).ToShortDateString();
// }
// first.WmsBillNum += "," + itm.WmsBillNum;
// first.WmsDate += "," + itm.WmsDate;
// }
// else
// {
// if (!string.IsNullOrEmpty(itm.WmsDate))
// {
// itm.WmsDate = DateTime.Parse(itm.WmsDate).ToShortDateString();
// }
// _ls.Add(itm);
// }
//}
//foreach (var itm in listCompare1.ToList())
//{
// if (!string.IsNullOrEmpty(itm.WmsDate))
// {
// itm.WmsDate = DateTime.Parse(itm.WmsDate).ToShortDateString();
// }
// _ls.Add(itm);
//}
//var _query = DbConnection.Query<HQHSettledDetailDiff>(_sql, null, null, true, 1200, null);
//又变了，要求发运和退货直接去比对WMS发运和退货视图
var _query = DbConnection.Query<HQHSettledDetailDiff>("[dbo].[p_hq_unsettle_1]", new { version = version }, null, true, 1200, CommandType.StoredProcedure);
_list = _query.ToList();
@ -450,13 +582,6 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
foreach (var itm1 in _list)
{
//var itm = _ls.FirstOrDefault(p => p.Kanban == itm1.订货看板编号 && p.MaterialCode == itm1.Sap编码);
//if (itm != null)
//{
// itm1.交货单号 = itm.WmsBillNum;
// itm1.交货时间 = itm.WmsDate;
//}
var itmcopy = _lscopy.FirstOrDefault(p => p.HQHKanBan == itm1.订货看板编号 && p.MaterialCode == itm1.Sap编码);
if (itmcopy != null)
{
@ -466,8 +591,6 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
}
}
return _list;
}
@ -1993,6 +2116,10 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
[ExporterHeader(DisplayName = "实际发货数量")]
public decimal 实际发货数量 { set; get; }
[ExporterHeader(DisplayName = "往期已结")]
public decimal 往期已结 { set; get; }
[ExporterHeader(DisplayName = "结算数量")]
public decimal 结算数量 { set; get; }
[ExporterHeader(DisplayName = "结算单价")]
@ -2005,7 +2132,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
[ExporterHeader(DisplayName = "实际发货总金额")]
public decimal 实际发货总金额 { set; get; }
[ExporterHeader(DisplayName = "量差(实际发货-结算)")]
[ExporterHeader(DisplayName = "量差")]
public decimal 量差 { set; get; }
[ExporterHeader(DisplayName = "单价差异")]

6
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleKBWithCodeDapperReportRepository.cs
View File

@ -36,11 +36,11 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
if (!string.IsNullOrEmpty(begintime) && Convert.ToDateTime(begintime) != DateTime.MinValue)
{
condition += string.Format(" and c.WMSActualGoodsDate>='{0}' ", begintime);
condition += string.Format(" where WMSActualGoodsDate>='{0}' ", begintime);
}
if (!string.IsNullOrEmpty(endtime) && Convert.ToDateTime(endtime) != DateTime.MinValue)
{
condition += string.Format(" and c.WMSActualGoodsDate<='{0}' ", endtime);
condition += string.Format(" where WMSActualGoodsDate<='{0}' ", endtime);
}
var datestr= version.Substring(0, 4) +"-"+ version.Substring(4, 2) + "-01";
@ -94,7 +94,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" AND A.MaterialCode = C.MaterialCode\n" +
" LEFT JOIN ( SELECT SUM ( amt ) / SUM ( Qty ) InvoicePrice, MaterialCode FROM set_invoice WHERE VERSION = '{0}' GROUP BY materialcode ) d ON A.MaterialCode = d.MaterialCode \n" +
" WHERE\n" +
" A.VERSION = '{0}' {1} \n" +
" A.VERSION = '{0}' \n" +
" ) TEMP1\n" +
" LEFT JOIN set_backQty temp3 ON temp1.Kanban = temp3.Code and temp1.MaterialCode=temp3.MaterialCode \n" +

32
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleSparePartDapperReportRepository.cs
View File

@ -718,8 +718,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" SELECT SUM\n" +
" ( ReceiptQty ) AS ReceiptQty,\n" +
" PurchaseOrderNo,\n" +
" MaterialCode,\n" +
" SapCode \n" +
" MaterialCode\n" +
" FROM\n" +
" Set_WMSSparePart \n" +
" WHERE\n" +
@ -727,15 +726,14 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" AND PurchaseOrderNo != '' {0}\n" +
" GROUP BY\n" +
" PurchaseOrderNo,\n" +
" MaterialCode,\n" +
" SapCode \n" +
" MaterialCode\n" +
" ) AS a\n" +
" LEFT OUTER JOIN ( SELECT MAX ( Id ) Id, MaterialCode, CustomerPartCode, MaterialDesc, EstimateTypeDesc FROM Set_material GROUP BY MaterialCode, MaterialDesc, EstimateTypeDesc, CustomerPartCode ) AS c ON a.MaterialCode = c.CustomerPartCode\n" +
" LEFT JOIN ( SELECT SUM ( Qty ) Qty, OrderBillNum, MaterialCode FROM Set_WmsSharePart90OutPutDetial WHERE State = 2 GROUP BY OrderBillNum, MaterialCode ) AS b ON a.PurchaseOrderNo= b.OrderBillNum \n" +
" AND a.SapCode = b.MaterialCode \n" +
" LEFT JOIN ( SELECT SUM ( Qty ) Qty, OrderBillNum,Extend1 FROM Set_WmsSharePart90OutPutDetial WHERE State = 2 GROUP BY OrderBillNum, Extend1 ) AS b ON a.PurchaseOrderNo= b.OrderBillNum \n" +
" AND a.MaterialCode = b.Extend1 \n" +
" WHERE\n" +
" b.OrderBillNum IS NULL \n" +
" AND b.MaterialCode IS NULL \n" +
" AND b.Extend1 IS NULL \n" +
" ) AS temp1\n" +
" LEFT JOIN ( SELECT * FROM set_backQty ) temp3 ON temp1.采购订单号 = temp3.Code \n" +
" AND temp1.SAP编码= temp3.MaterialCode\n" +
@ -788,8 +786,8 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" PurchaseOrderNo,\n" +
" MaterialCode \n" +
" ) a\n" +
" INNER JOIN ( SELECT SUM ( Qty ) ReceiptQty, OrderBillNum, MaterialCode FROM Set_WmsSharePart90OutPutDetial WHERE State = 2 GROUP BY OrderBillNum, MaterialCode ) AS b ON a.PurchaseOrderNo= b.OrderBillNum \n" +
" AND a.MaterialCode = b.MaterialCode\n" +
" INNER JOIN ( SELECT SUM ( Qty ) ReceiptQty, OrderBillNum, Extend1 FROM Set_WmsSharePart90OutPutDetial WHERE State = 2 GROUP BY OrderBillNum, Extend1 ) AS b ON a.PurchaseOrderNo= b.OrderBillNum \n" +
" AND a.MaterialCode = b.Extend1\n" +
" LEFT OUTER JOIN ( SELECT MAX ( Id ) Id, MaterialCode, CustomerPartCode, MaterialDesc, EstimateTypeDesc FROM Set_material GROUP BY MaterialCode, MaterialDesc, EstimateTypeDesc, CustomerPartCode ) AS c ON a.MaterialCode = c.CustomerPartCode \n" +
" WHERE\n" +
" a.ReceiptQty> b.ReceiptQty \n" +
@ -1152,8 +1150,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" SELECT SUM\n" +
" ( ReceiptQty ) AS ReceiptQty,\n" +
" PurchaseOrderNo,\n" +
" MaterialCode,\n" +
" SapCode \n" +
" MaterialCode\n" +
" FROM\n" +
" Set_WMSSparePart \n" +
" WHERE\n" +
@ -1161,15 +1158,14 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" AND PurchaseOrderNo != '' {0}\n" +
" GROUP BY\n" +
" PurchaseOrderNo,\n" +
" MaterialCode,\n" +
" SapCode \n" +
" MaterialCode\n" +
" ) AS a\n" +
" LEFT OUTER JOIN ( SELECT MAX ( Id ) Id, MaterialCode, CustomerPartCode, MaterialDesc, EstimateTypeDesc FROM Set_material GROUP BY MaterialCode, MaterialDesc, EstimateTypeDesc, CustomerPartCode ) AS c ON a.MaterialCode = c.CustomerPartCode\n" +
" LEFT JOIN ( SELECT SUM ( Qty ) Qty, OrderBillNum, MaterialCode FROM Set_WmsSharePart90OutPutDetial WHERE State = 2 GROUP BY OrderBillNum, MaterialCode ) AS b ON a.PurchaseOrderNo= b.OrderBillNum \n" +
" AND a.SapCode = b.MaterialCode \n" +
" LEFT JOIN ( SELECT SUM ( Qty ) Qty, OrderBillNum, Extend1 FROM Set_WmsSharePart90OutPutDetial WHERE State = 2 GROUP BY OrderBillNum, Extend1 ) AS b ON a.PurchaseOrderNo= b.OrderBillNum \n" +
" AND a.MaterialCode = b.Extend1 \n" +
" WHERE\n" +
" b.OrderBillNum IS NULL \n" +
" AND b.MaterialCode IS NULL \n" +
" AND b.Extend1 IS NULL \n" +
" ) AS temp1\n" +
" LEFT JOIN ( SELECT * FROM set_backQty ) temp3 ON temp1.采购订单号 = temp3.Code \n" +
" AND temp1.SAP编码= temp3.MaterialCode\n" +
@ -1222,8 +1218,8 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" PurchaseOrderNo,\n" +
" MaterialCode \n" +
" ) a\n" +
" INNER JOIN ( SELECT SUM ( Qty ) ReceiptQty, OrderBillNum, MaterialCode FROM Set_WmsSharePart90OutPutDetial WHERE State = 2 GROUP BY OrderBillNum, MaterialCode ) AS b ON a.PurchaseOrderNo= b.OrderBillNum \n" +
" AND a.MaterialCode = b.MaterialCode\n" +
" INNER JOIN ( SELECT SUM ( Qty ) ReceiptQty, OrderBillNum, Extend1 FROM Set_WmsSharePart90OutPutDetial WHERE State = 2 GROUP BY OrderBillNum, Extend1 ) AS b ON a.PurchaseOrderNo= b.OrderBillNum \n" +
" AND a.MaterialCode = b.Extend1\n" +
" LEFT OUTER JOIN ( SELECT MAX ( Id ) Id, MaterialCode, CustomerPartCode, MaterialDesc, EstimateTypeDesc FROM Set_material GROUP BY MaterialCode, MaterialDesc, EstimateTypeDesc, CustomerPartCode ) AS c ON a.MaterialCode = c.CustomerPartCode \n" +
" WHERE\n" +
" a.ReceiptQty> b.ReceiptQty \n" +

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

@ -48,7 +48,7 @@ namespace SettleAccount.Job.Services.Report
//反向对比，即大众备件未结（有单号），包含有发货有结算并且发货数量大于结算数量的数据也整合到未结中
var _reversels_withcode = _dapper.GetReverseWithCodeSettleSparePartReportList(purchaseOrderNo, version, sapCode, matialCode, beginTime, endTime);
var _reversels_withcode = _dapper.GetReverseWithCodeSettleSparePartReportList_unsettle(purchaseOrderNo, version, sapCode, matialCode, beginTime, endTime);
var stockList = _wmsDapper.GetSalesStock("BJJS");

Write Preview
Loading…
Cancel
Save