Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java
===================================================================
diff -u -r31897 -r33219
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java	(.../SterileLoadingTableManager.java)	(revision 31897)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java	(.../SterileLoadingTableManager.java)	(revision 33219)
@@ -433,6 +433,12 @@
                     JSONUtil.addProperty(json, "status", status);
                     return json.toString(); 
                 }
+                //代理灭菌单上的包要接收了才能进行灭菌装载GDSZYY-131
+                if(StringUtils.equals(tousseInstance.hasReceived(), Constants.STR_NO)){
+					JSONUtil.addProperty(json, "returnType", "dataError");
+					JSONUtil.addProperty(json, JSONUtil.JSON_KEY_MESSAGE, tousseInstance.getTousseDefinitionName() + tousseInstance.getBarcode() + "未进行扫描接收，请先打开代理灭菌单进行扫描！");
+                    return json.toString();
+				}
 				
 				String orgUnitCoding = tousseInstance.getOrgUnitCoding();
 				if(StringUtils.isEmpty(orgUnitCoding)){
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
===================================================================
diff -u -r33214 -r33219
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java	(.../ProxyDisinfectionManagerImpl.java)	(revision 33214)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java	(.../ProxyDisinfectionManagerImpl.java)	(revision 33219)
@@ -251,7 +251,7 @@
 		int awaitReceiveTousseAmount = 0;
 		if(tousseInstanceList != null){
 			for (TousseInstance ti : tousseInstanceList) {
-				if(!StringUtils.equals(ti.getHasReceived(), Constants.STR_YES)){
+				if(!StringUtils.equals(ti.hasReceived(), Constants.STR_YES)){
 					awaitReceiveTousseAmount++;
 				}
 			}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseSimpleVO.java
===================================================================
diff -u -r30894 -r33219
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseSimpleVO.java	(.../TousseSimpleVO.java)	(revision 30894)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseSimpleVO.java	(.../TousseSimpleVO.java)	(revision 33219)
@@ -164,6 +164,14 @@
 	 */
 	private String taskGroup;
 	
+	/**
+	 * 接收状态(GDSZYY-102)，"待接收"的物品，字段值为“否”
+	 * 1、目前只用于代理灭菌单上物品的接收核对；
+	 * 2、一级供应室打开在装配记录里生成的代理灭菌单扫描就是接收；
+	 * 3、"已接收"的代理灭菌单物品，才能录入灭菌记录。
+	 */
+	private String hasReceived;
+	
 	public int getAmount() {
         return amount;
     }
@@ -498,4 +506,14 @@
 		this.taskGroup = taskGroup;
 	}
 
+
+	public String getHasReceived() {
+		return hasReceived;
+	}
+	
+
+	public void setHasReceived(String hasReceived) {
+		this.hasReceived = hasReceived;
+	}
+
 }
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r33029 -r33219
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 33029)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 33219)
@@ -1272,6 +1272,9 @@
                     vo.setOperator(rs.getString("operator"));
                 }catch(Exception e){}
                 try{
+                    vo.setHasReceived(rs.getString("hasReceived"));
+                }catch(Exception e){}
+                try{
                     Object stockAmountObj = rs.getObject("StockAmount");
                     if(stockAmountObj != null){
                         if(stockAmountObj instanceof BigDecimal){
@@ -2149,7 +2152,7 @@
         }
         
         //1.根据传入的条码查询vo
-        String querySql = "select ti.reviewBasket_id,ti.tousseName,ti.departCoding,ti.depart,ti.sterilingMode,b.barcode,td.isTraceable "+
+        String querySql = "select ti.reviewBasket_id,ti.tousseName,ti.departCoding,ti.depart,ti.sterilingMode,b.barcode,td.isTraceable, ti.hasReceived "+
             "from TousseInstance ti join barcodeDevice b on ti.id=b.id "+
             "join TousseDefinition td on ti.tousseDefinition_id=td.id  "+
             "join TousseDefinition tdAncestor on td.ancestorID=tdAncestor.id "+
@@ -2166,6 +2169,10 @@
                     bList.add(bStr);
                 }
             }
+            //包要接收了才能进行灭菌装载GDSZYY-131
+            if(StringUtils.equals(tousseSimpleVO.getHasReceived(), Constants.STR_NO)){
+            	throw new RuntimeException(tousseSimpleVO.getTousseName() + tousseSimpleVO.getBarcode() + "未进行扫描接收，请先打开代理灭菌单进行扫描！");
+            }
         }
         
         ReviewedBasket basket = reviewedBasketManager