Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r29180 -r29185 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 29180) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 29185) @@ -3997,15 +3997,32 @@ */ private List getTousseItemVos(String appGoodsStr,String tousseInstanceInfos) { - List vos = new ArrayList(); + List vos = null; if (StringUtils.isNotBlank(tousseInstanceInfos)) { List tousses = new Gson().fromJson(tousseInstanceInfos, new TypeToken>(){}.getType()); - if(tousses != null){ - vos = tousses; + if(CollectionUtils.isNotEmpty(tousses)){ + vos = new ArrayList<>(); + for(TousseItemVo vo : tousses){ + //处理:HBSXKYY-36 PDA申请的借物单发不了货(申请器械包(或消毒物品、敷料包)时, 1.diposable字段为NULL的情况 2.disposableGoodsId为0) + if(StringUtils.equals(TousseItem.TYPE_DIPOSABLE_GOODS, vo.getTousseType())){ + vo.setDiposable(com.forgon.Constants.STR_YES); + }else{ + vo.setDiposable(com.forgon.Constants.STR_NO); + } + + Long disposableGoodsId = vo.getDisposableGoodsId(); + if(!DatabaseUtil.isPoIdValid(disposableGoodsId)){ + vo.setDisposableGoodsId(null); + } + vos.add(vo); + } + }else{ + vos = new ArrayList(); } }else{ // 此处代码应该删掉,为了以防万一,有些地方没改过来 if (StringUtils.isNotBlank(appGoodsStr)) { + vos = new ArrayList(); String[] goodsItemStrArray = appGoodsStr.split("#@"); for (String goodsItemStr : goodsItemStrArray) { String[] itemArray = goodsItemStr.split("#&");