From c7bf4b8773f888fd5be613b7bb6fb8ae4a47b028 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 23 四月 2024 16:53:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 65 ++++++++++----------------------
1 files changed, 21 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index cb34a46..3b86a9c 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -5,6 +5,7 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
@@ -46,27 +47,11 @@
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/default/v1")
+ @AppAuth(memo = "娣诲姞璁㈠崟鍏ュ簱")
public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
@RequestBody OpenOrderPakinParam param,
HttpServletRequest request) {
@@ -87,16 +72,16 @@
return R.ok();
}
- /**
- * 鍏ュ簱鍗曞洖鍐�
- */
- @PostMapping("/order/pakin/complete/default/v1")
- public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) OpenOrderCompleteParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- return R.ok().add(openService.pakinOrderComplete(param));
+ /*
+ * 閫熻吘鏁板瓧瀛敓璋冪敤鎺ュ彛
+ * */
+ @PostMapping("/digital/twin/inventory/quantity")
+ public synchronized R inventoryQuantity(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
+ return R.ok(openService.inventoryQuantity());
}
+
/**
* 娣诲姞鍑哄簱鍗�
@@ -109,12 +94,6 @@
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]涓嶈兘涓虹┖");
@@ -129,16 +108,6 @@
return R.ok();
}
- /**
- * 鍑哄簱鍗曞洖鍐�
- */
- @PostMapping("/order/pakout/complete/default/v1")
- public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) OpenOrderCompleteParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- return R.ok().add(openService.pakoutOrderComplete(param));
- }
/**
@@ -146,9 +115,10 @@
*/
@RequestMapping("/stock/default/v1")
public R queryStock(@RequestHeader(required = false) String appkey,
+ @RequestBody StockVo stockVo,
HttpServletRequest request) {
- auth(appkey, null, request);
- return R.ok().add(openService.queryStock());
+ auth(appkey, stockVo, request);
+ return R.ok().add(openService.queryStock(stockVo));
}
private void auth(String appkey, Object obj, HttpServletRequest request) {
@@ -165,6 +135,13 @@
}
}
+ /******************************************************* 鏁板瓧瀛敓 *******************************************************/
+
+ @PostMapping("/wrkdetl")
+ public R getInOutDetl(){
+ return openService.getInOutDetl();
+ }
+
public static void main(String[] args) {
// 1
System.out.println("======================================");
--
Gitblit v1.9.1