Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r21034 -r21035 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 21034) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 21035) @@ -5331,6 +5331,10 @@ obj.put(JSONUtil.JSON_KEY_MESSAGE, String.format("条码为[%s]的高值耗材状态不为%s", barcode , ExpensiveGoodsInstance.STATUS_DELIVERED)); return obj; } + if(!StringUtils.equals(expensiveGoodsInstance.getLocation(), currentOrgUnitCode)){ + obj.put(JSONUtil.JSON_KEY_MESSAGE, String.format("条码为[%s]的高值耗材当前所在位置为%s,与当前用户所属科室不一致,不能录入", barcode , expensiveGoodsInstance.getLocationForDisplay())); + return obj; + } obj.put("id", expensiveGoodsInstance.getId()); obj.put("barcode", expensiveGoodsInstance.getBarcode()); obj.put("showTousseName", expensiveGoods.getShowName());