From b71ac558e9cc6d588ed110eaa468b87c2951328f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LML=E4=B8=B6?= <mingliang.li@estsh.com>
Date: Fri, 17 May 2024 18:06:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E6=A3=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/busi/MesSpotCheckOrderResultService.java           | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderResultService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderResultService.java
index 7296ff2..ca14ff4 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderResultService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderResultService.java
@@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesSpotCheckOrderResult;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 @Service
 @Slf4j
@@ -14,6 +15,10 @@ public class MesSpotCheckOrderResultService extends BaseMesService<MesSpotCheckO
 
     protected void setPackQueryBean(MesSpotCheckOrderResult bean, DdlPackBean packBean) {
         DdlPreparedPack.getNumEqualPack(bean.getPid(), "pid", packBean);
-//        DdlPreparedPack.getStringLikerPack(bean.getErpWorkCenterName(), "erpWorkCenterName", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getTaskItemName(), "taskItemName", packBean);
+        DdlPreparedPack.getNumEqualPack(bean.getIsTolerance(), "isTolerance", packBean);
+        if (!StringUtils.isEmpty(bean.getSpotCheckTimeStart()) || !StringUtils.isEmpty(bean.getSpotCheckTimeEnd())) {
+            DdlPreparedPack.timeBuilder(bean.getSpotCheckTimeStart(), bean.getSpotCheckTimeEnd(), "spotCheckTime", packBean, false);
+        }
     }
 }