Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r18524 -r18554 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 18524) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 18554) @@ -4537,7 +4537,11 @@ { for(QualityMonitoringInstance qmi : qmis){ String qmiRemark = qmi.getRemark(); - qmi.setRemark("废弃包条码: " + barcode + ",重新装配条码 : " + barcodeStr + "; " + qmiRemark); + if(StringUtils.isBlank(qmiRemark)){ + qmi.setRemark("废弃包条码: " + barcode + ",重新装配条码 : " + barcodeStr + "; "); + }else{ + qmi.setRemark("废弃包条码: " + barcode + ",重新装配条码 : " + barcodeStr + "; " + qmiRemark); + } objectDao.saveOrUpdate(qmi); } }