From 44b6b79dd5dee0ebbd2d11b08abbc2be275bed58 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 09 二月 2026 16:10:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/api/controller/WcsApiController.java | 99 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 92 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/api/controller/WcsApiController.java b/src/main/java/com/zy/api/controller/WcsApiController.java
index 4411331..7a050d7 100644
--- a/src/main/java/com/zy/api/controller/WcsApiController.java
+++ b/src/main/java/com/zy/api/controller/WcsApiController.java
@@ -1,19 +1,23 @@
package com.zy.api.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import com.zy.api.controller.params.ReceviceTaskParams;
import com.zy.api.controller.params.WorkTaskParams;
import com.zy.api.service.WcsApiService;
+import com.zy.asrs.entity.LocAroundBind;
+import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.service.LocAroundBindService;
+import com.zy.asrs.service.WaitPakinService;
+import com.zy.asrs.utils.Utils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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.*;
+import java.util.List;
import java.util.Objects;
@Api("WCS浜や簰鎺ュ彛")
@@ -23,7 +27,11 @@
@Autowired
private WcsApiService wcsApiService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private LocAroundBindService locAroundBindService;
/**
* 閫氱煡WCS閿佸畾鍛ㄨ竟搴撲綅锛屽強绂佹浠诲姟鎵ц
* @author Ryan
@@ -37,7 +45,7 @@
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- if (Objects.isNull(params.getDeviceNo())) {
+ if (Objects.isNull(params.getDevNo())) {
return R.error("鏈哄彴鍙蜂笉鑳戒负绌猴紒锛�");
}
@@ -52,13 +60,90 @@
* @param params
* @return com.core.common.R
*/
- @ManagerAuth
+// @ManagerAuth
@ApiOperation("鍫嗗灈鏈哄洖搴撴惉杩愭寚浠�")
@PostMapping("/back/loc")
- public R backLoc(@RequestBody WorkTaskParams params) {
+ public synchronized R backLoc(@RequestBody String params) {
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
return wcsApiService.backLocs(params);
}
+
+
+ /**
+ * 涓嬪彂浠诲姟鑷砏CS
+ * @author Ryan
+ * @date 2026/1/10 13:57
+ * @param params
+ * @return com.core.common.R
+ */
+ @ManagerAuth
+ @ApiOperation("涓嬪彂浠诲姟鑷砏CS")
+ @PostMapping("/pub/wrks")
+ public R pubWrkToWcs(@RequestBody WorkTaskParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return wcsApiService.pubWrkToWcs(params);
+ }
+
+ @ManagerAuth
+ @ApiOperation("璁惧鎵ц鐘舵�佸洖鍐�-wcs浠诲姟瀹屾垚鍥炲啓")
+ @PostMapping("/openapi/report")
+ public R receviceTaskFromWcs(@RequestBody ReceviceTaskParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return wcsApiService.receviceTaskFromWcs(params);
+
+ }
+
+ @ManagerAuth
+ @ApiOperation("鑾峰彇缁勬墭鍏ュ簱鎵樼洏淇℃伅")
+ @PostMapping("/openapi/waitPakins")
+ public R waitPakins() {
+ List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("io_status", "N"));
+ return R.ok().add(waitPakins);
+
+ }
+
+ @ManagerAuth
+ @ApiOperation("鑾峰彇鏈哄彴搴撲綅鐨勬暟缁�")
+ @GetMapping("/openapi/arr")
+ public R arr() {
+ int i = 0;
+ int[] k = new int[] { 3, 0, 4, 1, 5, 2};
+ int c=0;
+ int h=0;
+ int i1 = 15;
+ List<LocAroundBind> locAroundBinds = locAroundBindService.selectList(new EntityWrapper<LocAroundBind>().orderBy("dev_id"));
+ String[] arr = new String[90];
+ for (LocAroundBind locAroundBind : locAroundBinds) {
+ String s = Utils.WMSLocToWCSLoc(locAroundBind.getBlocNo());
+ int index = i*6+k[c];
+ arr[index] = s;
+ c++;
+ if (c==k.length) {
+ c=0;
+ i++;
+ }
+ if (i==i1){
+ i=0;
+ h++;
+ System.out.print("[");
+ for (int j=0;j<i1*6;j++){
+ System.out.print(arr[j]+",");
+ }
+ System.out.println("]");
+ if (h==2){
+ i1 = 13;
+ }else if (h==3){
+ i1 = 8;
+ }
+ }
+ }
+ return R.ok();
+
+ }
}
--
Gitblit v1.9.1