|
|
@@ -42,7 +42,7 @@ import java.util.Date;
|
|
|
@Column(name="title", attrName="title", label="名称"),
|
|
|
}),
|
|
|
@JoinTable(type= JoinTable.Type.LEFT_JOIN, entity=MesMaterial.class, attrName="this", alias="d",
|
|
|
- on="d.erp_sn = SUBSTRING_INDEX(SUBSTRING_INDEX(a.sn, ',', 4), ',', -1)",
|
|
|
+ on="d.id = (SELECT mm.id FROM mes_material mm WHERE mm.erp_sn = SUBSTRING_INDEX(SUBSTRING_INDEX(a.sn, ',', 4), ',', -1) ORDER BY CASE WHEN mm.id = a.material_id THEN 0 ELSE 1 END, mm.update_date DESC LIMIT 1)",
|
|
|
columns={
|
|
|
@Column(name="title", attrName="productName", label="产品名称"),
|
|
|
}),
|