Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java =================================================================== diff -u -r14825 -r14855 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java (.../PackingAction.java) (revision 14825) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java (.../PackingAction.java) (revision 14855) @@ -235,7 +235,8 @@ String packAmountStr = request.getParameter("packAmount");// 配包数量 String taskGroup = request.getParameter("taskGroup");// 任务组 String tousseType = request.getParameter("tempTousseType"); - String idCardBarcode = request.getParameter("idCardBarcode"); + String idCardInstanceId = request.getParameter("idCardBarcode"); + String idCardDefinitionId = request.getParameter("idCardDefinitionId"); String disinfectionDate = request.getParameter("disinfectionDate"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); @@ -428,10 +429,9 @@ // 器械包标志牌处理 // 如果找到对应的器械包标识牌实例,则该器械包实例与标识牌实例关联,并退出循环,因为这里是1对1的关系 - if(StringUtils.isNotBlank(idCardBarcode)){ - IDCardInstance idCardInstance = idCardInstanceManager.getIDCardInstanceByBarcode(idCardBarcode); + if(StringUtils.isNotBlank(idCardInstanceId)){ if (packingManager.addTousseInstanceToIdCardInstance( - idCardInstance, null, tousseInstance)) { + idCardDefinitionId,idCardInstanceId, null, tousseInstance)) { Long useAmount = tousseInstance.getUseAmount(); if (useAmount != null){ idCardDefinitionUseAmount = useAmount.toString(); Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js =================================================================== diff -u -r13082 -r14855 --- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 13082) +++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 14855) @@ -85,7 +85,8 @@ var tousseId = tousseInfo.idCard.tousseDefinition.id; var tousseName = tousseInfo.idCard.tousseDefinition.name; var tousseType = tousseInfo.idCard.tousseDefinition.tousseType; - Ext.getCmp('idCardBarcode').setValue(barcode); + Ext.getCmp('idCardBarcode').setValue(tousseInfo.idCard.id); + Ext.getCmp('idCardDefinitionId').setValue(tousseInfo.idCard.idCardDefinitionId); Ext.getCmp('idCardName').setValue(tousseName); Ext.getCmp('tousseName').setValue(tousseName); Ext.getCmp('packAmount').setValue(1); @@ -866,6 +867,10 @@ name : 'idCardBarcode' },{ xtype : 'hidden', + id : 'idCardDefinitionId', + name : 'idCardDefinitionId' + },{ + xtype : 'hidden', id : 'isThereIdentificationCard', name : 'isThereIdentificationCard' },{