From 062b3da2a21fabbe5fe76178522ad763e09ed1cc Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 22 十二月 2023 10:01:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 72 ++++++++++++++++++-----------------
1 files changed, 37 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 54ae25a..1ce38b8 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,7 +1,6 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
@@ -12,13 +11,13 @@
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
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
@@ -53,24 +52,45 @@
* 娣诲姞鍏ュ簱鍗�
*/
@PostMapping("/order/pakin/default/v1")
+ @AppAuth(memo = "娣诲姞璁㈠崟鍏ュ簱")
public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakinParam param,
+ @RequestBody OpenOrderPakinJDParam param1,
HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
+ auth(appkey, param1, request);
+ if (Cools.isEmpty(param1)) {
return R.parse(BaseRes.PARAM);
}
- if (Cools.isEmpty(param.getOrderNo())) {
+ if (Cools.isEmpty(param1.getOrderNo())) {
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getOrderType())) {
+ if (Cools.isEmpty(param1.getFormId())) {
return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getOrderDetails())) {
+ if (Cools.isEmpty(param1.getMatList())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
+ OpenOrderPakinParam param = new OpenOrderPakinParam(param1);
openService.pakinOrderCreate(param);
return R.ok();
+ }
+
+ /*
+ * 閫熻吘鏁板瓧瀛敓璋冪敤鎺ュ彛
+ * */
+ @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());
+ }
+ /*
+ * 閫熻吘鏁板瓧瀛敓璋冪敤鎺ュ彛
+ * */
+ @PostMapping("/digital/ownerAll/number/quantity")
+ public synchronized R ownerAllNumber(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
+ return openService.ownerAllNumber();
}
@@ -80,21 +100,23 @@
@PostMapping("/order/pakout/default/v1")
@AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakoutParam param,
+ @RequestBody OpenOrderPakinJDParam param1,
HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
+ auth(appkey, param1, request);
+ if (Cools.isEmpty(param1)) {
return R.parse(BaseRes.PARAM);
}
- if (Cools.isEmpty(param.getOrderNo())) {
+ if (Cools.isEmpty(param1.getOrderNo())) {
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getOrderType())) {
+ if (Cools.isEmpty(param1.getFormId())) {
return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getOrderDetails())) {
+ if (Cools.isEmpty(param1.getCreateDate())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
+ OpenOrderPakoutParam param = new OpenOrderPakoutParam(param1);
+
openService.pakoutOrderCreate(param);
return R.ok();
}
@@ -108,7 +130,7 @@
public R queryStock(@RequestHeader(required = false) String appkey,
@RequestBody StockVo stockVo,
HttpServletRequest request) {
- auth(appkey, null, request);
+ auth(appkey, stockVo, request);
return R.ok().add(openService.queryStock(stockVo));
}
@@ -171,25 +193,5 @@
param1.setOrderNo("963001846497017856");
System.out.println(JSON.toJSONString(param1));
}
-
-
- @RequestMapping("/manDetl/in")
- public R manDetlAdd(@RequestBody JSONObject json){
- if (json == null){
- return R.error("浼犲叆鏁版嵁涓虹┖");
- }
- return openService.manDetlIn(json);
- }
-
-
- @RequestMapping("/manDetl/out")
- public R manDetlDelete(@RequestBody JSONObject json){
- if (json == null){
- return R.error("浼犲叆鏁版嵁涓虹┖");
- }
- return openService.manDetlOut(json);
- }
-
-
}
--
Gitblit v1.9.1