Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
===================================================================
diff -u -r17815 -r19327
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js	(.../diposableGoodsView.js)	(revision 17815)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js	(.../diposableGoodsView.js)	(revision 19327)
@@ -49,7 +49,8 @@
 		  	    {name : 'expDate'},
 		  	    {name : 'hasPrinted'},
 		  	    {name : 'printTime'},
-		  	    {name : 'supplierName'}
+		  	    {name : 'supplierName'},
+		  	    {name : 'inventorySerialNumber'}
 		  	]
 		})
 	});
@@ -384,11 +385,25 @@
 						anchor : '95%'
 					}]
 				}, {
+					hidden: !sstsConfig.useRecordNewAfterSubmit,
 					columnWidth : 1,
 					layout : 'form',
 					labelWidth : 110,
 					items : [{
 						xtype : 'numberfield',
+						fieldLabel : '物资编码',
+						maxLength : '16',
+						id : 'inventorySerialNumber',
+						name : 'inventorySerialNumber',
+						allowBlank : true,
+						anchor : '95%'
+					}]
+				}, {
+					columnWidth : 1,
+					layout : 'form',
+					labelWidth : 110,
+					items : [{
+						xtype : 'numberfield',
 						fieldLabel : '参考价',
 						maxLength : '16',
 						id : 'referencePrice',
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
===================================================================
diff -u -r19154 -r19327
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 19154)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 19327)
@@ -222,6 +222,7 @@
 	}
 	
 	private void setUpdatingProperties(DisposableGoods curDisposableGoods,DisposableGoods disposableGoods){
+		curDisposableGoods.setInventorySerialNumber(disposableGoods.getInventorySerialNumber());//物资编码
 		curDisposableGoods.setCertification(disposableGoods.getCertification());
 		curDisposableGoods.setExternalCode(disposableGoods.getExternalCode());
 //		curDisposableGoods.setGoodsType(disposableGoods.getGoodsType());
@@ -249,6 +250,7 @@
 		curDisposableGoods.setNotInventoryDeptCode(disposableGoods.getNotInventoryDeptCode());
 	}
 	private void setUpdatingProperties(DisposableGoodsStock curDisposableGoods,DisposableGoods disposableGoods){
+		curDisposableGoods.setInventorySerialNumber(disposableGoods.getInventorySerialNumber());//物资编码
 		curDisposableGoods.setCertification(disposableGoods.getCertification());
 		curDisposableGoods.setExternalCode(disposableGoods.getExternalCode());
 //		curDisposableGoods.setGoodsType(disposableGoods.getGoodsType());
Index: forgon-core/src/main/java/com/forgon/log/model/Log.java
===================================================================
diff -u -r19166 -r19327
--- forgon-core/src/main/java/com/forgon/log/model/Log.java	(.../Log.java)	(revision 19166)
+++ forgon-core/src/main/java/com/forgon/log/model/Log.java	(.../Log.java)	(revision 19327)
@@ -43,6 +43,7 @@
 	public static final String MODEL_BASEDATA = "基础数据";
 	public static final String MODEL_INTERFERE = "干预模块";
 	public static final String MODEL_DISPOSABLEGOODS_WRITEBACK = "一次性物品回写";
+	public static final String MODEL_DISPOSABLEGOODS = "一次性物品";
 	public static final String MODEL_TOUSSEDEFINITION = "器械包定义";
 	public static final String MODEL_RECYCLINGERRORANDDAMAGE = "丢失报损模块";
 	public static final String MODEL_BORROW = "借物管理模块";
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js
===================================================================
diff -u -r19309 -r19327
--- ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js	(.../config.js)	(revision 19309)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js	(.../config.js)	(revision 19327)
@@ -58,5 +58,7 @@
   //一键回收是否启用,true为启用,否则为不启用
   recycleAllTousseIntoBasket : true,
   //材料物资编码是否启用，true为启用,false为不启用
-  hideInventorySerialNumber : true
+  hideInventorySerialNumber : true,
+  //显示一次性物品物资编码
+  disposableGoodsInventorySerialNumber : true
 }
