From 01acbe595e57ab56811574dec0565ca0925c3eac Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Mon, 27 May 2024 09:42:19 +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=E6=94=B9=E4=B8=BA=E5=8F=AA=E6=9F=A5=E8=AF=A2=E6=9C=AC?=
 =?UTF-8?q?=E4=BA=BA=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/mes/service/impl/MesUnitPriceServiceImpl.java  | 4 ++++
 .../src/main/resources/mapper/mes/MesUnitPriceMapper.xml  | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java
index a4a574a03..8471aebbe 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java
@@ -8,6 +8,8 @@ import com.op.common.core.utils.DateUtils;
 import com.op.common.core.utils.StringUtils;
 import com.op.common.core.utils.bean.BeanValidators;
 import com.op.common.core.utils.uuid.IdUtils;
+import com.op.common.datascope.annotation.DataScope;
+import com.op.common.security.utils.SecurityUtils;
 import com.op.mes.domain.MesUnitPrice;
 import com.op.mes.mapper.MesUnitPriceMapper;
 import com.op.mes.service.IMesUnitPriceService;
@@ -58,6 +60,7 @@ public class MesUnitPriceServiceImpl implements IMesUnitPriceService {
     @Override
     @DS("#header.poolName")
     public List<MesUnitPrice> selectMesUnitPriceList(MesUnitPrice mesUnitPrice) {
+        mesUnitPrice.setCreateBy(SecurityUtils.getUsername());
         return mesUnitPriceMapper.selectMesUnitPriceList(mesUnitPrice);
     }
 
@@ -126,6 +129,7 @@ public class MesUnitPriceServiceImpl implements IMesUnitPriceService {
                 if (StringUtils.isNull(u)) {
                     BeanValidators.validateWithException(validator, mesUnitPrice);
                     mesUnitPrice.setPicId(IdUtils.simpleUUID());
+                    mesUnitPrice.setCreateBy(SecurityUtils.getUsername());
                     mesUnitPriceMapper.insertMesUnitPrice(mesUnitPrice);
                     successNum++;
                     successMsg.append("<br/>" + successNum + mesUnitPrice.getProductName() + "-" + mesUnitPrice.getChildprocessName() + " 导入成功");
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml
index e392cf8ab..ea9930a16 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml
@@ -29,8 +29,9 @@
 	</sql>
 
     <select id="selectMesUnitPriceList" parameterType="MesUnitPrice" resultMap="MesUnitPriceResult">
-        <include refid="selectMesUnitPriceVo"/>
-
+        select A.pic_id, A.factory_id, A.product_code, A.product_name, A.line_code,
+        A.line_name, A.childprocess_id, A.childprocess_code, A.childprocess_name, A.attr1,
+        A.attr2, A.attr3, A.attr4, A.create_by, A.create_time, A.update_by, A.update_time from mes_unit_price A
         <where>
             <if test="factoryId != null ">and factory_id = #{factoryId}</if>
             <if test="productCode != null  and productCode != ''">and product_code = #{productCode}</if>
@@ -50,8 +51,9 @@
             <if test="attr2 != null  and attr2 != ''">and attr2 = #{attr2}</if>
             <if test="attr3 != null ">and attr3 = #{attr3}</if>
             <if test="attr4 != null ">and attr4 = #{attr4}</if>
+            <if test="createBy != null">create_by = #{createBy}</if>
         </where>
-        ORDER BY childprocess_code ASC
+        ORDER BY A.childprocess_code ASC
     </select>
 
     <select id="selectMesUnitPriceByPicId" parameterType="String" resultMap="MesUnitPriceResult">