Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r28554 -r28580 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 28554) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 28580) @@ -4293,7 +4293,17 @@ obj.put("count", count); materialArray.add(obj); } - createInstanceTD = tousseDefinitionManager.newDisinfectGoodsDefinition(td, + TousseDefinition ancestorTD = null; + if(td.getAncestorID() != null && td.getAncestorID().longValue() != td.getId().longValue()){ + ancestorTD = tousseDefinitionManager.get(td.getAncestorID()); + if(ancestorTD.getAncestorID() != null && ancestorTD.getAncestorID().longValue() != ancestorTD.getId().longValue()){ + ancestorTD = tousseDefinitionManager.get(ancestorTD.getAncestorID()); + } + } + if(ancestorTD == null){ + ancestorTD = td; + } + createInstanceTD = tousseDefinitionManager.newDisinfectGoodsDefinition(ancestorTD, materialArray, application.getId()); appItem.setTousseDefinitionId(createInstanceTD.getId()); appItem.setMaterialAmount(createInstanceTD.getMaterialAmount()); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r28537 -r28580 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28537) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28580) @@ -1635,7 +1635,7 @@ alertDiv(barcode+",已入筐!"); }else{ var orgUnitName = $('#depart').val(); - var loadedAmount2 = tousseIntoBasketFunction(ti.id,td.id,td.name,1,td.isCleanedEntirely,orgUnitName,"",ti.barcode,td.tousseType,-1,'否',2,msg); + var loadedAmount2 = tousseIntoBasketFunction(ti.id,td.ancestorID,td.name,1,td.isCleanedEntirely,orgUnitName,"",ti.barcode,td.tousseType,-1,'否',2,msg); } }else{ var isExist = false; @@ -1660,7 +1660,7 @@ row: tmpRow, tousseItemId: '', tousseName: td.name, - tousseDefinitionID: td.id, + tousseDefinitionID: td.ancestorID, applicationAmount: 0, recycleAmount: 1, loadedAmount: 0, @@ -1676,12 +1676,12 @@ addToussItem(toussItem,sstsConfig.addTousseAtLastForRecycle); addBindGoods(toussItem,sstsConfig.addTousseAtLastForRecycle); //清除已删除的包 - cleanDeleteTousseItem(td.id); + cleanDeleteTousseItem(td.ancestorID); addErrorDamageRemark(ti,tmpRow); //未补充的丢失报损 loadUnSupplementMaterial(msg,tmpRow,ti.barcode); var orgUnitName = $('#depart').val(); - var loadedAmount2 = tousseIntoBasketFunction(ti.id,td.id,td.name,1,td.isCleanedEntirely,orgUnitName,"",ti.barcode,td.tousseType,-1,'否',2,msg); + var loadedAmount2 = tousseIntoBasketFunction(ti.id,td.ancestorID,td.name,1,td.isCleanedEntirely,orgUnitName,"",ti.barcode,td.tousseType,-1,'否',2,msg); } } }else{ //扫描标识牌实例条码