Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r14357 -r14360 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 14357) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 14360) @@ -487,7 +487,7 @@ } private void addPackingTask(RecyclingApplication application, - Map tousseIdAndAmount) + Map tousseIdAndAmount) throws RecyclingRecordException { Map tousseItemMap = new HashMap(); @@ -500,7 +500,8 @@ Set tousseIdSet = tousseIdAndAmount.keySet(); for (Long tousseId : tousseIdSet) { // 如果为正数,则需要往装配管理添加数量,如果为负数,则需要减少数量,否则不需要调整数量 - int needAddAmount = tousseIdAndAmount.get(tousseId); + int needAddAmount = tousseIdAndAmount.get(tousseId).getAmount(); + Integer urgentAmount = tousseIdAndAmount.get(tousseId).getUrgentAmount(); if (needAddAmount != 0) { TousseDefinition td = tousseDefinitionManager .getTousseDefinitionById("" + tousseId); @@ -524,6 +525,7 @@ if (task == null) { task = new PackingTask(); if (needAddAmount > 0) { + task.setUrgentAmount(urgentAmount); task.setAmount(needAddAmount); task.setUnPackAmount(needAddAmount); task.setTousseDefinition(td); @@ -597,7 +599,7 @@ List itemList = application.getApplicationItems(); List toDeleteItems = new ArrayList(); - Map tousseIdAndMap = new HashMap(); + Map tousseIdAndMap = new HashMap(); for (TousseItem item : itemList) { if(!TousseItem.TYPE_DIPOSABLE_GOODS.equals(item.getTousseType())){ @@ -635,7 +637,10 @@ || (TousseDefinition.STR_YES.equals(td .getIsPacking()) && TousseDefinition.STR_NO .equals(td.getIsRecycling()))) { - tousseIdAndMap.put(td.getId(), item.getUpdateAmount(application.getCommittedStatus())); + TousseItem tousseItem = new TousseItem(); + tousseItem.setAmount(item.getUpdateAmount(application.getCommittedStatus())); + tousseItem.setUrgentAmount(item.getUrgentAmount()); + tousseIdAndMap.put(td.getId(),tousseItem); } } }