From a927f549bc932fc28798b2010c2e9cf43808603e Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 15 Apr 2022 14:03:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Report/WmsOutputSumDapperRepository.cs | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) 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 09b4ca55..2f779b72 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 @@ -598,8 +598,8 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report "SELECT\n" + "'4007' LOGN,\n" + -"'其他出库' AS Type,\n" + -"'其他出库' Client,\n" + +"'自定义发货出库' AS Type,\n" + +"'自定义发货出库' Client,\n" + "'Z37' CODE,\n" + "'10' SaleCode,\n" + "CustomerCode ClientCode,\n" + @@ -895,8 +895,8 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report "SELECT\n" + "'4007' LOGN,\n" + -"'其他出库' AS Type,\n" + -"'其他出库' Client,\n" + +"'自定义发货出库' AS Type,\n" + +"'自定义发货出库' Client,\n" + "'Z37' CODE,\n" + "'10' SaleCode,\n" + "CustomerCode ClientCode,\n" + @@ -1303,7 +1303,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report "Union All\n"+ "SELECT\n" + -"'其他结算' AS Type,\n" + +"'自定义发货出库' AS Type,\n" + "customercode Client,\n" + "BillNum,\n" + "SapMaterialCode,\n" + @@ -1591,11 +1591,27 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " Set_WmsHQWithOutKanbanOutPutDetial \n" + "WHERE\n" + " VERSION = '{0}' \n" + -" AND State = 4" + +" AND State = 4 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 =4\n" +