Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
===================================================================
diff -u -r22075 -r22134
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java	(.../ExpensiveGoodsGodownEntryAction.java)	(revision 22075)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java	(.../ExpensiveGoodsGodownEntryAction.java)	(revision 22134)
@@ -626,6 +626,16 @@
 				returnMsg.put("barcodeType", BarcodeDevice.BARCODE_TYPE_BARCODEINFORMATION);
 				returnMsg.put("barcodeInformation", barcodeDevice);
 			}else if(barcodeDevice instanceof ExpensiveGoodsInstance){// 高值耗材处理
+				ExpensiveGoodsInstance expensiveGoodsInstance = (ExpensiveGoodsInstance)barcodeDevice;
+				if(expensiveGoodsInstance.used()){
+					throw new RuntimeException("高值耗材已使用，不能退库!");
+				}
+				if(expensiveGoodsInstance.outWarehouse()){
+					throw new RuntimeException("高值耗材已退库，不能退库!");
+				}
+				if(!expensiveGoodsInstance.entryPrepare()){
+					throw new RuntimeException("高值耗材不是预入库，不能退库!");
+				}
 				JSONObject obj = buildExpensiveGoodsInfo((ExpensiveGoodsInstance)barcodeDevice);
 				returnMsg.put("barcodeType", BarcodeDevice.BARCODE_TYPE_EXPENSIVEGOODS);
 				returnMsg.put("expensiveGoodsInstance", obj);
Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
===================================================================
diff -u -r22129 -r22134
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java	(.../ExpensiveGoodsGodownEntryManagerImpl.java)	(revision 22129)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java	(.../ExpensiveGoodsGodownEntryManagerImpl.java)	(revision 22134)
@@ -440,6 +440,9 @@
 			if(!expensiveGoodsInstance.entryPrepare()){
 				throw new RuntimeException("目前只支持预入库的高值耗材退货!");
 			}
+			if(expensiveGoodsInstance.outWarehouse()){
+				throw new RuntimeException("高值耗材已退库，不能退库!");
+			}
 			if(expensiveGoodsInstance.used()){
 				throw new RuntimeException("高值耗材已使用，不能退库!");
 			}