Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r20854 -r20969
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 20854)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 20969)
@@ -916,13 +916,13 @@
 			    }
 				var goodsName = goods.name;
 				// 验证是否为申请的物品
-				var b = isInvoiceGoods(goodsName);
-				if(!b){
-					if(result.data.length == 1){// 扫单个包才提示
-						showResult('['+getTtsNameByGoods(goods)+']不在发货计划中！');
-					}
-					continue;
-				}
+//				var b = isInvoiceGoods(goodsName);
+//				if(!b){
+//					if(result.data.length == 1){// 扫单个包才提示
+//						showResult('['+getTtsNameByGoods(goods)+']不在发货计划中！');
+//					}
+//					continue;
+//				}
 				
 				
 				if (sstsConfig.biologicalMonitoringEnable && biologicalMonitoringWarning) {  //发货时对含植入物的器械包，进行是否紧急发货以及生物监测情况的提示
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
===================================================================
diff -u -r20938 -r20969
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 20938)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 20969)
@@ -1,4 +1,4 @@
-var sstsConfig = {
+var sstsConfig = {
   // 禁用标识牌功能
   disableIdCard : false,
   // 审核器械包必须入篮筐（一级供应室）
@@ -222,6 +222,8 @@
   sycDefaultStartTime : true,
   //是否启用扫描器械包固定条码清洗功能: true为启用,false为不启用
   endbleScanTousseFixationBarcode : true,
+  // 发货界面使用简称
+  invoicePlanExtractedForm_useTtsName: true,
   //一次性物品入库单页面是否显示hrp入库时间 : true为启用,false为不启用
   GodownEntryShowHrpTime : true
 }
\ No newline at end of file
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r20910 -r20969
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 20910)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 20969)
@@ -4399,6 +4399,7 @@
 			if(Invoice.TYPE_CUSTOM.equals(invoiceType)){
 				return buildErrorMsgJsonResult("自定义发货暂时不支持高值耗材!");
 			}
+			boolean invoicePlanExtractedForm_useTtsName = CssdUtils.getSystemSetConfigByNameBool("invoicePlanExtractedForm_useTtsName");
 			// 高值耗材
 			ExpensiveDisposablegoods expensiveDisposablegoods = (ExpensiveDisposablegoods) barcodeDevice;
 			if(!expensiveDisposablegoods.inWarehouse()){
@@ -4417,7 +4418,12 @@
 				return buildErrorMsgJsonResult(String.format("条码为[%s]的高值耗材的物品定义已被删除", barcode));
 			}
 			String showName = diposableGoods.getShowName();
-			
+			if(invoicePlanExtractedForm_useTtsName){
+				String ttsName = diposableGoods.getTtsName();
+				if(invoicePlanExtractedForm_useTtsName && StringUtils.isNotBlank(ttsName)){
+					showName = ttsName;
+				}
+			}
 			DisposableGoodsBatchStock disposableGoodsBatchStock = expensiveDisposablegoods.getDisposableGoodsBatchStock();
 			if(disposableGoodsBatchStock == null){
 				return buildErrorMsgJsonResult(String.format("条码为[%s]的高值耗材的批次库存已被删除", barcode));
@@ -4521,6 +4527,7 @@
 			if(Invoice.TYPE_CUSTOM.equals(invoiceType)){
 				return buildErrorMsgJsonResult("自定义发货暂时不支持一次性物品!");
 			}
+			boolean invoicePlanExtractedForm_useTtsName = CssdUtils.getSystemSetConfigByNameBool("invoicePlanExtractedForm_useTtsName");
 			// 一次性物品
 			Long sourceWarehouseId = extraParam.get("sourceWarehouseId").getAsLong();
 			DisposableGoodsBatch disposableGoodsBatch = (DisposableGoodsBatch) barcodeDevice;
@@ -4530,8 +4537,12 @@
 				return buildErrorMsgJsonResult("此物品为高值耗材，请扫描高值耗材条码！");
 			}
 			String showName = diposableGoods.getShowName();
-			String name = diposableGoods.getShowNameForSmallestUnit();
-			
+			if(invoicePlanExtractedForm_useTtsName){
+				String ttsName = diposableGoods.getTtsName();
+				if(invoicePlanExtractedForm_useTtsName && StringUtils.isNotBlank(ttsName)){
+					showName = ttsName;
+				}
+			}
 			DisposableGoodsBatchStock disposableGoodsBatchStock = diposableGoodsManager.getDisposableGoodsStockByBatchNumber(sourceWarehouseId, diposableGoods.getId(), disposableGoodsBatch.getBatchNumber());
 			if(disposableGoodsBatchStock == null){
 				return buildErrorMsgJsonResult("批次库存为空！");
@@ -4850,6 +4861,7 @@
 		Set<Long> invoicePlanIds = new HashSet<>();
 		boolean tousseTypeApplyToInvoiceForm = CssdUtils.getSystemSetConfigByNameBool("invoicePlanExtractedView_TousseTypeApplyToInvoiceForm", false);
 		boolean hideUnprintedDisposableGoodsInvoicePlan = CssdUtils.getSystemSetConfigByNameBool("hideUnprintedDisposableGoodsInvoicePlan");
+		boolean invoicePlanExtractedForm_useTtsName = CssdUtils.getSystemSetConfigByNameBool("invoicePlanExtractedForm_useTtsName");
 		Set<Long> disposableGoodsIdSet = new HashSet<Long>();
 		for (InvoicePlan invoicePlan : invoicePlans) {
 			if (!invoicePlanManager.checkIsShowNoConBorrow(invoicePlan.getType(),invoicePlan.getBorrowConfirmStatus())){
@@ -5085,7 +5097,11 @@
 					Long disposableGoodsId = disposableGoods.getId();
 					ApplicationGoodsVo vo = datas.get(disposableGoodsId.toString());
 					if(vo != null ){
+						String ttsName = disposableGoods.getTtsName();
 						vo.setTtsName(disposableGoods.getTtsName());
+						if(invoicePlanExtractedForm_useTtsName && StringUtils.isNotBlank(ttsName)){
+							vo.setShowTousseName(ttsName);
+						}
 					}
 				}
 			}