From dea586adf232c722e8d2dfa833c3d7711a1019df Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 02 二月 2026 13:37:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 134 +++++++++++++++++++++++++++++++++-----------
1 files changed, 99 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 50f219f..c7e4761 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,14 +1,14 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
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.param.PackParam;
+import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.WaitPakinService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -35,33 +35,43 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private WaitPakinService waitPakinService;
-
+ @PostMapping("/order/matSync/default/v1")
+ @AppAuth(memo = "response.mat_sync_interface")
+ 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/package/v1")
- @AppAuth(memo = "鎵撳寘涓婄嚎鎺ュ彛")
- public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) PackParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- openService.packageUp(param);
- return R.ok();
- }
-
-
+// @PostMapping("/order/pakin/new/package/v1")
+// @AppAuth(memo = "鎵撳寘涓婄嚎鎺ュ彛")
+// public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
+// @RequestBody(required = false) PackParam param,
+// HttpServletRequest request) {
+// auth(appkey, param, request);
+// if (Cools.isEmpty(param)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// openService.packageUp(param);
+// return R.ok();
+// }
/**
* 娣诲姞鍏ュ簱鍗�
*/
- @PostMapping("/order/pakin/new/default/v1")
+ @PostMapping("/order/pakin/default/v1")
public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
@RequestBody OpenOrderPakinParam param,
HttpServletRequest request) {
@@ -70,13 +80,13 @@
return R.parse(BaseRes.PARAM);
}
if (Cools.isEmpty(param.getOrderNo())) {
- return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
+ return R.error("response.order_no_required");
}
if (Cools.isEmpty(param.getOrderType())) {
- return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
+ return R.error("response.order_type_required");
}
if (Cools.isEmpty(param.getOrderDetails())) {
- return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
+ return R.error("response.order_details_required");
}
openService.pakinOrderCreate(param);
return R.ok();
@@ -90,14 +100,16 @@
@RequestBody(required = false) OpenOrderCompleteParam param,
HttpServletRequest request) {
auth(appkey, param, request);
- return R.ok().add(openService.pakinOrderComplete(param));
+ R r = R.ok();
+ r.put("data",openService.pakinOrderComplete(param));
+ return r;
}
/**
* 娣诲姞鍑哄簱鍗�
*/
- @PostMapping("/order/pakout/new/default/v1")
- @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
+ @PostMapping("/order/pakout/default/v1")
+ @AppAuth(memo = "response.add_order_outbound")
public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
@RequestBody OpenOrderPakoutParam param,
HttpServletRequest request) {
@@ -106,19 +118,19 @@
return R.parse(BaseRes.PARAM);
}
if (Cools.isEmpty(param.getLgort())) {
- return R.error("鍗曟嵁缂栧彿[lgort]涓嶈兘涓虹┖");
+ return R.error("response.lgort_required");
}
if (!param.getLgort().equals("5006")) {
return R.ok();
}
if (Cools.isEmpty(param.getOrderNo())) {
- return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
+ return R.error("response.order_no_required");
}
if (Cools.isEmpty(param.getOrderType())) {
- return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
+ return R.error("response.order_type_required");
}
if (Cools.isEmpty(param.getOrderDetails())) {
- return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
+ return R.error("response.order_details_required");
}
openService.pakoutOrderCreate(param);
return R.ok();
@@ -132,7 +144,9 @@
@RequestBody(required = false) OpenOrderCompleteParam param,
HttpServletRequest request) {
auth(appkey, param, request);
- return R.ok().add(openService.pakoutOrderComplete(param));
+ R r = R.ok();
+ r.put("data",openService.pakoutOrderComplete(param));
+ return r;
}
@@ -143,9 +157,59 @@
public R queryStock(@RequestHeader(required = false) String appkey,
HttpServletRequest request) {
auth(appkey, null, request);
- return R.ok().add(openService.queryStock());
+ R r = R.ok();
+ r.put("data",openService.queryStock());
+ return r;
}
+ /**
+ * PDA妫�绱㈢洏鐐规暟閲�
+ */
+ @PostMapping("/pick/v1/getPickList")
+ @AppAuth(memo = "PDA Inventory Count Lookup")
+ public synchronized R getPickList(@RequestHeader(required = false) String appkey,
+ @RequestBody PdaPickListParam param,
+ HttpServletRequest request) {
+// auth(appkey, param, request);
+
+ List<PickWrkDetlListParam> list = openService.getPickList(param);
+ if (!list.isEmpty()) {
+ return R.ok(list);
+ }
+ return R.error("Location does not exist or has no details.");
+ }
+
+ /**
+ * PDA妫�绱㈢粍鎵樻暟鎹�
+ */
+ @PostMapping("/comb/v1/getCombList")
+ @AppAuth(memo = "PDA Get Comb List")
+ public synchronized R getCombList(@RequestHeader(required = false) String appkey,
+ @RequestBody PdaPickListParam param,
+ HttpServletRequest request) {
+// auth(appkey, param, request);
+
+ List<WaitPakin> list = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode()));
+ if (!list.isEmpty()) {
+ return R.ok(list);
+ }
+ return R.error("Combs does not exist or has no details.");
+ }
+
+ /**
+ * PDA妫�绱㈢粍鎵樻暟鎹�
+ */
+ @PostMapping("/comb/v1/deleteComb")
+ @AppAuth(memo = "PDA Delete Comb")
+ public synchronized R deleteComb(@RequestHeader(required = false) String appkey,
+ @RequestBody PdaPickListParam param,
+ HttpServletRequest request) {
+ boolean result = waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode()));
+ if(result) {
+ return R.ok();
+ }
+ return R.error("Combs does not exist or has no details.");
+ }
private void auth(String appkey, Object obj, HttpServletRequest request) {
log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
@@ -154,10 +218,10 @@
return;
}
if (Cools.isEmpty(appkey)) {
- throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
+ throw new CoolException("response.auth_failed_check_appkey");
}
if (!APP_KEY_LIST.contains(appkey)) {
- throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
+ throw new CoolException("response.auth_failed_check_appkey");
}
}
--
Gitblit v1.9.1