From 2ab2ecdb80e05b423a217d9fee92c18a6f0e3aeb Mon Sep 17 00:00:00 2001
From: "castle.zang" <castle.zang@estsh.com>
Date: Tue, 15 Oct 2024 19:56:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../busi/MesEarlyWarningServiceImpl.java           | 24 ++++++++++++++++++++++
 .../webservice/DcsForEquipmentServer.java          |  4 ++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesEarlyWarningServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesEarlyWarningServiceImpl.java
index b68c974..d9d94e7 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesEarlyWarningServiceImpl.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesEarlyWarningServiceImpl.java
@@ -4,6 +4,7 @@ import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesEarlyWarningService;
 import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.MesPcnException;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesEarlyWarningKanBan;
 import cn.estsh.i3plus.pojo.mes.model.MesEarlyWarningKanBanModel;
 import cn.estsh.i3plus.pojo.mes.repository.MesEarlyWarningKanBanRepository;
@@ -66,6 +67,29 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService {
 
     @Override
     public void getData(Long id, String organizeCode) {
+        DdlPackBean earlyWarningKanBanPackBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getNumEqualPack(id,"id",earlyWarningKanBanPackBean);
+        List<MesEarlyWarningKanBan> list = earlyWarningKanBanRao.findByHqlTopWhere(earlyWarningKanBanPackBean, 1);
+        if (list.isEmpty()){
+            //todo return;
+        }
+
+        MesEarlyWarningKanBan kanBan = list.get(0);
+        //1.获取最近的20条v107信息
+        DdlPackBean v107PackBean = DdlPackBean.getDdlPackBean(organizeCode);
+//        DdlPreparedPack.
+        //2.获取最新的一条报文信息
+
+        //3.获取最新的一条报文信息
+
+        //4.获取最新工位单号
+
+        //5.获取最新下线工单
+
+        //6.查询报警产量
+
+        //7.获取开班起始时间
 
+        //8.根据条件获取工单的数量
     }
 }
diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/webservice/DcsForEquipmentServer.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/webservice/DcsForEquipmentServer.java
index 29a0a60..d896a99 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/webservice/DcsForEquipmentServer.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/webservice/DcsForEquipmentServer.java
@@ -18,7 +18,7 @@ public class DcsForEquipmentServer {
     public static final Logger LOGGER = LoggerFactory.getLogger(DcsForEquipmentServer.class);
     @WebMethod(action = "GetConsoleItemCodeExt", operationName = "GetConsoleItemCodeExt")
     public String getConsoleItemCodeExt(@WebParam(name = "GetConsoleItemCodeExt") MesConsoleItemCodeExt mesConsoleItemCodeExt) {
-        DcsForEquipmentServiceImpl bean = (DcsForEquipmentServiceImpl) SpringContextsUtil.getBean("DcsForEquipmentServiceImpl");
+        DcsForEquipmentServiceImpl bean = (DcsForEquipmentServiceImpl) SpringContextsUtil.getBean("dcsForEquipmentServiceImpl");
         String organizeCode = mesConsoleItemCodeExt.getOrganizeCode();
         String custCode = mesConsoleItemCodeExt.getCustCode();
         String assemblyLine = mesConsoleItemCodeExt.getAssemblyLine();
@@ -37,7 +37,7 @@ public class DcsForEquipmentServer {
 
     @WebMethod(action = "FillConsoleResultExt", operationName = "FillConsoleResultExt")
     public String getConsoleItemCodeExt(@WebParam(name = "FillConsoleResultExt") MesConsoleResultExt mesConsoleResultExt) {
-        DcsForEquipmentServiceImpl bean = (DcsForEquipmentServiceImpl) SpringContextsUtil.getBean("DcsForEquipmentServiceImpl");
+        DcsForEquipmentServiceImpl bean = (DcsForEquipmentServiceImpl) SpringContextsUtil.getBean("dcsForEquipmentServiceImpl");
         String organizeCode = mesConsoleResultExt.getOrganizeCode();
         String custCode = mesConsoleResultExt.getCustCode();
         String assemblyLine = mesConsoleResultExt.getAssemblyLine();