Index: ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintRowVo.java =================================================================== diff -u -r23651 -r23658 --- ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintRowVo.java (.../PrintRowVo.java) (revision 23651) +++ ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintRowVo.java (.../PrintRowVo.java) (revision 23658) @@ -1,8 +1,11 @@ package com.forgon.disinfectsystem.print.vo; +import java.util.ArrayList; import java.util.Date; +import java.util.List; import com.forgon.Constants; +import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.string.StringTools; import com.forgon.tools.util.ForgonDateUtils; @@ -14,6 +17,10 @@ private Long tousseItemId; // 对应的TousseItem的id /** + * 关联的多个申请项id。主要由于合并打印的时候,多个申请项合并为一行打印,需要记录多个申请项的id,用于更新打印状态 + */ + private List tousseItemIds = new ArrayList<>(); + /** * 祖先包定义ID,用于做合并 */ private Long ancestorID; @@ -82,6 +89,18 @@ this.tousseItemId = tousseItemId; } + public List getTousseItemIds() { + return tousseItemIds; + } + /** + * 添加申请项id到申请项id的集合中。在创建vo的时候及合并的时候调用 + */ + public void addTousseItemId(Long tousseItemId){ + if(DatabaseUtil.isPoIdValid(tousseItemId)){ + tousseItemIds.add(tousseItemId); + } + } + public Long getAncestorID() { return ancestorID; } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r23651 -r23658 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 23651) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 23658) @@ -2807,6 +2807,7 @@ rowVo.setRowPrice(MathTools.add(rowVo.getRowPrice(), printRowVo.getRowPrice()).doubleValue()); rowVo.setSendOutAmount(MathTools.add(rowVo.getSendOutAmount(), printRowVo.getSendOutAmount()).intValue()); rowVo.setPrice(MathTools.div(rowVo.getRowPrice(), rowVo.getGoodsAmount()).doubleValue()); + rowVo.addTousseItemId(printRowVo.getTousseItemId()); printRowVo = null; } } @@ -3048,6 +3049,7 @@ rowVo.setExternalCode(externalCode); rowVo.setTousseItemId(tousseItem.getId()); + rowVo.addTousseItemId(tousseItem.getId()); InvoicePlan invoicePlan = tousseItem.getInvoicePlan(); if (invoicePlan != null){ Index: ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js =================================================================== diff -u -r23298 -r23658 --- ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js (.../printApplicationGoods.js) (revision 23298) +++ ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js (.../printApplicationGoods.js) (revision 23658) @@ -188,7 +188,8 @@ var tousseItemIds = []; top.Ext4.Array.each(summary.pages, function(page){ top.Ext4.Array.each(page.rows, function(row){ - tousseItemIds.push(row.tousseItemId); + tousseItemIds = tousseItemIds.concat(row.tousseItemIds); +// tousseItemIds.push(row.tousseItemId); }); }); if(tousseItemIds.length > 0){