Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r40877 -r40897 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 40877) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 40897) @@ -4627,6 +4627,7 @@ Set noPassIDCardInstances = new HashSet();//不同回收的标识牌 Set delPackingTaskIds = new HashSet();//删除的装配任务id 主要是因为一种物品有多条装配任务,删除这种物品时,可能会出现重复删除一个id,然后报错的问题 Set ptIds = new HashSet(); + boolean isRecyclingApplication = invoicePlan == null || invoicePlan.isRecyclingApplication()?true:false; for (RecyclingBasketItemVo json : itemJsonList) { String tousseName = json.getTousseName(); Long tousseDefinitionID = json.getTousseDefinitionID(); @@ -4822,7 +4823,8 @@ } if(amount != 0){ recyclingContext.setAnyRecyclingAmountChanged(true); - if(!tousseItemManager.recycled(tousseItem)&&!recyclingRecord.statusComfirmed()){ + + if(!isRecyclingApplication && !tousseItemManager.recycled(tousseItem)&&!recyclingRecord.statusComfirmed()){ //已确认的不能再修改 task.setRecycleAmountNeedConfirm(Constants.STR_YES); }else if(recyclingContext.getRecyclingAmountConfirm() || recyclingRecord.recyclingApplicationRecord()){