Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/loadScanBarcodeMsg.js =================================================================== diff -u -r29231 -r29992 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/loadScanBarcodeMsg.js (.../loadScanBarcodeMsg.js) (revision 29231) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/loadScanBarcodeMsg.js (.../loadScanBarcodeMsg.js) (revision 29992) @@ -40,7 +40,7 @@ rinseRecordStore = new top.Ext.data.Store({ proxy : new Ext.data.HttpProxy({ - url : WWWROOT + '/disinfectSystem/qualityMonitoringInstanceAction!scanBasketBarcodeForWashRecord.do', + url : WWWROOT + '/disinfectSystem/qualityMonitoringInstanceAction!scanBarcodeForWashRecord.do', method : 'POST' }), baseParams : {basketBarcode : barcodeValue}, Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r29958 -r29992 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 29958) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 29992) @@ -857,7 +857,8 @@ {name : 'note'}, {name : 'maxAmount'}, {name : 'urgentLevelObj'}, - {name : 'colorCode'} + {name : 'colorCode'}, + {name : 'washRecordId'} ]}); function buildColumnTreeColumns(treeId){ @@ -2405,6 +2406,20 @@ return v; } +//获取选择的待装配列表清洗记录id +function getWashRecordIds(){ + var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid'); + var selNodes = waitPackingTreeGrid.getView().getChecked(); + var washRecordIds = []; + for(var i=0;i 1){ + addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0]); + showResult('所选择的物品关联到了多条清洗记录，清洗信息将自动填写最早的清洗记录！'); + }else if(washRecordIds.length == 1){ + addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0]); + }else { + addQualityMonitoringByResponPart("清洗消毒"); + } } }], columns: [ @@ -2549,7 +2572,15 @@ handler : function() { materialCountRecords = Ext4.getCmp("materialGrid").getSelectionModel().getSelection(); otherPartAddQM = true; - addQualityMonitoringByResponPart("清洗消毒"); + var washRecordIds = getWashRecordIds(); + if(washRecordIds.length > 1){ + addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0]); + showResult('所选择的物品关联到了多条清洗记录，清洗信息将自动填写最早的清洗记录！'); + }else if(washRecordIds.length == 1){ + addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0]); + }else { + addQualityMonitoringByResponPart("清洗消毒"); + } } }/* ,"-",{ text : '打印回收清单', @@ -4139,7 +4170,15 @@ height: 100, fn : function(btn){ if(btn == 'no'){ - addQualityMonitoringByResponPart("清洗消毒"); + var washRecordIds = getWashRecordIds(); + if(washRecordIds.length > 1){ + addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0]); + showResult('所选择的物品关联到了多条清洗记录，清洗信息将自动填写最早的清洗记录！'); + }else if(washRecordIds.length == 1){ + addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0]); + }else { + addQualityMonitoringByResponPart("清洗消毒"); + } } } }); Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r29493 -r29992 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 29493) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 29992) @@ -802,13 +802,11 @@ for(var i = 0 ; i < materialCountRecords.length ; i++){ var materialName = materialCountRecords[i].data["name"]; - var count = materialCountRecords[i].data['count']; if( i == 0 ){ // 第一条记录 Ext.getCmp('material').setValue(materialName); - Ext.getCmp('materialAmount').setValue(count); }else{ - addExtractCheckMaterial(false,materialName,count,"","","","","","","","",""); + addExtractCheckMaterial(false,materialName,1,"","","","","","","","",""); } } } @@ -2244,11 +2242,12 @@ } /** - * 通过生产环节添加质量监测 - * @param responPartName 生产环节的名称 + * 通过生产环节添加质量监测,装配界面 + * @param {生产环节的名称} responPartName + * @param {清洗记录的ID} washRecordId */ -function addQualityMonitoringByResponPart(responPartName) { - addQualityMonitoring(); +function addQualityMonitoringByResponPart(responPartName,washRecordId) { + addQualityMonitoring('','','',washRecordId); Ext.getCmp('responsibilityPart').setValue(responPartName); otherPartAddQM = true; formDefinitionStore.baseParams.responsiblePerson = responPartName; @@ -2601,12 +2600,13 @@ } /** - * 添加或者修改质量监测实例（各个生产环节填写的质量监测也是会调用这里的）. - * @param id 质量监测实例id - * @param formDefinitionId 质量监测定义id - * @param formDefinitionName 质量监测定义名称 + * 添加或者修改质量监测实例（各个生产环节填写的质量监测也是会调用这里的） + * @param {质量监测实例id} id + * @param {质量监测定义id} formDefinitionId + * @param {质量监测定义名称} formDefinitionName + * @param {清洗记录的ID} washRecordId */ -function addQualityMonitoring(id,formDefinitionId,formDefinitionName) { +function addQualityMonitoring(id,formDefinitionId,formDefinitionName,washRecordId) { if(id==null||id=='undentified'){ id=""; } @@ -2870,7 +2870,32 @@ formDefinitionStore.load(); } } - + if(washRecordId){ + Ext.Ajax.request({ + url : WWWROOT + '/disinfectSystem/qualityMonitoringInstanceAction!loadWashRecordInfoById.do', + params : { + washRecordId : washRecordId + }, + success : function(response,options){ + var result = Ext.decode(response.responseText); + if(result.success == true){ + var record = result.data; + console.log(record) + Ext.getCmp('rinseBasketsName').setValue(record.washBasketName); + Ext.getCmp('cleaningMachinePosition').setValue(record.position); + Ext.getCmp('cleaningMachineDate').setValue(record.washDate); + Ext.getCmp('cleaningMachineName').setValue(record.disinfectIdentification); + Ext.getCmp('cleaningMachineProgramName').setValue(record.disinfectProgram); + Ext.getCmp('cleaningStartTime').setValue(record.startDate); + Ext.getCmp('cleaningEndTime').setValue(record.endDate); + Ext.getCmp('scanWashRecord_id').setValue(record.washRecordID); + Ext.getCmp('responsiblePerson').setValue(record.personInCharge); + }else{ + showResultQM(result.message); + } + } + }); + } } function uploadWindowA(imageType,id){ @@ -3874,6 +3899,7 @@ * 创建质量监测实例的表单. * @param id 质量监测实例id * @returns {Ext.FormPanel} + * 材料丢失或报损添加质量监测后进入 */ function getFormPanelContent(id){ initStore(); @@ -4066,14 +4092,27 @@ var barcodeValue = field.getValue(); Ext.getCmp("rinseBasketsBarcode").setValue(''); Ext.Ajax.request( { - url : WWWROOT + '/disinfectSystem/qualityMonitoringInstanceAction!scanBasketBarcodeForWashRecord.do', + url : WWWROOT + '/disinfectSystem/qualityMonitoringInstanceAction!scanBarcodeForWashRecord.do', params : {basketBarcode : barcodeValue}, success : function(response, options) { var result = Ext.decode(response.responseText); if(result.success == false){ showResult(result.message); }else{ - loadScanBarcodeMsg('rinseBasketsName','cleaningMachinePosition','cleaningMachineDate','cleaningMachineName','cleaningMachineProgramName','cleaningStartTime','cleaningEndTime','scanWashRecord_id',barcodeValue); + if(result.data.length > 1){ + loadScanBarcodeMsg('rinseBasketsName','cleaningMachinePosition','cleaningMachineDate','cleaningMachineName','cleaningMachineProgramName','cleaningStartTime','cleaningEndTime','scanWashRecord_id',barcodeValue); + }else if(result.data.length == 1){ + var record = result.data[0]; + Ext.getCmp('rinseBasketsName').setValue(record.washBasketName); + Ext.getCmp('cleaningMachinePosition').setValue(record.position); + Ext.getCmp('cleaningMachineDate').setValue(record.washDate); + Ext.getCmp('cleaningMachineName').setValue(record.disinfectIdentification); + Ext.getCmp('cleaningMachineProgramName').setValue(record.disinfectProgram); + Ext.getCmp('cleaningStartTime').setValue(record.startDate); + Ext.getCmp('cleaningEndTime').setValue(record.endDate); + Ext.getCmp('scanWashRecord_id').setValue(record.washRecordID); + Ext.getCmp('responsiblePerson').setValue(record.personInCharge); + } } }, failure : function(response, options) {