From 721e56d2156cd820beaabd8b4e3e5c06fd87c809 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 04 九月 2025 15:38:23 +0800
Subject: [PATCH] Merge branch 'master' of git://10.153.19.25/YiWuProject
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java | 17 ++++++++++++++++-
1 files changed, 16 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..7585d13 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) {
@@ -94,11 +97,23 @@
return Result.build(200, "淇敼鎴愬姛", hollowGlassOutRelationInfoService.dispatchHollowSwitch(flag));
}
+ @ApiOperation("涓┖浼樺厛绾у紑鍏�")
+ @PostMapping("/priorityHollowSwitch")
+ public Result<Boolean> priorityHollowSwitch(Boolean flag) {
+ return Result.build(200, "淇敼鎴愬姛", hollowGlassOutRelationInfoService.priorityHollowSwitch(flag));
+ }
+
@ApiOperation("鎵嬪姩鐢熸垚鏉庤禌鍏嬫枃浠�")
@PostMapping("/generateHollowLisecFile")
public Result<String> generateHollowLisecFile(String flowCardId, int cell, int isForce) throws IOException {
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