From fcb8b8cc392b146aa11bbaab9e497f7f13f29d44 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 26 五月 2025 11:38:17 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java
index 0e46ce4..47cec31 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java
@@ -1,14 +1,18 @@
package com.mes.hollow.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mes.hollow.entity.HollowGlassOutRelationInfo;
+import com.mes.hollow.entity.request.HollowHistoryTaskRequest;
import com.mes.hollow.entity.request.HollowTaskRequest;
import com.mes.hollow.service.HollowGlassOutRelationInfoService;
import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -29,7 +33,6 @@
@Resource
HollowGlassOutRelationInfoService hollowGlassOutRelationInfoService;
-
@ApiOperation("棰嗗彇浠诲姟")
@PostMapping("/receiveTask")
public Result<HollowGlassOutRelationInfo> receiveTask(HollowTaskRequest request) {
@@ -100,5 +103,11 @@
return Result.build(200, "淇敼鎴愬姛", hollowGlassOutRelationInfoService.generateHollowLisecFile(flowCardId, cell, isForce, 1));
}
+ @ApiOperation("鑾峰彇涓┖浠诲姟闃熷垪")
+ @PostMapping("/queryHollowHistoryTask")
+ public Result<Page<HollowGlassOutRelationInfo>> queryHollowHistoryTask(@RequestBody @Validated HollowHistoryTaskRequest request) {
+ return Result.build(200, "淇敼鎴愬姛", hollowGlassOutRelationInfoService.queryHollowHistoryTask(request));
+ }
+
}
--
Gitblit v1.8.0