Index: ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/config.js
===================================================================
diff -u -r15891 -r17217
--- ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/config.js	(.../config.js)	(revision 15891)
+++ ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/config.js	(.../config.js)	(revision 17217)
@@ -75,5 +75,7 @@
   //  是否校验生产厂家
   validateManufacturer : true,
   //在器械包视图列表列是否要显示【包装类型】、【灭菌程序】【所属任务组】这三个字段，为true：显示，为false或者没有配置：不显示
-  showTaskGroupAndPackageTypeAndSterilingMethod : true
+  showTaskGroupAndPackageTypeAndSterilingMethod : true,
+  //禁用整筐发货,默认为允许.true表示禁用,false表示允许
+  disableScanBasketInvoice : true
 }
\ No newline at end of file
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r17085 -r17217
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 17085)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 17217)
@@ -1809,6 +1809,9 @@
 		}
 	}
 	
+	/**
+	 * NOTINVOKE未被任务地方调用的方法,先注释起来
+	 */
 	public void updateProxyPrice(){
 		invoiceManager.updateProxyPrice();
 	}
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r17216 -r17217
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 17216)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 17217)
@@ -1027,6 +1027,7 @@
 				- orgPrice);
 		this.saveInvoice(invoice);
 		customTousseInstance.setFluctuationPrice(newToussePrice);
+		customTousseInstance.setDiscountPriceBySelf();
 		objectDao.saveOrUpdate(customTousseInstance);
 	}
 
@@ -1079,6 +1080,7 @@
 						double fPrice = supplyRoomConfigManager.getTousseFluctuationPrice(proxyPrice);
 						tousseInstance.setPrice(proxyPrice);
 						tousseInstance.setFluctuationPrice(fPrice);
+						tousseInstance.setDiscountPriceBySelf();
 						totalPrice += fPrice;
 					}
 				}
@@ -4183,6 +4185,11 @@
 					data);
 			return result;
 		}else if (barcodeDevice instanceof Container) {
+			//是否禁用整筐发货
+			Boolean disableScanBasketInvoice = CssdUtils.getSystemSetConfigByNameBool("disableScanBasketInvoice");
+			if(disableScanBasketInvoice != null && disableScanBasketInvoice.booleanValue()){
+				return buildErrorMsgJsonResult(String.format("系统不允许扫灭菌篮筐发货!"));
+			}
 			if(Invoice.TYPE_OPERATION_RESERVATION.equals(invoiceType)){
 				return buildErrorMsgJsonResult(String.format("手术预约发货暂时不支持扫篮筐发货!"));
 			}