Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/service/QualityMonitoringManagerImpl.java =================================================================== diff -u -r14011 -r14162 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/service/QualityMonitoringManagerImpl.java (.../QualityMonitoringManagerImpl.java) (revision 14011) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/service/QualityMonitoringManagerImpl.java (.../QualityMonitoringManagerImpl.java) (revision 14162) @@ -296,8 +296,11 @@ newMonitoring .setSterilizationRecordInfo(qualityMonitoring .getSterilizationRecordInfo()); - + newMonitoring.setBasketBarcode(qualityMonitoring.getBasketBarcode()); + newMonitoring.setBasketName(qualityMonitoring.getBasketName()); if (basket != null) { + newMonitoring.setBasketBarcode(containerBarcode); + newMonitoring.setBasketName(basket.getContainerName()); ClassifiedItem item = new ClassifiedItem(); item.setItemType(ClassifiedItem.TYPE_MATERIAL); item.setAmount(Integer.parseInt(amount)); Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/action/QualityMonitoringAction.java =================================================================== diff -u -r14021 -r14162 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/action/QualityMonitoringAction.java (.../QualityMonitoringAction.java) (revision 14021) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/action/QualityMonitoringAction.java (.../QualityMonitoringAction.java) (revision 14162) @@ -2,20 +2,14 @@ import java.io.IOException; import java.io.OutputStream; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; +import java.util.Collections; import java.util.Date; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; import javax.servlet.http.HttpServletResponse; -import net.sf.json.JSONArray; import net.sf.json.JSONNull; import net.sf.json.JSONObject; import net.sf.json.JsonConfig; @@ -28,35 +22,17 @@ import org.apache.struts2.convention.annotation.ParentPackage; import com.forgon.directory.acegi.tools.AcegiHelper; -import com.forgon.directory.model.BarcodeDevice; -import com.forgon.disinfectsystem.barcode.service.BarcodeManager; -import com.forgon.disinfectsystem.basedata.becleanitem.service.BeCleanItemManager; -import com.forgon.disinfectsystem.basedatamanager.container.service.ContainerManager; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; -import com.forgon.disinfectsystem.common.CssdUtils; -import com.forgon.disinfectsystem.entity.basedatamanager.container.Container; import com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile; -import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition; -import com.forgon.disinfectsystem.entity.becleanitem.ClassifiedItem; -import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket; import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoring; -import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringAnswer; -import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringConfig; -import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringItem; import com.forgon.disinfectsystem.qualitymonitoringmanager.qualitymonitoring.service.QualityMonitoringManager; -import com.forgon.disinfectsystem.qualitymonitoringmanager.qualitymonitoringconfig.service.QualityMonitoringConfigManager; import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.service.SterilizationRecordManager; import com.forgon.disinfectsystem.tousse.imagefilemanager.service.ImageFileManager; -import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager; -import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; -import com.forgon.tools.FileSystemHelper; import com.forgon.tools.ImageUtils; import com.forgon.tools.StrutsParamUtils; import com.opensymphony.xwork2.ModelDriven; import com.opensymphony.xwork2.Preparable; -import java.util.Collections; - /** * @author WangYi 2012-3-19 */ @@ -71,46 +47,17 @@ private QualityMonitoringManager qualityMonitoringManager; - private QualityMonitoringConfigManager qualityMonitoringConfigManager; - - private TousseInstanceManager tousseInstanceManager; - private ImageFileManager imageFileManager; private SupplyRoomConfigManager supplyRoomConfigManager; - private BeCleanItemManager beCleanItemManager; - - private MaterialDefinitionManager materialDefinitionManager; - - private BarcodeManager barcodeManager; - - private ContainerManager containerManager; - private SterilizationRecordManager sterilizationRecordManager; public void setSterilizationRecordManager( SterilizationRecordManager sterilizationRecordManager) { this.sterilizationRecordManager = sterilizationRecordManager; } - public void setContainerManager(ContainerManager containerManager) { - this.containerManager = containerManager; - } - - public void setBarcodeManager(BarcodeManager barcodeManager) { - this.barcodeManager = barcodeManager; - } - - public void setMaterialDefinitionManager( - MaterialDefinitionManager materialDefinitionManager) { - this.materialDefinitionManager = materialDefinitionManager; - } - - public void setBeCleanItemManager(BeCleanItemManager beCleanItemManager) { - this.beCleanItemManager = beCleanItemManager; - } - public SupplyRoomConfigManager getSupplyRoomConfigManager() { return supplyRoomConfigManager; } @@ -124,21 +71,11 @@ this.imageFileManager = imageFileManager; } - public void setTousseInstanceManager( - TousseInstanceManager tousseInstanceManager) { - this.tousseInstanceManager = tousseInstanceManager; - } - public void setQualityMonitoringManager( QualityMonitoringManager qualityMonitoringManager) { this.qualityMonitoringManager = qualityMonitoringManager; } - public void setQualityMonitoringConfigManager( - QualityMonitoringConfigManager qualityMonitoringConfigManager) { - this.qualityMonitoringConfigManager = qualityMonitoringConfigManager; - } - public void saveQualityMonitoring() { String materialInfo = StrutsParamUtils.getPraramValue("materialInfo",""); String tousseInstanceId = StrutsParamUtils.getPraramValue("tousseInstanceId", ""); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoring.java =================================================================== diff -u -r13809 -r14162 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoring.java (.../QualityMonitoring.java) (revision 13809) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoring.java (.../QualityMonitoring.java) (revision 14162) @@ -49,6 +49,10 @@ private String material; // 材料 private String remark; // 备注 + + private String basketBarcode;//篮筐条码 + + private String basketName;//篮筐名称 @JsonIgnore private List images;//上传图片 @@ -331,5 +335,21 @@ public void setTousseDefinitionId(String tousseDefinitionId) { this.tousseDefinitionId = tousseDefinitionId; } + + public String getBasketBarcode() { + return basketBarcode; + } + + public void setBasketBarcode(String basketBarcode) { + this.basketBarcode = basketBarcode; + } + + public String getBasketName() { + return basketName; + } + + public void setBasketName(String basketName) { + this.basketName = basketName; + } } Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js =================================================================== diff -u -r14011 -r14162 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js (.../qualitymonitoringForm.js) (revision 14011) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js (.../qualitymonitoringForm.js) (revision 14162) @@ -257,63 +257,17 @@ top.Ext.getCmp('optionAmount').setValue(''); var baseInfoPanel = top.Ext.getCmp('baseInfoPanel'); if("是" == result.data.isInsertBasket){ - if(top.Ext.getCmp("scanBarcode") == null){ - var fd = { - id:'insertBasket', - name:'insertBasket', - layout : 'form', - columnWidth : .5, - labelWidth : 90, - items : [{ - xtype : 'textfield', - name : 'scanBarcode', - id : 'scanBarcode', - fieldLabel : "清洗篮筐条码", - listeners : { - specialkey : function(field,e){ - if(e.getKey() == 13){ - var barcodeValue = field.getValue(); - ContainerTableManager.getBasketByBarcodeAndProcedures(barcodeValue,basketAllowProcedure,function(jsonStr){ - var obj = Ext.util.JSON.decode(jsonStr); - if(obj.success){ - top.Ext.getCmp('containerName').setValue(obj.containerName); - }else{ - showResult(obj.message); - } - top.Ext.getCmp("containerBarcode").setValue(barcodeValue); - top.Ext.getCmp("scanBarcode").setValue(''); - }); - } - } - }, - anchor : '95%' - }] - }; - var fd2 = { - id:'containerNameItem', - name:'containerNameItem', - layout : 'form', - columnWidth : .5, - labelWidth : 90, - items : [{ - xtype : 'textfield', - name : 'containerName', - id : 'containerName', - fieldLabel : "清洗篮筐名称", - readOnly:true, - allowBlank:false, - anchor : '95%' - }] - }; - baseInfoPanel.add(baseInfoPanel.items.getCount(), fd); - baseInfoPanel.add(baseInfoPanel.items.getCount(), fd2); - baseInfoPanel.doLayout(); - } + top.Ext.getCmp("insertBasket").show(); + top.Ext.getCmp("containerNameItem").show(); + + top.Ext.getCmp('containerName').setVisible(true); + top.Ext.getCmp('containerName').getEl().up('.x-form-item').setDisplayed(true); }else{ - if(top.Ext.getCmp("insertBasket") != null){ - top.Ext.getCmp("insertBasket").destroy(); - top.Ext.getCmp("containerNameItem").destroy(); - } + top.Ext.getCmp("insertBasket").hide(); + top.Ext.getCmp("containerNameItem").hide(); + + top.Ext.getCmp('containerName').setVisible(false); + top.Ext.getCmp('containerName').getEl().up('.x-form-item').setDisplayed(false); } var items = new Array(); for(var i = 0 ; i< result.data.items.length ; i++){ @@ -613,7 +567,52 @@ anchor : '95%' }] },{ + id:'insertBasket', + name:'insertBasket', layout : 'form', + columnWidth : .5, + labelWidth : 90, + items : [{ + xtype : 'textfield', + name : 'scanBarcode', + id : 'scanBarcode', + fieldLabel : "清洗篮筐条码", + listeners : { + specialkey : function(field,e){ + if(e.getKey() == 13){ + var barcodeValue = field.getValue(); + ContainerTableManager.getBasketByBarcodeAndProcedures(barcodeValue,basketAllowProcedure,function(jsonStr){ + var obj = Ext.util.JSON.decode(jsonStr); + if(obj.success){ + top.Ext.getCmp('containerName').setValue(obj.containerName); + }else{ + showResult(obj.message); + } + top.Ext.getCmp("containerBarcode").setValue(barcodeValue); + top.Ext.getCmp("scanBarcode").setValue(''); + }); + } + } + }, + anchor : '95%' + }] + },{ + id:'containerNameItem', + name:'containerNameItem', + layout : 'form', + columnWidth : .5, + labelWidth : 90, + items : [{ + xtype : 'textfield', + name : 'containerName', + id : 'containerName', + fieldLabel : "清洗篮筐名称", + readOnly:true, + allowBlank:true, + anchor : '95%' + }] + },{ + layout : 'form', columnWidth : 1, labelWidth : 90, items : [ { @@ -873,6 +872,14 @@ top.Ext.getCmp('responsiblePerson').setValue(result.data.responsiblePerson); top.Ext.getCmp('registerPerson').setValue(result.data.registerPerson); top.Ext.getCmp('tousseDefinitionId').setValue(result.data.tousseDefinitionId); + if(result.data.basketName!=null && result.data.basketName != ""){ + top.Ext.getCmp('containerName').setValue(result.data.basketName); + }else{ + top.Ext.getCmp("insertBasket").hide(); + top.Ext.getCmp("containerNameItem").hide(); + top.Ext.getCmp('containerName').setVisible(false); + top.Ext.getCmp('containerName').getEl().up('.x-form-item').setDisplayed(false); + } materialDefinitionStore.baseParams['spell'] = ""; materialDefinitionStore.reload(); if(result.data.tousseInstance != null){ @@ -1001,8 +1008,8 @@ } } //是否扫描篮筐 - var container = top.Ext.getCmp("containerName"); - if(container != null && container.getValue().length <= 0){ + var container = top.Ext.getCmp("containerName") ; + if(container != null && container.isVisible() && container.getValue() == ""){ showResult("请扫描篮筐条码！"); return false; }