Index: ssts-web/src/main/webapp/dataUpdater/sqls/5.0.41_5.0.42_tidb.sql =================================================================== diff -u -r40326 -r40330 --- ssts-web/src/main/webapp/dataUpdater/sqls/5.0.41_5.0.42_tidb.sql (.../5.0.41_5.0.42_tidb.sql) (revision 40326) +++ ssts-web/src/main/webapp/dataUpdater/sqls/5.0.41_5.0.42_tidb.sql (.../5.0.41_5.0.42_tidb.sql) (revision 40330) @@ -1 +1 @@ -update QualityMonitoringGoods set materialDefinitionId = (select id from MaterialDefinition where QualityMonitoringGoods.material = case when specification is null then name else concat(name, '[', specification, ']') end) where material is not null and material <> '' and materialDefinitionId is null; \ No newline at end of file +update QualityMonitoringGoods set materialDefinitionId = (select min(id) from MaterialDefinition where QualityMonitoringGoods.material = case when specification is null or specification = '' then name else concat(name, '[', specification, ']') end) where material is not null and material <> '' and materialDefinitionId is null; \ No newline at end of file Index: ssts-web/src/main/webapp/dataUpdater/sqls/5.0.41_5.0.42_sqlserver.sql =================================================================== diff -u -r40326 -r40330 --- ssts-web/src/main/webapp/dataUpdater/sqls/5.0.41_5.0.42_sqlserver.sql (.../5.0.41_5.0.42_sqlserver.sql) (revision 40326) +++ ssts-web/src/main/webapp/dataUpdater/sqls/5.0.41_5.0.42_sqlserver.sql (.../5.0.41_5.0.42_sqlserver.sql) (revision 40330) @@ -1 +1 @@ -update QualityMonitoringGoods set materialDefinitionId = (select id from MaterialDefinition where QualityMonitoringGoods.material = case when specification is null then name else name + '['+ specification +']' end) where material is not null and material <> '' and materialDefinitionId is null; \ No newline at end of file +update QualityMonitoringGoods set materialDefinitionId = (select min(id) from MaterialDefinition where QualityMonitoringGoods.material = case when specification is null or specification = '' then name else name + '['+ specification +']' end) where material is not null and material <> '' and materialDefinitionId is null; \ No newline at end of file Index: ssts-web/src/main/webapp/dataUpdater/sqls/5.0.41_5.0.42_oracle.sql =================================================================== diff -u -r40326 -r40330 --- ssts-web/src/main/webapp/dataUpdater/sqls/5.0.41_5.0.42_oracle.sql (.../5.0.41_5.0.42_oracle.sql) (revision 40326) +++ ssts-web/src/main/webapp/dataUpdater/sqls/5.0.41_5.0.42_oracle.sql (.../5.0.41_5.0.42_oracle.sql) (revision 40330) @@ -1 +1 @@ -update QualityMonitoringGoods set materialDefinitionId = (select id from MaterialDefinition where QualityMonitoringGoods.material = case when specification is null then name else name || '['|| specification || ']' end) where material is not null and materialDefinitionId is null; \ No newline at end of file +update QualityMonitoringGoods set materialDefinitionId = (select min(id) from MaterialDefinition where QualityMonitoringGoods.material = case when specification is null then name else name || '['|| specification || ']' end) where material is not null and materialDefinitionId is null; \ No newline at end of file