From 1226a69a810a3f54aadf6f523f661767f54e9c28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LML=E4=B8=B6?= <mingliang.li@estsh.com>
Date: Thu, 16 May 2024 16:40:57 +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          | 8 +++++++-
 .../mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java | 3 +++
 2 files changed, 10 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 01bbd9f..7296ff2 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
@@ -1,8 +1,9 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.busi;
 
-import cn.estsh.i3plus.ext.mes.api.base.IBaseMesService;
 import cn.estsh.i3plus.ext.mes.api.busi.IMesSpotCheckOrderResultService;
 import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.BaseMesService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+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;
@@ -10,4 +11,9 @@ import org.springframework.stereotype.Service;
 @Service
 @Slf4j
 public class MesSpotCheckOrderResultService extends BaseMesService<MesSpotCheckOrderResult> implements IMesSpotCheckOrderResultService {
+
+    protected void setPackQueryBean(MesSpotCheckOrderResult bean, DdlPackBean packBean) {
+        DdlPreparedPack.getNumEqualPack(bean.getPid(), "pid", packBean);
+//        DdlPreparedPack.getStringLikerPack(bean.getErpWorkCenterName(), "erpWorkCenterName", packBean);
+    }
 }
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java
index 790e841..b88bb03 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java
@@ -124,7 +124,10 @@ public class MesSpotCheckOrderService extends BaseMesService<MesSpotCheckOrder>
         detailList.forEach(k -> {
             MesSpotCheckOrderResult result = new MesSpotCheckOrderResult();
             BeanUtils.copyProperties(k, result, "id");
+            result.setSpotCheckOrderNo(finalBean.getSpotCheckOrderNo());
             result.setPid(finalBean.getId());
+            result.setWorkCenterCode(finalBean.getWorkCenterCode());
+            result.setWorkCellCode(finalBean.getWorkCellCode());
             result.setSpotCheckItemId(k.getId());
             result.setTaskItemName(k.getSpotCheckItemName());
             result.setSpotCheckStandardValue(k.getStandardValue());