Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java =================================================================== diff -u -r12713 -r12893 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 12713) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 12893) @@ -159,6 +159,11 @@ // 统计数量,如果该器械包按包统计则为1,如果按材料统计则将材料数量加起来 private Integer statisticsAmount; + /** + * 装配时所绑定的标识牌定义的使用次数 + */ + private Long useAmount; + private String recallTimeStr;// 召回时间 private String recaller;// 召回人 @@ -572,6 +577,14 @@ this.statisticsAmount = statisticsAmount; } + public Long getUseAmount() { + return useAmount; + } + + public void setUseAmount(Long useAmount) { + this.useAmount = useAmount; + } + public Double getFluctuationPrice() { return fluctuationPrice; } Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js =================================================================== diff -u -r12633 -r12893 --- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 12633) +++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 12893) @@ -46,6 +46,7 @@ {name : 'modifiedInfo'}, {name : 'toolAmount'}, {name : 'implantAmount'}, + {name : 'idCardDefinitionUseAmount'}, {name : 'materialTypeTotal'}, {name : 'validUntilStr'}, {name : 'warningDateStr'}, @@ -353,6 +354,7 @@ tousseObj.department = records[i].data['department']; tousseObj.applicant = records[i].data['applicant']; tousseObj.applicantDepart = records[i].data['applicantDepart']; + tousseObj.idCardDefinitionUseAmount = records[i].data['idCardDefinitionUseAmount']; //打印 // 必须先调用此代码,然后才能调用Ext.MessageBox.updateProgress Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r12882 -r12893 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 12882) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 12893) @@ -749,9 +749,13 @@ String sterileStartTime = tousseInstance.getSterileStartTime(); boolean isMarkTousse = expirationDateInfoManager .isMarkTousse(sterileStartTime, validUntilStr); - - + // 使用次数,包实例对应的标识牌定义的使用次数,即实体器械包的使用次数 + String useAmount = ""; + if (tousseInstance.getUseAmount() != null){ + useAmount = tousseInstance.getUseAmount().toString(); + } + obj.put("id", tousseInstance.getId()); obj.put("tousseName", tousseName); obj.put("tousseBarcode", tousseInstance.getBarcode()); @@ -774,6 +778,7 @@ obj.put("isSterile", isSterile); obj.put("toolAmount", toolAmount); obj.put("implantAmount", implantAmount); + obj.put("idCardDefinitionUseAmount", useAmount); obj.put("materialTypeTotal", materialTypeTotal); obj.put("validUntilStr", validUntilStr); obj.put("warningDateStr", warningUntilStr); @@ -2535,7 +2540,8 @@ } tousseInstance.setIdCardInstanceID(idCardInstance.getId()); - updateIDCardUseAmount(idCardInstance); + long useAmountOfIdCardDef = updateIDCardUseAmount(idCardInstance); + tousseInstance.setUseAmount(useAmountOfIdCardDef); // 获取一个标识牌信息 String sql = String @@ -2557,8 +2563,9 @@ /** * 更新标识牌的使用次数,包括标识牌实例和标识牌定义的使用次数 * @param idCardInstance + * @return 标识牌定义的使用次数 */ - private void updateIDCardUseAmount(IDCardInstance idCardInstance) { + private long updateIDCardUseAmount(IDCardInstance idCardInstance) { // 记录标识牌实例的使用次数,绑定一个包实例增加一个 Long useAmount = idCardInstance.getUseAmount(); if (useAmount != null){ @@ -2581,6 +2588,8 @@ IDCardDefinition def = idCardInstance.getIDCardDefinition(objectDao); def.setUseAmount(useAmountOfDef); objectDao.saveOrUpdate(def); + + return useAmountOfDef; } /**