Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r13624 -r13625 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 13624) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 13625) @@ -3191,28 +3191,32 @@ } } //追溯清洗的多个篮筐 - if(PackingTask.TASK_RECYCLINGRECORD.equals(currentPackingTask.getTaskType())){ - String basketBarcodes = currentPackingTask.getBasketBarcode(); - if(StringUtils.isNotBlank(basketBarcodes)){ - String sql = String.format("select distinct b.id from classifybasket b ,classifieditem i where " - + "b.id = i.classifybasket_id and b.containerbarcode in ('%s') and i.recyclingrecordid = %s ", - basketBarcodes.replaceAll(";", "','"),currentPackingTask.getSourceId()); - ResultSet rs = objectDao.executeSql(sql); - List li = new ArrayList(); - try { - while(rs.next()){ - String classifyBasketId = rs.getString(1); - li.add(classifyBasketId); + if(TousseDefinition.PACKAGE_TYPE_FOREIGN.equals(td.getTousseType()) || TousseDefinition.PACKAGE_TYPE_SPLIT.equals(td.getTousseType())){ + tousseInstance.setClassifyBasketIds("" + tousseInstance.getClassifyBasket_id()); + }else{ + if(PackingTask.TASK_RECYCLINGRECORD.equals(currentPackingTask.getTaskType())){ + String basketBarcodes = currentPackingTask.getBasketBarcode(); + if(StringUtils.isNotBlank(basketBarcodes)){ + String sql = String.format("select distinct b.id from classifybasket b ,classifieditem i where " + + "b.id = i.classifybasket_id and b.containerbarcode in ('%s') and i.recyclingrecordid = %s ", + basketBarcodes.replaceAll(";", "','"),currentPackingTask.getSourceId()); + ResultSet rs = objectDao.executeSql(sql); + List li = new ArrayList(); + try { + while(rs.next()){ + String classifyBasketId = rs.getString(1); + li.add(classifyBasketId); + } + } catch (SQLException e) { + e.printStackTrace(); + } finally{ + DatabaseUtil.closeResultSetAndStatement(rs); } - } catch (SQLException e) { - e.printStackTrace(); - } finally{ - DatabaseUtil.closeResultSetAndStatement(rs); + if(li.size() > 0){ + String [] idArray = li.toArray(new String[li.size()]); + tousseInstance.setClassifyBasketIds(StringUtils.join(idArray, ";")); + } } - if(li.size() > 0){ - String [] idArray = li.toArray(new String[li.size()]); - tousseInstance.setClassifyBasketIds(StringUtils.join(idArray, ";")); - } } } }