diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseQualityInspectionItem.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseQualityInspectionItem.java
index 5df4917..87529e6 100644
--- a/aucma-base/src/main/java/com/aucma/base/domain/BaseQualityInspectionItem.java
+++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseQualityInspectionItem.java
@@ -56,6 +56,12 @@ public class BaseQualityInspectionItem extends BaseEntity {
@Excel(name = "工位编号")
private String stationCode;
+ /**
+ * 工位名称
+ */
+ @Excel(name = "工位名称")
+ private String stationName;
+
/**
* 启用标识
*/
@@ -88,6 +94,14 @@ public class BaseQualityInspectionItem extends BaseEntity {
@Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date updatedTime;
+ public String getStationName() {
+ return stationName;
+ }
+
+ public void setStationName(String stationName) {
+ this.stationName = stationName;
+ }
+
public void setObjId(Long objId) {
this.objId = objId;
}
diff --git a/aucma-base/src/main/resources/mapper/base/BaseQualityInspectionItemMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseQualityInspectionItemMapper.xml
index a3b8146..a7b2d55 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseQualityInspectionItemMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseQualityInspectionItemMapper.xml
@@ -12,6 +12,7 @@
+
@@ -21,45 +22,47 @@
- select obj_id,
- quality_defect_code,
- quality_defect_name,
- parent_id,
- material_categories,
- material_subclass,
- station_code,
- remark,
- is_flag,
- created_by,
- created_time,
- updated_by,
- updated_time
- from base_quality_inspection_item
+ select qi.obj_id,
+ qi.quality_defect_code,
+ qi.quality_defect_name,
+ qi.parent_id,
+ qi.material_categories,
+ qi.material_subclass,
+ qi.station_code,
+ pl.PRODUCT_LINE_NAME station_name,
+ qi.remark,
+ qi.is_flag,
+ qi.created_by,
+ qi.created_time,
+ qi.updated_by,
+ qi.updated_time
+ from base_quality_inspection_item qi
+ left join BASE_PRODUCTLINE pl on pl.PRODUCT_LINE_CODE = qi.STATION_CODE
@@ -67,12 +70,12 @@