From 1ada83322a2101bad596f809af93c9c6b6cdc2ba Mon Sep 17 00:00:00 2001
From: jun <junsheng.li@estsh.com>
Date: Wed, 23 Oct 2024 10:20:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E6=80=A5=E4=BB=B6=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=BC=94=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/base/MesPullingOrderInfoService.java          | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java
index 8a3ece4..d195ac7 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java
@@ -1,16 +1,10 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
-import cn.estsh.i3plus.ext.mes.api.base.IMesPartPullService;
 import cn.estsh.i3plus.ext.mes.api.base.IMesPullingOrderInfoService;
-import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
-import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
-import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
 import cn.estsh.i3plus.icloud.core.sdk.ICoreUtilCloud;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
-import cn.estsh.i3plus.platform.common.util.WmsConstWords;
-import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
@@ -18,10 +12,9 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.repository.*;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
-import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.util.CollectionUtils;
 import org.slf4j.Logger;
@@ -304,7 +297,7 @@ public class MesPullingOrderInfoService extends BaseMesService<MesPullingOrderIn
         if (!CollectionUtils.isEmpty(pullingOrderPartInfos)) {
             mesPullingOrder.setPartList(pullingOrderPartInfos);
         }
-        resultMap.put("orderInfo", mesPullingOrder);
+        resultMap.put("orderInfo", JSONObject.toJSONString(mesPullingOrder));
         resultMap.put("success", true);
         resultMap.put("message", message);