From a5ad0e628f85e5da2b16adc27f5759b7fdf7500b Mon Sep 17 00:00:00 2001
From: gsz <fightgoo@qq.com>
Date: Thu, 26 Sep 2024 14:20:05 +0800
Subject: [PATCH] =?UTF-8?q?43251=20=E6=AD=A6=E6=B1=89PCN-SPS=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=8B=89=E5=8A=A8WebService=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/base/MesPullingOrderInfoService.java       |  4 ++--
 .../serviceimpl/webservice/WebServiceServerSPS.java        | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 4 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 259f6f3..3f6a064 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
@@ -273,10 +273,10 @@ public class MesPullingOrderInfoService extends BaseMesService<MesPullingOrderIn
         Map resultMap = new HashMap();
         //查询拉动单状态为已扫描=20的 拉动单
         DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(organizeCode);
-        DdlPreparedPack.getStringEqualPack(pullingGroupCode, "pullCode", seriesPackBean);
+//        DdlPreparedPack.getStringEqualPack(pullingGroupCode, "pullCode", seriesPackBean);
         DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.PART_PULL_ORDER_TYPE.SPS_PULL.getValue(), "pullOrderType", seriesPackBean);
         DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.PULL_ORDER_STATUS.JIS_PULL.getValue(), "pullOrderStatus", seriesPackBean);
-        DdlPreparedPack.getStringEqualPack(assemblyLine, "workCenterCode", seriesPackBean);
+//        DdlPreparedPack.getStringEqualPack(assemblyLine, "workCenterCode", seriesPackBean);
         seriesPackBean.setWhereAppend(seriesPackBean.getWhereAppend() + "  order by modifyDatetime desc");
 
         MesPullingOrderInfo mesPullingOrder = baseRDao.getByProperty(seriesPackBean);
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/webservice/WebServiceServerSPS.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/webservice/WebServiceServerSPS.java
index 941c744..9cda9f6 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/webservice/WebServiceServerSPS.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/webservice/WebServiceServerSPS.java
@@ -2,6 +2,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.webservice;
 
 import cn.estsh.i3plus.ext.mes.apiservice.model.SpsInfo;
 import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.MesPullingOrderInfoService;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.impp.framework.boot.util.SpringContextsUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,10 +10,11 @@ import org.slf4j.LoggerFactory;
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
 import javax.jws.WebService;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @Description : WebServiceServerSPS
+ * @Description :soapUI调用 http://10.193.30.22:8300/i3plus/mes-service-spsEqu?wsdl
  * @Author :gsz
  * @Date 2024/8/30 9:18
  * @Modify
@@ -28,7 +30,15 @@ public class WebServiceServerSPS {
         LOGGER.info("syncSPSForEquipment主数据:{}", spsInfo);
 
         MesPullingOrderInfoService bean = (MesPullingOrderInfoService) SpringContextsUtil.getBean("mesPullingOrderInfoService");
-        return  bean.doSPSForEquipment(spsInfo.getAssemblyLine(),spsInfo.getPullingGroupCode(),spsInfo.getOrganizeCode());
+        if (StringUtil.isEmpty(spsInfo.getOrganizeCode())) {
+            Map resultMap = new HashMap();
+            resultMap.put("success", false);
+            String message = "SPS拉动数据已扫描数据为空，请检查拉动单数据";
+            resultMap.put("message", message);
+            return resultMap;
+        }
+        return  bean.doSPSForEquipment("","",spsInfo.getOrganizeCode());
+//        return  bean.doSPSForEquipment(spsInfo.getAssemblyLine(),spsInfo.getPullingGroupCode(),spsInfo.getOrganizeCode());
     }
 
 }