change - 工单字段修改

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;
     }

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;
     }

os-mes/src/main/resources/mapper/mes/prod/ProdPlanInfoMapper.xml

@@ -24,62 +24,68 @@
         <result property="updatedTime" column="updated_time"/>
         <result property="planBeginTime" column="plan_begin_time"/>
         <result property="planEndTime" column="plan_end_time"/>
+        <result property="stationName" column="station_name"/>
+        <result property="teamName" column="team_name"/>
     </resultMap>
 
     <sql id="selectProdPlanInfoVo">
-        select obj_id,
+        select ppi.obj_id,
-               plan_code,
+               ppi.plan_code,
-               order_code,
+               ppi.order_code,
-               material_code,
+               ppi.material_code,
-               material_name,
+               ppi.material_name,
-               station_code,
+               ppi.station_code,
-               device_code,
+               bpl.product_line_name station_name,
-               team_code,
+               ppi.device_code,
-               plan_amount,
+               ppi.team_code,
-               complete_amount,
+               btm.team_name,
-               begin_time,
+               ppi.plan_amount,
-               end_time,
+               ppi.complete_amount,
-               comp_flag,
+               ppi.begin_time,
-               created_by,
+               ppi.end_time,
-               created_time,
+               ppi.comp_flag,
-               updated_by,
+               ppi.created_by,
-               updated_time,
+               ppi.created_time,
-               plan_begin_time,
+               ppi.updated_by,
-               plan_end_time
+               ppi.updated_time,
-        from prod_plan_info
+               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
     </sql>
 
     <select id="selectProdPlanInfoList" parameterType="ProdPlanInfo" resultMap="ProdPlanInfoResult">
         <include refid="selectProdPlanInfoVo"/>
         <where>
