From ed8bd2cd2634798298e90cf075a67173b154f0fa Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 18 八月 2025 14:19:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 392 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 352 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index c358f57..ab3eb29 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,20 +1,22 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
-import com.core.common.*;
+import com.core.annotations.AppAuth;
+import com.core.common.Cools;
+import com.core.common.R;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.param.OpenOrderCompleteParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
-import com.zy.asrs.entity.param.OpenOrderPakoutParam;
+import com.zy.asrs.entity.OutLocInfoParam;
+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;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* Created by vincent on 2022/4/8
@@ -22,7 +24,7 @@
@Slf4j
@RestController
@RequestMapping("open/asrs")
-public class OpenController {
+public class OpenController extends BaseController {
private static final boolean auth = true;
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
@@ -32,31 +34,208 @@
@Autowired
private OpenService openService;
+ @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("/fxprk")
+ @AppAuth(memo = "鍙嶄慨鍝佸叆搴�")
+ public synchronized R fxprk(@RequestHeader(required = false) String appkey,
+ @RequestBody FxprkParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok(openService.fxprk(param));
+ }
- /****************************************************************************/
- /********************************* 鎵撳寘涓婄嚎 **********************************/
- /****************************************************************************/
+ @PostMapping("/kthl")
+ @AppAuth(memo = "绌烘墭鐩樺洖娴�(浜屾ゼ娴佸埌涓�妤�)")
+ public synchronized R kthl(@RequestHeader(required = false) String appkey,
+ @RequestBody KthlParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return openService.kthl(param);
+ }
+ @PostMapping("/tb")
+ @AppAuth(memo = "涓�妤艰创鏍囪皟鐢�")
+ public synchronized R tb(@RequestHeader(required = false) String appkey,
+ @RequestBody TbParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return openService.tb(param);
+ }
- @PostMapping("/order/pakin/new/package/v1")
- public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
- @RequestParam(required = false) String barcode) {
- auth(appkey, barcode);
- if (Cools.isEmpty(barcode)) {
- return R.parse(BaseRes.PARAM);
+ @PostMapping("/dd")
+ @AppAuth(memo = "涓�妤兼墦甯﹁皟鐢�")
+ public synchronized R dd(@RequestHeader(required = false) String appkey,
+ @RequestBody TbParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return openService.dd(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);
+ if (Cools.isEmpty(param,param.getOrderNo(),param.getOrderType(),param.getGroups())) {
+ R.parse("鍙傛暟涓嶈兘涓虹┖");
}
+ return openService.zwmsOutLocWork(param);
+ }
+
+ @PostMapping("/cxzk")
+ @AppAuth(memo = "鏍规嵁鍖呰缁勫彿鏌ヨ鍦ㄥ簱鏃堕棿-MES璋冪敤")
+ public synchronized R queryInLocTime(@RequestHeader(required = false) String appkey,
+ @RequestBody List<String> param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return openService.queryInLocTime(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("/zpckdw")
+ @AppAuth(memo = "缁勭洏妗佹灦gwcs鍛婅瘔zwms璐х墿鍒颁綅锛寊mws鍛婅瘔gwcs鎬庝箞鎷�")
+ public synchronized R zphjDw(@RequestHeader(required = false) String appkey,
+ @RequestBody ZphjckdwParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return openService.zphjDw(param);
+ }
+
+ @PostMapping("/cdwc")
+ @AppAuth(memo = "缁勭洏妗佹灦鎷嗗灈瀹屾垚gwcs璇锋眰zwms")
+ public synchronized R zphjCdwc(@RequestHeader(required = false) String appkey,
+ @RequestBody ZphjcdwcParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return openService.zphjCdwc(param);
+ }
+
+ @PostMapping("/updateBarcode")
+ @AppAuth(memo = "鏇存柊搴撲綅绌烘墭鐩樻潯鐮�")
+ public synchronized R updateBarcode(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
+ openService.updateBarcode();
return R.ok();
}
+ @PostMapping("/prodCheck")
+ @AppAuth(memo = "浜у搧鍚堟牸鏍￠獙,EMS璋冪敤")
+ public synchronized R prodCheck(@RequestHeader(required = false) String appkey,
+ @RequestBody List<ProdCheckParam> param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return openService.prodCheck(param);
+ }
+
+ @PostMapping("/xhd")
+ @AppAuth(memo = "鐩樼偣浣嶈姹備寒鐏�")
+ public synchronized R requestXhd(@RequestHeader(required = false) String appkey,
+ @RequestBody Map<String,Object> param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param.get("barcode"))){
+ return R.parse("鏉＄爜閿欒锛�" + param.get("barcode"));
+ }
+ return openService.requestXhd((String) param.get("barcode"));
+ }
+
+
+ @PostMapping("/kxlhcdwc")
+ @AppAuth(memo = "绌洪棽鐞嗚揣鎷嗗灈瀹屾垚")
+ public synchronized R kxlhCdwc(@RequestHeader(required = false) String appkey,
+ @RequestBody KxlhcdwcParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return openService.kxlhCdwc(param);
+ }
+
+ @PostMapping("/getUnfulfilledOrders")
+ @AppAuth(memo = "鑾峰彇鏈畬鎴愯鍗曠粺璁′俊鎭�")
+ public synchronized R getUnfulfilledOrders(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
+ return openService.getUnfulfilledOrders();
+ }
+
+ @PostMapping("/getCrnLaneWayInfo")
+ @AppAuth(memo = "鑾峰彇鍫嗗灈鏈虹姸鎬佸強鎵�灞炲贩閬撳簱浣嶇粺璁′俊鎭�")
+ public synchronized R getCrnLaneWayInfo(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
+ return openService.getCrnLaneWayInfo();
+ }
+
+ @PostMapping("/getOutLocInfoByBarcode")
+ @AppAuth(memo = "鏍规嵁鎵樼洏鐮侊紝鑾峰彇鍑哄簱鐗╂枡淇℃伅杩涜澶у睆鏄剧ず")
+ public synchronized R getOutLocInfoByBarcode(@RequestHeader(required = false) String appkey,
+ @RequestBody OutLocInfoParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getBarcode())) {
+ return R.parse("鎵樼洏鐮佷笉鑳戒负绌�");
+ }
+ return openService.getOutLocInfoByBarcode(param.getBarcode());
+ }
+
+
+ /*@PostMapping("/order/matSync/default/v1")
+ @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
+ public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) MatSyncParam param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ openService.syncMat(param);
+ return R.ok();
+ }*/
/**
* 娣诲姞鍏ュ簱鍗�
*/
- @PostMapping("/order/pakin/new/default/v1")
+ /*@PostMapping("/order/pakin/default/v1")
+ @AppAuth(memo = "娣诲姞璁㈠崟鍏ュ簱")
public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakinParam param) {
- auth(appkey, param);
+ @RequestBody OpenOrderPakinParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
@@ -71,27 +250,36 @@
}
openService.pakinOrderCreate(param);
return R.ok();
- }
+ }*/
/**
* 鍏ュ簱鍗曞洖鍐�
*/
- @PostMapping("/order/pakin/complete/default/v1")
+ /*@PostMapping("/order/pakin/complete/default/v1")
public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) OpenOrderCompleteParam param) {
- auth(appkey, param);
+ @RequestBody(required = false) OpenOrderCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
return R.ok().add(openService.pakinOrderComplete(param));
- }
+ }*/
/**
* 娣诲姞鍑哄簱鍗�
*/
- @PostMapping("/order/pakout/new/default/v1")
+ /*@PostMapping("/order/pakout/default/v1")
+ @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakoutParam param) {
- auth(appkey, param);
+ @RequestBody OpenOrderPakoutParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getLgort())) {
+ return R.error("鍗曟嵁缂栧彿[lgort]涓嶈兘涓虹┖");
+ }
+ if (!param.getLgort().equals("5006")) {
+ return R.ok();
}
if (Cools.isEmpty(param.getOrderNo())) {
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
@@ -104,31 +292,33 @@
}
openService.pakoutOrderCreate(param);
return R.ok();
- }
+ }*/
/**
* 鍑哄簱鍗曞洖鍐�
*/
- @PostMapping("/order/pakout/complete/default/v1")
+ /*@PostMapping("/order/pakout/complete/default/v1")
public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) OpenOrderCompleteParam param) {
- auth(appkey, param);
+ @RequestBody(required = false) OpenOrderCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
return R.ok().add(openService.pakoutOrderComplete(param));
- }
+ }*/
/**
* 搴撳瓨缁熻
*/
- @RequestMapping("/stock/default/v1")
- public R queryStock(@RequestHeader(required = false) String appkey) {
- auth(appkey, null);
+ /*@RequestMapping("/stock/default/v1")
+ public R queryStock(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
return R.ok().add(openService.queryStock());
- }
+ }*/
-
- private void auth(String appkey, Object obj) {
- log.info("{}鎺ュ彛琚闂紒appkey:{},璇锋眰鏁版嵁锛歿}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ private void auth(String appkey, Object obj, HttpServletRequest request) {
+ log.info("OpenController绫�:銆恵}銆戞帴鍙ｈ璁块棶;appkey:銆恵}銆�;璇锋眰鏁版嵁锛氥�恵}銆�", request.getRequestURI(), appkey, JSON.toJSONString(obj));
+ request.setAttribute("cache", obj);
if (!auth) {
return;
}
@@ -140,7 +330,18 @@
}
}
- public static void main(String[] args) {
+
+// @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("======================================");
OpenOrderPakinParam param = new OpenOrderPakinParam();
@@ -177,6 +378,117 @@
OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
param1.setOrderNo("963001846497017856");
System.out.println(JSON.toJSONString(param1));
+ }*/
+
+
+
+ /*...........................寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐...........................*/
+ /*............................Created by Monkey D. Luffy on 2023.07.19.............................*/
+
+ /**
+ * 璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�
+ */
+ @PostMapping("/labeller/mat/auth/v1")
+ @AppAuth(memo = "璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�") //old闇�瑕佷慨鏀�
+ public synchronized R labellerMat(@RequestHeader(required = false) String appkey,
+ @RequestBody LabellerMatParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok(openService.labellerMat(param));
}
+ /**
+ * 璐存爣鏈鸿创鏍囧畬鎴�
+ */
+ @PostMapping("/labeller/complete/auth/v1")
+ @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/v2")
+ @AppAuth(memo = "鏉剧洓(1妤�)锛氱爜鍨涘畬鎴愪笅鍙戠‘璁や俊鍙�")
+ public synchronized R palletizingCompleteS(@RequestHeader(required = false) String appkey,
+ @RequestBody PalletizingCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ 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);
+ }
+
+
+ /**
+ * 妗佹灦涓婁綅杞欢锛氬崟娆℃媶鍨涘畬鎴愰�氱煡
+ */
+ @PostMapping("/single/unstacking/complete/auth/v1")
+ @AppAuth(memo = "妗佹灦涓婁綅杞欢锛氬崟娆℃媶鍨涘畬鎴愰�氱煡")
+ public synchronized R singleUnstackingComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody SingleUnstackingCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.singleUnstackingComplete(param);
+ return R.ok(param);
+ }
+
+ /**
+ * 妗佹灦涓婁綅杞欢锛氬崟鎵樻媶鍨涘畬鎴愰�氱煡
+ */
+ @PostMapping("/single/mount/unstacking/complete/auth/v1")
+ @AppAuth(memo = "妗佹灦涓婁綅杞欢锛氬崟鎵樻媶鍨涘畬鎴愰�氱煡")
+ public synchronized R singleMountUnstackingComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody SingleMountUnstackingCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.singleMountUnstackingComplete(param);
+ return R.ok(param);
+ }
+
+ /**
+ * 璁″垝缁勮揣鍗�
+ */
+ @PostMapping("/groupOrderConfirm/auth/v1")
+ @AppAuth(memo = "璁″垝鍗曟嵁涓嬪彂")
+ public synchronized R groupOrderConfirm(@RequestHeader(required = false) String appkey,
+ @RequestBody GroupOrderConfirmParam param,
+ HttpServletRequest request) {
+// auth(appkey, param, request);
+ openService.groupOrderConfirm(param);
+ return R.ok(param);
+ }
+
+ /*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
+
}
--
Gitblit v1.9.1