diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/TaskListDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/TaskListDto.cs index 72e66ae1..0e0ebd07 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/TaskListDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/TaskListDto.cs @@ -197,7 +197,9 @@ namespace Win.Sfs.SettleAccount.Entities public string Version { set; get; } [ImporterHeader(Name = "是否备件")] [ExporterHeader(DisplayName = "是否备件")] - public string IsBack { set; get; } + [ValueMapping("批量", 0)] + [ValueMapping("备件", 1)] + public ExporterIsBack IsBack { set; get; } [ImporterHeader(Name = "结算数量")] [ExporterHeader(DisplayName = "结算数量")] public decimal Qty { set; get; } @@ -210,7 +212,7 @@ namespace Win.Sfs.SettleAccount.Entities public decimal RealityNumber { set; get; } [ImporterHeader(Name = "出库数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "出库数量")] public decimal OutputQty { set; get; } [ImporterHeader(Name = "Extend", IsIgnore = true)] [ExporterHeader(DisplayName = "Extend", IsIgnore = true)] @@ -305,7 +307,7 @@ namespace Win.Sfs.SettleAccount.Entities [ExporterHeader(DisplayName = "寄销库数量")] public decimal StockQty { set; get; } - [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "出库数量")] public decimal OutPutQty { set; get; } [ExporterHeader(DisplayName = "开票单价")] @@ -432,7 +434,9 @@ namespace Win.Sfs.SettleAccount.Entities public string Version { set; get; } [ImporterHeader(Name = "是否备件")] [ExporterHeader(DisplayName = "是否备件")] - public string IsBack { set; get; } + [ValueMapping("批量", 0)] + [ValueMapping("备件", 1)] + public ExporterIsBack IsBack { set; get; } [ImporterHeader(Name = "结算数量")] [ExporterHeader(DisplayName = "结算数量")] public decimal Qty { set; get; } @@ -445,7 +449,7 @@ namespace Win.Sfs.SettleAccount.Entities public decimal RealityNumber { set; get; } [ImporterHeader(Name = "出库数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "出库数量")] public decimal OutputQty { set; get; } [ImporterHeader(Name = "客户")] [ExporterHeader(DisplayName = "客户")] @@ -492,7 +496,9 @@ namespace Win.Sfs.SettleAccount.Entities public string Version { set; get; } [ImporterHeader(Name = "是否备件")] [ExporterHeader(DisplayName = "是否备件")] - public string IsBack { set; get; } + [ValueMapping("批量", 0)] + [ValueMapping("备件", 1)] + public ExporterIsBack IsBack { set; get; } [ImporterHeader(Name = "结算数量")] [ExporterHeader(DisplayName = "结算数量")] public decimal Qty { set; get; } @@ -505,7 +511,7 @@ namespace Win.Sfs.SettleAccount.Entities public decimal RealityNumber { set; get; } [ImporterHeader(Name = "出库数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "出库数量")] public decimal OutputQty { set; get; } [ImporterHeader(Name = "客户")] [ExporterHeader(DisplayName = "客户")] @@ -540,7 +546,9 @@ namespace Win.Sfs.SettleAccount.Entities { [ImporterHeader(Name = "是否备件", IsIgnore = true)] [ExporterHeader(DisplayName = "是否备件", IsIgnore = true)] - public string IsSparePart { set; get; } + [ValueMapping("批量", 0)] + [ValueMapping("备件", 1)] + public ExporterIsBack IsSparePart { set; get; } //交货单号 [ImporterHeader(Name = "寄销库数量", IsIgnore = true)] @@ -548,7 +556,7 @@ namespace Win.Sfs.SettleAccount.Entities public decimal StockQty { set; get; } [ImporterHeader(Name = "出库数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "出库数量")] public decimal OutPutQty { set; get; } [ImporterHeader(Name = "组件组物料", IsIgnore = true)] @@ -666,7 +674,21 @@ namespace Win.Sfs.SettleAccount.Entities } + public enum ExporterIsBack + { + /// + /// 批量 + /// + [Display(Name = "批量")] + Normal = 0, + + /// + /// 备件 + /// + [Display(Name = "备件")] + PupilsAway = 1, + } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnSumInterface.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnSumInterface.cs index 3dce74fb..a319e116 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnSumInterface.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnSumInterface.cs @@ -27,7 +27,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// /// 已结算出库查询 /// - [Authorize(SettleAccountPermissions.WMSJIT.Default)] + //[Authorize(SettleAccountPermissions.WMSJIT.Default)] [Route("api/settleaccount/WMSOutputDetailWithCodeReport")] public class WMSOutputDetailWithCodeReportAppService : SettleAccountApplicationBase @@ -64,21 +64,22 @@ namespace Win.Sfs.SettleAccount.Entities.WMS [HttpGet] [Route("Make")] [UnitOfWork(false)] - public async Task ReportMake(string version, DateTime accountDate) + public async Task ReportMake(string cnumber,string materialCode, DateTime accountDate) { + await _wmsRepository.BatchDeleteAsync(); //有条码的业务（可根据条码/K号/底盘号，查询是否结算过，结算期间） - var _ls = _dapper.GetWmsSearchWithCodeReportList(version, "0"); + var _ls = _dapper.GetWmsSearchWithCodeReportList(cnumber, materialCode); + + //var _count = _wmsRepository.Count(p =>p.State > 0); + //if (_count > 0) + //{ + // throw new BusinessException("8899", "状态大于0不能生成!"); + //} + //else + //{ + // await _wmsRepository.BatchDeleteAsync(); + //} - var _count = _wmsRepository.Count(p => p.Version == version && p.State > 0); - if (_count > 0) - { - throw new BusinessException("8899", "不能重新生成此版本!"); - } - else - { - var query = _wmsRepository.Where(p => p.Version == version); - await query.BatchDeleteAsync(); - } List _lst = new List(); if (_ls != null && _ls.Count() > 0) { @@ -88,7 +89,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS Guid.NewGuid(), itm.客户, itm.出库类型, - version, + string.Empty, itm.结算单, itm.通用代码号, itm.物料号, @@ -107,6 +108,16 @@ namespace Win.Sfs.SettleAccount.Entities.WMS )); } } + //过滤 物料号 + if (!string.IsNullOrEmpty(materialCode)) + { + var _org_groupList = materialCode.Split(new char[] { '\n' }).Distinct().ToList(); + var _groupList = _org_groupList[0].Replace("\\n", ",").TrimEnd(','); + if (_groupList.Count() > 0) + { + _lst = _lst.Where(p => _groupList.Contains(p.MaterialCode)).ToList(); + } + } await _wmsRepository.GetDbContext().BulkInsertAsync(_lst); return ApplicationConsts.SuccessStr; } @@ -120,17 +131,17 @@ namespace Win.Sfs.SettleAccount.Entities.WMS virtual public async Task> GetListAsync(WmsRequestDetailReportDto input) { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - //客户过滤 - if (!string.IsNullOrEmpty(input.Client)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client }); - } - //出库类型 - if (!string.IsNullOrEmpty(input.Type)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type }); - } + //input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); + ////客户过滤 + //if (!string.IsNullOrEmpty(input.Client)) + //{ + // input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client }); + //} + ////出库类型 + //if (!string.IsNullOrEmpty(input.Type)) + //{ + // input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type }); + //} var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true); var totalCount = await GetCountAsync(input); @@ -156,23 +167,23 @@ namespace Win.Sfs.SettleAccount.Entities.WMS [Route("Export")] virtual public async Task ExportAsync(WmsRequestDetailReportDto input) { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - //客户过滤 - if (!string.IsNullOrEmpty(input.Client)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client }); - } - //出库类型 - if (!string.IsNullOrEmpty(input.Type)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type }); - } + //input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); + ////客户过滤 + //if (!string.IsNullOrEmpty(input.Client)) + //{ + // input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client }); + //} + ////出库类型 + //if (!string.IsNullOrEmpty(input.Type)) + //{ + // input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type }); + //} var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, 0, true); var dtoDetails = ObjectMapper.Map, List>(entities); IExporter _excel = new ExcelExporter(); byte[] result = null; - var _fileName = string.Format("差异清单(有单号)报表_{0}.xlsx", Guid.NewGuid().ToString()); + var _fileName = string.Format("已结算出库查询_{0}.xlsx", Guid.NewGuid().ToString()); result = await _excel.ExportAsByteArray(dtoDetails); result.ShouldNotBeNull(); //保存导出文件到服务器存成二进制 diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs index 7e5afeb7..1b0dfcd6 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Volo.Abp; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Repositories.Dapper; using Volo.Abp.EntityFrameworkCore; @@ -1145,295 +1146,136 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report /// /// 有条码的业务（可根据条码/K号/底盘号，查询是否结算过，结算期间） /// - /// + /// 通用代码号 /// /// - public virtual List GetWmsSearchWithCodeReportList(string version, string state) + public virtual List GetWmsSearchWithCodeReportList(string CNumber, string materialCode) { + + if(string.IsNullOrEmpty(CNumber)) + { + throw new BusinessException("001", "通用代码号不能为空！"); + } + string getcnumber = ""; + var _org_cnumbersList = CNumber.Split(new char[] { '\n' }).Distinct().ToList(); + var _cnumbersList = _org_cnumbersList[0].Replace("\\n", ",").TrimEnd(',').Split(','); + foreach (var cnumber in _cnumbersList) + { + getcnumber += "'" + cnumber.ToString().Trim() + "'"+ ","; + } var _sql = "SELECT\n" + - " ROW_NUMBER ( ) OVER ( ORDER BY Type DESC ) 行号 ,\n" + - " temp1.Client 客户,\n" + - " temp1.Type 出库类型,\n" + - " temp1.BillNum 结算单,\n" + - " temp1.MaterialCode 物料号,\n" + - " temp1.CNumber 通用代码号,\n" + - " Isnull( temp1.Qty, 0 ) 结算数量,\n" + - " Isnull( temp1.OutputQty, 0 ) 实际出库数量,\n" + - " Isnull( temp1.Qty, 0 ) - Isnull( temp1.OutputQty, 0 ) 差异数量,\n" + - " temp1.Price 开票单价,\n" + - " Round( Isnull( temp1.Qty, 0 ) * temp1.Price, 2 ) 结算金额,\n" + - " Round( ( Isnull( temp1.Qty, 0 ) - Isnull( temp1.OutputQty, 0 ) ) * temp1.Price, 2 ) WMS待出库金额,\n" + - " temp2.EstimateType 物料组编码,\n" + - " temp2.EstimateTypeDesc 物料组车型,\n" + - " temp2.MaterialDesc 物料描述,\n" + - " temp1.remark 备注 \n" + - "FROM\n" + - " (\n" + - " SELECT\n" + - " '大众准时化出库' AS Type,\n" + - " '大众' Client,\n" + - " BillNum,\n" + - " MaterialCode,\n" + - " Qty,\n" + - " 0 OutputQty,\n" + - " 0 IsBack,\n" + - " Price,\n" + - " ChassisNumber CNumber,\n" + - " Remark \n" + - " FROM\n" + - " Set_WmsJitOutPutDetial \n" + - " WHERE\n" + - " VERSION = '{0}' \n" + - " AND State =2 UNION ALL\n" + - " SELECT\n" + - " '大众看板出库' AS Type,\n" + - " '大众' Client,\n" + - " BillNum,\n" + - " MaterialCode,\n" + - " Qty Qty,\n" + - " 0 OutputQty,\n" + - " 0 IsBack,\n" + - " Price,\n" + - " Kanban CNumber,\n" + - " Remark \n" + - " FROM\n" + - " Set_WmsKanbanOutPutDetial \n" + - " WHERE\n" + - " VERSION = '{0}' \n" + - " AND State =2 UNION ALL\n" + - " SELECT\n" + - " '大众无看板出库' AS Type,\n" + - " '大众' Client,\n" + - " BillNum,\n" + - " SapMaterialCode MaterialCode,\n" + - " Qty Qty,\n" + - " RealityNumber OutputQty,\n" + - " 0 IsBack,\n" + - " Price,\n" + - " '' CNumber,\n" + - " Remark \n" + - " FROM\n" + - " Set_WmsWithOutKanbanOutPutDetial \n" + - " WHERE\n" + - " VERSION = '{0}' \n" + - " AND State =2 UNION ALL\n" + - " SELECT\n" + - " '大众备件汇总出库' AS Type,\n" + - " '大众' Client,\n" + - " BillNum,\n" + - " MaterialCode,\n" + - " Qty Qty,\n" + - " RealityNumber OutputQty,\n" + - " 1 IsBack,\n" + - " Price,\n" + - " '' CNumber,\n" + - " Remark \n" + - " FROM\n" + - " Set_WmsSharePartOutPutDetial \n" + - " WHERE\n" + - " VERSION = '{0}' \n" + - " AND State =2 UNION ALL\n" + - " SELECT\n" + - " '大众备件条码出库' AS Type,\n" + - " '大众' Client,\n" + - " BillNum,\n" + - " MaterialCode,\n" + - " Qty Qty,\n" + - " 0 OutPutQty,\n" + - " 1 IsBack,\n" + - " Price,\n" + - " OrderBillNum CNumber,\n" + - " Remark \n" + - " FROM\n" + - " Set_WmsSharePart90OutPutDetial \n" + - " WHERE\n" + - " VERSION = '{0}' \n" + - " AND State =2 UNION ALL\n" + - " SELECT\n" + - " '红旗看板出库' AS Type,\n" + - " '红旗' Client,\n" + - " BillNum,\n" + - " MaterialCode,\n" + - " Qty Qty,\n" + - " 0 OutPutQty,\n" + - " 0 IsBack,\n" + - " Price,\n" + - " Kanban CNumber,\n" + - " Remark \n" + - " FROM\n" + - " Set_WmsHQHKanbanOutPutDetial \n" + - " WHERE\n" + - " VERSION = '{0}' \n" + - " AND State =2 UNION ALL\n" + - " SELECT\n" + - " '红旗一轿手工出库' AS Type,\n" + - " '红旗' Client,\n" + - " BillNum,\n" + - " SapMaterialCode MaterialCode,\n" + - " Qty,\n" + - " RealityNumber OutputQty,\n" + - " IsBack,\n" + - " Price,\n" + - " '' CNumber,\n" + - " Remark \n" + - " FROM\n" + - " Set_WmsHQWithOutKanbanOutPutDetial \n" + - " WHERE\n" + - " IsBack = 0 \n" + - " AND VERSION = '{0}' \n" + - " AND State =2 UNION ALL\n" + - " SELECT\n" + - " '红旗一轿手工出库(备件)' AS Type,\n" + - " '红旗' Client,\n" + - " BillNum,\n" + - " SapMaterialCode,\n" + - " Qty Qty,\n" + - " RealityNumber OutputQty,\n" + - " IsBack,\n" + - " Price,\n" + - " '' CNumber,\n" + - " Remark \n" + - " FROM\n" + - " Set_WmsOneTimeSaleOutPutDetial \n" + - " WHERE\n" + - " IsBack = 1 \n" + - " AND VERSION = '{0}' \n" + - " AND State =2 \n" + - - - "UNION ALL\n" + -"SELECT\n" + -" '一次性销售' AS TYPE,\n" + -" '一次性销售' Client,\n" + -" BillNum,\n" + -" SapMaterialCode,\n" + -" Qty Qty,\n" + -" RealityNumber OutputQty,\n" + -" 0 IsBack,\n" + -" Price,\n" + -" '' CNumber,\n" + -" Remark \n" + -"FROM\n" + -" Set_WmsOneTimeSaleOutPutDetial \n" + -"WHERE\n" + -" VERSION = '{0}' \n" + -" AND STATE = 2 \n" + - - - "Union All\n" + - - "SELECT\n" + -"'自定义发货出库' AS Type,\n" + -"customercode Client,\n" + -"BillNum,\n" + -"SapMaterialCode,\n" + -"Qty Qty,\n" + -"Qty OutputQty,\n" + -"'0' IsBack,\n" + -"Price,\n" + -"Kanban CNumber,\n" + -"Remark\n" + -"FROM\n" + -"Set_WmsCustomerKanbanOutPutDetial\n" + -"WHERE\n" + -"VERSION = '{0}'\n" + -"AND State =2\n" + + " ROW_NUMBER ( ) OVER ( ORDER BY Type DESC ) 行号 ,\n" + + " temp1.Client 客户,\n" + + " temp1.Type 出库类型,\n" + + " temp1.BillNum 结算单,\n" + + " temp1.MaterialCode 物料号,\n" + + " temp1.CNumber 通用代码号,\n" + + " Isnull( temp1.Qty, 0 ) 结算数量,\n" + + " Isnull( temp1.OutputQty, 0 ) 实际出库数量,\n" + + " Isnull( temp1.Qty, 0 ) - Isnull( temp1.OutputQty, 0 ) 差异数量,\n" + + " temp1.Price 开票单价,\n" + + " Round( Isnull( temp1.Qty, 0 ) * temp1.Price, 2 ) 结算金额,\n" + + " Round( ( Isnull( temp1.Qty, 0 ) - Isnull( temp1.OutputQty, 0 ) ) * temp1.Price, 2 ) WMS待出库金额,\n" + + " temp2.EstimateType 物料组编码,\n" + + " temp2.EstimateTypeDesc 物料组车型,\n" + + " temp2.MaterialDesc 物料描述,\n" + + " temp1.remark 备注 \n" + + "FROM\n" + + " (\n" + + " SELECT\n" + + " '大众准时化出库' AS Type,\n" + + " '大众' Client,\n" + + " BillNum,\n" + + " MaterialCode,\n" + + " Qty,\n" + + " 0 OutputQty,\n" + + " 0 IsBack,\n" + + " Price,\n" + + " ChassisNumber CNumber,\n" + + " Remark \n" + + " FROM\n" + + " Set_WmsJitOutPutDetial \n" + + " WHERE\n" + + " ChassisNumber IN ({0}) \n" + + " AND State = 2 UNION ALL\n" + + " SELECT\n" + + " '大众看板出库' AS Type,\n" + + " '大众' Client,\n" + + " BillNum,\n" + + " MaterialCode,\n" + + " Qty Qty,\n" + + " 0 OutputQty,\n" + + " 0 IsBack,\n" + + " Price,\n" + + " Kanban CNumber,\n" + + " Remark \n" + + " FROM\n" + + " Set_WmsKanbanOutPutDetial \n" + + " WHERE\n" + + " Kanban IN ({0}) \n" + + " AND State = 2 UNION ALL\n" + + " SELECT\n" + + " '大众备件条码出库' AS Type,\n" + + " '大众' Client,\n" + + " BillNum,\n" + + " MaterialCode,\n" + + " Qty Qty,\n" + + " 0 OutPutQty,\n" + + " 1 IsBack,\n" + + " Price,\n" + + " OrderBillNum CNumber,\n" + + " Remark \n" + + " FROM\n" + + " Set_WmsSharePart90OutPutDetial \n" + + " WHERE\n" + + " OrderBillNum IN ({0}) \n" + + " AND State = 2 UNION ALL\n" + + " SELECT\n" + + " '红旗看板出库' AS Type,\n" + + " '红旗' Client,\n" + + " BillNum,\n" + + " MaterialCode,\n" + + " Qty Qty,\n" + + " 0 OutPutQty,\n" + + " 0 IsBack,\n" + + " Price,\n" + + " Kanban CNumber,\n" + + " Remark \n" + + " FROM\n" + + " Set_WmsHQHKanbanOutPutDetial \n" + + " WHERE\n" + + " Kanban IN ({0}) \n" + + " AND State = 2 \n" + + //" UNION ALL SELECT\n" + + //" '自定义发货出库' AS Type,\n" + + //" customercode Client,\n" + + //" BillNum,\n" + + //" SapMaterialCode,\n" + + //" Qty Qty,\n" + + //" Qty OutputQty,\n" + + //" '0' IsBack,\n" + + //" Price,\n" + + //" Kanban CNumber,\n" + + //" Remark \n" + + //" FROM\n" + + //" Set_WmsCustomerKanbanOutPutDetial \n" + + //" WHERE\n" + + //" Kanban IN ({0}) \n" + + //" AND State = 2\n" + + " \n" + + " ) temp1\n" + + " LEFT JOIN ( SELECT MAX ( Id ) Id, MaterialCode, MaterialDesc, EstimateType, EstimateTypeDesc FROM Set_material GROUP BY MaterialCode, MaterialDesc, EstimateTypeDesc, EstimateType ) temp2 ON temp1.MaterialCode = temp2.MaterialCode"; - " ) temp1\n" + - " LEFT JOIN ( SELECT MAX ( Id ) Id, MaterialCode, MaterialDesc, EstimateType, EstimateTypeDesc FROM Set_material GROUP BY MaterialCode, MaterialDesc, EstimateTypeDesc, EstimateType ) temp2 ON temp1.MaterialCode = temp2.MaterialCode"; - //var _sql = "SELECT\n" + - // " ROW_NUMBER ( ) OVER ( ORDER BY Type DESC ) 行号 ,\n" + - // " temp1.Client 客户,\n" + - // " temp1.Type 出库类型,\n" + - // " temp1.BillNum 结算单,\n" + - // " temp1.MaterialCode 物料号,\n" + - // " temp1.CNumber 通用代码号,\n" + - // " Isnull( temp1.Qty, 0 ) 结算数量,\n" + - // " Isnull( temp1.OutputQty, 0 ) 实际出库数量,\n" + - // " Isnull( temp1.Qty, 0 ) - Isnull( temp1.OutputQty, 0 ) 差异数量,\n" + - // " temp1.Price 开票单价,\n" + - // " Round( Isnull( temp1.Qty, 0 ) * temp1.Price, 2 ) 结算金额,\n" + - // " Round( ( Isnull( temp1.Qty, 0 ) - Isnull( temp1.OutputQty, 0 ) ) * temp1.Price, 2 ) WMS待出库金额,\n" + - // " temp2.EstimateType 物料组编码,\n" + - // " temp2.EstimateTypeDesc 物料组车型,\n" + - // " temp2.MaterialDesc 物料描述,\n" + - // " temp1.remark 备注 \n" + - // "FROM\n" + - // " (\n" + - // " SELECT\n" + - // " '大众准时化出库' AS Type,\n" + - // " '大众' Client,\n" + - // " BillNum,\n" + - // " MaterialCode,\n" + - // " Qty,\n" + - // " 0 OutputQty,\n" + - // " 0 IsBack,\n" + - // " Price,\n" + - // " ChassisNumber CNumber,\n" + - // " Remark \n" + - // " FROM\n" + - // " Set_WmsJitOutPutDetial \n" + - // " WHERE\n" + - // " VERSION = '{0}' \n" + - // " AND State = 2 UNION ALL\n" + - // " SELECT\n" + - // " '大众看板出库' AS Type,\n" + - // " '大众' Client,\n" + - // " BillNum,\n" + - // " MaterialCode,\n" + - // " Qty Qty,\n" + - // " 0 OutputQty,\n" + - // " 0 IsBack,\n" + - // " Price,\n" + - // " Kanban CNumber,\n" + - // " Remark \n" + - // " FROM\n" + - // " Set_WmsKanbanOutPutDetial \n" + - // " WHERE\n" + - // " VERSION = '{0}' \n" + - // " AND State = 2 UNION ALL\n" + - // " SELECT\n" + - // " '大众备件条码出库' AS Type,\n" + - // " '大众' Client,\n" + - // " BillNum,\n" + - // " MaterialCode,\n" + - // " Qty Qty,\n" + - // " 0 OutPutQty,\n" + - // " 1 IsBack,\n" + - // " Price,\n" + - // " OrderBillNum CNumber,\n" + - // " Remark \n" + - // " FROM\n" + - // " Set_WmsSharePart90OutPutDetial \n" + - // " WHERE\n" + - // " VERSION = '{0}' \n" + - // " AND State = 2 UNION ALL\n" + - // " SELECT\n" + - // " '红旗看板出库' AS Type,\n" + - // " '红旗' Client,\n" + - // " BillNum,\n" + - // " MaterialCode,\n" + - // " Qty Qty,\n" + - // " 0 OutPutQty,\n" + - // " 0 IsBack,\n" + - // " Price,\n" + - // " Kanban CNumber,\n" + - // " Remark \n" + - // " FROM\n" + - // " Set_WmsHQHKanbanOutPutDetial \n" + - // " WHERE\n" + - // " VERSION = '{0}' \n" + - // " AND State = 2 \n" + - // " ) temp1\n" + - // " LEFT JOIN ( SELECT MAX ( Id ) Id, MaterialCode, MaterialDesc, EstimateType, EstimateTypeDesc FROM Set_material GROUP BY MaterialCode, MaterialDesc, EstimateTypeDesc, EstimateType ) temp2 ON temp1.MaterialCode = temp2.MaterialCode"; - _sql = string.Format(_sql, version, state); + _sql = string.Format(_sql, getcnumber.TrimEnd(',')); var _query = DbConnection.Query(_sql, null, null, true, 1200, null); - return _query.ToList(); + var _ls = _query.ToList(); + + return _ls; }