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 | 136 ++++++++++++++++++++++-----------------------
1 files changed, 66 insertions(+), 70 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 7c29e2a..1ce38b8 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,15 +1,13 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+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.service.ApiLogService;
+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.utils.IpTools;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +17,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* Created by vincent on 2022/4/8
@@ -35,119 +34,109 @@
@Autowired
private OpenService openService;
- @Autowired
- private ApiLogService apiLogService;
-
-
- /****************************************************************************/
- /********************************* 鎵撳寘涓婄嚎 **********************************/
- /****************************************************************************/
-
-
- @PostMapping("/order/pakin/new/package/v1")
- public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
- @RequestParam(required = false) String barcode,
- HttpServletRequest request) {
- auth(appkey, barcode);
- if (Cools.isEmpty(barcode)) {
+ @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.packageUp(barcode);
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鎵撳寘涓婄嚎鎺ュ彛",
- request.getRequestURI(),
- appkey,
- IpTools.gainRealIp(request),
- barcode,
- JSON.toJSONString(R.ok()),
- Boolean.TRUE
- );
+ 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);
- if (Cools.isEmpty(param)) {
+ @RequestBody OpenOrderPakinJDParam param1,
+ HttpServletRequest request) {
+ 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("/order/pakin/complete/default/v1")
- public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) OpenOrderCompleteParam param) {
- auth(appkey, param);
- 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());
}
+ /*
+ * 閫熻吘鏁板瓧瀛敓璋冪敤鎺ュ彛
+ * */
+ @PostMapping("/digital/ownerAll/number/quantity")
+ public synchronized R ownerAllNumber(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
+ return openService.ownerAllNumber();
+ }
+
/**
* 娣诲姞鍑哄簱鍗�
*/
- @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);
- if (Cools.isEmpty(param)) {
+ @RequestBody OpenOrderPakinJDParam param1,
+ HttpServletRequest request) {
+ 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();
}
- /**
- * 鍑哄簱鍗曞洖鍐�
- */
- @PostMapping("/order/pakout/complete/default/v1")
- public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) OpenOrderCompleteParam param) {
- auth(appkey, param);
- return R.ok().add(openService.pakoutOrderComplete(param));
- }
/**
* 搴撳瓨缁熻
*/
@RequestMapping("/stock/default/v1")
- public R queryStock(@RequestHeader(required = false) String appkey) {
- auth(appkey, null);
- return R.ok().add(openService.queryStock());
+ public R queryStock(@RequestHeader(required = false) String appkey,
+ @RequestBody StockVo stockVo,
+ HttpServletRequest request) {
+ auth(appkey, stockVo, request);
+ return R.ok().add(openService.queryStock(stockVo));
}
-
- 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("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ request.setAttribute("cache", obj);
if (!auth) {
return;
}
@@ -159,6 +148,13 @@
}
}
+ /******************************************************* 鏁板瓧瀛敓 *******************************************************/
+
+ @PostMapping("/wrkdetl")
+ public R getInOutDetl(){
+ return openService.getInOutDetl();
+ }
+
public static void main(String[] args) {
// 1
System.out.println("======================================");
--
Gitblit v1.9.1