-            <if test="planCode != null  and planCode != ''">and plan_code = #{planCode}</if>
+            <if test="planCode != null  and planCode != ''">and ppi.plan_code = #{planCode}</if>
-            <if test="orderCode != null  and orderCode != ''">and order_code = #{orderCode}</if>
+            <if test="orderCode != null  and orderCode != ''">and ppi.order_code = #{orderCode}</if>
-            <if test="materialCode != null  and materialCode != ''">and material_code = #{materialCode}</if>
+            <if test="materialCode != null  and materialCode != ''">and ppi.material_code = #{materialCode}</if>
-            <if test="materialName != null  and materialName != ''">and material_name like concat('%', #{materialName},
+            <if test="materialName != null  and materialName != ''">and ppi.material_name like concat('%', #{materialName},
                 '%')
             </if>
-            <if test="stationCode != null  and stationCode != ''">and station_code = #{stationCode}</if>
+            <if test="stationCode != null  and stationCode != ''">and ppi.station_code = #{stationCode}</if>
-            <if test="deviceCode != null  and deviceCode != ''">and device_code = #{deviceCode}</if>
+            <if test="deviceCode != null  and deviceCode != ''">and ppi.device_code = #{deviceCode}</if>
-            <if test="teamCode != null  and teamCode != ''">and team_code = #{teamCode}</if>
+            <if test="teamCode != null  and teamCode != ''">and ppi.team_code = #{teamCode}</if>
-            <if test="planAmount != null ">and plan_amount = #{planAmount}</if>
+            <if test="planAmount != null ">and ppi.plan_amount = #{planAmount}</if>
-            <if test="completeAmount != null ">and complete_amount = #{completeAmount}</if>
+            <if test="completeAmount != null ">and ppi.complete_amount = #{completeAmount}</if>
             <if test="params.beginBeginTime != null and params.beginBeginTime != '' and params.endBeginTime != null and params.endBeginTime != ''">
-                and begin_time between #{params.beginBeginTime} and #{params.endBeginTime}
+                and ppi.begin_time between #{params.beginBeginTime} and #{params.endBeginTime}
             </if>
-            <if test="endTime != null ">and end_time = #{endTime}</if>
+            <if test="endTime != null ">and ppi.end_time = #{endTime}</if>
-            <if test="compFlag != null  and compFlag != ''">and comp_flag = #{compFlag}</if>
+            <if test="compFlag != null  and compFlag != ''">and ppi.comp_flag = #{compFlag}</if>
-            <if test="createdBy != null  and createdBy != ''">and created_by = #{createdBy}</if>
+            <if test="createdBy != null  and createdBy != ''">and ppi.created_by = #{createdBy}</if>
-            <if test="createdTime != null ">and created_time = #{createdTime}</if>
+            <if test="createdTime != null ">and ppi.created_time = #{createdTime}</if>
-            <if test="updatedBy != null  and updatedBy != ''">and updated_by = #{updatedBy}</if>
+            <if test="updatedBy != null  and updatedBy != ''">and ppi.updated_by = #{updatedBy}</if>
-            <if test="updatedTime != null ">and updated_time = #{updatedTime}</if>
+            <if test="updatedTime != null ">and ppi.updated_time = #{updatedTime}</if>
-            <if test="planBeginTime != null ">and plan_begin_time = #{planBeginTime}</if>
+            <if test="planBeginTime != null ">and ppi.plan_begin_time = #{planBeginTime}</if>
-            <if test="planEndTime != null ">and plan_end_time = #{planEndTime}</if>
+            <if test="planEndTime != null ">and ppi.plan_end_time = #{planEndTime}</if>
         </where>
     </select>
 
     <select id="selectProdPlanInfoByObjId" parameterType="Long" resultMap="ProdPlanInfoResult">
         <include refid="selectProdPlanInfoVo"/>
-        where obj_id = #{objId}
+        where ppi.obj_id = #{objId}
     </select>
 
     <insert id="insertProdPlanInfo" parameterType="ProdPlanInfo" useGeneratedKeys="true" keyProperty="objId">

os-mes/src/main/resources/mapper/mes/record/RecordStaffAttendanceMapper.xml

@@ -7,8 +7,10 @@
     <resultMap type="RecordStaffAttendance" id="RecordStaffAttendanceResult">
         <result property="objId" column="obj_id"/>
         <result property="staffId" column="staff_id"/>
+        <result property="staffName" column="staff_name"/>
         <result property="attendanceType" column="attendance_type"/>
         <result property="teamCode" column="team_code"/>
+        <result property="teamName" column="team_name"/>
         <result property="classes" column="classes"/>
         <result property="remark" column="remark"/>
         <result property="isFlag" column="is_flag"/>
@@ -20,10 +22,27 @@
     </resultMap>
 
     <sql id="selectRecordStaffAttendanceVo">
-        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
     </sql>
 
-    <select id="selectRecordStaffAttendanceList" parameterType="RecordStaffAttendance" resultMap="RecordStaffAttendanceResult">
+    <select id="selectRecordStaffAttendanceList" parameterType="RecordStaffAttendance"
+            resultMap="RecordStaffAttendanceResult">
         <include refid="selectRecordStaffAttendanceVo"/>
         <where>
             <if test="staffId != null  and staffId != ''">and staff_id = #{staffId}</if>
@@ -41,7 +60,8 @@
         where obj_id = #{objId}
     </select>
 
-    <insert id="insertRecordStaffAttendance" parameterType="RecordStaffAttendance" useGeneratedKeys="true" keyProperty="objId">
+    <insert id="insertRecordStaffAttendance" parameterType="RecordStaffAttendance" useGeneratedKeys="true"
+            keyProperty="objId">
         insert into record_staff_attendance
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="staffId != null">staff_id,</if>
@@ -90,7 +110,9 @@
     </update>
 
     <delete id="deleteRecordStaffAttendanceByObjId" parameterType="Long">
-        delete from record_staff_attendance where obj_id = #{objId}
+        delete
+        from record_staff_attendance
+        where obj_id = #{objId}
     </delete>
 
     <delete id="deleteRecordStaffAttendanceByObjIds" parameterType="String">