Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java =================================================================== diff -u -r19804 -r19859 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java (.../ForeignTousseApplicationManager.java) (revision 19804) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java (.../ForeignTousseApplicationManager.java) (revision 19859) @@ -35,7 +35,7 @@ * 保存外来器械包申请单 * @param foreignTousseApplication 外来器械包申请单 * @param foreignTousseTreeData 外来器械包的一些数据 - * @param actionType 保存外来器械包的动作(值目前有四种:1、新增 2、干预 3、回收时修改 4、确认归还) + * @param actionType 保存外来器械包的动作(值目前有三种:1、新增 2、干预 3、确认归还) * @param basketBarcode */ public void saveOrUpdate(ForeignTousseApplication foreignTousseApplication, Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r19830 -r19859 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 19830) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 19859) @@ -3580,7 +3580,7 @@ toussePrice = td.getPrice(); if (TousseDefinition.PACKAGE_TYPE_FOREIGN - .equals(tousseType)) { + .equals(tousseType) && toussePrice == 0) { toussePrice = config.getForeignToussePrice(); } // toussePriceFloatPercent = config