Index: forgon-core/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r15813 -r16043 --- forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 15813) +++ forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 16043) @@ -19,7 +19,7 @@ "3.3.0","3.3.8", "3.3.9", "3.3.10","3.3.12","3.3.13","3.8.0","3.9.0","3.9.1","3.9.2","4.0.2","4.0.3","4.0.4", "4.0.5","4.0.6","4.0.44","4.0.45","4.1.0","4.1.1","4.1.2","4.1.3","4.1.4","4.1.5","4.1.6","4.1.7","4.1.8","4.1.9","4.2.0","4.2.1","4.2.2", "4.2.3","4.2.4","4.2.5","4.2.6","4.2.7","4.2.8","4.2.9","4.3.0","4.3.1","4.3.2","4.3.3","4.3.4","4.3.5","4.3.6","4.3.7","4.3.8","4.3.9", - "4.4.0","4.4.1","4.4.2","4.4.3","4.4.4","4.4.5"};// 版本列表 + "4.4.0","4.4.1","4.4.2","4.4.3","4.4.4","4.4.5","4.4.6"};// 版本列表 public final static List SOFTWARE_VERSION_LIST = Arrays .asList(SOFTWARE_VERSION_ARRAY); public final static String SOFTWARE_VERSION = SOFTWARE_VERSION_ARRAY[SOFTWARE_VERSION_ARRAY.length - 1];// 软件最新版本 Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/idcarddefinition/IDCardDefinition.java =================================================================== diff -u -r14866 -r16043 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/idcarddefinition/IDCardDefinition.java (.../IDCardDefinition.java) (revision 14866) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/idcarddefinition/IDCardDefinition.java (.../IDCardDefinition.java) (revision 16043) @@ -61,6 +61,7 @@ private boolean idCardInstancesLoad = false; + private String curIdCardInstanceBarcode; @Id @GeneratedValue(strategy = GenerationType.AUTO) public Long getId() { @@ -119,6 +120,14 @@ this.idCardInstancesLoad = idCardInstancesLoad; } + public String getCurIdCardInstanceBarcode() { + return curIdCardInstanceBarcode; + } + + public void setCurIdCardInstanceBarcode(String curIdCardInstanceBarcode) { + this.curIdCardInstanceBarcode = curIdCardInstanceBarcode; + } + public void safelySetLastTousseInstanceId(Long lastTousseInstanceId) { if(this.lastTousseInstanceId == null){ this.lastTousseInstanceId = lastTousseInstanceId; Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java =================================================================== diff -u -r16018 -r16043 --- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java (.../IDCardDefinitionManagerImpl.java) (revision 16018) +++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java (.../IDCardDefinitionManagerImpl.java) (revision 16043) @@ -297,6 +297,7 @@ obj.put("deleted", idCardDefinition.getDeleted()); obj.put("status", idCardDefinition.getStatus()); obj.put("description", description); + obj.put("curIdCardInstanceBarcode", idCardDefinition.getCurIdCardInstanceBarcode()); obj.put("tousseDefinitionID", idCardDefinition.getTousseDefinitionID()); @@ -455,6 +456,8 @@ idCardInstance.setStatus(IDCardInstance.STATUS_USING); idCardInstanceManager.save_TRANS_MANDATORY(idCardInstance); + idCardDefinition.setCurIdCardInstanceBarcode(idCardInstance.getBarcode()); + objectDao.saveOrUpdate(idCardDefinition); obj.put("idCardDefinition", idCardDefinition); obj.put("idCardInstance", idCardInstance); return obj; @@ -502,6 +505,9 @@ idCardInstance.setPrintDate(printDate); idCardInstance.setType(BarcodeDevice.BARCODE_TYPE_SIGNBOARD); idCardInstance.setIdCardDefinitionID(idCardDefinition.getId()); + + idCardDefinition.setCurIdCardInstanceBarcode(idCardInstance.getBarcode()); + objectDao.update(idCardDefinition); return idCardInstance; } @@ -740,6 +746,8 @@ if (idCardInstanceToUpdate != null) { idCardInstanceToUpdate .setStatus(IDCardInstance.STATUS_USING); + idCardDefinitionFrom.setCurIdCardInstanceBarcode(idCardInstanceToUpdate.getBarcode()); + objectDao.update(idCardDefinitionFrom); objectDao.update(idCardInstanceToUpdate); } } @@ -759,6 +767,8 @@ fromIDCardInstance.setStatus(IDCardInstance.STATUS_USING); fromIDCardInstance.setIdCardDefinitionID(Long .valueOf(toIDCardDefinitionID)); + idCardDefinitionTo.setCurIdCardInstanceBarcode(fromIDCardInstance.getBarcode()); + objectDao.update(idCardDefinitionTo); idCardInstanceManager.update_TRANS_MANDATORY(fromIDCardInstance); } Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.4.5_4.4.6.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.4.5_4.4.6.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.4.5_4.4.6.sql (revision 16043) @@ -0,0 +1 @@ +update IDCardDefinition set curIdCardInstanceBarcode=(select max(b.barcode) from IDCardInstance i inner join barcodeDevice b on i.id=b.id where i.idCardDefinitionID=IDCardDefinition.id and i.status='使用中' and b.barcode is not null); \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js =================================================================== diff -u -r16018 -r16043 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js (.../idCardForm.js) (revision 16018) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js (.../idCardForm.js) (revision 16043) @@ -52,6 +52,7 @@ {name : 'deleted'}, {name : 'status'}, {name : 'barcode'}, + {name : 'curIdCardInstanceBarcode'}, {name : 'idCardInstances'}, {name : 'useAmount'}, {name : 'traceableMaterials'}, @@ -92,7 +93,8 @@ var signBoardCm = new top.Ext.grid.ColumnModel([ new top.Ext.grid.CheckboxSelectionModel ({singleSelect : true,hideable:false}),//checkbox 列 {header : '编号',dataIndex : 'number',width : 50}, - {header : "当前条码",dataIndex : 'barcode',width : 70}, +// {header : "当前条码",dataIndex : 'barcode',width : 70}, + {header : "当前条码",dataIndex : 'curIdCardInstanceBarcode',width : 70}, {header : "使用次数",dataIndex : 'useAmount',width : 70}, {header : "状态",dataIndex : 'status',width : 80}, {id:'description',header : "描述",