Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
===================================================================
diff -u -r22175 -r23217
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 22175)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 23217)
@@ -226,7 +226,10 @@
 	private Boolean isTousseDgMergeConvert = false;//是否器械包一次性物品合并转换申请单
 	
 	private Boolean isPackingAfterWashTimeEnd = true;//是否清洗时间结束后装配
-	
+	/**
+	 * 高值耗材的处理科室
+	 */
+	private String showInvoicePlan = STR_NO;
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	public Long getId() {
@@ -775,5 +778,18 @@
 			Integer expensiveGoodsBillWarningTime) {
 		this.expensiveGoodsBillWarningTime = expensiveGoodsBillWarningTime;
 	}
+
+	public String getShowInvoicePlan() {
+		return showInvoicePlan;
+	}
+
+	public void setShowInvoicePlan(String showInvoicePlan) {
+		if(showInvoicePlan == null){
+			this.showInvoicePlan = STR_NO;
+		}else{
+			this.showInvoicePlan = showInvoicePlan;
+		}
+	}
 	
+	
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsIdentification.java
===================================================================
diff -u -r20513 -r23217
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsIdentification.java	(.../DisposableGoodsIdentification.java)	(revision 20513)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsIdentification.java	(.../DisposableGoodsIdentification.java)	(revision 23217)
@@ -55,8 +55,13 @@
 	 * his接口的批次id
 	 * 深圳南山同步入库时传递的批次batchId
 	 */
-	private String identification; 
+	private String identification;
 	
+	/**
+	 * 源标识id，发货时，目标仓库可能会增加库存，创建新的标识，新的标识会记住对应的源标识
+	 */
+	private Long srcIdentification;
+	
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	public Long getId() {
@@ -75,6 +80,14 @@
 		this.identification = identification;
 	}
 
+	public Long getSrcIdentification() {
+		return srcIdentification;
+	}
+
+	public void setSrcIdentification(Long srcIdentification) {
+		this.srcIdentification = srcIdentification;
+	}
+
 	public Date getEntryDate() {
 		return entryDate;
 	}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java
===================================================================
diff -u -r22678 -r23217
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java	(.../SubmitInvoiceContext.java)	(revision 22678)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java	(.../SubmitInvoiceContext.java)	(revision 23217)
@@ -83,6 +83,8 @@
 	private Map<String, WareHouse> targetWareHouseMap = new HashMap<>();
 	private Map<Long, WareHouse> targetIdToWareHouseMap = new HashMap<>();
 	
+	private WareHouse targetWareHouse = null;
+	private boolean targetDepartIsSupplyRoom = false;
 	/**
 	 * 发货员
 	 */
@@ -343,6 +345,22 @@
 		return targetIdToWareHouseMap;
 	}
 
+	public WareHouse getTargetWareHouse() {
+		return targetWareHouse;
+	}
+
+	public void setTargetWareHouse(WareHouse targetWareHouse) {
+		this.targetWareHouse = targetWareHouse;
+	}
+
+	public boolean isTargetDepartIsSupplyRoom() {
+		return targetDepartIsSupplyRoom;
+	}
+
+	public void setTargetDepartIsSupplyRoom(boolean targetDepartIsSupplyRoom) {
+		this.targetDepartIsSupplyRoom = targetDepartIsSupplyRoom;
+	}
+
 	public String getSender() {
 		return sender;
 	}