From 79af2cb25b1044d8a796873f9fc86d3d1b9e853f Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Tue, 12 Mar 2024 09:58:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E4=BB=B6=E5=B7=A5=E8=B5=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MesUnitPriceReportController.java          | 17 ++++++++++++++++-
 .../mapper/mes/MesUnitpriceReportMapper.xml    | 18 ++++++++++--------
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesUnitPriceReportController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesUnitPriceReportController.java
index 548bda2d..a8d917c7 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesUnitPriceReportController.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesUnitPriceReportController.java
@@ -1,9 +1,13 @@
 package com.op.mes.controller;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
+import com.op.mes.domain.MesUnitPrice;
 import com.op.mes.domain.MesUnitpriceReport;
+import com.op.mes.service.IMesUnitPriceService;
 import com.op.mes.service.IMesUnitpriceReportService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,6 +38,8 @@ import com.op.common.core.web.page.TableDataInfo;
 public class MesUnitPriceReportController extends BaseController {
     @Autowired
     private IMesUnitpriceReportService mesUnitpriceReportService;
+    @Autowired
+    private IMesUnitPriceService mesUnitPriceService;
 
     /**
      * 查询计件工资统计列表
@@ -64,7 +70,16 @@ public class MesUnitPriceReportController extends BaseController {
     @RequiresPermissions("unitPriceReport:report:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id) {
-        return success(mesUnitpriceReportService.selectMesUnitpriceReportById(id));
+
+        MesUnitpriceReport mup=mesUnitpriceReportService.selectMesUnitpriceReportById(id);
+        MesUnitPrice mesUnitPrice=new MesUnitPrice();
+        mesUnitPrice.setProductCode(mup.getProductCode().substring(mup.getProductCode().length() - 11));
+        mesUnitPrice.setLineCode(mup.getLineCode());
+        List<MesUnitPrice> list = mesUnitPriceService.selectMesUnitPriceList(mesUnitPrice);
+        Map map=new HashMap();
+        map.put("MesUnitpriceReport",mup);
+        map.put("MesUnitPriceInfo",list);
+        return success(map);
     }
 
     /**
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 fcbd4145..de3f1522 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
@@ -44,6 +44,7 @@
         mur.product_name,
         mur.line_code,
         mur.attr1 AS real_wages,
+        mur.remark,
         be.equipment_name,
         mur.nick_name,
         mur.childprocess_code,
@@ -101,6 +102,7 @@
         mur.product_name,
         mur.attr1,
         mur.line_code,
+        mur.remark,
         be.equipment_name,
         mur.nick_name,
         mur.childprocess_code,
@@ -166,15 +168,15 @@
 <!--            <if test="productCode != null">product_code = #{productCode},</if>-->
 <!--            <if test="userName != null and userName != ''">user_name = #{userName},</if>-->
 <!--            <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>-->
-<!--            <if test="childprocessCode != null">childprocess_code = #{childprocessCode},</if>-->
-<!--            <if test="childprocessName != null">childprocess_name = #{childprocessName},</if>-->
+            <if test="childprocessCode != null">childprocess_code = #{childprocessCode},</if>
+            <if test="childprocessName != null">childprocess_name = #{childprocessName},</if>
             <if test="attr1 != null">attr1 = #{attr1},</if>
-<!--            <if test="attr2 != null">attr2 = #{attr2},</if>-->
-<!--            <if test="attr3 != null">attr3 = #{attr3},</if>-->
-<!--            <if test="createBy != null">create_by = #{createBy},</if>-->
-<!--            <if test="createTime != null">create_time = #{createTime},</if>-->
-<!--            <if test="updateBy != null">update_by = #{updateBy},</if>-->
-<!--            <if test="updateTime != null">update_time = #{updateTime},</if>-->
+            <if test="attr2 != null">attr2 = #{attr2},</if>
+            <if test="attr3 != null">attr3 = #{attr3},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
         </trim>
         where id = #{id}