From 4b36de11315a56cec62ffa6fc7935707440d0d4a Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Fri, 3 Nov 2023 17:28:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=98=E6=88=BF=E7=9C=8B=E6=9D=BF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/mes/controller/WCSInterfaceController.java  | 14 ++++++++++++++
 .../src/main/java/com/op/mes/mapper/MesMapper.java |  3 +++
 .../com/op/mes/service/IWCSInterfaceService.java   |  2 ++
 .../mes/service/impl/IWCInterfaceServiceImpl.java  | 13 +++++++++++++
 .../src/main/resources/mapper/mes/MesMapper.xml    |  3 +++
 5 files changed, 35 insertions(+)

diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java
index c5432c13d..dabab8e58 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java
@@ -32,6 +32,7 @@ public class WCSInterfaceController extends BaseController {
     @Autowired
     private IWCSInterfaceService wCInterfaceService;
 
+
     /**
      * 下一工序机台集合获取
      * •接口描述：成型机码垛完、暂存区、WCS 请求 MES 获取目的地集合
@@ -121,6 +122,19 @@ public class WCSInterfaceController extends BaseController {
         return success(wCInterfaceService.dataBKTask(tables));
     }
 
+    /**
+     * 在运行烘房数据
+     * @param
+     */
+
+    @PostMapping("/dryRoomData")
+    public AjaxResult getDryRoomData(@RequestBody BoardDTO boardDTO){
+        if(StringUtils.isBlank(boardDTO.getFactory())){
+            return error("[factory] is not null");
+        }
+        return success(wCInterfaceService.getDryRoomData(boardDTO));
+    }
+
     public  static void main(String args[]){
         System.out.println(DateUtils.getDate());
     }
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java
index e01e5f297..2684c5987 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java
@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Mapper接口
@@ -48,4 +49,6 @@ public interface MesMapper {
     void deleteBkDateByTable(@Param("startDate") String startDate, @Param("endDate")String endDate);
 
     void deleteBkDate(@Param("table")String addMonthTable,@Param("startDate") String startDate, @Param("endDate")String endDate);
+
+    List<Map<String, String>> selectcxjList();
 }
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java
index 8b720e6f5..f98207bd3 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java
@@ -33,4 +33,6 @@ public interface IWCSInterfaceService {
     R dataClearTask(List<String> tables);
 
     R dataBKTask(List<String> tables);
+
+    Map getDryRoomData(BoardDTO boardDTO);
 }
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
index f424345ed..97aceb935 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
@@ -259,6 +259,8 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
         return R.ok(true);
     }
 
+
+
     public void dateBKFunc(String poolName,List<String> tables){
         DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key
         DateTimeFormatter ymdhms = DateTimeFormatter.ofPattern("yyyy-MM-dd");
@@ -322,6 +324,17 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
         return "保存成功条数："+saveNum;
     }
 
+    @Override
+    public Map getDryRoomData(BoardDTO boardDTO) {
+        DynamicDataSourceContextHolder.push("ds_"+boardDTO.getFactory());// 这是数据源的key
+        //成型机清单
+        Map map=new HashMap();
+        List<Map<String,String>> eqmapList =  mesMapper.selectcxjList();
+        map.put("result",eqmapList);
+        return map;
+
+    }
+
     public static void main(String args[]){
         DateTimeFormatter ymdhms = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         LocalDate today = LocalDate.now();
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml
index 5c279053b..bc236c792 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml
@@ -161,6 +161,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * FROM mes_material_transfer_result
         where create_time >= #{startDate} and #{endDate}>create_time
     </select>
+    <select id="selectcxjList" resultType="java.util.Map">
+        SELECT * FROM [dbo].[base_equipment] WHERE  equipment_type_code='equ_type_cxj'
+    </select>
     <delete id="deleteBkDateByTable">
         delete from mes_material_transfer_result
         where create_time >= #{startDate} and #{endDate}>create_time