Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java =================================================================== diff -u -r14674 -r14721 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java (.../ForeignProxyDisinfectionManagerImpl.java) (revision 14674) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java (.../ForeignProxyDisinfectionManagerImpl.java) (revision 14721) @@ -585,6 +585,10 @@ for (ForeignProxyItem proxyItem : proxyItems) { proxyItem.setForeignProxyDisinfection(foreignProxyDisinfection); } + // 如果点击的装配并打印标签按钮或装配并打印申请单按钮,则对是否打印进行赋值 + if(isPackingAndPrint){ + foreignProxyDisinfection.setHasPrinted(Constants.STR_YES); + } saveOrUpdate(foreignProxyDisinfection); List printTousseInstances = new LinkedList(); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/foreignproxydisinfection/ForeignProxyDisinfection.java =================================================================== diff -u -r14617 -r14721 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/foreignproxydisinfection/ForeignProxyDisinfection.java (.../ForeignProxyDisinfection.java) (revision 14617) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/foreignproxydisinfection/ForeignProxyDisinfection.java (.../ForeignProxyDisinfection.java) (revision 14721) @@ -147,7 +147,6 @@ return dao.findBySql(TousseInstance.class.getSimpleName(), sql); } - @Transient public String getHasPrinted() { return hasPrinted; }