Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r23974 -r24267 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 23974) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 24267) @@ -1299,7 +1299,7 @@ JSONObject params = recyclingContext.getJsonParamObject(); boolean autoReturnTheBorrowingTousse = recyclingContext.getAutoReturnTheBorrowingTousse(); //放入篮筐的物品 - List basketItemJson = JSONUtil.fromJson(params.getJSONArray("tousseJson"), RecyclingBasketItemVo.class) ; + List basketItemJson = JSONUtil.fromJson(params.optJSONArray("tousseJson"), RecyclingBasketItemVo.class) ; //未入篮筐删掉的物品 JSONArray deleteTousseItems = params.optJSONArray("delToussItems"); //加急物品 @@ -3196,8 +3196,9 @@ for (String tousseName : groupDatasByName.keySet()){ Collection list = groupDatasByName.getCollection(tousseName); - if(list.size() != 2) + if(list.size() != 2){ continue; + } Iterator iterator = list.iterator(); TousseItem borrowTousseItem = iterator.next(); TousseItem recycleItem = iterator.next(); @@ -3907,7 +3908,7 @@ //当前入筐的是普通器械包,验证篮筐内是否有标识牌条码 } else { for (int n = 0; n < scanedGoods.size(); n++) { - JSONObject scanedItem = scanedGoods.getJSONObject(n); + JSONObject scanedItem = scanedGoods.optJSONObject(n); String scanedIdCardBarcode = scanedItem.optString("idCardBarcode"); String itemType = scanedItem.optString("type"); if (ClassifiedItem.TYPE_TOUSSE.equals(itemType)