Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r41085 -r41188 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 41085) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 41188) @@ -2903,6 +2903,9 @@ for (int i = 0; i < cameraPhotoInfo.size(); i++) { JSONObject cameraPhotoItem = (JSONObject)cameraPhotoInfo.get(i); Long tousseId = cameraPhotoItem.optLong("tousseId"); + if(tousseIdToRecyclingItemIdMap!= null && !tousseIdToRecyclingItemIdMap.containsKey(tousseId)){//可能被拆出去了 + continue; + } String barcode = cameraPhotoItem.optString("barcode"); String barcodeSql = null; if(StringUtils.isNotBlank(barcode)){ @@ -11103,6 +11106,7 @@ } /** + * 需要注意的是 以后物品新加功能和属性 拆出去容易因为参数未被拆 出现拆出去的物品缺失功能和属性 * 根据拆分物品的JSONArray,构建回收参数 * @param jsonArray 拆分物品 * @param oldJsonParam @@ -11150,6 +11154,11 @@ if(oldErrorDamageDetail == null){ oldErrorDamageDetail = new JSONArray(); } + JSONArray cameraPhotoInfo = new JSONArray(); + JSONArray oldCameraPhotoInfo = oldJsonParam.optJSONArray("cameraPhotoInfo"); + if(oldCameraPhotoInfo == null){ + oldCameraPhotoInfo = new JSONArray(); + } Set tdNameSet = new HashSet(); for (Object object : jsonArray) { JSONObject jsonObj = (JSONObject) object; @@ -11201,12 +11210,18 @@ errorDamageDetail.add(json); } } + for(int i=0;i