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 671635d0..6bc92812 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 @@ -1053,6 +1053,34 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " IsBack = 1 \n" + " AND VERSION = '{0}' \n" + " AND State = 3 \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_WmsHQWithOutKanbanOutPutDetial \n" + +"WHERE\n" + +" VERSION = '{0}' \n" + +" AND STATE = 3"+ + + + + + + + + + + " ) 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 ";