diff --git a/os-mes/src/main/java/com/os/mes/prod/domain/ProdPlanInfo.java b/os-mes/src/main/java/com/os/mes/prod/domain/ProdPlanInfo.java index 8fbf904..1073dd7 100644 --- a/os-mes/src/main/java/com/os/mes/prod/domain/ProdPlanInfo.java +++ b/os-mes/src/main/java/com/os/mes/prod/domain/ProdPlanInfo.java @@ -47,11 +47,17 @@ public class ProdPlanInfo extends BaseEntity { private String materialName; /** - * 计划工位 + * 工位编号 */ - @Excel(name = "计划工位") + @Excel(name = "工位编号") private String stationCode; + /** + * 工位名称 + */ + @Excel(name = "工位名称") + private String stationName; + /** * 设备编号 */ @@ -59,11 +65,17 @@ public class ProdPlanInfo extends BaseEntity { private String deviceCode; /** - * 计划班组 + * 班组编号 */ - @Excel(name = "计划班组") + @Excel(name = "班组编号") private String teamCode; + /** + * 班组名称 + */ + @Excel(name = "班组名称") + private String teamName; + /** * 计划数量 */ @@ -136,6 +148,22 @@ public class ProdPlanInfo extends BaseEntity { @Excel(name = "计划结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date planEndTime; + public String getStationName() { + return stationName; + } + + public void setStationName(String stationName) { + this.stationName = stationName; + } + + public String getTeamName() { + return teamName; + } + + public void setTeamName(String teamName) { + this.teamName = teamName; + } + public void setObjId(Long objId) { this.objId = objId; } diff --git a/os-mes/src/main/java/com/os/mes/record/domain/RecordStaffAttendance.java b/os-mes/src/main/java/com/os/mes/record/domain/RecordStaffAttendance.java index 469f61c..c44cc6d 100644 --- a/os-mes/src/main/java/com/os/mes/record/domain/RecordStaffAttendance.java +++ b/os-mes/src/main/java/com/os/mes/record/domain/RecordStaffAttendance.java @@ -25,6 +25,12 @@ public class RecordStaffAttendance extends BaseEntity { @Excel(name = "员工ID") private String staffId; + /** + * 员工名称 + */ + @Excel(name = "员工名称") + private String staffName; + /** * 打卡类型（0上班 1下班） */ @@ -37,6 +43,12 @@ public class RecordStaffAttendance extends BaseEntity { @Excel(name = "班组编号") private String teamCode; + /** + * 班组名称 + */ + @Excel(name = "班组名称") + private String teamName; + /** * 班次（1早班 2晚班） */ @@ -55,6 +67,22 @@ public class RecordStaffAttendance extends BaseEntity { @Excel(name = "机台编号") private String machineCode; + public String getStaffName() { + return staffName; + } + + public void setStaffName(String staffName) { + this.staffName = staffName; + } + + public String getTeamName() { + return teamName; + } + + public void setTeamName(String teamName) { + this.teamName = teamName; + } + public void setObjId(Long objId) { this.objId = objId; } diff --git a/os-mes/src/main/resources/mapper/mes/prod/ProdPlanInfoMapper.xml b/os-mes/src/main/resources/mapper/mes/prod/ProdPlanInfoMapper.xml index 5b193e1..ac4ea94 100644 --- a/os-mes/src/main/resources/mapper/mes/prod/ProdPlanInfoMapper.xml +++ b/os-mes/src/main/resources/mapper/mes/prod/ProdPlanInfoMapper.xml @@ -24,62 +24,68 @@ + + - select obj_id, - plan_code, - order_code, - material_code, - material_name, - station_code, - device_code, - team_code, - plan_amount, - complete_amount, - begin_time, - end_time, - comp_flag, - created_by, - created_time, - updated_by, - updated_time, - plan_begin_time, - plan_end_time - from prod_plan_info + select ppi.obj_id, + ppi.plan_code, + ppi.order_code, + ppi.material_code, + ppi.material_name, + ppi.station_code, + bpl.product_line_name station_name, + ppi.device_code, + ppi.team_code, + btm.team_name, + ppi.plan_amount, + ppi.complete_amount, + ppi.begin_time, + ppi.end_time, + ppi.comp_flag, + ppi.created_by, + ppi.created_time, + ppi.updated_by, + ppi.updated_time, + ppi.plan_begin_time, + ppi.plan_end_time + from prod_plan_info ppi + left join base_product_line bpl on bpl.product_line_code = ppi.station_code + left join base_team_members btm on btm.team_code = ppi.team_code diff --git a/os-mes/src/main/resources/mapper/mes/record/RecordStaffAttendanceMapper.xml b/os-mes/src/main/resources/mapper/mes/record/RecordStaffAttendanceMapper.xml index bed9739..a1f1469 100644 --- a/os-mes/src/main/resources/mapper/mes/record/RecordStaffAttendanceMapper.xml +++ b/os-mes/src/main/resources/mapper/mes/record/RecordStaffAttendanceMapper.xml @@ -5,34 +5,53 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + - select obj_id, staff_id, attendance_type, team_code, classes, remark, is_flag, create_by, create_time, update_by, update_time, machine_code from record_staff_attendance + select rsa.obj_id, + rsa.staff_id, + bsi.staff_name, + rsa.attendance_type, + rsa.team_code, + btm.team_name, + rsa.classes, + rsa.remark, + rsa.is_flag, + rsa.create_by, + rsa.create_time, + rsa.update_by, + rsa.update_time, + rsa.machine_code + from record_staff_attendance rsa + left join base_team_members btm on btm.team_code = rsa.team_code + left join base_staff_info bsi on bsi.staff_id = rsa.staff_id - - and staff_id = #{staffId} - and attendance_type = #{attendanceType} - and team_code = #{teamCode} - and classes = #{classes} - and is_flag = #{isFlag} - and create_time = #{createTime} - and machine_code = #{machineCode} + and staff_id = #{staffId} + and attendance_type = #{attendanceType} + and team_code = #{teamCode} + and classes = #{classes} + and is_flag = #{isFlag} + and create_time = #{createTime} + and machine_code = #{machineCode} @@ -41,7 +60,8 @@ where obj_id = #{objId} - + insert into record_staff_attendance staff_id, @@ -90,7 +110,9 @@ - delete from record_staff_attendance where obj_id = #{objId} + delete + from record_staff_attendance + where obj_id = #{objId}