Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
===================================================================
diff -u -r37957 -r38598
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp	(.../setForeignTousseDefinition.jsp)	(revision 37957)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp	(.../setForeignTousseDefinition.jsp)	(revision 38598)
@@ -1,9 +1,16 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <%@ page contentType="text/html; charset=UTF-8"%>
+<%@ page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
+<%@ page import="com.forgon.tools.SpringBeanManger"%>
+<%
+	SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
+	request.setAttribute("ftMaxWeight",supplyRoomConfigManager.getSystemParamsObj().getFtMaxWeight());
+%>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>设置外来器械包定义</title>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="js/select2css.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="js/jquery-min.js" ></script>
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
@@ -12,6 +19,7 @@
 <script type="text/javascript" src="commonRecycle.js?version=${svnRevision}"></script>
 
 <link rel="stylesheet" href="${ctx}/js/magnificPopup/magnific-popup.css">
+
 </head>
 </style>
 <script type="text/javascript">
@@ -26,7 +34,7 @@
 	var recyclingrecordId = '${param.recyclingrecordId}';
 	var row = '${param.row}';
 	var recyclingStatus = '';
-
+	var ftMaxWeight = '${ftMaxWeight}';
 	//动态加载JS和CSS
 	document.write('<link href="${ctx}/disinfectsystem/touchScreen/recycle/${param.resolution}/images/foreignTousseStyle.css" rel="stylesheet" type="text/css" />');
 
@@ -124,6 +132,7 @@
 		
 		var price = $('#price0').text();
 		var amount = $('#amount0').text();
+		var weight = $('#weight0').text();
 		
 		var foreignTousseInfo = new Array();
 		
@@ -133,6 +142,7 @@
 			supplierName : supplierName,
 			amount : amount,
 			price : price,
+			weight : weight,
 			recyclingStatus : recyclingStatus,
 			materials : materials
 		});
@@ -150,6 +160,7 @@
 				+ '<td class="w111">&nbsp</td>'
 				+ '<td class="w222" id="materialName' + rowNum + '" onclick="openSearcheMaterialFrom(this,' + rowNum + ')"></td>'
 				+ '<td class="w333" id="includeImplant' + rowNum + '" onclick="changeIsIncludeImplant(this);">否</td>'
+				+ '<td class="w333 weight">0</td>'
 				+ '<td class="w333">0</td>'
 				+ '<td id="amount' + rowNum + '" class="w333" onclick="openUpdateAmount(this,' + rowNum + ',0)">0</td>'
 				+ '<td class="w333">&nbsp</td>'
@@ -186,6 +197,9 @@
 				alert('修改失败，该物品已经接收，如需调整请使用干预功能处理。');
 				return;
 			}
+		}else if(updateType == 4){
+			title = '修改重量';
+			isPrice = true;
 		}
 	    obj.blur();
 		var designedTousseWidth = 980;
@@ -214,6 +228,7 @@
 		}
 		var recycleAmount_old = $('#amount'+row).text();
 		var usedAmountOfIncludeImplant_old = $('#usedAmountOfIncludeImplant'+row).text();
