Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r30177 -r30399
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 30177)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 30399)
@@ -5912,7 +5912,7 @@
 	// 发货扫描时的扫条码处理,暂时从getInfoByBarcode复制而来，还需要做进一步的优化处理
 	@Override
 	public JsonObject getInfoByBarcodeForInvoiceScan(JsonObject params){
-		logger.debug("getInfoByBodyCodeForInvoiceScan params=" + params);
+		logger.debug("getInfoByBarcodeForInvoiceScan params=" + params);
 		
 //		switch(invoiceType){
 //		case Invoice.TYPE_OPERATION_RESERVATION:
@@ -6575,6 +6575,13 @@
 			result.add("tips", tips);
 			return result;
 		}else {
+			//SSTS-287 自定义发货，在“扫描条码”筐中扫描科室条码时,进行提示
+			if(barcodeDevice instanceof BarcodeDevice){
+				BarcodeDevice barcodeDeviceObject = (BarcodeDevice)barcodeDevice;
+				if(StringUtils.equals(invoiceType, Invoice.TYPE_CUSTOM)){
+					throw new SystemException(String.format("自定义发货只能扫描器械包实例条码,所扫的条码类型为:%s", barcodeDeviceObject.getType()));
+				}
+			}
 			JsonObject json = getOrgUnitJsonForCustomInvoice(barcodeStr);
 			if(json != null){
 				return json;