From f873c89d87eb16ee83c0058d9a841a97d8e2bf14 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 08 七月 2024 18:12:11 +0800
Subject: [PATCH] gwcs请求入库参数修改
---
src/main/java/com/zy/asrs/controller/OpenController.java | 108 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 92 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index a37f3c6..752d5a2 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -2,11 +2,11 @@
import com.alibaba.fastjson.JSON;
import com.core.annotations.AppAuth;
-import com.core.common.*;
+import com.core.common.Cools;
+import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
-import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,8 +14,6 @@
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
/**
* Created by vincent on 2022/4/8
@@ -149,6 +147,61 @@
}
}
+ @PostMapping("/scrk")
+ @AppAuth(memo = "GWMS璋冪敤鐢熸垚鍏ュ簱宸ヤ綔妗�")
+ public synchronized R gwmsGenerateInventory(@RequestHeader(required = false) String appkey,
+ @RequestBody GwmsGenerateInventoryDto param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok(openService.gwmsGenerateInventory(param));
+ }
+
+ @PostMapping("/zxrk")
+ @AppAuth(memo = "GWCS鍒拌揪鍫嗗灈鏈哄叆搴撶珯鐐硅姹俍WCS鎵ц")
+ public synchronized R crnExecute(@RequestHeader(required = false) String appkey,
+ @RequestBody CrnExecuteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok(openService.crnExecute(param));
+ }
+
+ @PostMapping("/ckrw")
+ @AppAuth(memo = "ZWMS鎺ユ敹MES涓嬪彂鍑哄簱浠诲姟")
+ public synchronized R zwmsOutLocWork(@RequestHeader(required = false) String appkey,
+ @RequestBody ZwmsOutLocWorkDto param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok(openService.zwmsOutLocWork(param));
+ }
+
+ @PostMapping("/ckjgsb")
+ @AppAuth(memo = "璐х墿鍒拌揪鍑哄簱鍙ｄ互鍚庯紝涓婃姤鍑哄簱缁撴灉")
+ public synchronized R outLocResultReport(@RequestHeader(required = false) String appkey,
+ @RequestBody GhjtApiParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok(openService.outLocResultReport(param));
+ }
+
+ @PostMapping("/cpjck")
+ @AppAuth(memo = "鎷嗙洏鏈哄嚭搴撴帴鍙�")
+ public synchronized R emptyOutLoc(@RequestHeader(required = false) String appkey,
+ @RequestBody GhjtApiParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok(openService.emptyOutLoc(param));
+ }
+
+// @PostMapping("/cpjck")
+// @AppAuth(memo = "鐗╂枡淇℃伅鑾峰彇")
+// public synchronized R emptyOutLoc(@RequestHeader(required = false) String appkey,
+// @RequestBody GhjtApiParam param,
+// HttpServletRequest request) {
+// auth(appkey, param, request);
+// return R.ok(openService.emptyOutLoc(param));
+// }
+
+
/*public static void main(String[] args) {
// 1
System.out.println("======================================");
@@ -197,7 +250,7 @@
* 璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�
*/
@PostMapping("/labeller/mat/auth/v1")
- @AppAuth(memo = "璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�")
+ @AppAuth(memo = "璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�") //old闇�瑕佷慨鏀�
public synchronized R labellerMat(@RequestHeader(required = false) String appkey,
@RequestBody LabellerMatParam param,
HttpServletRequest request) {
@@ -209,25 +262,51 @@
* 璐存爣鏈鸿创鏍囧畬鎴�
*/
@PostMapping("/labeller/complete/auth/v1")
- @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�")
+ @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�") //old闇�瑕佷慨鏀�
public synchronized R labellerComplete(@RequestHeader(required = false) String appkey,
@RequestBody LabellerCompleteParam param,
HttpServletRequest request) {
auth(appkey, param, request);
openService.labellerComplete(param);
+ return R.ok();
+ }
+
+ /**
+ * 涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+ */
+ @PostMapping("/palletizing/complete/auth/v1")
+ @AppAuth(memo = "涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�")
+ public synchronized R PalletizingCompleteTwoFloorParam(@RequestHeader(required = false) String appkey,
+ @RequestBody PalletizingCompleteTwoFloorParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.PalletizingCompleteTwoFloorParam(param);
return R.ok(param);
}
/**
- * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+ * 鏉剧洓(1妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
*/
- @PostMapping("/palletizing/complete/auth/v1")
- @AppAuth(memo = "涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�")
- public synchronized R palletizingComplete(@RequestHeader(required = false) String appkey,
- @RequestBody PalletizingCompleteParam param,
- HttpServletRequest request) {
+ @PostMapping("/palletizing/complete/auth/v2")
+ @AppAuth(memo = "鏉剧洓(1妤�)锛氱爜鍨涘畬鎴愪笅鍙戠‘璁や俊鍙�")
+ public synchronized R palletizingCompleteS(@RequestHeader(required = false) String appkey,
+ @RequestBody PalletizingCompleteParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
- openService.palletizingComplete(param);
+ openService.palletizingCompleteS(param);
+ return R.ok();
+ }
+
+ /**
+ * 涓帶锛氬嚭搴撳畬鎴愭湀鍙扮浉鍏�
+ */
+ @PostMapping("/balcony/complete/auth/v1")
+ @AppAuth(memo = "涓帶锛氬嚭搴撳畬鎴愭湀鍙扮浉鍏�") //old闇�瑕佷慨鏀�
+ public synchronized R balconyComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody LabellerMatParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.balconyComplete(param);
return R.ok(param);
}
@@ -257,9 +336,6 @@
openService.singleMountUnstackingComplete(param);
return R.ok(param);
}
-
-
-
/*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
--
Gitblit v1.9.1