Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r17565 -r17585 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 17565) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 17585) @@ -2828,6 +2828,12 @@ Ext4.getCmp('save_print').hide(); Ext4.getCmp('packingLableBtn').hide(); } + var idCardBarcodeTemp = record.get("idCardBarcode"); + if(idCardBarcodeTemp != ""){ + loadIdCardByBarcode(idCardBarcodeTemp); + }else{ + Ext4.getCmp('idCardName').setValue(""); + } var isLeaf = record.get('leaf'); if(!isLeaf){ if(record.get('checked') == false){ Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r17583 -r17585 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 17583) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 17585) @@ -4876,6 +4876,8 @@ packingTask.setWashRecord_id(washRecordId); packingTask.setClassifyBasket_id(tousseInstance.getClassifyBasket_id()); packingTask.setRecyclingBasketName(tousseInstance.getWashBasket()); + // 设置标识牌 + packingTask.setIdCardBarcode(tousseInstance.getIdCardInstanceBarcode()); saveOrUpdate(packingTask); if(isThereIDCard){ for(TousseInstance ti : tis){