Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
===================================================================
diff -u -r34224 -r34294
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js	(.../awaitForRecycleList.js)	(revision 34224)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js	(.../awaitForRecycleList.js)	(revision 34294)
@@ -176,16 +176,42 @@
 				var confirmRecyclingAmount = getSystemSetConfig('confirmRecyclingAmount', false);
 				var specialInfection = result.data[i].specialInfection || '';
 				var recyclingTimes = result.data[i].recyclingTimes;
-				var haveUnRecycling = result.data[i].haveUnRecycling;
+				var haveUnRecycling = result.data[i].haveUnRecycling;//回收数量小于申请数量
+				var greaterThan = result.data[i].greaterThan;//回收数量大于申请数量
 				//根据状态修改背景颜色
 				var trColor = '';
 				if (status == '未确认') {
 					trColor = 'bgcolor="#FF8C69"';
 				}
 
-				if ((confirmRecyclingAmount && recycleAmountNeedConfirm == '是' && status !== '已确认') || result.data[i].recyclingStatus == '部分回收' || (haveUnRecycling && sstsConfig.enableRecyclingRecordBGColorWhenRecycleAmountLessThanApplyAmount)) {
+				if (result.data[i].recyclingStatus == '部分回收' || (haveUnRecycling && sstsConfig.enableRecyclingRecordBGColorWhenRecycleAmountLessThanApplyAmount)) {
 					trColor = 'bgcolor="yellow"';
 				}
+				
+				if(confirmRecyclingAmount && recycleAmountNeedConfirm == '是' && status !== '已确认'){
+					if(sstsConfig.backgroundColorOfRecyclingRecordWhichRecyclingAmountNotEqualToAppplyAmount){
+						var config = sstsConfig.backgroundColorOfRecyclingRecordWhichRecyclingAmountNotEqualToAppplyAmount;
+						if(haveUnRecycling && greaterThan){
+							if(config.greaterAndLessThanColor){
+								trColor = 'bgcolor="'+config.greaterAndLessThanColor+'"';
+							}else {
+								trColor = 'bgcolor="#FF8C69"';
+							}
+						}else if(haveUnRecycling){
+							if(config.lessThanColor){
+								trColor = 'bgcolor="'+config.lessThanColor+'"';
+							}else {
+								trColor = 'bgcolor="#FF8C69"';
+							}
+						}else if(greaterThan){
+							if(config.greaterThanColor){
+								trColor = 'bgcolor="'+config.greaterThanColor+'"';
+							}else {
+								trColor = 'bgcolor="#FF8C69"';
+							}
+						}
+					}
+				}
 
 				if (result.data[i].recyclingApplicationType == '外来器械包申请单' && result.data[i].recyclingStatus == '部分接收') {
 					trColor = 'bgcolor="yellow"';
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js
===================================================================
diff -u -r33951 -r34294
--- ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js	(.../config.js)	(revision 33951)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js	(.../config.js)	(revision 34294)
@@ -112,7 +112,7 @@
   //是否允许回收数量减小的部分超过待装配数量
   allowDecreaseRecyclingAmountGreatUnPackingAmount : true,
   //回收时，申请数量与回收数量不一致，是否要确认
-  //confirmRecyclingAmount:true,
+  confirmRecyclingAmount:true,
   //器械包定义是否批量修改
   tousseDefinitionCanBatchEdit : true,
   //禁用基数限制
@@ -248,5 +248,7 @@
   //PDA快速回收
   enableQuickRecyclelnUseRecordWithPDA:true,
   //当外来器械未归还时能否申请
-  canApplyForForeignTousseNotReturn:false
+  canApplyForForeignTousseNotReturn:false,
+  //回收数量与申请数量不一致的回收记录的背景颜色
+  backgroundColorOfRecyclingRecordWhichRecyclingAmountNotEqualToAppplyAmount : {"greaterThanColor":"#98FB98","lessThanColor":"#87CEEB","greaterAndLessThanColor":"#CC99CC"}
 }
\ No newline at end of file