\ No newline at end of file
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
===================================================================
diff -u -r19154 -r19327
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java	(.../DiposableGoodsAction.java)	(revision 19154)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java	(.../DiposableGoodsAction.java)	(revision 19327)
@@ -27,6 +27,8 @@
 
 import com.beust.jcommander.ParameterException;
 import com.forgon.Constants;
+import com.forgon.directory.acegi.tools.AcegiHelper;
+import com.forgon.directory.vo.LoginUserData;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
 import com.forgon.disinfectsystem.common.CssdUtils;
 import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodBatchStockManager;
@@ -43,6 +45,7 @@
 import com.forgon.systemsetting.service.HttpOptionManager;
 import com.forgon.tools.GB2Alpha;
 import com.forgon.tools.GB2WB;
+import com.forgon.tools.SpringBeanManger;
 import com.forgon.tools.StrutsParamUtils;
 import com.forgon.tools.StrutsResponseUtils;
 import com.forgon.tools.db.DatabaseUtil;
@@ -53,6 +56,8 @@
 import com.forgon.tools.util.SqlUtils;
 import com.opensymphony.xwork2.ModelDriven;
 import com.opensymphony.xwork2.Preparable;
+import com.forgon.log.model.Log;
+import com.forgon.log.service.LogManager;
 
 @ParentPackage(value = "default")
 @Namespace(value = "/disinfectSystem")
@@ -76,6 +81,8 @@
 	
 	private DisposableGoodsStorageRecordManager disposableGoodsStorageRecordManager;
 	
+	private LogManager appLogManager;
+	
 	public void setWareHouseManager(WareHouseManager wareHouseManager) {
 		this.wareHouseManager = wareHouseManager;
 	}
@@ -174,6 +181,15 @@
 				diposableGoods.setWbCode(GB2WB.getWBCode(diposableGoods.getName()));
 				diposableGoods.setNotInventoryGoods(StrutsParamUtils.getPraramValue("isInventoryGoods", ""));
 				if(DatabaseUtil.isPoIdValid(diposableGoods.getId())){
+					DisposableGoods origineDG = diposableGoodsManager.getDisposableGoodsById_ForUpdate(diposableGoods.getId().toString());
+					// 记录日志
+					if(origineDG != null){
+						appLogManager = (LogManager) SpringBeanManger.getBean("appLogManager");
+						String result = "包定义id=" + origineDG.getId() + ";" + comparedisposableGoodsDefinition(origineDG , diposableGoods);
+						if(StringUtils.isNotBlank(result)){
+							appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DISPOSABLEGOODS, Log.TYPE_UPDATE, result);
+						}
+					}
 					diposableGoodsManager.updateDisposableGoods_TRANS_REQUIRED(diposableGoods);
 				}else{
 					diposableGoodsManager.save(diposableGoods);
@@ -1243,5 +1259,91 @@
 			StrutsResponseUtils.output(jSONObject);
 		}
 	}
