diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkstation.java b/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkstation.java
index f8aa52e..0b8f684 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkstation.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkstation.java
@@ -54,6 +54,42 @@ public class MdWorkstation extends BaseEntity
@Excel(name = "工序名称")
private String processName;
+ /** 线边库ID */
+ @Excel(name = "仓库ID")
+ private Long warehouseId;
+
+ /** 线边库编码 */
+ @Excel(name = "仓库编码")
+ private String warehouseCode;
+
+ /** 线边库名称 */
+ @Excel(name = "仓库名称")
+ private String warehouseName;
+
+ /** 库区ID */
+ @Excel(name = "库区ID")
+ private Long locationId;
+
+ /** 库区编码 */
+ @Excel(name = "库区编码")
+ private String locationCode;
+
+ /** 库区名称 */
+ @Excel(name = "库区名称")
+ private String locationName;
+
+ /** 库位ID */
+ @Excel(name = "库位ID")
+ private Long areaId;
+
+ /** 库位编码 */
+ @Excel(name = "库位编码")
+ private String areaCode;
+
+ /** 库位名称 */
+ @Excel(name = "库位名称")
+ private String areaName;
+
/** 是否启用 */
@Excel(name = "是否启用")
private String enableFlag;
diff --git a/ktg-mes/src/main/resources/mapper/md/MdWorkstationMapper.xml b/ktg-mes/src/main/resources/mapper/md/MdWorkstationMapper.xml
index 0c11774..e194e55 100644
--- a/ktg-mes/src/main/resources/mapper/md/MdWorkstationMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/md/MdWorkstationMapper.xml
@@ -15,6 +15,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
+
+
+
+
+
+
@@ -28,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select workstation_id, workstation_code, workstation_name, workstation_address, workshop_id, workshop_code, workshop_name, process_id, process_code, process_name, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_workstation
+ select workstation_id, workstation_code, workstation_name, workstation_address, workshop_id, workshop_code, workshop_name, process_id, process_code, process_name,warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_workstation
@@ -74,6 +92,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
process_id,
process_code,
process_name,
+ warehouse_id,
+ warehouse_code,
+ warehouse_name,
+ location_id,
+ location_code,
+ location_name,
+ area_id,
+ area_code,
+ area_name,
enable_flag,
remark,
attr1,
@@ -95,6 +122,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{processId},
#{processCode},
#{processName},
+ #{warehouseId},
+ #{warehouseCode},
+ #{warehouseName},
+ #{locationId},
+ #{locationCode},
+ #{locationName},
+ #{areaId},
+ #{areaCode},
+ #{areaName},
#{enableFlag},
#{remark},
#{attr1},
@@ -120,6 +156,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
process_id = #{processId},
process_code = #{processCode},
process_name = #{processName},
+ warehouse_id = #{warehouseId},
+ warehouse_code = #{warehouseCode},
+ warehouse_name = #{warehouseName},
+ location_id = #{locationId},
+ location_code = #{locationCode},
+ location_name = #{locationName},
+ area_id = #{areaId},
+ area_code = #{areaCode},
+ area_name = #{areaName},
enable_flag = #{enableFlag},
remark = #{remark},
attr1 = #{attr1},