Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.jsp
===================================================================
diff -u -r23512 -r25072
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.jsp	(.../godownEntryView.jsp)	(revision 23512)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.jsp	(.../godownEntryView.jsp)	(revision 25072)
@@ -1,3 +1,4 @@
+<%@page import="com.forgon.tools.Constants"%>
 <%@page import="com.forgon.disinfectsystem.entity.assestmanagement.GodownEntryItem"%>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier,com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry "%>
 <%@ page contentType="text/html; charset=UTF-8"%>
@@ -17,6 +18,7 @@
 <title>入库单信息</title>
 <script type="text/javascript">
 var TYPE_IN = '<%=GodownEntry.TYPE_IN%>';
+var STR_YES = '<%=Constants.STR_YES%>';
 var HAS_TYPE_YES = '<%=GodownEntryItem.HAS_TYPE_YES%>';
 var HAS_TYPE_NO = '<%=GodownEntryItem.HAS_TYPE_NO%>';
 var HAS_TYPE_PASS = '<%=GodownEntryItem.HAS_TYPE_PASS%>';
@@ -45,7 +47,8 @@
 <script language="javascript" src="${ctx}/disinfectsystem/print/LodopFuncs.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/print/print.js" /></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/print/printConfig.js" /></script>
-
+<!--  -->
+<link rel="stylesheet" type="text/css" href="${ctx}/common/common.css"/>
 <script type="text/javascript">
 	var curUserName = '${userName}';
     var SSTS_WarehouseEntry_Create = true;
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
===================================================================
diff -u -r23856 -r25072
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 23856)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 25072)
@@ -949,8 +949,8 @@
 			top.Ext.getCmp("time").setValue(Ext.util.Format.date(new Date(action.result.data.time.time), 'Y-m-d H:i'));
 			setWareHouseInfo(action.result.data.warehouseID,action.result.data.warehouseName);
 			top.Ext.getCmp("wareHouse1").setValue(action.result.data.warehouseID);
-			top.Ext.getCmp("equipmentVerifier").setValue(action.result.data.equipmentVerifier);
-			top.Ext.getCmp("supplyRoomVerifier").setValue(action.result.data.supplyRoomVerifier);
+			top.Ext.getCmp("equipmentVerifier").setValue(action.result.data.equipmentVerifier);//设备科核对人
+			top.Ext.getCmp("supplyRoomVerifier").setValue(action.result.data.supplyRoomVerifier);//供应室核对人
 
 			for(var i = 0 ;i < action.result.data.itemsList.length ;i++){
 				var specification = action.result.data.itemsList[i].diposableGoods.specification;
@@ -1011,6 +1011,10 @@
  * 页面中需要定义 modify(v,data) 函数
  */
 function modify(v,data){
+	if(sstsConfig.showDisposableGoodsGodownEntryVerifier){
+		commonEntry.setSupplyRoomVerifier(data['supplyRoomVerifier']);
+		commonEntry.setEquipmentVerifier(data['equipmentVerifier']);
+	};
 	editRecord(data['id']);
 }
 
@@ -1030,12 +1034,16 @@
 		{header : "HRP入库时间",width : 200,dataIndex : 'hrpTime' , renderer : myDateFormatByMinute, hidden : !sstsConfig.godownEntryShowHrpTime},
 		{header : "金额",width : 200,dataIndex : 'totalPrice'},
 		{header : "供应商",width : 200,dataIndex : 'supplierName'},
+		{header : "是否已有双人核对",width : 120,dataIndex : 'isHasVerifier', hidden : !sstsConfig.showDisposableGoodsGodownEntryVerifier},
 		{id : 'operationRemark',header : "备注",width : 120,dataIndex : 'remark'}
 	];
 
 	var readerDetail = [
 	    {name : 'id'}, 
 	    {name : 'serialNumber'},
+	    {name : 'isHasVerifier'},//是否已有双人核对(目前只省医有用)
+	    {name : 'supplyRoomVerifier'},//供应室核对人(目前只省医有用)
+	    {name : 'equipmentVerifier'},//设备科核对人(目前只省医有用)
 	    {name : 'operator'},
 	    {name : 'time'}, 
 	    {name : 'remark'},
@@ -1053,7 +1061,8 @@
 	        {type: 'date',  dataIndex: 'time'},
 	        {type: 'string',  dataIndex: 'remark'},
 	        {type: 'string',  dataIndex: 'totalPrice'},
-	        {type: 'string',  dataIndex: 'supplierName'}
+	        {type: 'string',  dataIndex: 'supplierName'},
+	        {type: 'string',  dataIndex : 'isHasVerifier'}
 	    ]}
 	);
 
