From 97dc167ceaeb3b3e6723ec767720765a1b4a0f38 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Tue, 27 Feb 2024 08:49:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E4=BB=B6=E5=B7=A5=E8=B5=84=E7=BB=9F?=
=?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/op/mes/domain/MesUnitpriceReport.java | 58 ++++++++++++++++
.../impl/MesUnitpriceReportServiceImpl.java | 6 ++
.../mapper/mes/MesUnitpriceReportMapper.xml | 68 +++++++++++--------
.../system/controller/SysUserController.java | 2 +
4 files changed, 107 insertions(+), 27 deletions(-)
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitpriceReport.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitpriceReport.java
index 266dc00e..a77d0560 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitpriceReport.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitpriceReport.java
@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
+import java.math.BigDecimal;
+
/**
* 计件工资统计对象 mes_unitprice_report
*
@@ -45,6 +47,13 @@ public class MesUnitpriceReport extends BaseEntity {
private String lineCode;
+ private String equipmentName;
+ private String totalQuantity;
+ private BigDecimal result;
+ private String headCount;
+ private String avgResult;
+ private String realWages;
+
/**
* 用户账号
@@ -82,6 +91,55 @@ public class MesUnitpriceReport extends BaseEntity {
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String attr2;
+ public String getRealWages() {
+ return realWages;
+ }
+
+ public void setRealWages(String realWages) {
+ this.realWages = realWages;
+ }
+
+ public String getHeadCount() {
+ return headCount;
+ }
+
+ public void setHeadCount(String headCount) {
+ this.headCount = headCount;
+ }
+
+ public String getAvgResult() {
+ return avgResult;
+ }
+
+ public void setAvgResult(String avgResult) {
+ this.avgResult = avgResult;
+ }
+
+
+ public BigDecimal getResult() {
+ return result;
+ }
+
+ public void setResult(BigDecimal result) {
+ this.result = result;
+ }
+
+ public String getTotalQuantity() {
+ return totalQuantity;
+ }
+
+ public void setTotalQuantity(String totalQuantity) {
+ this.totalQuantity = totalQuantity;
+ }
+
+ public String getEquipmentName() {
+ return equipmentName;
+ }
+
+ public void setEquipmentName(String equipmentName) {
+ this.equipmentName = equipmentName;
+ }
+
public String getLineCode() {
return lineCode;
}
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitpriceReportServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitpriceReportServiceImpl.java
index f16dd946..13a2260a 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitpriceReportServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitpriceReportServiceImpl.java
@@ -3,7 +3,9 @@ package com.op.mes.service.impl;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.op.common.core.context.SecurityContextHolder;
import com.op.common.core.utils.DateUtils;
+import com.op.common.security.utils.SecurityUtils;
import com.op.mes.domain.MesUnitpriceReport;
import com.op.mes.mapper.MesUnitpriceReportMapper;
import com.op.mes.service.IMesUnitpriceReportService;
@@ -29,6 +31,7 @@ public class MesUnitpriceReportServiceImpl implements IMesUnitpriceReportService
* @return 计件工资统计
*/
@Override
+ @DS("#header.poolName")
public MesUnitpriceReport selectMesUnitpriceReportById(String id) {
return mesUnitpriceReportMapper.selectMesUnitpriceReportById(id);
}
@@ -52,6 +55,7 @@ public class MesUnitpriceReportServiceImpl implements IMesUnitpriceReportService
* @return 结果
*/
@Override
+
public int insertMesUnitpriceReport(MesUnitpriceReport mesUnitpriceReport) {
mesUnitpriceReport.setCreateTime(DateUtils.getNowDate());
return mesUnitpriceReportMapper.insertMesUnitpriceReport(mesUnitpriceReport);
@@ -64,8 +68,10 @@ public class MesUnitpriceReportServiceImpl implements IMesUnitpriceReportService
* @return 结果
*/
@Override
+ @DS("#header.poolName")
public int updateMesUnitpriceReport(MesUnitpriceReport mesUnitpriceReport) {
mesUnitpriceReport.setUpdateTime(DateUtils.getNowDate());
+ mesUnitpriceReport.setUpdateBy(SecurityContextHolder.getUserName());
return mesUnitpriceReportMapper.updateMesUnitpriceReport(mesUnitpriceReport);
}
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml
index 7c6c4684..c0e2c26a 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml
@@ -11,11 +11,17 @@
+
+
+
+
+
+
@@ -31,36 +37,42 @@