Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/DeleteRecyclingRecordItemTests.java =================================================================== diff -u -r28711 -r28798 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/DeleteRecyclingRecordItemTests.java (.../DeleteRecyclingRecordItemTests.java) (revision 28711) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/DeleteRecyclingRecordItemTests.java (.../DeleteRecyclingRecordItemTests.java) (revision 28798) @@ -17,6 +17,7 @@ import test.forgon.disinfectsystem.AbstractCSSDTest; +import com.forgon.disinfectsystem.common.CssdUtils; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.becleanitem.ClassifiedItem; import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket; @@ -305,7 +306,13 @@ }catch (RecyclingRecordException e) { msg = e.getMessage(); } - assertEquals("Test开胸包已装配,不能修改!", msg); + //是否允许回收数量减小的部分超过待装配数量。如果允许,那装配任务就被删除 + boolean allowModifyRecyclingAmountBelowUnPackingAmount = CssdUtils.getSystemSetConfigByNameBool("allowDecreaseRecyclingAmountGreatUnPackingAmount"); + if(allowModifyRecyclingAmountBelowUnPackingAmount){ + assertEquals(null, msg); + }else{ + assertEquals("Test开胸包已装配,不能修改!", msg); + } } }