From 519f42d527a1dd4917455609855f732b1eb0f7a0 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 20 三月 2026 11:08:11 +0800
Subject: [PATCH] 新增接口： 给mes提供机台及对应机台工位的冻结情况
---
src/main/java/com/zy/api/controller/HmesApiController.java | 62 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/api/controller/HmesApiController.java b/src/main/java/com/zy/api/controller/HmesApiController.java
index 3ac42f5..f6c4a4f 100644
--- a/src/main/java/com/zy/api/controller/HmesApiController.java
+++ b/src/main/java/com/zy/api/controller/HmesApiController.java
@@ -1,22 +1,29 @@
package com.zy.api.controller;
+import com.alibaba.fastjson.JSONObject;
import com.core.annotations.ManagerAuth;
+import com.core.common.Cools;
import com.core.common.R;
+import com.zy.api.controller.params.HmesBackLocParams;
import com.zy.api.controller.params.ReceviceTaskParams;
import com.zy.api.service.HmesApiService;
+import com.zy.asrs.entity.param.OpenOrderPakoutParam;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
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;
+import org.springframework.web.bind.annotation.GetMapping;
import java.util.Objects;
@Api(value = "HMES瀵规帴")
@RestController
+@Slf4j
@RequestMapping("/api")
public class HmesApiController {
@@ -29,15 +36,22 @@
* @date 2026/1/10 10:40
* @return com.core.common.R
*/
- @ManagerAuth
+// @ManagerAuth
@ApiOperation("涓嬪彂鐢熶骇浠诲姟")
@PostMapping("/work/tasks")
- public R menauWork(@RequestBody ReceviceTaskParams params) {
+ public R menauWork(@RequestBody OpenOrderPakoutParam params) {
+ log.info("涓嬪彂鐢熶骇浠诲姟={}", JSONObject.toJSONString(params));
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- if (Objects.isNull(params.getDeviceNo())) {
- return R.error("鏈哄彴鍙蜂笉鑳戒负绌猴紒锛�");
+ if (Cools.isEmpty(params.getOrderNo())) {
+ return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(params.getBillType())) {
+ return R.error("鍗曟嵁绫诲瀷[BillType]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(params.getMatList())) {
+ return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
return hmesApiService.pubWorkTask(params);
@@ -50,19 +64,55 @@
* @param params
* @return com.core.common.R
*/
- @ManagerAuth
+// @ManagerAuth
@ApiOperation("绌跨嚎瀹屾垚")
@PostMapping("/work/release/lock")
public R releaseLock(@RequestBody ReceviceTaskParams params) {
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- if (Objects.isNull(params.getDeviceNo())) {
+ if (Objects.isNull(params.getDevNo())) {
return R.error("鏈哄彴鍙蜂笉鑳戒负绌猴紒锛�");
}
return hmesApiService.releaseLock(params);
}
+ /**
+ * 鑾峰彇鏈哄彴鍙婂搴斿伐浣嶅喕缁撴儏鍐�
+ * @author Ryan
+ * @date 2026/3/20 11:06
+ * @return com.core.common.R
+ */
+// @ManagerAuth
+ @ApiOperation("鑾峰彇鏈哄彴鍙婂搴斿伐浣嶅喕缁撴儏鍐�")
+ @GetMapping("/work/freeze/status")
+ public R getDeviceFreezeStatus() {
+ return hmesApiService.getDeviceFreezeStatus();
+ }
+
+ /**
+ * 绌烘《/浣欐枡鍥炲簱
+ * @author Ryan
+ * @date 2026/3/20 11:28
+ * @param params
+ * @return com.core.common.R
+ */
+// @ManagerAuth
+ @ApiOperation("绌烘《/浣欐枡鍥炲簱")
+ @PostMapping("/work/back/loc")
+ public R backLoc(@RequestBody HmesBackLocParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Cools.isEmpty(params.getLocNo()) && Cools.isEmpty(params.getWorkNo()) && Cools.isEmpty(params.getBarcode())) {
+ return R.error("搴撲綅鍙穂locNo]銆佸伐浣滃彿[workNo]銆佹潯鐮乕barcode]涓嶈兘鍚屾椂涓虹┖");
+ }
+ if (Cools.isEmpty(params.getBackType())) {
+ return R.error("鍥炲簱绫诲瀷[backType]涓嶈兘涓虹┖");
+ }
+ return hmesApiService.backLoc(params);
+ }
+
}
--
Gitblit v1.9.1