Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r37916 -r37927
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 37916)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 37927)
@@ -3147,11 +3147,18 @@
 		height = size.height;
 
 		offsetTop = offsetTop * zoomRatio;
+		var recyclingStatus = $("#recyclingStatus").val();
+		var canUpdatePrice = false;
+		if(sstsConfig.enableModifyThePriceOfForeignTousseInrecyclingRecord){
+			if(recyclingStatus == '待接收' || recyclingStatus == '部分接收'){
+				canUpdatePrice = true;
+			}
+		}
 
 		layerIndex = layer.open({
 			type: 2,
 			title: [tousseName + '  信息', true],
-			content: 'setForeignTousseDefinition.jsp?resolution=' + resolution + '&width=' + width + '&height=' + height + '&row=' + row + '&tousseDefinitionID=' + tousseDefinitionID + '&applicationId=' + params_appId + '&recyclingrecordId=' + params_id,
+			content: 'setForeignTousseDefinition.jsp?resolution=' + resolution + '&width=' + width + '&height=' + height + '&row=' + row + '&tousseDefinitionID=' + tousseDefinitionID + '&applicationId=' + params_appId + '&recyclingrecordId=' + params_id + '&canUpdatePrice=' + canUpdatePrice,
 			area: [width + 'px', height + heightExtra + 'px'],
 			border: [5, 0.3, '#fff', true],
 			closeBtn: [2, true],
Index: ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js
===================================================================
diff -u -r37883 -r37927
--- ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js	(.../config.js)	(revision 37883)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js	(.../config.js)	(revision 37927)
@@ -314,6 +314,8 @@
 enableFilteredDataIsNotExportedOfTousseInstanceView:true,
 //是否在回收清点模块显示回收时间
 enableDisplayRecyclingTimeOfrecyclingRecordList:true,
+//允许在回收申请单中修改外来器械包的价格
+enableModifyThePriceOfForeignTousseInrecyclingRecord:true,
 //回收是否修改申请单备注，true修改
 modifyRemarkInRecycling:true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp
===================================================================
diff -u -r32910 -r37927
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp	(.../updateAmount.jsp)	(revision 32910)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp	(.../updateAmount.jsp)	(revision 37927)
@@ -9,7 +9,11 @@
 <script type="text/javascript" src="commonRecycle.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script> 
  <script type="text/javascript" src="${ctx}/js/speaker.js?version=${svnRevision}"></script> 
-
+<style>
+	#button_1 {
+		display: none;
+	}
+</style>
 </head>
 <script>
 smartSpeaker.setType('<%=AcegiHelper.getLoginUser().getMessagePromptType()%>');
@@ -35,11 +39,13 @@
 }else{
 	isDialogStatus =isDialogStatus;
 }
+var isPrice = '${param.isPrice}';
 var clickNum;
 var WWWROOT = '${ctx}';
 if(customAmountSubmit){
 	clickNum = 0;
 }
+var labelName = isPrice == 'true' ? '价格':'数量';
 
 //动态加载JS和CSS
 document.write('<link href="${ctx}/disinfectsystem/touchScreen/recycle/${param.resolution}/images/style.css" rel="stylesheet" type="text/css" />');
@@ -64,11 +70,15 @@
 	}
     function submitButton(inputObj,updateResult){
     	if(inputObj.value != null && inputObj.value != ""){
-    		window.parent.openElement.innerText = inputObj.value;   
+			var value = inputObj.value;
+			if(inputObj.value.indexOf('.') > -1 && inputObj.value.split('.')[1] == ''){
+				value = value + '00';
+			}
+    		window.parent.openElement.innerText = value;   
 			if(window.parent.setRemarks){
 				window.parent.setRemarks(row,updateResult);
 			}
-    		confirmNUm(inputObj.value,'audioNum');
+    		confirmNUm(value,'audioNum');
 			if(typeof parent.closeUpdateAmount == 'function'){
 				parent.closeUpdateAmount();
 			}else {
@@ -85,28 +95,42 @@
 	function setInputValue(Number) {
 		var inputObj = document.getElementById('inputText');
 		var inputValue = inputObj.value;
-		/* if(inputValue == "" && Number == '0'){
-			return;
-		} */
 		confirmNUm(Number,'audioNum');
-		var temp = parseInt(inputValue + Number);
-		if(from == 'customLoadedAmount'){
-			var maxAmount = recycleAmount - loadedAmount;
-			if(temp > maxAmount){
-				alert('装载数量不能超过' + maxAmount);
-				return;
+		var temp = 0;
+		if(inputValue.indexOf('.') > -1 && inputValue.split('.')[1].length > 1){
+			return;
+		}
+		if(inputValue.indexOf('.') == -1 && Number !== '.'){
+			temp = parseInt(inputValue + Number);
+		}else if(inputValue.indexOf('.') == -1 && Number == '.'){
+			temp = inputValue + Number;
+		}else if(inputValue.indexOf('.') > -1 && Number !== '.'){
+			temp = inputValue + Number;
+		}else {
+			return;
+		}
+		if(isPrice == 'true'){
+			inputObj.value = temp;
+		}else {
+			if(from == 'customLoadedAmount'){
+				var maxAmount = recycleAmount - loadedAmount;
+				if(temp > maxAmount){
+					alert('装载数量不能超过' + maxAmount);
+					return;
+				}else{
+					inputObj.value = temp;
+					refreshLeftAmount();
+				}
 			}else{
-				inputObj.value = temp;
-				refreshLeftAmount();
+				if (parseInt(temp,10) <= MAX_RECYCLE_AMOUNT){
+					inputObj.value = temp;
+				}
+				else{
+					alert("最大回收数量为" + MAX_RECYCLE_AMOUNT + "，不能大于该数量！");
+				}
 			}
-		}else{
-			if (parseInt(temp,10) <= MAX_RECYCLE_AMOUNT){
-				inputObj.value = temp;
-			}
-			else{
-				alert("最大回收数量为" + MAX_RECYCLE_AMOUNT + "，不能大于该数量！");
-			}
 		}
+		
 	}
 	function okData(){
 		var inputObj = document.getElementById('inputText');
@@ -145,7 +169,7 @@
 					alert('输入数量错误,只能是1到' + (recycleAmount - loadedAmount))
 				}
 			}else{
-				alert('请输入数量');
+				alert('请输入'+labelName);
 			}
 			return;
 		}
@@ -283,9 +307,13 @@
 				document.getElementsByTagName('body')[0].style.zoom = 0.95;
 			}
         }
+		if(isPrice == 'true'){
+			document.getElementById('button_1').style.display = 'block';
+			documentGetElementsByClassName('num-ten',document)[0].style.width = '635px';
+			documentGetElementsByClassName('num',document)[0].style.width = '600px';
+			document.getElementById('labelName').innerHTML = '价格:';
+		}
 	})
