From 226c432a5cd4def93e7215ca1405c87dd6612d56 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 5 Mar 2025 09:42:55 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/mes/mapper/MesReportWorkMapper.java | 3 +++ .../impl/MesReportWorkServiceImpl.java | 2 +- .../mapper/mes/MesReportWorkMapper.xml | 21 ++++++++++++++++++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java index 0fa14b461..d5baafb81 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java @@ -96,6 +96,9 @@ public interface MesReportWorkMapper { @MapKey("nameDate") Map getLineChartsDatas(MesReportProduction mesReportProduction); + @MapKey("nameDate") + Map getLineChartsDayDatas(MesReportProduction mesReportProduction); + @MapKey("name") Map getDayOfMonthDatas(MesReportProduction mesReportProduction); diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java index e5637614f..5035d5f3f 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java @@ -688,7 +688,7 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { //日期名称数组 List xAxisDatas = getDays(startTime,endTime); lineChartDto.setxAxisDatas(xAxisDatas); - Map productdatas = mesReportWorkMapper.getLineChartsDatas(mesReportProduction); + Map productdatas = mesReportWorkMapper.getLineChartsDayDatas(mesReportProduction); //值 List datas = new ArrayList<>(); for(String dayStr:xAxisDatas) { diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index 3934a5495..cf45716c2 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -310,6 +310,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" )mrw group by mrw.nameDate,mrw.productCode,mrw.productName,mrw.feedbackTime + SELECT @@ -35,15 +36,16 @@ SELECT CAST(ROUND(mlp.efficiency / NULLIF(mlp.attr1, 0) / NULLIF(mlp.use_man, 0), 1) AS FLOAT) AS standardEfficiency, CAST(ROUND(mrws.quantity_feedback / NULLIF(mrws.work_time, 0) / NULLIF(mrws.use_man, 0), 1) AS FLOAT) AS actualEfficiency, mrws.parent_order, - mrws.remark as reason + mrws.remark as reason,bst.Shift_Desc AS shift FROM [dbo].[mes_report_work] mrws LEFT JOIN pro_order_workorder pow ON mrws.workorder_code = pow.workorder_code LEFT JOIN base_product_attached bpa ON bpa.product_code = RIGHT(mrws.product_code, 11) LEFT JOIN base_product bp ON bp.product_code = mrws.product_code LEFT JOIN mes_line_product mlp ON mlp.product_code = mrws.product_code AND mlp.line_code = mrws.machine_code + LEFT JOIN base_shifts_t bst ON bst.Shift_Id=mrws.shift_code WHERE - CAST(mrws.feedback_time AS DATE) = #{feedbackTime} + CAST(pow.product_date AS DATE) = #{feedbackTime} AND mrws.del_flag = '0' ORDER BY mrws.machine_name ASC; diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesAttendanceRecordsMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesAttendanceRecordsMapper.xml new file mode 100644 index 000000000..0dbd9798b --- /dev/null +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesAttendanceRecordsMapper.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select id, user_id, user_name, attendance_status, sex, age, id_number, start_time, start_addr, end_time, end_addr, attendance_time, attendance_date, work_hours, create_time, post from mes_attendance_records + + + + + + + + insert into mes_attendance_records + + id, + user_id, + user_name, + attendance_status, + sex, + age, + id_number, + start_time, + start_addr, + end_time, + end_addr, + attendance_time, + attendance_date, + work_hours, + create_time, + post, + + + #{id}, + #{userId}, + #{userName}, + #{attendanceStatus}, + #{sex}, + #{age}, + #{idNumber}, + #{startTime}, + #{startAddr}, + #{endTime}, + #{endAddr}, + #{attendanceTime}, + #{attendanceDate}, + #{workHours}, + #{createTime}, + #{post}, + + + + + update mes_attendance_records + + user_id = #{userId}, + user_name = #{userName}, + attendance_status = #{attendanceStatus}, + sex = #{sex}, + age = #{age}, + id_number = #{idNumber}, + start_time = #{startTime}, + start_addr = #{startAddr}, + end_time = #{endTime}, + end_addr = #{endAddr}, + attendance_time = #{attendanceTime}, + attendance_date = #{attendanceDate}, + work_hours = #{workHours}, + create_time = #{createTime}, + post = #{post}, + + where id = #{id} + + + + delete from mes_attendance_records where id = #{id} + + + + delete from mes_attendance_records where id in + + #{id} + + + diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index 91a73da2e..201851c02 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -1427,6 +1427,73 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" equ.equipment_name order by equ.equipment_name + + + + + + + + + + + + + + + + + + + + + + + insert into mes_report_work