From d4e50bba1c22ef072f2089d3daef07ea543983b7 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Tue, 27 Aug 2024 15:47:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E4=BB=B6=E5=B7=A5=E8=B5=84=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/op/mes/domain/MesUnitpriceReport.java  | 7 +++++--
 .../resources/mapper/mes/MesUnitpriceReportMapper.xml    | 9 +++++----
 2 files changed, 10 insertions(+), 6 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 abd136338..b91cc67db 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
@@ -54,6 +54,9 @@ public class MesUnitpriceReport extends BaseEntity {
     @Excel(name = "产品名称")
     private String productName;
 
+    @Excel(name = "带线组长")
+    private String lineLeader;
+
 //    @Excel(name = "产线编码")
 //    private String sapCode;
 
@@ -78,6 +81,8 @@ public class MesUnitpriceReport extends BaseEntity {
     @Excel(name = "岗位")
     private String post;
 
+    @Excel(name = "工时")
+    private String attr2;
     /**
      * 子工序名称
      */
@@ -110,8 +115,6 @@ public class MesUnitpriceReport extends BaseEntity {
     @Excel(name = " 计件薪酬（元）")
     private BigDecimal result;
 
-    @Excel(name = "工时")
-    private String attr2;
 
     @Excel(name = "扣款")
     private BigDecimal kk;
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 58b2e4ad9..e463ab550 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
@@ -27,7 +27,7 @@
         <result property="realWages" column="real_wages"/>
         <result property="attr2" column="attr2"/>
         <result property="attr3" column="attr3"/>
-        <result property="createBy" column="create_by"/>
+        <result property="lineLeader" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
@@ -95,7 +95,8 @@
 
         CAST (mup.attr1 AS DECIMAL(18, 6)) AS attr1,
         ROUND(mup.attr1 * mur.attr1, 2) AS result,
-        mur.create_time
+        mur.create_time,
+        mur.create_by
         FROM
         mes_unitprice_report mur
         LEFT JOIN mes_unit_price mup ON RIGHT ( mur.product_code, 11 ) = mup.product_code
@@ -168,8 +169,8 @@
         mur.sj,
         mur.tsfy,
         mur.ybbt,
-        mur.xcbt
-
+        mur.xcbt,
+        mur.create_by
     </select>
 
     <select id="selectMesUnitpriceReportById" parameterType="String" resultMap="MesUnitpriceReportResult">