Index: forgon-core/src/main/java/com/forgon/Constants.java
===================================================================
diff -u -r12579 -r12917
--- forgon-core/src/main/java/com/forgon/Constants.java	(.../Constants.java)	(revision 12579)
+++ forgon-core/src/main/java/com/forgon/Constants.java	(.../Constants.java)	(revision 12917)
@@ -16,7 +16,8 @@
 public class Constants {
 
 	public final static String[] SOFTWARE_VERSION_ARRAY = new String[] {
-			"3.3.0","3.3.8", "3.3.9", "3.3.10","3.3.12","3.3.13","3.8.0","3.9.0","3.9.1","3.9.2","4.0.2","4.0.3","4.0.4","4.0.5","4.0.6","4.0.44","4.0.45","4.1.0"};// 版本列表
+			"3.3.0","3.3.8", "3.3.9", "3.3.10","3.3.12","3.3.13","3.8.0","3.9.0","3.9.1","3.9.2","4.0.2","4.0.3","4.0.4",
+			"4.0.5","4.0.6","4.0.44","4.0.45","4.1.0","4.1.1"};// 版本列表
 	public final static List<String> SOFTWARE_VERSION_LIST = Arrays
 			.asList(SOFTWARE_VERSION_ARRAY);
 	public final static String SOFTWARE_VERSION = SOFTWARE_VERSION_ARRAY[SOFTWARE_VERSION_ARRAY.length - 1];// 软件最新版本
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GoodPurchaseAction.java
===================================================================
diff -u -r12795 -r12917
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GoodPurchaseAction.java	(.../GoodPurchaseAction.java)	(revision 12795)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GoodPurchaseAction.java	(.../GoodPurchaseAction.java)	(revision 12917)
@@ -141,6 +141,7 @@
 				goodPurchaseItem.setSupplierName(supplierName);
 				
 				GoodPurchaseItems.add(goodPurchaseItem);
+				goodPurchasePlan.setOrgUnit(orgUnit);
 			}
 		}
 	}
@@ -184,14 +185,14 @@
 			GoodPurchasePlan entry = goodPurchasePlan;
 			
 			if (StringUtils.isNotBlank(id)) {
-				// 更新入库单,里面的item有可能会更新，新建，删除标识号。
+				// 
 				buildGoodPurchasePlanParamsForUpdate(original, entry);
 				
 				goodPurchasePlanManager.updateGoodPurchasePlan(original, entry, returnMsg);
 			} else {
 				Date time = new Date();
 				entry.setTime(time);
-				// 保存入库单,里面的item一定都是新建标识号对象,并且需要更新批次属性。
+				//
 				entry = goodPurchasePlan;
 				buildGoodPurchasePlanParamsForSave(entry);
 				
Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java
===================================================================
diff -u -r12780 -r12917
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java	(.../ReturnGoodsRecordTableManager.java)	(revision 12780)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java	(.../ReturnGoodsRecordTableManager.java)	(revision 12917)
@@ -109,6 +109,8 @@
 					+ AcegiHelper.getLoginUser()
 							.getCurrentOrgUnitCode() + "'";
 		}
+		sql += " and po.handleDepartCode = '" + AcegiHelper.getLoginUser()
+				.getCurrentOrgUnitCode() + "'";
 		return gridManager.renderGrid(parameterMap,
 				ReturnGoodsRecord.class.getSimpleName(), sql, new String[] {
 						"returnGoodsItems", "recyclingApplication" });
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GoodPurchasePlan.java
===================================================================
diff -u -r12562 -r12917
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GoodPurchasePlan.java	(.../GoodPurchasePlan.java)	(revision 12562)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GoodPurchasePlan.java	(.../GoodPurchasePlan.java)	(revision 12917)
@@ -11,6 +11,7 @@
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 
 import org.hibernate.annotations.Cache;
@@ -19,6 +20,7 @@
 import org.hibernate.annotations.CascadeType;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.forgon.directory.model.OrgUnit;
 
 /**
  * 采购计划单
@@ -40,6 +42,11 @@
 	
 	private String remark; //备注
 	
+	/**
+	 * 采购的科室
+	 */
+	private OrgUnit orgUnit;
+	
 	@JsonIgnore
 	private List<GoodPurchaseItem> itemsList = new ArrayList<GoodPurchaseItem>();
 	
@@ -67,7 +74,15 @@
 	public void setId(Long id) {
 		this.id = id;
 	}
+	@ManyToOne
+	@JoinColumn(name = "orgUnit_id")
+	public OrgUnit getOrgUnit() {
+		return orgUnit;
+	}
 
+	public void setOrgUnit(OrgUnit orgUnit) {
+		this.orgUnit = orgUnit;
+	}
 	public String getSerialNumber() {
 		return serialNumber;
 	}
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GoodPurchaseTableManager.java
===================================================================
diff -u -r12562 -r12917
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GoodPurchaseTableManager.java	(.../GoodPurchaseTableManager.java)	(revision 12562)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GoodPurchaseTableManager.java	(.../GoodPurchaseTableManager.java)	(revision 12917)
@@ -7,6 +7,7 @@
 
 import com.forgon.component.grid.GridManager;
 import com.forgon.databaseadapter.service.DateQueryAdapter;
+import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry;
 import com.forgon.disinfectsystem.entity.assestmanagement.GoodPurchasePlan;
 
@@ -68,6 +69,7 @@
 			sql += " and po.time <= " + dateQueryAdapter.dateAdapter(endDate);
 		}
 
+		sql += (" and po.orgUnit.orgUnitCoding = '" + AcegiHelper.getCurrentOrgUnitCode() + "'");
 		return gridManager.renderGrid(parameterMap,
 				GoodPurchasePlan.class.getSimpleName(), sql,
 				new String[] { "itemsList" });