From 264a479aa1ad16818110e9f9d833bbf02e298f47 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 16 三月 2026 10:06:28 +0800
Subject: [PATCH] #lfderp接口开发
---
src/main/java/com/zy/asrs/controller/OpenController.java | 419 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 315 insertions(+), 104 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 925fa41..d6e4dde 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,51 +1,217 @@
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.DocType;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
-import com.zy.asrs.service.*;
+import com.zy.asrs.entity.ErpOrder;
+import com.zy.asrs.entity.ErpOrderDetl;
+import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.ErpMat;
+import com.zy.asrs.service.ErpOrderDetlService;
+import com.zy.asrs.service.ErpOrderService;
+import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.ErpMatService;
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.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
/**
* Created by vincent on 2022/4/8
*/
+@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>() {{
+ add("ea1f0459efc02a79f046f982767939ae");
+ }};
@Autowired
- private OrderService orderService;
+ private OpenService openService;
@Autowired
- private OrderDetlService orderDetlService;
+ private ErpMatService erpMatService;
@Autowired
- private SnowflakeIdWorker snowflakeIdWorker;
+ private ErpOrderService erpOrderService;
@Autowired
- private DocTypeService docTypeService;
- @Autowired
- private MatService matService;
- @Autowired
- private LocDetlService locDetlService;
+ private ErpOrderDetlService erpOrderDetlService;
+ @Value("${open-asrs.auth.app-id:wms_8f7c3d126a944e3ab5c89d21f4a7c6b2}")
+ private String openAppId;
+
+ @Value("${open-asrs.auth.app-secret:D9f3A7xP1kLm8Q2tW5zH0sY6vR4bNcE7FjK3uM9pT2aL8qX6}")
+ private String openAppSecret;
+
+ @Value("${open-asrs.auth.token-valid-minutes:30}")
+ private Integer tokenValidMinutes;
+
+ private static final Map<String, TokenInfoParam> TOKEN_CACHE = new ConcurrentHashMap<>();
+
+ @PostMapping("/getToken")
+ public synchronized R getToken(@RequestBody(required = false) Map<String, String> param) {
+ log.info("{}鎺ュ彛琚闂紱璇锋眰鏁版嵁锛歿}", "/getToken", JSON.toJSONString(param));
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+
+ String appId = param.get("appId");
+ String appSecret = param.get("appSecret");
+ if (Cools.isEmpty(appId)) {
+ return R.error("鍙傛暟[appId]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(appSecret)) {
+ return R.error("鍙傛暟[appSecret]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(openAppId) || Cools.isEmpty(openAppSecret)) {
+ throw new CoolException("绯荤粺鏈厤缃畂pen-asrs.auth.app-id鎴杘pen-asrs.auth.app-secret");
+ }
+ if (!openAppId.equals(appId) || !openAppSecret.equals(appSecret)) {
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appId鎴朼ppSecret鏃犺锛�");
+ }
+
+ String token = UUID.randomUUID().toString().replace("-", "");
+ long expireAt = System.currentTimeMillis() + tokenValidMinutes * 60L * 1000L;
+ TOKEN_CACHE.put(token, new TokenInfoParam(appId, expireAt));
+
+ Map<String, Object> result = new HashMap<>();
+ result.put("token", token);
+ result.put("validTime", tokenValidMinutes);
+ return R.ok().add(result);
+ }
+
+ public static boolean validToken(String authorization) {
+ if (Cools.isEmpty(authorization)) {
+ return false;
+ }
+ TokenInfoParam tokenInfo = TOKEN_CACHE.get(authorization);
+ if (tokenInfo == null) {
+ return false;
+ }
+ if (System.currentTimeMillis() > tokenInfo.getExpireAt()) {
+ TOKEN_CACHE.remove(authorization);
+ return false;
+ }
+ return true;
+ }
+ @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("/erp/mat/sync")
+ public synchronized R erpMatSync(@RequestBody(required = false) List<Map<String, Object>> body,
+ HttpServletRequest request) {
+ auth(null, body, request);
+ if (Cools.isEmpty(body)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ openService.syncErpMat(body);
+ Map<String, Object> res = new HashMap<>();
+ res.put("result", "SUCCESS");
+ return R.ok().add(res);
+ }
+
+ @PostMapping("/erp/order/addPrd")
+ public synchronized R erpOrderAddPrd(@RequestBody Object body,
+ HttpServletRequest request) {
+ List<OrderDto> orders;
+ if (body instanceof List) {
+ orders = JSON.parseArray(JSON.toJSONString(body), OrderDto.class);
+ } else {
+ OrderDto dto = JSON.parseObject(JSON.toJSONString(body), OrderDto.class);
+ orders = new ArrayList<>();
+ orders.add(dto);
+ }
+ auth(null, orders, request);
+ if (Cools.isEmpty(orders)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ return R.ok().add(openService.addErpOrder(orders));
+ }
+
+ @PostMapping("/erp/order/addQc")
+ public synchronized R erpOrderAddQc(@RequestBody Object body,
+ HttpServletRequest request) {
+ List<OrderDto> orders;
+ if (body instanceof List) {
+ orders = JSON.parseArray(JSON.toJSONString(body), OrderDto.class);
+ } else {
+ OrderDto dto = JSON.parseObject(JSON.toJSONString(body), OrderDto.class);
+ orders = new ArrayList<>();
+ orders.add(dto);
+ }
+ auth(null, orders, request);
+ if (Cools.isEmpty(orders)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ return R.ok().add(openService.addErpOrder(orders));
+ }
+
+ @PostMapping("/erp/order/addSrm")
+ public synchronized R erpOrderAddSrm(@RequestBody Object body,
+ HttpServletRequest request) {
+ List<OrderDto> orders;
+ if (body instanceof List) {
+ orders = JSON.parseArray(JSON.toJSONString(body), OrderDto.class);
+ } else {
+ OrderDto dto = JSON.parseObject(JSON.toJSONString(body), OrderDto.class);
+ orders = new ArrayList<>();
+ orders.add(dto);
+ }
+ auth(null, orders, request);
+ if (Cools.isEmpty(orders)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ return R.ok().add(openService.addErpOrder(orders));
+ }
+
+ @PostMapping("/MES/inventory/details")
+ public synchronized R mesInventoryDetails(@RequestBody(required = false) Map<String, Object> param,
+ HttpServletRequest request) throws IOException {
+ auth(null, param, request);
+ if (param == null) {
+ param = new HashMap<>();
+ }
+ return R.ok().add(openService.mesInventoryDetails(param));
+ }
+
+ @PostMapping("/MES/inventory/summary")
+ public synchronized R mesInventorySummary(@RequestBody(required = false) Map<String, Object> param,
+ HttpServletRequest request) throws IOException {
+ auth(null, param, request);
+ if (param == null) {
+ param = new HashMap<>();
+ }
+ return R.ok().add(openService.mesInventorySummary(param));
+ }
+
/**
* 娣诲姞鍏ュ簱鍗�
*/
@PostMapping("/order/pakin/default/v1")
- @Transactional
- public synchronized R orderCreate(@RequestBody OpenOrderPakinParam param) {
+ public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
+ @RequestBody OpenOrderPakinParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
@@ -58,85 +224,61 @@
if (Cools.isEmpty(param.getOrderDetails())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
- Order order = orderService.selectByNo(param.getOrderNo());
- if (!Cools.isEmpty(order)) {
- return R.error(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
- }
- DocType docType = docTypeService.selectOrAdd(param.getOrderType());
- Date now = new Date();
- // 鍗曟嵁涓绘。
- order = new Order(
- String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
- param.getOrderNo(), // 璁㈠崟缂栧彿
- DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
- docType.getDocId(), // 鍗曟嵁绫诲瀷
- null, // 椤圭洰缂栧彿
- null, //
- null, // 璋冩嫧椤圭洰缂栧彿
- null, // 鍒濆绁ㄦ嵁鍙�
- null, // 绁ㄦ嵁鍙�
- null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
- null, // 鑱旂郴鏂瑰紡
- null, // 鎿嶄綔浜哄憳
- null, // 鍚堣閲戦
- null, // 浼樻儬鐜�
- null, // 浼樻儬閲戦
- null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
- null, // 瀹炰粯閲戦
- null, // 浠樻绫诲瀷
- null, // 涓氬姟鍛�
- null, // 缁撶畻澶╂暟
- null, // 閭垂鏀粯绫诲瀷
- null, // 閭垂
- null, // 浠樻鏃堕棿
- null, // 鍙戣揣鏃堕棿
- null, // 鐗╂祦鍚嶇О
- null, // 鐗╂祦鍗曞彿
- 1L, // 璁㈠崟鐘舵��
- 1, // 鐘舵��
- 9527L, // 娣诲姞浜哄憳
- now, // 娣诲姞鏃堕棿
- 9527L, // 淇敼浜哄憳
- now, // 淇敼鏃堕棿
- null // 澶囨敞
- );
- if (!orderService.insert(order)) {
- throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- // 鍗曟嵁鏄庣粏妗�
- List<DetlDto> list = new ArrayList<>();
- List<DetlDto> orderDetails = param.getOrderDetails();
- for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
- if (DetlDto.has(list, dto)) {
- DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
- assert detlDto != null;
- detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
- } else {
- list.add(dto);
- }
- }
- for (DetlDto detlDto : list) {
- Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
- }
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(9527L);
- orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(9527L);
- orderDetl.setUpdateTime(now);
- orderDetl.setStatus(1);
- orderDetl.setQty(0.0D);
- if (!orderDetlService.insert(orderDetl)) {
- throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- }
+ 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,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok().add(openService.pakinOrderComplete(param));
+ }
+
+ /**
+ * 娣诲姞鍑哄簱鍗�
+ */
+ @PostMapping("/order/pakout/default/v1")
+ @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
+ public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
+ @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]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderType())) {
+ return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderDetails())) {
+ return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
+ }
+ 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,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok().add(openService.pakoutOrderComplete(param));
}
@@ -144,8 +286,77 @@
* 搴撳瓨缁熻
*/
@RequestMapping("/stock/default/v1")
- public R queryStock() {
- return R.ok(locDetlService.queryStockTotal());
+ 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, HttpServletRequest request) {
+ log.info("{}鎺ュ彛琚闂紱token:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", request.getHeader("Authorization"), JSON.toJSONString(obj));
+ request.setAttribute("cache", obj);
+ if (!auth) {
+ return;
+ }
+ String authorization = request.getHeader("Authorization");
+ if (Cools.isEmpty(authorization)) {
+ authorization = request.getHeader("authorization");
+ }
+ if (!Cools.isEmpty(authorization)) {
+ String val = authorization.trim();
+ if (val.toLowerCase().startsWith("bearer")) {
+ int idx = val.indexOf(' ');
+ authorization = idx > -1 ? val.substring(idx + 1).trim() : "";
+ } else {
+ authorization = val;
+ }
+ }
+ if (!Cools.isEmpty(authorization)) {
+ if (validToken(authorization)) {
+ return;
+ }
+ throw new CoolException("璁よ瘉澶辫触锛岃纭Authorization鏃犺锛�");
+ }
+ throw new CoolException("璁よ瘉澶辫触锛岃纭Authorization鏃犺锛�");
+ }
+
+ public static void main(String[] args) {
+ // 1
+ System.out.println("======================================");
+ OpenOrderPakinParam param = new OpenOrderPakinParam();
+ param.setOrderNo(String.valueOf(new SnowflakeIdWorker().nextId()));
+ param.setOrderType("鎵撳寘涓婄嚎鍗�");
+ param.setOrderTime(DateUtils.convert(new Date()));
+ List<DetlDto> orderDetails = new ArrayList<>();
+ param.setOrderDetails(orderDetails);
+ for (int i = 0; i < 3; i++) {
+ DetlDto detlDto = new DetlDto();
+ switch (i) {
+ case 0:
+ detlDto.setMatnr("MDH020030530");
+ detlDto.setBatch("500");
+ detlDto.setAnfme(18.0);
+ break;
+ case 1:
+ detlDto.setMatnr("MDH020016416");
+ detlDto.setBatch("500");
+ detlDto.setAnfme(32.0);
+ break;
+ case 2:
+ detlDto.setMatnr("LSH90152025");
+ detlDto.setAnfme(50.0);
+ break;
+ default:
+ break;
+ }
+ orderDetails.add(detlDto);
+ }
+ System.out.println(JSON.toJSONString(param));
+ // 2
+ System.out.println("======================================");
+ OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
+ param1.setOrderNo("963001846497017856");
+ System.out.println(JSON.toJSONString(param1));
}
}
--
Gitblit v1.9.1