Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r21477 -r21496
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 21477)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 21496)
@@ -473,6 +473,7 @@
 	{name : 'damageRemark'},
 	{name : 'urgentLevel'},
 	{name : 'idCardBarcode'},
+	{name : 'customSplitBasketAmount'},
 	{name : 'serialNumber'}
 ]});
 
@@ -502,6 +503,29 @@
 			align:'center',
 		    sortable: true,
 		    dataIndex: 'amount',
+		    renderer: function(v,p,record,rowIndex, columnIndex, store,view){
+		    	if(!sstsConfig.waitPackingTaskGrid_show_foreignTousse_customSplitBasketAmount){
+		    		return v;
+		    	}
+		    	if('basketTreeGrid' == treeId){
+		    		return v;
+		    	}
+		    	if(record.get('leaf')){
+		    		if(record.data.customSplitBasketAmount > 0){
+		    			return v+'('+record.data.customSplitBasketAmount+')';
+		    		}else{
+		    			return v;
+		    		}
+		    	}else{
+		    		if(record.data.customSplitBasketAmount > 0 && record.data.children.length <= 1){
+		    			return v+'('+record.data.customSplitBasketAmount+')';
+		    		}else{
+		    			return v;
+		    		}
+		    	}
+		    	
+		    	return v;
+		    },
 		    editor: {
 		        xtype: 'numberfield',
 		        allowBlank: true,
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
===================================================================
diff -u -r21435 -r21496
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 21435)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 21496)
@@ -1,4 +1,4 @@
-var sstsConfig = {
+var sstsConfig = {
   // 禁用标识牌功能
   disableIdCard : false,
   // 审核器械包必须入篮筐（一级供应室）
@@ -234,6 +234,8 @@
   invoicePlanExtractedView_showDisposableGoodsType:true,
   //一次性物品入库单页面是否显示hrp入库时间 : true为启用,false为不启用
   godownEntryShowHrpTime : true,
+  //装配任务列表，显示外来器械的自定义拆框数量
+  waitPackingTaskGrid_show_foreignTousse_customSplitBasketAmount: true,
   //科室申领中，是否重复打印当天已经打印的申领物品
   reprintTodayPrintedTousseItem : true
 }
\ No newline at end of file