@@ -1169,7 +1178,14 @@
 		plugins: filters,
 		autoExpandColumn : 'operationRemark',
 		renderTo : 'gridDiv',
-		frame : false
+		frame : false,
+		viewConfig:{
+			getRowClass : function(record,rowIndex,rowParams,store){
+	            if(sstsConfig.showDisposableGoodsGodownEntryVerifier && record.data.isHasVerifier != STR_YES ){
+	                return 'my_row_red div';
+	            }
+			}
+		}
 	}, readerDetail,
 		GodownEntryTableManager.findGodownEntryTableList,
 		null 
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryForm.js
===================================================================
diff -u -r23856 -r25072
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryForm.js	(.../godownEntryForm.js)	(revision 23856)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryForm.js	(.../godownEntryForm.js)	(revision 25072)
@@ -219,6 +219,7 @@
 					name : 'supplyRoomVerifierBarcode',
 					width : 100,
 					enableKeyEvents : true,
+					disabled : commonEntry.hasSupplyRoomVerifier() ? true:false,
 					listeners : {
 						render : function(c) {
 							c.getEl().on('keypress',function(e) {
@@ -252,6 +253,7 @@
 					typeAhead : false,
 					allowBlank : true,
     				width : 100,
+    				readlyOnly : commonEntry.hasSupplyRoomVerifier() ? true:false,
 					listeners : {
 						select : function(combo, record, index) {
 							top.Ext.getCmp('supplyRoomVerifier').setValue(record.data.name);
@@ -276,6 +278,7 @@
 					name : 'equipmentVerifierBarcode',
 					width : 100,
 					enableKeyEvents : true,
+    				disabled : commonEntry.hasEquipmentVerifier() ? true:false,
 					listeners : {
 						render : function(c) {
 							c.getEl().on('keypress',function(e) {
@@ -309,6 +312,7 @@
 					typeAhead : false,
 					allowBlank : true,
     				width : 100,
+    				readOnly : commonEntry.hasEquipmentVerifier() ? true:false,
 					listeners : {
 						select : function(combo, record, index) {
 							top.Ext.getCmp('equipmentVerifier').setValue(record.data.name);
@@ -1172,7 +1176,7 @@
 			}
 		},{
 			text : '保存核对人',
-			hidden: verifierUpdateButton || !sstsConfig.showDisposableGoodsGodownEntryVerifier||(commonEntry.isOpen()?false:true),
+			hidden: !showEntryVerifierButton(),
 			handler : function(){
 				var supplyRoomVerifier = top.Ext.getCmp('supplyRoomVerifier').getValue();//供应室核对员
 				var equipmentVerifier = top.Ext.getCmp('equipmentVerifier').getValue();//设备科核对员
@@ -1497,4 +1501,17 @@
 	});
 //	return isCheckSuccess;
 	return resutMassage;
-}
\ No newline at end of file
+};
+
+/*
+*是否显示保存审核人
+*/
+function showEntryVerifierButton(){
+	if(!verifierUpdateButton && sstsConfig.showDisposableGoodsGodownEntryVerifier){
+		if(commonEntry.isOpen() && !commonEntry.hasEquipmentVerifier() && !commonEntry.hasSupplyRoomVerifier()){
+			return true;
+		}
+		return false;
+	}
+	return false;
+};
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/commonEntry.js
===================================================================
diff -u -r22637 -r25072
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/commonEntry.js	(.../commonEntry.js)	(revision 22637)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/commonEntry.js	(.../commonEntry.js)	(revision 25072)
@@ -11,6 +11,35 @@
 	 */
 	var userName = '';
 	/**
+	 * 供应室核对人(暂时只有省医无菌物品入库使用该字段)
+	 */
+	var entrySupplyRoomVerifier = '';
+	/**
+	 * 设备科审核人(暂时只有省医无菌物品入库使用该字段)
+	 */
+	var entryEquipmentVerifier = '';
+	
+	/**
+	 * 是否已有供应室核对人
+	 *  @returns {Boolean} 
+	 */
+	this.hasSupplyRoomVerifier = function(){
+		if(entrySupplyRoomVerifier == null || entrySupplyRoomVerifier == ''){
+			return false;
+		}
+		return true;
+	}
+	/**
+	 * 是否已有设备科审核人
+	 *  @returns {Boolean} 
+	 */
+	this.hasEquipmentVerifier = function(){
+		if(entryEquipmentVerifier == null || entryEquipmentVerifier == ''){
+			return false;
+		}
+		return true;
+	}
+	/**
 	 * 是否是新添加一张单
 	 * @returns {Boolean} true表示是打开一张单，false表示是新添加一张单
 	 */
@@ -20,6 +49,13 @@
 		}
 		return true;
 	}
+	
+	this.setEquipmentVerifier = function(equipmentVerifier){
+		entryEquipmentVerifier = equipmentVerifier;
+	}
+	this.setSupplyRoomVerifier = function(supplyRoomVerifier){
+		entrySupplyRoomVerifier = supplyRoomVerifier;
+	}
 	this.setId = function(id){
 		entryid = id;
 	}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java
===================================================================
diff -u -r23492 -r25072
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java	(.../GodownEntry.java)	(revision 23492)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java	(.../GodownEntry.java)	(revision 25072)
@@ -22,6 +22,7 @@
 import org.hibernate.annotations.CascadeType;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.forgon.tools.Constants;
 
 /**
  * 入库单
@@ -139,6 +140,11 @@
 	 */
 	private String supplyRoomVerifier;
 	
+	/**
+	 * 是否已有双人核对（广东省医院这边无菌物品入库需要双人核对）默认为否
+	 */
+	private String isHasVerifier = Constants.STR_NO;
+	
 	@JsonIgnore
 	private List<GodownEntryItem> itemsList = new ArrayList<GodownEntryItem>();
 	
@@ -418,6 +424,14 @@
 		this.hrpTime = hrpTime;
 	}
 
+	public String getIsHasVerifier() {
+		return isHasVerifier;
+	}
+
+	public void setIsHasVerifier(String isHasVerifier) {
+		this.isHasVerifier = isHasVerifier;
+	}
+
 	public void calculateTotalPrice() {
 		totalPrice = 0.0;
 		List<GodownEntryItem> items = getItemsList();
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
===================================================================
diff -u -r23824 -r25072
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 23824)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 25072)
@@ -3215,6 +3215,10 @@
 				//4 修改入库单核对人
 				entry.setEquipmentVerifier(newEVerifier);
 				entry.setSupplyRoomVerifier(newOVerifier);
+				//若设备科核对人，供应室核对人都有则 是否已有双人核对为：是
+				if(StringUtils.isNotEmpty(newEVerifier)&&StringUtils.isNotEmpty(newOVerifier)){
+					entry.setIsHasVerifier(Constants.STR_YES);
+				}
 				objectDao.saveOrUpdate(entry);
 				
 				//5 记录日志