Index: ssts-web/src/main/webapp/disinfectsystem/packing/recyclingLostRecordForm.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/packing/recyclingLostRecordForm.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/recyclingLostRecordForm.js	(revision 26519)
@@ -0,0 +1,884 @@
+var recordId = '';
+function removeGridLostItem(){
+	var recyclingLostItemStore = top.Ext.getCmp('recyclingLostItemGrid').getStore();
+	var rows = top.Ext.getCmp('recyclingLostItemGrid').getSelectionModel().getSelections();// 返回值为
+	if (rows) {
+		for ( var i = 0; i < rows.length; i++) {
+			if(rows[i].get('additionalAmount')){
+				showResult('不能删除已补充数量的器材丢失记录！' , null , sstsConfig.messagePauseTimeOnPackingPage);
+				return;
+			}
+			recyclingLostItemStore.remove(rows[i]);
+		}
+	}
+}
+
+var addRecyclingLostItem = Ext.data.Record.create([
+	{name : 'id'}, 
+	{name : 'tousseName'}, 
+	{name : 'materialName'},
+	{name : 'damagedAmount'},
+	{name : 'additionalPerson'},
+	{name : 'additionalAmount'},
+	{name : 'additionalTime'},
+	{name : 'amount'},
+	{name : 'materialDefinitionId'},
+	{name : 'loadOneTime'}
+]);
+
+function clearTBarValueAndMaterialLostReload(materialLostStore){
+	top.Ext.getCmp('tempMaterial2').setValue();
+	top.Ext.getCmp('tempCount2').setValue();
+	if(typeof recyclingLostMode != 'undefined' || top.Ext.getCmp('linkType2').getValue() != LINKTYPE_RECYCLINGRECORD_ERROR){//如果不是回收丢失
+		top.Ext.getCmp('tempTousseName2').setValue();
+		materialLostStore.baseParams.tousseDefinitionId = '';
+		recordId = '';
+		materialLostStore.reload();
+	}
+	
+}
+
+function addLostItemToGrid(materialLostStore, linkType, param) {
+	var tempTousseName = top.Ext.getCmp('tempTousseName2').getRawValue();
+	var tempMaterial = top.Ext.getCmp('tempMaterial2').getRawValue();
+	var materialDefintionId= top.Ext.getCmp('tempMaterial2').getValue();
+	var tempCount = top.Ext.getCmp('tempCount2').getValue();
+	
+	if(!tempMaterial) {
+		showResult("请输入材料名称！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+		return;
+	}
+	
+	if(tempCount<1){
+		showResult("输入数量不能小于0！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+		return;
+	}
+	
+	if(!tempCount) {
+		showResult("请输入数量！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+		return;
+	}
+	
+	//检查记录是否已存在
+	if(isExistLost(tempTousseName, tempMaterial)){
+		showResult('丢失器材列表中已经包含该记录，不能重复添加！' , null , sstsConfig.messagePauseTimeOnPackingPage);
+		return;
+	}
+	
+	if(linkType){
+		//检测丢失数量
+		if(linkType == LINKTYPE_RECYCLINGRECORD_ERROR){//如果是回收丢失
+			/*RecyclingDamageRecordTableManager.getRecyclingDamagedAmountWithBeCleanItemByParam(tempTousseName, tempMaterial, function(damagedAmount){
+				addItemToGrid2(tempTousseName, tempMaterial, damagedAmount, tempCount);
+			});*/
+			var isCleanedEntirely = false;//不是整包清洗
+			if(tempTousseName){
+				var record = top.Ext.getCmp('tempTousseName2').store.getById(recordId);
+				isCleanedEntirely = (record.data.isCleanedEntirely != '否');
+				if(isCleanedEntirely){//是否为整包清洗
+					var hasFind = false;
+					for(var k=0,len=param.tempTousseInstanceStore.getCount();k<len;k++){
+						var recordTou = param.tempTousseInstanceStore.getAt(k);
+						if(recordTou.get('name')==record.data.name){
+							hasFind = true;
+							var damagedAmount = recordTou.get('recycleAmount');
+							DWREngine.setAsync(false);
+							TousseDefinitionTableManager.getMaterialInstanceCountByTousseName(record.data.name,tempMaterial,function(materialCount){
+								damagedAmount *= materialCount;
+							});
+							DWREngine.setAsync(true);
+							addItemToGrid22(record.data.name, tempMaterial, damagedAmount, tempCount,materialDefintionId, true);
+						}
+					}
+					if(!hasFind){
+						showResult('输入的器械包当前还没被回收！' , null , sstsConfig.messagePauseTimeOnPackingPage);
+						return;
+					}
+				}
+			}
+			if(!isCleanedEntirely){
+			//不是整包清洗，则需要从待分类材料里验证数量
+				var hasFind = false;
+				var damagedAmount = 0;
+				for(var k=0,len=param.tempmaterialLostStore.getCount();k<len;k++){
+					var recordMater =param.tempmaterialLostStore.getAt(k);
+					if(recordMater.get('materialName')==tempMaterial){
+						hasFind = true;
+						damagedAmount = recordMater.get('amount');
+					}
+				}
+				var tempDamagedAmount = getLostMaterialCount(param.rootNode, tempMaterial);
+				if(tempDamagedAmount > 0){
+					damagedAmount += tempDamagedAmount;
+				}
+				if(!hasFind && tempDamagedAmount == -1){
+					showResult('输入的材料当前还没被回收！' , null , sstsConfig.messagePauseTimeOnPackingPage);
+				}else{
+					addItemToGrid2(tempTousseName, tempMaterial, damagedAmount, tempCount,materialDefintionId, true);
+				}
+			}
+		}else{
+			//如果没有选择器械包而直接选择材料则直接添加
+			if(tempTousseName != null && tempTousseName != ""){
+				MaterialErrorDamageTableManager.getRecyclingDamagedAmountWithPackingTaskByParam(tempTousseName, tempMaterial, function(damagedAmount){
+					addItemToGrid2(tempTousseName, tempMaterial, damagedAmount, tempCount, materialDefintionId, true);
+				});
+			}else{
+				addItemToGrid2(tempTousseName, tempMaterial, tempCount, tempCount, materialDefintionId, false);
+			}
+			
+		}
+	}else{
+		addItemToGrid2(tempTousseName, tempMaterial, damagedAmount, tempCount, materialDefintionId, false);
+	}
+	clearTBarValueAndMaterialLostReload(materialLostStore);
+}
+
+function getLostMaterialCount(rootNode, material){
+	var materialCount = 0, hasFind = false;
+	rootNode.eachChild(function(pNode){
+		if(pNode.attributes.type == '材料' && pNode.attributes.name == material){
+			materialCount += pNode.attributes.amount;
+			hasFind = true;
+		}else if(pNode.attributes.type == '容器'){
+			pNode.eachChild(function(cNode){
+				if(cNode.attributes.type == '材料' && cNode.attributes.name == material){
+					materialCount += cNode.attributes.amount;
+					hasFind = true;
+				}
+			});
+		}
+	});
+	if(hasFind){//如果找到当前材料
+		return materialCount;
+	}else{
+		return -1;
+	}
+}
+
+function addItemToGrid2(tempTousseName, tempMaterial, damagedAmount, tempCount,materialDefinitionId, valid){
+	if(valid && tempCount > damagedAmount){
+		showResult('当前输入的材料的最大可丢失数量为'+damagedAmount+'！' , null , sstsConfig.messagePauseTimeOnPackingPage);
+		return;
+	}
+	top.Ext.getCmp('recyclingLostItemGrid').getStore().add(
+		new addRecyclingLostItem({
+			id : 0,
+			materialDefinitionId : materialDefinitionId,
+			tousseName : tempTousseName == null?"":tempTousseName, 
+			materialName : tempMaterial,
+			damagedAmount : damagedAmount,//最大可丢失数量
+			additionalAmount : 0,//已补充数量
+			amount : tempCount,
+			loadOneTime : true
+		})
+	);
+}
+
+function isExistLost(tempTousseName, tempMaterial){
+	var recyclingLostItemStore = top.Ext.getCmp('recyclingLostItemGrid').getStore();
+	for(var i = 0; i < recyclingLostItemStore.getCount(); i++) {
+		var record = recyclingLostItemStore.getAt(i);
+		var materialName = record.get('materialName');
+		if(tempTousseName){
+			if(record.get('tousseName') == tempTousseName && materialName == tempMaterial){
+				return true;
+			}
+		}else{
+			if(materialName == tempMaterial && !record.get('tousseName')){
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+function addAndEditRecyclingLostRecord(id, linkType, param) {
+	var tempAmount = 0;
+	var tousseLostStore = tousseLostStore = new Ext.data.Store({
+		proxy : new Ext.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/MaterialErrorDamageAction!findToussesDef.do',
+			method : 'POST'
+		}),
+		reader : new Ext.data.JsonReader({
+			totalProperty : 'totalCount',
+			root : 'data'
+		}, [{name : 'id',mapping : 'id'}, 
+		    {name : 'spelling',mapping : 'spelling'}, 
+		    {name : 'name',mapping : 'name'}, 
+		    {name : 'displayName',mapping : 'displayName'}, 
+		    {name : 'unPackAmount',mapping : 'unPackAmount'}, 
+		    {name : 'packingTaskId',mapping : 'packingTaskId'}, 
+		    {name : 'isCleanedEntirely',mapping : 'isCleanedEntirely'}, 
+		    {name : 'amount',mapping : 'amount'}]
+		),
+		listeners : {
+			beforeload : function(thiz, options){
+				thiz.baseParams.linkType = linkType;
+				
+				if(linkType == LINKTYPE_RECYCLINGRECORD_ERROR){//如果是回收丢失
+					thiz.baseParams.tousseName = param.tousseName;
+				}
+			},
+			load : function(thiz, records, options){
+				if(linkType == LINKTYPE_RECYCLINGRECORD_ERROR){//如果是回收丢失
+					for(var i=0;i<records.length;i++){
+						if(param.tousseName == records[i].data.name){
+							top.Ext.getCmp('tempTousseName2').setRawValue(records[i].data.name);
+							recordId = records[i].id;
+							materialLostStore.baseParams = {'tousseDefinitionId':records[i].data.id};
+							//materialLostStore.reload();
+							top.Ext.getCmp('tempTousseName2').setDisabled(true);
+						}
+					}
+				}
+			}
+		}
+	});
+	
+	var materialLostStore = new Ext.data.Store({
+		proxy : new Ext.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getMaterialDefinitionDataForDamage.do',
+			method : 'POST'
+		}),
+		reader : new Ext.data.JsonReader({
+			totalProperty : 'totalCount',
+			root : 'data'
+		}, [{
+			name : 'id',
+			mapping : 'id'
+		}, {
+			name : 'spelling',
+			mapping : 'spelling'
+		}, {
+			name : 'name',
+			mapping : 'name'
+		}])
+	});
+	
+	var rd = new Ext.data.JsonReader({
+		root : 'rows',
+		fields : [
+			{name : 'id'}, 
+			{name : 'tousseName'}, 
+			{name : 'materialName'},
+			{name : 'amount'},
+			{name : 'materialDefinitionId'},
+			{name : 'additionalPerson'},
+			{name : 'additionalAmount'},
+			{name : 'additionalTime'},
+			{name : 'oldAmount'},//临时
+			{name : 'damagedAmount'},//临时//最大可丢失数量
+			{name : 'loadOneTime'}//临时
+		]
+	});
+
+	//初始化加载器材列表
+	var lostItemStore = new Ext.data.Store({
+		proxy : new Ext.data.HttpProxy({
+			url : '',
+			method : 'GET'
+		}),
+		reader : rd
+	});
+	
+	var appDepartJsonStoreLost = new Ext.data.Store({
+		proxy : new Ext.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSettleAccountsDepartJson.do',
+			method : 'POST'
+		}),
+		reader : new Ext.data.JsonReader({
+			root : 'data'
+		},[
+		    {name : 'id',mapping : 'id'}, 
+		    {name : 'name',mapping : 'name'}
+		  ]
+		)
+	});
+	
+	var linkTypeStoreLost = new Ext.data.SimpleStore({
+		fields : ['typeName'],
+		data : [[LINKTYPE_RECYCLINGRECORD_ERROR], [LINKTYPE_WASHANDDISINFECTRECORD_ERROR], [LINKTYPE_PACKINGRECORD_ERROR]]
+	});
+	
+	var cmLost = new Ext.grid.ColumnModel([
+	    {header : "包名称",width : 140,dataIndex : 'tousseName',menuDisabled:true},
+		{header : "材料名称", dataIndex : 'materialName',width : 100,menuDisabled:true}, 
+		{header : "可丢失数量",width : 10,dataIndex : 'damagedAmount',menuDisabled:true,hidden:true},
+		{header : "",width : 10,dataIndex : 'loadOneTime',menuDisabled:true,hidden:true},//
+		{header : "",width : 10,dataIndex : 'oldAmount',menuDisabled:true,hidden:true},//
+		{header : "丢失数量",width : 60,dataIndex : 'amount',menuDisabled:true,
+			editor : new Ext.form.NumberField({
+				allowBlank : false,
+				allowNegative : false,
+				style : 'text-align: left',
+				allowDecimals : false
+			})
+		},
+		{header : "补充人",width : 60,dataIndex : 'additionalPerson',menuDisabled:true},
+		{header : "补充数量",width : 60,dataIndex : 'additionalAmount',menuDisabled:true},
+		{header : "补充时间",width : 110,dataIndex : 'additionalTime',menuDisabled:true, renderer : myDateFormatByMinute},
+		{id : 'autoWidth2',header:'删除',dataIndex:'button',width:40,menuDisabled:true,
+			renderer: function(v,p,record){
+				var str = "<img src=\"" + WWWROOT + "/images/web/stop.png\" onclick=\"getCurrentTab().removeGridLostItem() \">";
+				return str;
+			}
+		}
+	]);
+
+	var formLost = new top.Ext.FormPanel({
+		id : 'recyclingLostRecordForm',
+		frame : true,
+		border : 0,
+		labelSeparator : '：',
+		bodyStyle : 'padding:5px 5px 0px 5px',
+		width : 700,
+		labelAlign:'right',
+		autoHeight : true,
+		autoScroll : true,
+		items : [{
+        	xtype:"fieldset",
+            layout:'column',
+            title :'器材丢失单信息',
+            autoHeight:true,            
+            items:[{
+				layout : 'column',
+				items : [{
+					xtype : 'hidden',
+					name : 'id',
+					id : 'id'
+				},{
+					xtype : 'hidden',
+					name : 'status',
+					id : 'status2'
+				},{
+					xtype : 'hidden',
+					name : 'saveBtType',
+					id : 'saveBtType2'
+				},{
+					xtype : 'hidden',
+					name : 'recyclingDamageItemIds',
+					id : 'recyclingDamageItemIds2'
+				},{
+					xtype : 'hidden',
+					name : 'departCoding',
+					id : 'departCoding2'
+				},{
+					columnWidth : .5,
+					layout : 'form',
+					labelWidth : 70,
+					items : [{
+						xtype : 'textfield',
+						fieldLabel : '丢失人',
+						maxLength : '16',
+						id : 'damageOfPeople2',
+						name : 'damageOfPeople',
+						allowBlank : false,
+						anchor : '100%',
+						readOnly : true,
+						cls:'fieldReadOnlyNoRemove'
+					}]
+				}, {
+					columnWidth : .5,
+					layout : 'form',
+					labelWidth : 70,
+					items : [{
+						xtype : 'combo',
+						fieldLabel : '丢失科室',
+						id : 'depart2',
+						name : 'depart',
+						queryParam : 'spell',
+						minChars : 0,
+						anchor : '100%',
+						valueField : 'id',
+						displayField : 'name',
+						store : appDepartJsonStoreLost,
+						forceSelection : true,
+						lazyInit : true,
+						triggerAction : 'all',
+						hideTrigger : true,
+						typeAhead : false,
+						allowBlank : false,
+						flex : 1,
+						listeners:{
+							select:function(combo, record, index){
+								top.Ext.getCmp("depart2").setValue(record.get('name'));
+								top.Ext.getCmp("departCoding2").setValue(record.get('id'));
+							}
+						}						
+					}]
+				},{
+					columnWidth : .5,
+					layout : 'form',
+					labelWidth : 70,
+					items : [{
+						xtype : 'combo',
+						fieldLabel : '丢失环节',
+						id : 'linkType2',
+						name : 'linkType',
+						valueField : 'typeName',
+						displayField : 'typeName',
+						width : 140,
+						mode : 'local',
+						store : linkTypeStoreLost,
+						forceSelection : true,
+						autoLoad : true,
+						triggerAction : 'all',
+						hideTrigger : false,
+						typeAhead : false,
+						allowBlank : false,
+						anchor : '100%',
+						listeners : {
+							select : function(combo, record, index) {
+								top.Ext.getCmp('linkType2').setValue(record.data.typeName);
+								clearTBarValueAndMaterialLostReload(materialLostStore);
+								tousseLostStore.reload();
+							}
+						}
+					}]
+				},{
+					columnWidth : .5,
+					layout : 'form',
+					labelWidth : 70,
+					items : [{
+						xtype : 'datefieldWithMin',
+						fieldLabel : '时间',
+						id : 'time2',
+						name : 'time',
+						editable : false,
+						allowBlank : false,
+						format:'Y-m-d H:i',
+						anchor : '100%'
+					}]
+				},{
+						columnWidth : .88,
+						layout : 'form',
+						labelWidth : 70,
+						items : [{
+							xtype : 'textarea',
+							height : 45,
+							fieldLabel : '备注',
+							id : 'remark2',
+							name : 'remark',
+							allowBlank : true,
+							readOnly : true,
+							anchor : '100%'
+						}]
+					},{
+						columnWidth : .12,
+						layout : 'form',
+						items : [{
+							xtype : 'button',
+							text : '添加备注',
+							iconCls : 'btn_ext_add',
+							handler : function() {
+								var endCase = openModalWindow(WWWROOT+"/disinfectsystem/recyclingApplication/selectEndCause.jsp?time="+new Date().getTime()+'&optionType=error', "选择丢失备注", "760", "400");
+								if(!isUndefinedOrNullOrEmpty(endCase)){
+									top.Ext.getCmp("remark2").setValue(endCase);
+								}else if(endCase == ""){
+									top.Ext.getCmp("remark2").setValue("");
+								}
+							}
+						}]
+					}]
+			}]
+		},{
+        	xtype:"fieldset", 
+            layout:'column',
+            title :'器材丢失明细',
+            autoHeight:true,            
+            items:[{
+			   layout : 'form',
+			   columnWidth : 1,
+			   items :[new top.Ext.grid.EditorGridPanel({
+					id : 'recyclingLostItemGrid',
+					store : lostItemStore,
+					bodyStyle : 'border:1px solid #afd7af',
+					cm : cmLost,
+					width :720,
+					height : 320,
+					viewConfig: {
+			            forceFit:true
+					},
+					autoExpandColumn : 'autoWidth',
+					border  : true,
+					frame : false,
+					clicksToEdit : 1,// 设置点击几次才可编辑
+					selModel : new top.Ext.grid.RowSelectionModel({
+						singleSelect : false
+					}),
+					tbar : new top.Ext.Panel({
+						    border: false,
+						    items:[{
+						        xtype: 'toolbar',
+						        items: [{
+									text : '包名称  :'
+								},{
+									xtype : 'combo',
+									id : 'tempTousseName2',
+									name : 'tempTousseName',
+									queryParam : 'spell',
+									minChars : 0,
+									valueField : 'id',
+									displayField : 'displayName',
+									width : 140,
+									store : tousseLostStore,
+									forceSelection : true,
+									lazyInit : true,
+									triggerAction : 'all',
+									hideTrigger : false,
+									typeAhead : false,
+									allowBlank : true,
+									editable:true,
+									anchor : '97%',
+									listeners : {
+										select : function(combo, record, index) {
+//											materialLostStore.removeAll(); 
+											top.Ext.getCmp('tempTousseName2').setRawValue(record.data.name);
+											recordId = record.id;
+											materialLostStore.baseParams = {'tousseDefinitionId':record.data.id};
+											materialLostStore.reload();
+										},
+										specialkey : function(field, ee) {
+											if (ee.getKey() == Ext.EventObject.ENTER) {
+												top.Ext.getCmp('tempMaterial2').focus();
+											}
+										}
+									}
+								},{
+									text : '材料名称  :'
+								},{
+									xtype : 'combo',
+									id : 'tempMaterial2',
+									name : 'tempMaterial',
+									queryParam : 'spell',
+									minChars : 0,
+									valueField : 'id',
+									displayField : 'name',
+									width : 140,
+									store : materialLostStore,
+									forceSelection : true,
+									autoLoad : true,
+//									lazyInit : false,  
+									editable:true,
+									triggerAction : 'all',
+									hideTrigger : false,
+									typeAhead : false,
+									allowBlank : true,
+									anchor : '97%',
+									listeners : {
+										specialkey : function(field, ee) {
+											if (ee.getKey() == Ext.EventObject.ENTER) {
+												top.Ext.getCmp('tempCount2').focus();
+											}
+										}
+									}
+								},{
+									text : '数量  :'
+								},{
+									xtype : 'numberfield',
+									id : 'tempCount2',
+									name : 'tempCount',
+									style : 'text-align: left',
+									anchor : '95%',
+									width : 50,
+									allowNegative : false,
+									allowDecimals : false,
+									listeners : {
+										specialkey : function(field, ee) {
+											if (ee.getKey() == Ext.EventObject.ENTER) {
+												addLostItemToGrid(materialLostStore, linkType, param);
+											}
+										}
+									}
+								},{
+									text : '添加',
+									iconCls : 'btn_ext_add',
+									handler : function() {	
+										addLostItemToGrid(materialLostStore, linkType, param);
+									}
+								},{
+									text : '清空',
+									iconCls : 'icon_set',
+									handler : function() {	
+										clearTBarValueAndMaterialLostReload(materialLostStore);
+									}
+								}]
+						    }]
+						}),
+					listeners:{
+				   		beforeedit : function(e){//
+				   			tempAmount = e.record.data['amount'];
+			   			},
+			   			afteredit : function(e) {
+			   				if(e.value<1){
+			   					showResult("输入数量不能小于1！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+			   					e.record.set('amount',tempAmount);
+			   					return;
+			   				}
+			   				
+			   				//输入的数量不能小于已补充的数量
+			   				if(e.record.get('additionalAmount') && e.value < e.record.get('additionalAmount')){
+			   					showResult("输入数量不能小于已补充的数量！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+			   					e.record.set('amount',tempAmount);
+			   					return;
+			   				}
+			   				if(linkType){
+				   				var tempDamagedAmount = 0;
+				   				//if(!e.record.data['loadOneTime']){
+					   				//如果当前还没有加载最大可待清洗数量
+				   					
+				   					//检测丢失数量	//回收
+				   					if(top.Ext.getCmp('linkType2').getValue() == LINKTYPE_RECYCLINGRECORD_ERROR){
+	//			   						tousseInstanceStore
+				   						/*RecyclingDamageRecordTableManager.getRecyclingDamagedAmountWithBeCleanItemByParam(e.record.data['tousseName'], e.record.data['materialName'], function(damagedAmount){
+											tempDamagedAmount = damagedAmount;
+										});*/
+										//如果是回收丢失
+										var isCleanedEntirely = false;//不是整包清洗
+										if(recordId){
+											var record = top.Ext.getCmp('tempTousseName2').store.getById(recordId);
+											isCleanedEntirely = (record.data.isCleanedEntirely != '否');
+											if(isCleanedEntirely){//是否为整包清洗
+												var hasFind = false;
+												for(var k=0,len=param.tempTousseInstanceStore.getCount();k<len;k++){
+													var recordTou = param.tempTousseInstanceStore.getAt(k);
+													if(recordTou.get('name')==record.data.name){
+														hasFind = true;
+														tempDamagedAmount = recordTou.get('recycleAmount');
+														DWREngine.setAsync(false);
+														TousseDefinitionTableManager.getMaterialInstanceCountByTousseName(record.data.name,e.record.get('materialName'),function(materialCount){
+															tempDamagedAmount *= materialCount;
+														});
+														DWREngine.setAsync(true);
+													}
+												}
+											}
+										}
+										if(!isCleanedEntirely){
+										//不是整包清洗，则需要从待分类材料里验证数量
+											var hasFind = false;
+											var damagedAmount = 0;
+											for(var k=0,len=param.tempmaterialLostStore.getCount();k<len;k++){
+												var recordMater =param.tempmaterialLostStore.getAt(k);
+												if(recordMater.get('materialName')==e.record.get('materialName')){
+													hasFind = true;
+													damagedAmount = recordMater.get('amount');
+												}
+											}
+											var tempDamagedAmount = getLostMaterialCount(param.rootNode, e.record.get('materialName'));
+											if(tempDamagedAmount > 0){
+												damagedAmount += tempDamagedAmount;
+											}
+											if(!hasFind && tempDamagedAmount == -1){
+												damagedAmount = 0;
+											}
+											tempDamagedAmount = damagedAmount;
+										}
+										if(e.record.data['id'] != 0){
+											tempDamagedAmount = tempDamagedAmount - e.record.data['oldAmount'];
+										}
+				   						
+				   					}else{
+					   					DWREngine.setAsync(false);
+					   					MaterialErrorDamageTableManager.getRecyclingDamagedAmountWithPackingTaskByParam(e.record.data['tousseName'], e.record.data['materialName'], function(damagedAmount){
+				   							tempDamagedAmount = damagedAmount;
+				   						});
+										DWREngine.setAsync(true);
+				   					}
+									
+	//								e.record.set('loadOneTime',true);
+									e.record.set('damagedAmount',tempDamagedAmount);
+				   			//	}else{
+	//			   					tempDamagedAmount = e.record.data['damagedAmount'];
+	//			   				}
+				   				
+				   				if(tempDamagedAmount <= 0){
+				   					showResult('该材料没有可丢失的数量！' , null , sstsConfig.messagePauseTimeOnPackingPage);
+									return;
+				   				}
+				   				
+				   				if(e.record.data['id'] != 0){
+				   					var difAmount = e.record.data['amount'] - e.record.data['oldAmount'];
+				   					if(difAmount > 0 && difAmount > tempDamagedAmount){
+				   						showResult('该材料的最大可丢失数量为'+tempDamagedAmount+'！' , null , sstsConfig.messagePauseTimeOnPackingPage);
+				   						e.record.set('amount',tempAmount);
+										return;
+				   					}
+				   				}else if(e.record.data['amount'] > tempDamagedAmount){
+				   					showResult('该材料的最大可丢失数量为'+tempDamagedAmount+'！' , null , sstsConfig.messagePauseTimeOnPackingPage);
+				   					e.record.set('amount',tempAmount);
+									return;
+				   				}
+			   				}
+			   			}
+			   		}
+				})]
+            }]
+		}],
+		buttonAlign :'center',
+		buttons : [{
+			text : '保存',
+			id : 'saveBtn2',
+			hidden:false,
+			handler : function(){
+				top.Ext.MessageBox.confirm("请确认","是否保存丢失单信息？",function(btn) {
+					if(btn=='yes') {
+						top.Ext.getCmp('saveBtType2').setValue('save');
+						submitLostFormFunction(param,TYPE_ERROR);
+					}
+				});
+			}
+		}/*,{
+			text : '保存并补充',
+			id : 'saveAndSupplyBtn',
+			hidden:LINKTYPE_RECYCLINGRECORD_ERROR==linkType?true:false,
+			handler : function(){
+				top.Ext.MessageBox.confirm("请确认","是否保存丢失单信息？",function(btn) {
+					if(btn=='yes') {
+						top.Ext.getCmp('saveBtType').setValue('saveAndAdditional');
+						submitLostFormFunction('');
+					}
+				});
+			}
+		}*/,{
+			text : '取消',
+			handler : function() {
+				winLost.close();
+			}
+		}]
+	});
+	
+	materialLostStore.on('load', function(thiz, records, options){
+		var meterialVal = top.Ext.getCmp('tempMaterial2').getValue();
+		if(meterialVal){
+			if(thiz.find('name',meterialVal)==-1){
+				top.Ext.getCmp('tempMaterial2').setValue('');
+			}
+		}
+	});
+	
+	var winLost = new top.Ext.Window({
+		id : 'recyclingLostRecordWin',
+		layout : 'fit',
+		title : '器材丢失单信息',
+		width : 780,
+		modal : true,
+		autoHeight : true,
+		closeAction:'close',
+		border : false,
+		height:480,
+		plain : true,
+		items : [ formLost ]
+	});
+	if(!id){
+		if(linkType==LINKTYPE_RECYCLINGRECORD_ERROR){
+			initFormLostData(linkType, $Id('userName').value, param.departCode, param.depart);
+		}else{
+			initFormLostData(linkType, $Id('userName').value, $Id('departCoding').value, $Id('departName').value);
+		}
+//		top.Ext.getCmp('time').setValue(new Date());
+		setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'time2');  //（设置出借时间，取服务器时间 cjr）
+	}
+	/*if(linkType){
+		top.Ext.getCmp('linkType').setDisabled(true);
+	}*/
+	winLost.show();
+}
+function eachMaterialAndCallbackLost(recyclingLostItemStore, callBack, isValid){
+	for(var i=0,len=recyclingLostItemStore.getCount();i<len;i++){
+		var record = recyclingLostItemStore.getAt(i);
+		var difAmount = record.get('amount');
+		if(record.get('id') != 0){
+			difAmount = record.get('amount') - record.get('oldAmount');
+		}
+		var valid = callBack(record.get('materialName'), difAmount);
+		if(isValid && !valid){
+			return record.get('materialName');//验证不通过
+		}
+	}
+	return '';
+}
+
+function submitLostFormFunction(param,type){
+	var formLost = top.Ext.getCmp('recyclingLostRecordForm');
+	if(top.Ext.getCmp('damageOfPeople2').getValue().length<1){
+		showResult('丢失人信息不能为空' , null , sstsConfig.messagePauseTimeOnPackingPage);
+		return false;
+	}
+	
+	if(!formLost.getForm().isValid()){
+		showResult('请正确填写表单各值' , null , sstsConfig.messagePauseTimeOnPackingPage);
+		return false;
+	}
+	
+	var recyclingLostItemStore = top.Ext.getCmp('recyclingLostItemGrid').getStore();
+	
+	if(recyclingLostItemStore.getCount()<1){
+		showResult('丢失器材信息列表不能为空' , null , sstsConfig.messagePauseTimeOnPackingPage);
+		return false;
+	}
+	if(param){
+		var isCleanedEntirely = false;//不是整包清洗
+		if(recordId){
+			var record = top.Ext.getCmp('tempTousseName2').store.getById(recordId);
+			isCleanedEntirely = (record.data.isCleanedEntirely != '否');
+			if(!isCleanedEntirely){//是否为整包清洗
+				//验证材料是否够减
+				var materialName = eachMaterialAndCallbackLost(recyclingLostItemStore, validateReduce, true);
+				if(materialName){
+					showResult(materialName+'的丢失数量不能大于回收数量' , null , sstsConfig.messagePauseTimeOnPackingPage);
+					return false;
+				}
+				//删减材料（丢失）
+				eachMaterialAndCallbackLost(recyclingLostItemStore, materialReduce, false);
+			}
+		}
+	}
+	
+	var data = new Array();
+	for ( var i = 0; i < recyclingLostItemStore.getCount(); i++) {
+		var record = recyclingLostItemStore.getAt(i);
+		data.push({
+			materialName : record.get('materialName'),
+			materialDefinitionId : record.get('materialDefinitionId'),
+			tousseDefinitionId : "",
+			amount : record.get('amount')
+		});
+	}
+	
+	var params = {};
+	params.depart = top.Ext.getCmp('depart2').getValue();
+	params.departCoding = top.Ext.getCmp('departCoding2').getValue();
+	params.linkType = top.Ext.getCmp('linkType2').getValue();
+	params.damageOfPeople = top.Ext.getCmp('damageOfPeople2').getValue(); 
+	params.remark = top.Ext.getCmp('remark2').getValue();
+	params.data = data;
+	params.type = type;
+	formLost.form.submit({
+		url : WWWROOT + '/disinfectSystem/MaterialErrorDamageAction!saveRecyclingDamageRecord.do',
+		method : 'POST',
+		waitMsg : '正在保存数据，请稍候',
+		waitTitle : '提交表单',
+		params : {params : JSON.stringify(params)},
+		success : function(form, action) {
+			if(action.result.success){
+				showResult("保存成功！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+				top.Ext.getCmp('recyclingLostRecordWin').close();
+			}else{
+				showResult(action.result.message , null , sstsConfig.messagePauseTimeOnPackingPage);
+			}
+		},
+		failure : function(form, action) {
+			showResult(action.result.message , null , sstsConfig.messagePauseTimeOnPackingPage);
+		}
+	});
+	return true;
+}
+
+function initFormLostData(linkType, damageOfPeople, departCoding, depart){
+	top.Ext.getCmp('linkType2').setValue(linkType);
+	top.Ext.getCmp('damageOfPeople2').setValue(damageOfPeople);
+	top.Ext.getCmp('departCoding2').setValue(departCoding);
+	top.Ext.getCmp('depart2').setValue(depart);
+}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
===================================================================
diff -u -r25483 -r26519
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 25483)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 26519)
@@ -15,6 +15,7 @@
 <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
 <%@page import="com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition" %>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition" %>
+<%@page import="com.forgon.disinfectsystem.entity.materialerrordamage.MaterialErrorDamageDetail" %>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
 <html>
@@ -340,6 +341,19 @@
 var LINKTYPE_WASHANDDISINFECTRECORD = '<%=RecyclingDamageItem.LINKTYPE_WASHANDDISINFECTRECORD%>';
 //装配报损
 var LINKTYPE_PACKINGRECORD = '<%=RecyclingDamageItem.LINKTYPE_PACKINGRECORD%>';
+
+//回收丢失
+var LINKTYPE_RECYCLINGRECORD_ERROR = '<%=RecyclingError.LINKTYPE_RECYCLINGRECORD%>';
+//清洗丢失
+var LINKTYPE_WASHANDDISINFECTRECORD_ERROR = '<%=RecyclingError.LINKTYPE_WASHANDDISINFECTRECORD%>';
+//装配丢失
+var LINKTYPE_PACKINGRECORD_ERROR = '<%=RecyclingError.LINKTYPE_PACKINGRECORD%>';
+//器械丢失
+var TYPE_ERROR = '<%=MaterialErrorDamageDetail.TYPE_ERROR%>';
+//器械报损
+var TYPE_DAMAGE = '<%=MaterialErrorDamageDetail.TYPE_DAMAGE%>';
+
+
 var errorTypeAdd = '<%=RecyclingError.ERRORTYPE_ADD%>';
 var basketAllowProcedure = '<%=Container.CONTAINER_STATUS_WASHED%>;<%=Container.CONTAINER_STATUS_PACKED%>';
 var imageType_tousse = '<%=ImageFile.IMAGE_TYPE_TOUSSE%>';
@@ -466,6 +480,9 @@
  	.script("${ctx}/disinfectsystem/recyclingdamagerecord/damageMaterialAdditionalForm.js")
  	.script("${ctx}/dwr/interface/RecyclingApplicationTableManager.js")
 	
+	<!-- 添加丢失器械 -->
+	.script("recyclingLostRecordForm.js")
+	
 	<!-- 质量监测 -->
  	.script("${ctx }/dwr/interface/QualityMonitoringInstanceTableManager.js")
  	.script("${ctx}/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js")
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r26489 -r26519
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 26489)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 26519)
@@ -2305,6 +2305,13 @@
         addAndEditRecyclingDamageRecord('', LINKTYPE_PACKINGRECORD);
     }
 },"-",{
+    text : '添加丢失器械',
+    //hidden : SSTS_QualityRecord_Create,
+    iconCls : 'btn_ext_application_add',
+    handler : function() {
+        addAndEditRecyclingLostRecord('', LINKTYPE_PACKINGRECORD_ERROR);
+    }
+},"-",{
     text : '添加质量监测',
     hidden:SSTS_QualityRecord_Create,
     iconCls : 'btn_ext_application_add',
@@ -2313,14 +2320,14 @@
     	otherPartAddQM = true;
     	addQualityMonitoringByResponPart("清洗消毒");
     }