-    
-   
 </script>
 
 <body onload="loaded();">
@@ -301,12 +329,13 @@
         <li><a href="javascript:void(0);" id="button8" onclick="setInputValue(8);">8</a></li>
         <li><a href="javascript:void(0);" id="button9" onclick="setInputValue(9);">9</a></li>
         <li><a href="javascript:void(0);" id="button0" onclick="setInputValue(0);">0</a></li>
+		<li><a href="javascript:void(0);" id="button_1" onclick="setInputValue('.');">.</a></li>
     </ul>
     <div class="blank20"></div>
     <div class="search">
     <table width="90%" border="0" align="center" cellpadding="0" cellspacing="0">
       <tr>
-        <td>数量:</td>
+        <td id="labelName">数量:</td>
         <td><input id="inputText" name="" type="text" readonly="readonly" class="input" />
         	<br/><span id="leftLoadAmount" style="color:red">剩余装载数量:1000</span>
         </td>
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
===================================================================
diff -u -r37368 -r37927
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp	(.../setForeignTousseDefinition.jsp)	(revision 37368)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp	(.../setForeignTousseDefinition.jsp)	(revision 37927)
@@ -21,6 +21,7 @@
 	var tousseDefinitionID = '${param.tousseDefinitionID}';
 	var applicationId = '${param.applicationId}';
 	var resolution = '${param.resolution}';
+	var canUpdatePrice = '${param.canUpdatePrice}';
 	
 	var recyclingrecordId = '${param.recyclingrecordId}';
 	var row = '${param.row}';
@@ -171,6 +172,17 @@
 	//打开编辑数量页面
 	var openElement;
 	function openUpdateAmount(obj,row,updateType){
+		var title = '修改数量';
+		var isPrice = false;
+		if(updateType == 3){
+			if(canUpdatePrice == 'true'){
+				title = '修改价格';
+				isPrice = true;
+			}else {
+				alert('修改失败，该物品已经接收，如需调整请使用干预功能处理。');
+				return;
+			}
+		}
 	    obj.blur();
 		var designedTousseWidth = 980;
 		var designedTousseHeight = 700;
@@ -205,13 +217,16 @@
 	    openElement = obj;
 	    $.layer({
 	         type : 2,
-	         title : ['修改数量',true],
-	         iframe : {src : 'updateAmount.jsp?from=errors&resolution='+resolution+'&row='+row+'&recyclingTimes='+recyclingTimes},
+	         title : [title,true],
+	         iframe : {src : 'updateAmount.jsp?from=errors&resolution='+resolution+'&row='+row+'&recyclingTimes='+recyclingTimes+'&isPrice='+isPrice},
 	         area : [width + 'px' , height + 'px'],
 	         border : [5, 0.3, '#fff', true],
 	         closeBtn : [2 , true],
 	         offset : [top+'px',''],
 			 end:function(){
+				if(updateType == 3){
+					return
+				}
 				 if($('#includeImplant'+row).text() == '是' && recyclingStatus == '待回收'){
 					if(updateType == 0){
 						var recycleAmount_new = $('#amount'+row).text();
@@ -234,7 +249,7 @@
 						var recycleAmount_new = recycleAmount_old - value;
 						$('#amount'+row).text(recycleAmount_new);
 					}
-				 }
+				}
 			 }
 	    });
 	}
@@ -297,7 +312,7 @@
 						+ '<td class="w333">&nbsp</td>'
 						+ '<td id="amount0" class="w333">' +  amount + '</td>'
 						+ '<td class="w333"></td>'
-						+ '<td class="w333" id="price0">'+price+'</td>'
+						+ '<td class="w333" id="price0"  onclick="openUpdateAmount(this,' + rowNum + ',3)">'+price+'</td>'
 						+ '<td id="minDismantleAmount0" class="w333" >&nbsp</td>'
 						+ '<td id="usedAmountOfIncludeImplant0" class="w333" >&nbsp</td>'
 						+ '<td class="w444" onclick="appendTR();">+</td>'