Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r36372 -r36377 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 36372) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 36377) @@ -2830,10 +2830,12 @@ logger.debug("获取待装配任务sql:" + sql); try{ rs = objectDao.executeSql(sql); + boolean queryClassifyBasket_id = SqlUtils.isExistColumn(rs, "classifyBasket_id"); + boolean queryclassifyBasketIds = SqlUtils.isExistColumn(rs, "classifyBasketIds"); + boolean queryrecyclingUser = SqlUtils.isExistColumn(rs, "recyclingUser"); + boolean queryurgentLevelId = SqlUtils.isExistColumn(rs, "urgentLevelId"); while(rs.next()){ PackingTask task = new PackingTask(); - - BigDecimal taskIdBigDecimal = (BigDecimal)rs.getObject("taskId"); BigDecimal sourceIdBigDecimal = (BigDecimal)rs.getObject("sourceId"); BigDecimal washRecord_idBigDecimal = (BigDecimal)rs.getObject("washRecord_id"); @@ -2858,16 +2860,16 @@ task.setDamageRemark(rs.getString("damageRemark")); task.setUrgentLevel(rs.getString("urgentLevel")); - if(SqlUtils.isExistColumn(rs, "classifyBasket_id")){ + if(queryClassifyBasket_id){ task.setClassifyBasket_id(rs.getLong("classifyBasket_id")); } - if(SqlUtils.isExistColumn(rs, "classifyBasketIds")){ + if(queryclassifyBasketIds){ task.setClassifyBasketIds(rs.getString("classifyBasketIds")); } - if(SqlUtils.isExistColumn(rs, "recyclingUser")){ + if(queryrecyclingUser){ task.setRecyclingUser(rs.getString("recyclingUser")); } - if(enableUrgentFunction && SqlUtils.isExistColumn(rs,"urgentLevelId")){ + if(enableUrgentFunction && queryurgentLevelId){ Long urgentLevelId = rs.getLong("urgentLevelId"); if(urgentLevelId != null){ UrgentLevel ul = new UrgentLevel();