-},"-",{
+}/* ,"-",{
     text : '打印回收清单',
     hidden:SSTS_RecyclingDetail_Print,
     iconCls : 'icon_print',
     handler : function() {
     	recyclingDetailWindow();
     }
-}];
+} */];
 
 var basketStore = new Ext4.data.TreeStore({
      model: cModel,
@@ -4202,7 +4209,14 @@
     		            handler : function() {
     		            	packingComboTousse();
     		            }
-    		        }
+					},{
+						text : '打印回收清单',
+						hidden:SSTS_RecyclingDetail_Print,
+						iconCls : 'icon_print',
+						handler : function() {
+							recyclingDetailWindow();
+						}
+					}
     			]
     		},{
 	        xtype: 'toolbar',
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/recyclingDamageRecordForm.js
===================================================================
diff -u -r26452 -r26519
--- ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/recyclingDamageRecordForm.js	(.../recyclingDamageRecordForm.js)	(revision 26452)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/recyclingDamageRecordForm.js	(.../recyclingDamageRecordForm.js)	(revision 26519)
@@ -725,7 +725,7 @@
 				top.Ext.MessageBox.confirm("请确认","是否保存报损单信息？",function(btn) {
 					if(btn=='yes') {
 						top.Ext.getCmp('saveBtType').setValue('save');
-						submitFormFunction(param);
+						submitFormFunction(param,TYPE_DAMAGE);
 					}
 				});
 			}
@@ -801,7 +801,7 @@
 	return '';
 }
 
-function submitFormFunction(param){
+function submitFormFunction(param,type){
 	var form = top.Ext.getCmp('recyclingDamageRecordForm');
 	if(top.Ext.getCmp('damageOfPeople').getValue().length<1){
 		showResult('报损人信息不能为空' , null , sstsConfig.messagePauseTimeOnPackingPage);
@@ -855,6 +855,7 @@
 	params.damageOfPeople = top.Ext.getCmp('damageOfPeople').getValue(); 
 	params.remark = top.Ext.getCmp('remark').getValue();
 	params.data = data;
+	params.type = type;
 	
 	form.form.submit({
 		url : WWWROOT + '/disinfectSystem/MaterialErrorDamageAction!saveRecyclingDamageRecord.do',