Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r20552 -r20566 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 20552) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 20566) @@ -2042,8 +2042,13 @@ //2、终止对应的申请项 for(TousseItem tousseItem: tousseItems){ tousseItem.setIsTerminated(true); - // 删除关联的装配任务 - deleteAssociatedPackingTask(tousseItem,"终止申请项删除装配任务"); + + //ZSYKZX-81 终止申请单时需要不联动删除未装配的装配任务。 + boolean terminateInvoicePlanNotUpdatePackingTask = CssdUtils.getSystemSetConfigByNameBool("terminateInvoicePlanNotUpdatePackingTask", false); + if (!terminateInvoicePlanNotUpdatePackingTask) { + // 删除关联的装配任务 + deleteAssociatedPackingTask(tousseItem,"终止申请项删除装配任务"); + } } //3、更新申请单的状态 Index: ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js =================================================================== diff -u -r20510 -r20566 --- ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js (.../config.js) (revision 20510) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js (.../config.js) (revision 20566) @@ -28,6 +28,8 @@ enableTerminatePartOfApplication : true, //限制入库单填写的一次性物品为能申领的物品 restrictGodownEntryDiposableGoods : false, + //终止申请单或者终止申请项后不需要联动删除装配任务(true则不需要,false或者不配置都需要删除) + terminateInvoicePlanNotUpdatePackingTask: true, //提交申请单前显示申请的物品清单 showAppliedGoodsBeforeSubmit : true, // 隐藏使用记录的洗手护士域