From 0717f35d64de3897db0f7c50e05f66b4afa182fa Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Wed, 27 Mar 2024 09:20:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E4=BB=B6=E5=B7=A5=E8=B5=84=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MesUnitPriceServiceImpl.java | 31 +------------------
 .../mapper/mes/MesUnitPriceMapper.xml         |  7 ++++-
 2 files changed, 7 insertions(+), 31 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 6e9af3eb..4323c4fc 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
@@ -112,7 +112,7 @@ public class MesUnitPriceServiceImpl implements IMesUnitPriceService {
     @DS("#header.poolName")
     public String importMesUnitPrice(List<MesUnitPrice> UnitPriceList, Boolean updateSupport, String operName) {
         if (StringUtils.isNull(UnitPriceList) || UnitPriceList.size() == 0) {
-            throw new ServiceException("导入用户数据不能为空！");
+            throw new ServiceException("导入计件薪酬基础数据不能为空！");
         }
         int successNum = 0;
         int failureNum = 0;
@@ -146,34 +146,5 @@ public class MesUnitPriceServiceImpl implements IMesUnitPriceService {
             successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
         }
         return successMsg.toString();
-//		if (StringUtils.isNull(UnitPriceList) || UnitPriceList.size() == 0) {
-//			throw new ServiceException("导入数据不能为空！");
-//		}
-//		int successNum = 0;
-//		int failureNum = 0;
-//		StringBuilder successMsg = new StringBuilder();
-//		StringBuilder failureMsg = new StringBuilder();
-//		for (MesUnitPrice mesUnitPrice : UnitPriceList) {
-//			try {
-//				// 验证是否存在这个产线产品
-//				mesUnitPrice.setPicId(IdUtils.simpleUUID());
-//				mesUnitPriceMapper.insertMesUnitPrice(mesUnitPrice);
-//				successNum++;
-//				successMsg.append("导入成功");
-//
-//			} catch (Exception e) {
-//				failureNum++;
-//				String msg = "导入失败：";
-//				failureMsg.append(msg + e.getMessage());
-//				log.error(msg, e);
-//			}
-//		}
-//		if (failureNum > 0) {
-//			failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
-//			throw new ServiceException(failureMsg.toString());
-//		} else {
-//			successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
-//		}
-//		return successMsg.toString();
     }
 }
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 a561e158..e392cf8a 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
@@ -60,7 +60,12 @@
     </select>
     <select id="selectMesUnitPriceByProCode" parameterType="MesUnitPrice" resultMap="MesUnitPriceResult">
         <include refid="selectMesUnitPriceVo"/>
-        where product_code = #{productCode} and childprocess_code = #{childprocessCode}
+        <where>
+            <if test="factoryId != null ">and factory_id = #{factoryId}</if>
+            <if test="productCode != null  and productCode != ''">and product_code = #{productCode}</if>
+            <if test="lineCode != null  and lineCode != ''">and line_code = #{lineCode}</if>
+            <if test="childprocessCode != null  and childprocessCode != ''">and childprocess_code = #{childprocessCode}</if>
+        </where>
     </select>
 
     <insert id="insertMesUnitPrice" parameterType="MesUnitPrice">