Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java =================================================================== diff -u -r18560 -r18721 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java (.../QualityMonitoringInstanceManagerImpl.java) (revision 18560) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java (.../QualityMonitoringInstanceManagerImpl.java) (revision 18721) @@ -255,8 +255,13 @@ String[] qmgProperty = tousseInstanceInfos[i].split("@"); if(qmgProperty != null && qmgProperty.length == 7){ QualityMonitoringGoods qmg = new QualityMonitoringGoods(); + TousseInstance ti = tousseInstanceManager.get(qmgProperty[1]); // tousseBarcode + "@" + tousseInstanceId + "@" + tousseName + "@" + tousseAmount + "@" + tousseRecycle+ "@" + tousseRePacking+ "@" + order +";"; - qmg.setBarcode(qmgProperty[0]); + if(ti != null){ + qmg.setBarcode(ti.getBarcode()); + }else{ + qmg.setBarcode(qmgProperty[0]); + } qmg.setTousseInstanceId(qmgProperty[1]); qmg.setTousseName(qmgProperty[2]); Integer amount = 0;