Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r32267 -r32306
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 32267)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 32306)
@@ -2226,10 +2226,6 @@
 //打印一次性物品汇总
 function printDisposableGoodsInvoicePlanSummary(printType){
 	var inventorySerialNumber = printConfig.inventorySerialNumber || [];
-	if(inventorySerialNumber.length == 0){
-		showResult('请先在printConfig.js里面配置物资编码');
-		return;
-	}
 	var records = top.Ext.getCmp('recordListStoreGrid').getSelectionModel().getSelections();
 	var printRecordIds = [];
 	if(records.length == 0){
@@ -3710,6 +3706,11 @@
 	     {header : "归还状态",width : 65 * fontSizeScale,dataIndex : 'returnStatus', renderer : renderReturnStatusColor},
          {header : "终止状态",width : 65 * fontSizeScale,dataIndex : 'endStatus'},
          {id:'operationRemark',header: "备注", dataIndex: 'remark'},
+		 {id:'applyRecycleDifferentMsg',width : 200 * fontSizeScale,header: "差异情况", dataIndex: 'applyRecycleDifferentMsg',renderer:function(v,p,record){
+			if(v !== ''){
+				return '<div style="background-color:#87CEFA">'+v+'</div>';
+			}
+		 }},
 	     {header : "拼音码",width : 120 * fontSizeScale,dataIndex : 'spelling',hidden:true}, 
 	     {header : "五笔码",width : 120 * fontSizeScale,dataIndex : 'wbCode',hidden:true}, 
 	     {header: "发货单状态", dataIndex: 'invoiceStatus',hidden:true},
@@ -3819,6 +3820,7 @@
 	     {name : 'readed'},
 	     {name : 'committedStatus'},
 	     {name : 'invoiceStatus'},
+		 {name : 'applyRecycleDifferentMsg'},
 	     {name : 'prepareRecycleOperator'},
 	     {name : 'prepareRecycleComfirmor'},
 	     {name : 'prepareRecycleDateTime'},
Index: ssts-web/src/main/webapp/disinfectsystem/message/messageView2.js
===================================================================
diff -u -r32189 -r32306
--- ssts-web/src/main/webapp/disinfectsystem/message/messageView2.js	(.../messageView2.js)	(revision 32189)
+++ ssts-web/src/main/webapp/disinfectsystem/message/messageView2.js	(.../messageView2.js)	(revision 32306)
@@ -45,7 +45,11 @@
 			}
 		},
 		{ header: "内容", id: 'content', dataIndex: 'content' },
-		{ header: "发布科室", width: 100, dataIndex: 'departName' },
+		{
+			header: "发布科室", width: 100, dataIndex: 'departName', renderer: function () {
+				return '系统自动发布';
+			}
+		},
 		{ header: "发布位置", width: 120, dataIndex: 'location' },
 		{ header: "发布时间", width: 120, dataIndex: 'publishTime', renderer: myDateFormatByMinute }
 	];