Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/service/SterilisationManagerImpl.java =================================================================== diff -u -r12331 -r14965 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/service/SterilisationManagerImpl.java (.../SterilisationManagerImpl.java) (revision 12331) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/service/SterilisationManagerImpl.java (.../SterilisationManagerImpl.java) (revision 14965) @@ -79,5 +79,16 @@ } return null; } + /** + * 通过灭菌程序获取灭菌目的 + */ + public String getSterilisationPurposeByName(String name){ + Sterilisation sa = getSterilisationByName(name); + if(sa != null){ + return sa.getSterilizationPurpose(); + }else{ + return null; + } + } } Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r14963 -r14965 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 14963) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 14965) @@ -52,6 +52,7 @@ import com.forgon.disinfectsystem.basedatamanager.container.service.ContainerManager; import com.forgon.disinfectsystem.basedatamanager.container.service.ReviewedBasketManager; import com.forgon.disinfectsystem.basedatamanager.goodsstock.service.GoodsStockManager; +import com.forgon.disinfectsystem.basedatamanager.sterilisation.service.SterilisationManager; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; import com.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseInstanceUtils; import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager; @@ -129,6 +130,10 @@ /** * @author songwei 2012-3-25 上午11:02:11 */ +/** + * @author JC + * + */ public class PackingManagerImpl implements PackingManager { private final Logger logger = Logger.getLogger(this.getClass()); @@ -184,6 +189,12 @@ private InitDbConnection dbConnection; + private SterilisationManager sterilisationManager; + + public void setSterilisationManager(SterilisationManager sterilisationManager) { + this.sterilisationManager = sterilisationManager; + } + public void setDbConnection(InitDbConnection dbConnection) { this.dbConnection = dbConnection; } @@ -711,7 +722,7 @@ if (tousseInstance.getUseAmount() != null){ useAmount = tousseInstance.getUseAmount().toString(); } - + String saPurpose = sterilisationManager.getSterilisationPurposeByName(tousseInstance.getSterilingType()); obj.put("id", tousseInstance.getId()); obj.put("tousseName", tousseName); obj.put("tousseBarcode", tousseInstance.getBarcode()); @@ -728,6 +739,7 @@ .format(tousseInstance.getOperationTime())); obj.put("packType", tousseInstance.getPackageType()); obj.put("sterilization", tousseInstance.getSterilingType()); + obj.put("sterilizationPurpose",saPurpose); obj.put("tousseType", td.getTousseType()); obj.put("supplierName", supplierName); obj.put("sterilizer", sterilizer); Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/modifyTousseInstances.js =================================================================== diff -u -r12331 -r14965 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/modifyTousseInstances.js (.../modifyTousseInstances.js) (revision 12331) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/modifyTousseInstances.js (.../modifyTousseInstances.js) (revision 14965) @@ -4,9 +4,9 @@ //灭菌程序 var sterilizerTypeStore = new Ext.data.SimpleStore({ - fields : [ 'id','typeName' ], + fields : [ 'id','typeName','typeNameAndPurpose' ], autoLoad :true, - url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getSterilizerType.do' + url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getSterilizerTypeAndSterilizationPurpose.do' }); //包装类型 var packageTypeStore = new Ext.data.SimpleStore({ @@ -212,7 +212,7 @@ xtype : 'combo', fieldLabel : "灭菌程序", valueField : 'typeName', - displayField : 'typeName', + displayField : 'typeNameAndPurpose', store : sterilizerTypeStore, forceSelection : true, editable : false, Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r14945 -r14965 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 14945) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 14965) @@ -967,12 +967,12 @@ var sterilizerTypeStore = new Ext4.data.Store({ proxy : { type : 'ajax', - url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getSterilizerType.do', + url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getSterilizerTypeAndSterilizationPurpose.do', reader : { type : 'array' } }, - fields : [ 'id','typeName' ], + fields : [ 'id','typeName','typeNameAndPurpose' ], autoLoad : true }); //灭菌炉 @@ -1306,7 +1306,7 @@ labelWidth:90, labelAlign:'right', valueField : 'typeName', - displayField : 'typeName', + displayField : 'typeNameAndPurpose', labelAlign:'right', store : sterilizerTypeStore, forceSelection : true, Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java =================================================================== diff -u -r14308 -r14965 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java (.../SterilizerAction.java) (revision 14308) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java (.../SterilizerAction.java) (revision 14965) @@ -302,6 +302,69 @@ e.printStackTrace(); } } + + public void getSterilizerTypeAndSterilizationPurpose() { + List list = barcodeManager.getSterilizationType(); + String sterilizerName = StrutsParamUtils.getPraramValue( + "sterilizerName", ""); + StringBuffer buffer = new StringBuffer(); + boolean isSterilizationRecordModel = "sterilizationRecord" + .equals(StrutsParamUtils.getPraramValue("type", "")); + if (!isSterilizationRecordModel) { + JSONObject obj = new JSONObject(); + + buffer.append("['0','无',''],"); + } + if (StringUtils.isNotBlank(sterilizerName)) { + Sterilizer sterilizer = sterilizerManager + .getSterilizerByName(sterilizerName); + if (sterilizer != null) { + Set set = sterilizer.getSterilisations(); + for (Sterilisation sterilisation : set) { + String purpose = ""; + if(StringUtils.isNotBlank(sterilisation.getSterilizationPurpose())){ + purpose = "("+sterilisation.getSterilizationPurpose()+")"; + } + buffer.append("['").append(sterilisation.getId()) + .append("','") + .append(sterilisation.getSterilisation()) + .append("','") + .append(sterilisation.getSterilisation()+purpose) + .append("'],"); + } + } + } else { + if (list != null && list.size() > 0) { + for (int i = 0; i < list.size(); i++) { + if (list.get(i) instanceof Sterilisation) { + Sterilisation sterilisation = (Sterilisation) list + .get(i); + String purpose = ""; + if(StringUtils.isNotBlank(sterilisation.getSterilizationPurpose())){ + purpose = "("+sterilisation.getSterilizationPurpose()+")"; + } + buffer.append("['").append(sterilisation.getId()) + .append("','") + .append(sterilisation.getSterilisation()) + .append("','") + .append(sterilisation.getSterilisation()+purpose) + .append("'],"); + } + } + } + } + String result = ""; + if (buffer.length() > 0) { + result = buffer.substring(0, buffer.length() - 1); + } + HttpServletResponse response = StrutsParamUtils.getResponse(); + try { + response.setCharacterEncoding("utf-8"); + response.getWriter().print("[" + result + "]"); + } catch (IOException e) { + e.printStackTrace(); + } + } public void getAllSterilizer() { String ownGroup = StrutsParamUtils.getPraramValue( Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js =================================================================== diff -u -r14911 -r14965 --- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 14911) +++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 14965) @@ -8,9 +8,9 @@ //灭菌程序 var sterilizerTypeStore = new Ext.data.SimpleStore({ - fields : [ 'id','typeName' ], + fields : [ 'id','typeName','typeNameAndPurpose' ], autoLoad :true, - url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getSterilizerType.do' + url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getSterilizerTypeAndSterilizationPurpose.do' }); //包装类型 @@ -690,12 +690,12 @@ xtype : 'combo', fieldLabel : "灭菌程序", valueField : 'typeName', - displayField : 'typeName', + displayField : 'typeNameAndPurpose', store : sterilizerTypeStore, forceSelection : true, editable : false, lazyInit : false, - listWidth:100, + listWidth:150, triggerAction : 'all', mode : "local", name : "sterilingType", Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/service/SterilisationManager.java =================================================================== diff -u -r12331 -r14965 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/service/SterilisationManager.java (.../SterilisationManager.java) (revision 12331) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/service/SterilisationManager.java (.../SterilisationManager.java) (revision 14965) @@ -23,4 +23,10 @@ public Sterilisation getSterilisationByName(String name); public Sterilisation getSterilisationBySterilisationType(String sterilisationTyp); + /** + * 通过灭菌程序获取灭菌目的 + * @param name + * @return + */ + public String getSterilisationPurposeByName(String name); } Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js =================================================================== diff -u -r14701 -r14965 --- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 14701) +++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 14965) @@ -74,6 +74,7 @@ {name : 'packType'}, {name : 'barcodePaperType'}, {name : 'sterilization'}, + {name : 'sterilizationPurpose'}, {name : 'tousseType'}, {name : 'supplierName'}, {name : 'sterilizer'}, @@ -157,6 +158,12 @@ },{ header : '灭菌程序', dataIndex : 'sterilization', + renderer : function getShowName(v, p, record){ + if(record.data.sterilizationPurpose != null && record.data.sterilizationPurpose != ''){ + return v + '(' + record.data.sterilizationPurpose + ')'; + } + return v; + }, width : 70, sortable : true },{