Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r37812 -r38065 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 37812) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 38065) @@ -10586,8 +10586,11 @@ //高值耗材的逻辑 disposableGoodsBatch = diposableGoodsManager.getDisposableGoodsBatchById(((ExpensiveDisposablegoods)bd).getDisposableGoodsBatchID()); + if(!goodsDepartShareConfigManager.canShareGoodsforTwoDepart(useRecord.getDepartCoding(), edg.getLocation())){ + throw new SystemException(String.format("%s(%s)属于%s,无法录入", edg.getName(), edg.getBarcode(), edg.getLocationForDisplay())); + } // 取第1个发货明细用于录入使用记录 - List list = getDiposableGoodsItemCanUseForExpensiveDisposableGoods(useRecord.getDepartCoding(), bd.getId()); + List list = getDiposableGoodsItemCanUseForExpensiveDisposableGoods(edg.getLocation(), bd.getId()); if(CollectionUtils.isEmpty(list)){ String err = String.format("该物品(%s)的使用数量大于发货数量!", disposableGoods.getShowName()); throw new RuntimeException(err);