Index: ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintRowVo.java =================================================================== diff -u -r15689 -r15806 --- ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintRowVo.java (.../PrintRowVo.java) (revision 15689) +++ ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintRowVo.java (.../PrintRowVo.java) (revision 15806) @@ -59,6 +59,10 @@ private Double rowPrice; private int serialNumber; + /** + * 打印顺序 + */ + private Integer sequence = 0; public Long getTousseItemId() { return tousseItemId; @@ -227,4 +231,12 @@ public void setExpDate(String expDate) { this.expDate = StringTools.defaultIfBlank(expDate,""); } + + public Integer getSequence() { + return sequence; + } + + public void setSequence(Integer sequence) { + this.sequence = sequence == null?0:sequence; + } } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r15749 -r15806 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 15749) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 15806) @@ -2308,7 +2308,18 @@ rowVos.add(printRowVo); } } - + Collections.sort(rowVos, new Comparator(){ + @Override + public int compare(PrintRowVo o1, PrintRowVo o2) { + if(o1.getSequence() > o2.getSequence()){ + return 1; + }else if(o1.getSequence() < o2.getSequence()){ + return -1; + }else{ + return 0; + } + } + }); return rowVos; } @@ -2431,6 +2442,7 @@ rowVo.setSterileBatchNumber(batchStock.getSterileBatchNumber()); rowVo.setManufacturer(batchStock.getManufacturer()); rowVo.setExpDate(batchStock.getExpDateStr()); + rowVo.setSequence(disposableGoods.getSequence()); } }