Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java =================================================================== diff -u -r38452 -r38499 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java (.../InvoicePlanOptimizeManagerImpl.java) (revision 38452) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java (.../InvoicePlanOptimizeManagerImpl.java) (revision 38499) @@ -571,7 +571,7 @@ invoiceOrigin, tousseDeliverOccasion); //查询待发货申请单的申请项(最后一个%s点位符用于插入时间过滤条件用,无时间过滤条件时,替换为空字符串) - String queryTousseItemSql = String.format("select invoicePlanId,invoicePlanType,tousseName,tousseType,diposable,grade,applicationTime from (select "+ invoicePlanTableAlias +".id invoicePlanId," + String queryTousseItemSql = String.format("select invoicePlanId,invoicePlanType,tousseName,tousseType,diposable,grade,applicationTime,amount,urgentAmount from (select "+ invoicePlanTableAlias +".id invoicePlanId," + invoicePlanTableAlias +".type invoicePlanType," + tousseItemTableAlias +".tousseName," + tousseItemTableAlias +".tousseType," @@ -647,7 +647,7 @@ invoiceOrigin, tousseDeliverOccasion); //查询待发货申请单的申请项(最后一个%s点位符用于插入时间过滤条件用,无时间过滤条件时,替换为空字符串) - String queryTousseItemSql = String.format("select invoicePlanId,invoicePlanType,tousseName,tousseType,diposable,grade,applicationTime from (select "+ invoicePlanTableAlias +".id invoicePlanId," + String queryTousseItemSql = String.format("select invoicePlanId,invoicePlanType,tousseName,tousseType,diposable,grade,applicationTime,amount,urgentAmount from (select "+ invoicePlanTableAlias +".id invoicePlanId," + invoicePlanTableAlias +".type invoicePlanType," + tousseItemTableAlias +".tousseName," + tousseItemTableAlias +".tousseType," Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r38474 -r38499 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 38474) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 38499) @@ -1777,7 +1777,7 @@ invoiceOrigin, tousseDeliverOccasion); //查询待发货申请单的申请项(最后一个%s点位符用于插入时间过滤条件用,无时间过滤条件时,替换为空字符串) - String queryTousseItemSql = String.format("select invoicePlanId,invoicePlanType,tousseName,tousseType,diposable,grade,applicationTime from (select "+ invoicePlanTableAlias +".id invoicePlanId," + String queryTousseItemSql = String.format("select invoicePlanId,invoicePlanType,tousseName,tousseType,diposable,grade,applicationTime,amount,urgentAmount from (select "+ invoicePlanTableAlias +".id invoicePlanId," + invoicePlanTableAlias +".type invoicePlanType," + tousseItemTableAlias +".tousseName," + tousseItemTableAlias +".tousseType,"