From 91c0155937f3177c41cfd91636d5094454fff855 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 12 三月 2025 17:19:14 +0800
Subject: [PATCH] 添加上片历史任务接口
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java | 2
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 43 ++++----
hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/entity/request/LoadGlassDeviceTaskHistoryRequest.java | 68 +++++++++++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/service/LoadGlassDeviceTaskHistoryService.java | 3
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/dto/FlowCardDTO.java | 100 ++++++++++++++++++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java | 6
hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/service/impl/LoadGlassDeviceTaskHistoryServiceImpl.java | 25 +++++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/loadglassdevicetaskhistory/controller/LoadGlassDeviceTaskHistoryController.java | 41 ++++++++
8 files changed, 263 insertions(+), 25 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/entity/request/LoadGlassDeviceTaskHistoryRequest.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/entity/request/LoadGlassDeviceTaskHistoryRequest.java
new file mode 100644
index 0000000..befb80a
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/entity/request/LoadGlassDeviceTaskHistoryRequest.java
@@ -0,0 +1,68 @@
+package com.mes.opctask.entity.request;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mes.base.entity.PageRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * (LoadGlassDeviceTaskHistory)琛ㄥ疄浣撶被
+ *
+ * @author makejava
+ * @since 2024-11-06 22:23:00
+ */
+@SuppressWarnings("serial")
+@Data
+public class LoadGlassDeviceTaskHistoryRequest extends PageRequest {
+ /**
+ * 鍘熺墖瀹�
+ */
+ private String rawGlassWidth;
+ /**
+ * 鍘熺墖楂�
+ */
+ private String rawGlassHeight;
+ /**
+ * 鍘熺墖瀹�
+ */
+ private String rawGlassThickness;
+ /**
+ * 鍘熺墖楂�
+ */
+ private String rawGlassfilmsId;
+ /**
+ * 涓婄墖璁惧缂栧彿
+ */
+ private Integer station;
+ /**
+ * 涓婄墖浣嶇紪鍙�
+ */
+ private Integer slot;
+ /**
+ * 浠诲姟鐘舵�� 0榛樿绌轰换鍔� 1鎵ц涓� 2缁撴潫浠诲姟
+ */
+ private List<Integer> taskStateList;
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @ApiModelProperty(value = "寮�濮嬫椂闂�", position = 6)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date beginDate;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @ApiModelProperty(value = "缁撴潫鏃堕棿", position = 7)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endDate;
+
+}
+
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/service/LoadGlassDeviceTaskHistoryService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/service/LoadGlassDeviceTaskHistoryService.java
index fa78ca0..3efe0b2 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/service/LoadGlassDeviceTaskHistoryService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/service/LoadGlassDeviceTaskHistoryService.java
@@ -1,7 +1,9 @@
package com.mes.opctask.service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.opctask.entity.LoadGlassDeviceTaskHistory;
+import com.mes.opctask.entity.request.LoadGlassDeviceTaskHistoryRequest;
/**
* (LoadGlassDeviceTaskHistory)琛ㄦ湇鍔℃帴鍙�
@@ -11,5 +13,6 @@
*/
public interface LoadGlassDeviceTaskHistoryService extends IService<LoadGlassDeviceTaskHistory> {
+ Page<LoadGlassDeviceTaskHistory> queryLoadGlassHistoryTask(LoadGlassDeviceTaskHistoryRequest request);
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/service/impl/LoadGlassDeviceTaskHistoryServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/service/impl/LoadGlassDeviceTaskHistoryServiceImpl.java
index 5d6d2c5..088b677 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/service/impl/LoadGlassDeviceTaskHistoryServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/service/impl/LoadGlassDeviceTaskHistoryServiceImpl.java
@@ -1,9 +1,15 @@
package com.mes.opctask.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.smallbun.screw.core.util.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.opctask.entity.LoadGlassDeviceTaskHistory;
+import com.mes.opctask.entity.request.LoadGlassDeviceTaskHistoryRequest;
import com.mes.opctask.mapper.LoadGlassDeviceTaskHistoryDao;
import com.mes.opctask.service.LoadGlassDeviceTaskHistoryService;
+import com.mes.tools.DateUtil;
import org.springframework.stereotype.Service;
/**
@@ -15,5 +21,24 @@
@Service
public class LoadGlassDeviceTaskHistoryServiceImpl extends ServiceImpl<LoadGlassDeviceTaskHistoryDao, LoadGlassDeviceTaskHistory> implements LoadGlassDeviceTaskHistoryService {
+ @Override
+ public Page<LoadGlassDeviceTaskHistory> queryLoadGlassHistoryTask(LoadGlassDeviceTaskHistoryRequest request){
+ if (null == request.getBeginDate()) {
+ request.setBeginDate(DateUtil.getBeginDate());
+ request.setEndDate(DateUtil.getEndDate());
+ }
+ Page<LoadGlassDeviceTaskHistory> page = new Page<>(request.getPageNo(), request.getPageSize());
+ LambdaQueryWrapper<LoadGlassDeviceTaskHistory> wrapper = new LambdaQueryWrapper<LoadGlassDeviceTaskHistory>()
+ .like(StringUtils.isNotBlank(request.getRawGlassWidth()), LoadGlassDeviceTaskHistory::getRawGlassWidth, request.getRawGlassWidth())
+ .like(StringUtils.isNotBlank(request.getRawGlassHeight()), LoadGlassDeviceTaskHistory::getRawGlassHeight, request.getRawGlassHeight())
+ .like(StringUtils.isNotBlank(request.getRawGlassWidth()), LoadGlassDeviceTaskHistory::getRawGlassWidth, request.getRawGlassWidth())
+ .like(StringUtils.isNotBlank(request.getRawGlassWidth()), LoadGlassDeviceTaskHistory::getRawGlassWidth, request.getRawGlassWidth())
+ .eq(request.getStation() != 0, LoadGlassDeviceTaskHistory::getStation, request.getStation())
+ .eq(request.getSlot() != 0, LoadGlassDeviceTaskHistory::getSlot, request.getSlot())
+ .in(CollectionUtil.isNotEmpty(request.getTaskStateList()), LoadGlassDeviceTaskHistory::getTaskState, request.getTaskStateList())
+ .between(LoadGlassDeviceTaskHistory::getCreateTime, request.getBeginDate(), request.getEndDate())
+ .orderByDesc(LoadGlassDeviceTaskHistory::getCreateTime);
+ return this.page(page, wrapper);
+ }
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/dto/FlowCardDTO.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/dto/FlowCardDTO.java
new file mode 100644
index 0000000..ecebba7
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/dto/FlowCardDTO.java
@@ -0,0 +1,100 @@
+package com.mes.pp.entity.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author wu
+ * @since 2024-07-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class FlowCardDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 椤圭洰鍚嶇О
+ */
+ private String productName;
+
+ /**
+ * 鐜荤拑鍚嶇О
+ */
+ private String glassChild;
+
+ /**
+ * 璁㈠崟绫诲瀷
+ */
+ private String orderType;
+
+ /**
+ * 娴佺▼鍗″彿
+ */
+ private String processId;
+
+ /**
+ * 璁㈠崟搴忓彿
+ */
+ private Integer orderNumber;
+
+ /**
+ * 灞傚彿
+ */
+ private Integer technologyNumber;
+
+ /**
+ * 璁㈠崟鏁伴噺
+ */
+ private Integer quantity;
+
+ /**
+ * 鎶ュ伐鏁伴噺
+ */
+ private String reportWorkQuantity;
+
+ /**
+ * 鎶ュ伐鏁伴噺
+ */
+ private String reportWorkQuantityCount;
+
+ /**
+ * 鎶ュ伐鏃堕棿
+ */
+ private String reportWorkTime;
+
+ /**
+ * 鐮存崯鏁伴噺
+ */
+ private String broken_num;
+
+ /**
+ * 搴撳瓨鏁伴噺
+ */
+ private Integer inventory;
+
+ /**
+ * 搴撳瓨闈㈢Н
+ */
+ private Double inventoryArea;
+
+ /**
+ * 鍙戣揣鏁伴噺
+ */
+ private Integer shippedQuantity;
+
+ /**
+ * 鐜荤拑No
+ */
+ private String glassNumber;
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java
index ff76c67..385df27 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java
@@ -31,7 +31,7 @@
// 3銆佹暟鎹簮閰嶇疆
DataSourceConfig dsc = new DataSourceConfig();
- dsc.setUrl("jdbc:mysql://10.153.19.150:3306/yiwumes?serverTimezone=GMT%2b8");
+ dsc.setUrl("jdbc:mysql://localhost:3306/north_glass_mes?serverTimezone=GMT%2b8");
dsc.setDriverName("com.mysql.cj.jdbc.Driver");
dsc.setUsername("root");
dsc.setPassword("beibo.123/");
@@ -41,7 +41,7 @@
// 4銆佸寘閰嶇疆
PackageConfig pc = new PackageConfig();
pc.setParent("com.mes");
- pc.setModuleName("raw_glass_storage_station"); //妯″潡鍚�
+ pc.setModuleName("loadglassdevicetaskhistory"); //妯″潡鍚�
pc.setController("controller");
pc.setService("service");
pc.setMapper("mapper");
@@ -52,7 +52,7 @@
// strategy.setInclude("raw_glass_storage_details");
// strategy.setInclude("raw_glass_storage_station");
- strategy.setInclude("raw_glass_storage_station");
+ strategy.setInclude("load_glass_device_task_history");
strategy.setNaming(NamingStrategy.underline_to_camel);//鏁版嵁搴撹〃鏄犲皠鍒板疄浣撶殑鍛藉悕绛栫暐
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java
index 2be50fd..1b8037d 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java
@@ -29,7 +29,7 @@
.eq(StringUtils.checkValNotNull(request.getTaskState()), EdgStorageDeviceTaskHistory::getTaskState, request.getTaskState())
.eq(StringUtils.checkValNotNull(request.getTaskType()), EdgStorageDeviceTaskHistory::getTaskType, request.getTaskType())
.between(StringUtils.checkValNotNull(request.getStartTime()), EdgStorageDeviceTaskHistory::getCreateTime, request.getStartTime(),
- request.getEndTime()).orderByDesc(EdgStorageDeviceTaskHistory::getCreateTime).last("limit 20");
+ request.getEndTime()).orderByDesc(EdgStorageDeviceTaskHistory::getCreateTime);
if (StringUtils.isNotBlank(request.getGlassId())) {
wrapper.and(e -> e.like(EdgStorageDeviceTaskHistory::getGlassIdIn, request.getGlassId())
.or().like(EdgStorageDeviceTaskHistory::getGlassIdOut, request.getGlassId()));
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
index 5323dd5..8190839 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
@@ -175,7 +175,12 @@
List<RawGlassStorageDetails> stationTwoList = rawGlassStorageDetailList.stream().filter(item -> item.getDeviceId() == 6).collect(Collectors.toList());
jsonObject.append("stationOne", stationOneList);
jsonObject.append("stationTwo", stationTwoList);
-
+ //鏄惁寮�濮嬪伐绋�
+ Engineering engineering = engineeringService.selectInitiate(1);
+ jsonObject.append("engineering", engineering);
+ //宸ヤ綅淇℃伅
+ List<UpWorkstation> upWorkstations = upWorkstationService.list();
+ jsonObject.append("list", upWorkstations);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
@@ -218,6 +223,7 @@
String inkageStatus = plcParameterObject.getPlcParameter("InkageStatus").getValue();
// String inkageStatus ="1";
jsonObject.append("InkageStatus", inkageStatus);
+
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
@@ -230,26 +236,21 @@
}
}
- @Scheduled(fixedDelay = 1000)
- public void loadGlassIsRun() {
- JSONObject jsonObject = new JSONObject();
- //鏄惁寮�濮嬪伐绋�
- Engineering engineering = engineeringService.selectInitiate(1);
- jsonObject.append("engineering", engineering);
- //宸ヤ綅淇℃伅
- List<UpWorkstation> upWorkstations = upWorkstationService.list();
- jsonObject.append("list", upWorkstations);
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlassIsRun");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
- } else {
- log.info("loadGlassIsRun is closed");
- }
- }
- }
- }
+// @Scheduled(fixedDelay = 1000)
+// public void loadGlassIsRun() {
+// JSONObject jsonObject = new JSONObject();
+//
+// ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlassIsRun");
+// if (sendwServer != null) {
+// for (WebSocketServer webserver : sendwServer) {
+// if (webserver != null) {
+// webserver.sendMessage(jsonObject.toString());
+// } else {
+// log.info("loadGlassIsRun is closed");
+// }
+// }
+// }
+// }
public void overTask(String loadStatus, int state) {
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/loadglassdevicetaskhistory/controller/LoadGlassDeviceTaskHistoryController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/loadglassdevicetaskhistory/controller/LoadGlassDeviceTaskHistoryController.java
new file mode 100644
index 0000000..1830ca0
--- /dev/null
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/loadglassdevicetaskhistory/controller/LoadGlassDeviceTaskHistoryController.java
@@ -0,0 +1,41 @@
+package com.mes.loadglassdevicetaskhistory.controller;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mes.opctask.entity.LoadGlassDeviceTaskHistory;
+import com.mes.opctask.entity.request.LoadGlassDeviceTaskHistoryRequest;
+import com.mes.opctask.service.LoadGlassDeviceTaskHistoryService;
+import com.mes.pp.service.OptimizeProjectService;
+import com.mes.uppattenusage.entity.UpPattenUsage;
+import com.mes.utils.Result;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author wf
+ * @since 2025-03-12
+ */
+@RestController
+@RequestMapping("/loadglassdevicetaskhistory")
+public class LoadGlassDeviceTaskHistoryController {
+
+ @Autowired
+ private LoadGlassDeviceTaskHistoryService loadGlassDeviceTaskHistoryService;
+
+ @ApiOperation("鎸夌収鏌ヨ鏉′欢鏌ヨ涓婄墖鍘嗗彶浠诲姟")
+ @PostMapping("/queryLoadGlassHistoryTask") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
+ @ResponseBody
+ public Result<Page<LoadGlassDeviceTaskHistory>> queryBigStorageCageHistoryTask(@RequestBody @Validated LoadGlassDeviceTaskHistoryRequest request) {
+ return Result.build(200, "鏌ヨ鎴愬姛", loadGlassDeviceTaskHistoryService.queryLoadGlassHistoryTask(request));
+ }
+
+}
+
--
Gitblit v1.8.0