+		var weight_old = $('#weight0').text();
 		var recyclingTimes = 1;
 		if(recyclingStatus == '待回收' && $('#includeImplant'+row).text() == '否' && updateType == 0){
 			recyclingTimes = 2;
@@ -231,7 +246,15 @@
 				if(updateType == 3){
 					return
 				}
-				 if($('#includeImplant'+row).text() == '是' && recyclingStatus == '待回收'){
+				if(sstsConfig.enableModifyWeightOfForeignTousseAfterApply && applicationId !== '' && updateType == 4){
+					var weight_new = $('#weight0').text();
+					if(weight_new !== '' && ftMaxWeight !== '' && parseFloat(weight_new) > parseFloat(ftMaxWeight)){
+						$('#weight0').text(weight_old)
+						alert("外来器械包的重量不能超过最大重量"+ftMaxWeight);
+						return
+					}
+				}
+				if($('#includeImplant'+row).text() == '是' && recyclingStatus == '待回收'){
 					if(updateType == 0){
 						var recycleAmount_new = $('#amount'+row).text();
 						var value = parseInt(recycleAmount_new) - parseInt(recycleAmount_old);
@@ -303,6 +326,7 @@
 				supplierName = foreignTousseArray[0].supplierName;
 				tousseName = foreignTousseArray[0].tousseName;
 				var amount = foreignTousseArray[0].amount;
+				var weight = foreignTousseArray[0].weight || '';
 				var price = foreignTousseArray[0].price;
 				var iframeHeight = window.screen.height;
 				var imgName = '器械包图片';
@@ -314,9 +338,10 @@
 						+ '<td class="w111">'+supplierName+'</td>'
 						+ '<td class="w222" style="cursor: pointer;" onclick="openFullSizeWindowWithName(\''+url+'\',false,\''+imgName+'\')">' + tousseName + '</td>'
 						+ '<td class="w333">&nbsp</td>'
+						+ '<td class="w333 weight" id="weight0" onclick="openUpdateAmount(this,0,4)">' +  weight + '</td>'
 						+ '<td id="amount0" class="w333">' +  amount + '</td>'
 						+ '<td class="w333"></td>'
-						+ '<td class="w333" id="price0"  onclick="openUpdateAmount(this,' + rowNum + ',3)">'+price+'</td>'
+						+ '<td class="w333" id="price0"  onclick="openUpdateAmount(this,0,3)">'+price+'</td>'
 						+ '<td id="minDismantleAmount0" class="w333" >&nbsp</td>'
 						+ '<td id="usedAmountOfIncludeImplant0" class="w333" >&nbsp</td>'
 						+ '<td class="w444" onclick="appendTR();">+</td>'
@@ -350,6 +375,7 @@
 							+ '<td class="w222" id="materialName' + rowNum + '" onclick="openSearcheMaterialFrom(this,' + rowNum + ')">' + materialItem.tousseName + '</td>'
 							+ '<td class="w333" id="includeImplant' + rowNum + '" onclick="changeIsIncludeImplant(this);">' + materialItem.includeImplant
 							+ '</td>'
+							+ '<td class="w333 weight"></td>'
 							+ '<td class="w333">' +  applyAmount + '</td>'
 							+ '<td id="amount' + rowNum + '" class="w333" onclick="openUpdateAmount(this,' + rowNum + ',0)">' +  recycleAmount + '</td>'
 							+ '<td class="w333">&nbsp</td>'
@@ -364,6 +390,12 @@
 					
 					$("#recyclingErrorTable").append(materialElement);	
 					
+					if(sstsConfig.enableModifyWeightOfForeignTousseAfterApply && sstsConfig.foreignTousseAddWeight && applicationId !== ''){
+						$(".weight").show()
+					}else {
+						$(".weight").hide()
+					}
+					
 					rowNum++;
 				}
 				$('#recycleAmountColumn').text("回收数量(" + totalRecycleAmount + "件)");
@@ -401,15 +433,16 @@
 			</table>
 			<table width="100%" border="0" cellspacing="0" cellpadding="0">
 				<tr class="title">
-					<th width="18%">供应商</th>
-					<th width="19%">包/材料名称</th>
-					<th width="9%">是否植入物</th>
-					<th width="9%">申请数量</th>
-					<th width="9%" id="recycleAmountColumn">回收数量</th>
-					<th width="9%">单价</th>
-					<th width="9%">可拆卸数量</th>
-					<th width="9%">植入物使用数量</th>
-					<th width="9%">操作</th>
+					<th class="w111">供应商</th>
+					<th class="w222">包/材料名称</th>
+					<th class="w333">是否植入物</th>
+					<th class="w333 weight">重量</th>
+					<th class="w333">申请数量</th>
+					<th class="w333" id="recycleAmountColumn">回收数量</th>
+					<th class="w333">单价</th>
+					<th class="w333">可拆卸数量</th>
+					<th class="w333">植入物使用数量</th>
+					<th class="w444">操作</th>
 				</tr>
 			</table>
 			<div class="box">
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/foreignTousseStyle.css
===================================================================
diff -u -r21589 -r38598
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/foreignTousseStyle.css	(.../foreignTousseStyle.css)	(revision 21589)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/foreignTousseStyle.css	(.../foreignTousseStyle.css)	(revision 38598)
@@ -121,12 +121,12 @@
 
 .copyRight{ position:absolute; bottom:0; height:29px; text-align:center; font-family:Tahoma, Geneva, sans-serif; width:1980px; font-size:16px; line-height:29px;}
 
-.clds-box{ width:1300px; margin:0 auto; font-size:18px; background:#f0f0f0; padding:15px 10px}
+.clds-box{ width:1440px; margin:0 auto; font-size:18px; background:#f0f0f0; padding:15px 10px}
 .clds-box .table{ border:1px solid #ddd; padding:1px}
 .clds-box .table th{ border-right:1px solid #fff;border-bottom:1px solid #ddd; color:#369; font-size:26px;}
 .clds-box .title{ background:url(tit_bg_01.jpg) repeat-x; height:45px;}
 .clds-box .box{height:500px; overflow-y:scroll; background:#fff; overflow-x:hidden,text-align:left; float:left}
-.clds-box .box table{ margin:0 auto; width:1280px}
+.clds-box .box table{ margin:0 auto; width:1440px}
 .clds-box .box table td{ border-right:1px solid #ddd; border-bottom:1px solid #ddd; text-align:center; font-size:26px; color:#2e6271; padding:8px 0}
 .clds-box .box .w1{ width:236px;}
 .clds-box .box .w2{ width:171px}
@@ -142,13 +142,13 @@
 .clds-box .box .w55{ width:475px}
 .clds-box .box .w66{ width:171px}
 
-.clds-box .box .w111{ width:230px;}
-.clds-box .box .w222{ width:243px;height:60px;}
-.clds-box .box .w333{ width:115px;}
-.clds-box .box .w444{ width:99px;}
-.clds-box .box .w555{ width:115px;}
-.clds-box .box .w666{ width:115px;}
-.clds-box .box .w777{ width:115px;}
+.clds-box .box .w111,.clds-box .title .w111{ width:230px;}
+.clds-box .box .w222,.clds-box .title .w222{ width:243px;height:60px;}
+.clds-box .box .w333,.clds-box .title .w333{ width:115px;}
+.clds-box .box .w444,.clds-box .title .w444{ width:99px;}
+.clds-box .box .w555,.clds-box .title .w555{ width:115px;}
+.clds-box .box .w666,.clds-box .title .w666{ width:115px;}
+.clds-box .box .w777,.clds-box .title .w777{ width:115px;}
 
 .clds-box .add{background:url(pic_bg.jpg) no-repeat 0 -691px; width:59px; height:58px; display:inline-block; margin-right:10px; line-height:200px; overflow:hidden }
 .clds-box .add:hover{ background-position:0 -751px; }
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r38532 -r38598
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 38532)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 38598)
@@ -3462,7 +3462,7 @@
 			}, {
 				columnWidth: .5,
 				xtype: 'combo',
-				hidden: !sstsConfig.showTousseWeight,
+				hidden: !(!(sstsConfig.enableModifyWeightOfForeignTousseAfterApply && sstsConfig.foreignTousseAddWeight) && sstsConfig.showTousseWeight),
 				fieldLabel: '重量',
 				id: 'tousseWeight',
 				name: 'tousseWeight',
@@ -3481,6 +3481,20 @@
 				triggerAction: 'all',
 				typeAhead: false,
 				allowBlank: true
+			}, {
+				columnWidth: .5,
+				xtype: 'numberfield',
+				fieldLabel: '重量',
+				allowNegative: false,
+				id: 'weight',
+				name: 'weight',
+				hidden: !(sstsConfig.enableModifyWeightOfForeignTousseAfterApply && sstsConfig.foreignTousseAddWeight),
+				componentCls: 'formItemMgn',
+				minValue: 0,
+				labelWidth: 90,
+				labelAlign: 'right',
+				allowBlank: true,
+				anchor: '95%'
 			},{
 				xtype:'hidden',
 				id:'useOldRemark',
@@ -5969,6 +5983,7 @@
 		}
 		var params = paramsObj;
 		var tousseWeight = Ext4.getCmp('tousseWeight').getValue();
+		var weight = Ext4.getCmp('weight').getValue();
 		var sterilizedThisTime = Ext4.getCmp('sterilizedThisTime').getValue();
 		var secondaryDisinfection = Ext4.getCmp('secondaryDisinfection').getValue();
 		//是否消毒物品
@@ -6055,6 +6070,7 @@
 		params.frequency = frequency;
 		params.confirmContinue = '';
 		params.tousseWeight = tousseWeight;
+		params.weight = weight;
 		params.sterilizedThisTime = sterilizedThisTime;
 		params.secondaryDisinfection = secondaryDisinfection;
 		params.websocketSessionId = getWebsocketSessionId();
@@ -7490,6 +7506,13 @@
 				if (!checked) {
 					deselectCheckAll();
 				}
+				if(node.data.tousseType == '外来器械包' && checked){
+					Ext4.getCmp('weight').enable();
+					Ext4.getCmp('weight').setValue(node.data.weight || '');
+				}else {
+					Ext4.getCmp('weight').disable();
+					Ext4.getCmp('weight').setValue('');
+				}
 			},
 			itemcontextmenu: taskItemMenu
 		},
@@ -7540,6 +7563,16 @@
 									getPackingMaterialsForCheckFun(rootNode.childNodes[0]);
 								}
 							}, 200);
+							if(rootNode.childNodes.length == 1 && rootNode.childNodes[0].data.tousseType == '外来器械包'){
+								Ext4.getCmp('weight').enable();
+								Ext4.getCmp('weight').setValue(rootNode.childNodes[0].data.weight || '');
+							}else {
+								Ext4.getCmp('weight').disable();
+								Ext4.getCmp('weight').setValue('');
+							}
+						}else {
+							Ext4.getCmp('weight').disable();
+							Ext4.getCmp('weight').setValue('');
 						}
 						showOrHidePrintBtn();
 						resetScanIDCardBarcodeVisibility();
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r38353 -r38598
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 38353)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 38598)
@@ -3141,9 +3141,9 @@
 			offset: [offsetTop + 'px', '']
 		});
 	} else if (tousseType == '外来器械包') {
-		var width = 740;
+		var width = 840;
 		var height = 400;
-		var designedTousseWidth = 980;
+		var designedTousseWidth = 1080;
 		var designedTousseHeight = 700;
 		var designedWidth = 1920;
 		var designedHeight = 1080;
@@ -3152,7 +3152,7 @@
 		var offsetTop = 100;
 		var heightExtra = 10;
 		if (resolution == '1980') {
-			width = 1080;
+			width = 1180;
 			height = 800;
 		}
 		var zoomRatio = calculateZoomRatio(designedWidth, designedHeight, actualWidth, actualHeight);
@@ -3179,7 +3179,6 @@
 				canUpdatePrice = true;
 			}
 		}
-
 		layerIndex = layer.open({
 			type: 2,
 			title: [tousseName + '  信息', true],
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
===================================================================
diff -u -r37039 -r38598
--- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js	(.../config.js)	(revision 37039)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js	(.../config.js)	(revision 38598)
@@ -221,7 +221,9 @@
   //器械包定义是否批量修改
   tousseDefinitionCanBatchEdit : true,
 	  //启用外来器械厂家归还人。
-enableReturneeOfForeignTousseSupplier:true,
+  enableReturneeOfForeignTousseSupplier:true,
 	//	外来器械在申请和装配增加重量字段
-foreignTousseAddWeight:true
+  foreignTousseAddWeight:true,
+  //	允许外来器械包在申请后修改重量
+  enableModifyWeightOfForeignTousseAfterApply:true
 }
\ No newline at end of file