+	/**
+	 * 比较一次性物品包定义的修改，用于记录日志
+	 * @param origineDG 修改前的包定义
+	 * @param disposableGoods 修改后的包定义
+	 * @return
+	 */
+	public String comparedisposableGoodsDefinition(DisposableGoods origineDG , DisposableGoods disposableGoods){
+		StringBuffer modifyContent = new StringBuffer("");
+		if(!StringUtils.equals(origineDG.getName(), disposableGoods.getName())){
+			modifyContent.append("name属性修改前=").append(origineDG.getName()).append(",修改后=").append(disposableGoods.getName()).append(";");
+		}
+		if(!StringUtils.equals(origineDG.getInventorySerialNumber(), disposableGoods.getInventorySerialNumber())){
+			modifyContent.append("InventorySerialNumber属性修改前=").append(origineDG.getInventorySerialNumber()).append(",修改后=").append(disposableGoods.getInventorySerialNumber()).append(";");
+		}
+		if(!StringUtils.equals(origineDG.getCertification(), disposableGoods.getCertification())){
+			modifyContent.append("Certification属性修改前=").append(origineDG.getCertification()).append(",修改后=").append(disposableGoods.getCertification()).append(";");
+		}
+		if(!StringUtils.equals(origineDG.getExternalCode(), disposableGoods.getExternalCode())){
+			modifyContent.append("ExternalCode属性修改前=").append(origineDG.getExternalCode()).append(",修改后=").append(disposableGoods.getExternalCode()).append(";");
+		}
+		if(!StringUtils.equals(origineDG.getGrade(), disposableGoods.getGrade())){
+			modifyContent.append("Grade属性修改前=").append(origineDG.getGrade()).append(",修改后=").append(disposableGoods.getGrade()).append(";");
+		}
+		if(!StringUtils.equals(origineDG.getGuid(), disposableGoods.getGuid())){
+			modifyContent.append("Guid属性修改前=").append(origineDG.getGuid()).append(",修改后=").append(disposableGoods.getGuid()).append(";");
+		}
+		if(!StringUtils.equals(origineDG.getIsApplicationMaterial(), disposableGoods.getIsApplicationMaterial())){
+			modifyContent.append("IsApplicationMaterial属性修改前=").append(origineDG.getIsApplicationMaterial()).append(",修改后=").append(disposableGoods.getIsApplicationMaterial()).append(";");
+		}
+		if(!StringUtils.equals(origineDG.getIsPartOfTousseMaterial(), disposableGoods.getIsPartOfTousseMaterial())){
+			modifyContent.append("IsPartOfTousseMaterial属性修改前=").append(origineDG.getIsPartOfTousseMaterial()).append(",修改后=").append(disposableGoods.getIsPartOfTousseMaterial()).append(";");
+		}
+		if(!StringUtils.equals(origineDG.getIsSupplyRoomGoods(), disposableGoods.getIsSupplyRoomGoods())){
+			modifyContent.append("IsSupplyRoomGoods属性修改前=").append(origineDG.getIsSupplyRoomGoods()).append(",修改后=").append(disposableGoods.getIsSupplyRoomGoods()).append(";");
+		}
+		if((origineDG.getMaxStorage() == null ? 0 : origineDG.getMaxStorage().intValue()) !=  (disposableGoods.getMaxStorage() == null ? 0 :  disposableGoods.getMaxStorage().intValue())){
+			modifyContent.append("MaxStorage属性修改前=").append(origineDG.getMaxStorage()).append(",修改后=").append(disposableGoods.getMaxStorage()).append(";");
+		}
+		if((origineDG.getMinApplyAmount() == null ? 0 : origineDG.getMinApplyAmount().intValue()) !=  (disposableGoods.getMinApplyAmount() == null ? 0 :  disposableGoods.getMinApplyAmount().intValue())){
+			modifyContent.append("MinApplyAmount属性修改前=").append(origineDG.getMinApplyAmount()).append(",修改后=").append(disposableGoods.getMinApplyAmount()).append(";");
+		}
+		if((origineDG.getMinStorage() == null ? 0 : origineDG.getMinStorage().intValue()) !=  (disposableGoods.getMinStorage() == null ? 0 :  disposableGoods.getMinStorage().intValue())){
+			modifyContent.append("MinStorage属性修改前=").append(origineDG.getMinStorage()).append(",修改后=").append(disposableGoods.getMinStorage()).append(";");
+		}
+		if(!StringUtils.equals(origineDG.getPackageSpec(), disposableGoods.getPackageSpec())){
+			modifyContent.append("PackageSpec属性修改前=").append(origineDG.getPackageSpec()).append(",修改后=").append(disposableGoods.getPackageSpec()).append(";");
+		}
+		if(!StringUtils.equals(origineDG.getPrintInLabel(), disposableGoods.getPrintInLabel())){
+			modifyContent.append("PrintInLabel属性修改前=").append(origineDG.getPrintInLabel()).append(",修改后=").append(disposableGoods.getPrintInLabel()).append(";");
+		}
+		if(!StringUtils.equals(origineDG.getSpecification(), disposableGoods.getSpecification())){
+			modifyContent.append("Specification属性修改前=").append(origineDG.getSpecification()).append(",修改后=").append(disposableGoods.getSpecification()).append(";");
+		}
+		if(!StringUtils.equals(origineDG.getApplicationSpecification(), disposableGoods.getApplicationSpecification())){
+			modifyContent.append("ApplicationSpecification属性修改前=").append(origineDG.getApplicationSpecification()).append(",修改后=").append(disposableGoods.getApplicationSpecification()).append(";");
+		}
+		if(!StringUtils.equals(origineDG.getType(), disposableGoods.getType())){
+			modifyContent.append("Type属性修改前=").append(origineDG.getType()).append(",修改后=").append(disposableGoods.getType()).append(";");
+		}
+		if(!StringUtils.equals(origineDG.getUnit(), disposableGoods.getUnit())){
+			modifyContent.append("Unit属性修改前=").append(origineDG.getUnit()).append(",修改后=").append(disposableGoods.getUnit()).append(";");
+		}
+		if(!StringUtils.equals(origineDG.getMiddlePackageUnit(), disposableGoods.getMiddlePackageUnit())){
+			modifyContent.append("MiddlePackageUnit属性修改前=").append(origineDG.getMiddlePackageUnit()).append(",修改后=").append(disposableGoods.getMiddlePackageUnit()).append(";");
+		}
+		if(!StringUtils.equals(origineDG.getNotInventoryDeptCode(), disposableGoods.getNotInventoryDeptCode())){
+			modifyContent.append("NotInventoryDeptCode属性修改前=").append(origineDG.getNotInventoryDeptCode()).append(",修改后=").append(disposableGoods.getNotInventoryDeptCode()).append(";");
+		}
+		if((origineDG.getReferencePrice() == null ? 0 : origineDG.getReferencePrice().doubleValue()) !=  (disposableGoods.getReferencePrice() == null ? 0 :  disposableGoods.getReferencePrice().doubleValue())){
+			modifyContent.append("ReferencePrice属性修改前=").append(origineDG.getReferencePrice()).append(",修改后=").append(disposableGoods.getReferencePrice()).append(";");
+		}
+		if((origineDG.getUnitConvertCoefficient() == null ? 0 : origineDG.getUnitConvertCoefficient().doubleValue()) !=  (disposableGoods.getUnitConvertCoefficient() == null ? 0 :  disposableGoods.getUnitConvertCoefficient().doubleValue())){
+			modifyContent.append("UnitConvertCoefficient属性修改前=").append(origineDG.getUnitConvertCoefficient()).append(",修改后=").append(disposableGoods.getUnitConvertCoefficient()).append(";");
+		}
+		if((origineDG.getMaxApplyAmount() == null ? 0 : origineDG.getMaxApplyAmount().doubleValue()) !=  (disposableGoods.getMaxApplyAmount() == null ? 0 :  disposableGoods.getMaxApplyAmount().doubleValue())){
+			modifyContent.append("MaxApplyAmount属性修改前=").append(origineDG.getMaxApplyAmount()).append(",修改后=").append(disposableGoods.getMaxApplyAmount()).append(";");
+		}
+		if((origineDG.getTransferScale() == null ? 0 : origineDG.getTransferScale().doubleValue()) !=  (disposableGoods.getTransferScale() == null ? 0 :  disposableGoods.getTransferScale().doubleValue())){
+			modifyContent.append("TransferScale属性修改前=").append(origineDG.getTransferScale()).append(",修改后=").append(disposableGoods.getTransferScale()).append(";");
+		}
+		if((origineDG.getSequence() == null ? 0 : origineDG.getSequence().intValue()) !=  (disposableGoods.getSequence() == null ? 0 :  disposableGoods.getSequence().intValue())){
+			modifyContent.append("Sequence属性修改前=").append(origineDG.getSequence()).append(",修改后=").append(disposableGoods.getSequence()).append(";");
+		}
+		
+		return modifyContent.toString();
+	}
 	
 }