Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r35545 -r35571 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 35545) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 35571) @@ -3925,31 +3925,6 @@ return isChange; } - private void setIdCardBarcodeForPackingTask(Map idCardTaskMap) { - boolean autoSetIDCardBarcodeForPacking = CssdUtils.getSystemSetConfigByNameBool("autoSetIDCardBarcodeForPacking"); - if(autoSetIDCardBarcodeForPacking){ - if(idCardTaskMap.size() > 0){ - for (Long taskId : idCardTaskMap.keySet()) { - PackingTask task = idCardTaskMap.get(taskId); - TousseDefinition td = task.getTousseDefinition(); - if(TousseDefinition.STR_NO.equals(td.cleanedEntirely())){ - continue; - } - List idCardInfoList = packingManager.findIDCardForPackingTask(task.getId()); - if(idCardInfoList == null || idCardInfoList.size() != 1){ - continue; - } - IDCardInfoForPackingTask idCardInfo = idCardInfoList.get(0); - IDCardInstance instance = idCardInstanceManager.getIDCardInstanceByID("" + idCardInfo.getIdCardInstanceID()); - if(instance == null){ - throw new RuntimeException("id="+idCardInfo.getIdCardInstanceID()+"的标识牌实例已不存在!"); - } - task.setIdCardBarcode(instance.getBarcode()); - } - } - } - } - private void cleanErrorAndDamagePackingTaskId(Long taskId){ @SuppressWarnings("unchecked") List errors = objectDao.findBySql(MaterialErrorDamageDetail.class.getSimpleName(), "where po.packingTaskId = " + taskId);