From e760b8a8ec81b7113a01b98eb2d165dcf84fc1b2 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 20 四月 2026 13:48:47 +0800
Subject: [PATCH] 对接接口开发
---
src/main/java/com/zy/asrs/controller/OpenController.java | 270 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 258 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 5576b9c..99787dc 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,22 +1,37 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.result.OpenInventoryVo;
+import com.zy.asrs.entity.result.OpenSummaryVo;
+import com.zy.asrs.entity.result.TokenVo;
+import com.zy.asrs.mapper.LocDetlMapper;
+import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.OpenService;
+import com.zy.common.service.wms.Result;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
+import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2022/4/8
@@ -34,12 +49,32 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private ConfigService configService;
+
+ @Autowired
+ private LocMastService locMastService;
+
+ @Autowired
+ private LocDetlMapper locDetlMapper;
+
+ @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, TokenVo> TOKEN_CACHE = new ConcurrentHashMap<>();
+
@Deprecated
@PostMapping("/grouping")
@AppAuth(memo = "AGV缁勬墭璋冪敤")
public synchronized R grouping(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) AgvGroupingParam param,
- HttpServletRequest request){
+ @RequestBody(required = false) AgvGroupingParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param.getOrderNo())) {
param.setOrderNo(param.getBillNo());
@@ -57,14 +92,14 @@
@PostMapping("/barcodeVerificatio")
@AppAuth(memo = "AGV璋冪敤鏍￠獙鏉＄爜")
public synchronized R barcodeVerificatio(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) Map<String,String> param,
- HttpServletRequest request){
+ @RequestBody(required = false) Map<String, String> param,
+ HttpServletRequest request) {
auth(appkey, param, request);
// 鎵樼洏鏉＄爜
String barcode = param.get("barcode");
if (Cools.isEmpty(barcode)) {
- return R.parse("鏉＄爜涓嶈兘涓虹┖");
+ return R.parse("鏉＄爜涓嶈兘涓虹┖");
}
return openService.barcodeVerificatio(barcode);
@@ -73,10 +108,14 @@
@PostMapping("/outbound")
@AppAuth(memo = "MES璋冪敤鍑哄簱")
public synchronized R outbound(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) OutBoundParam param,
- HttpServletRequest request) {
+ @RequestBody(required = false) OutBoundParam param,
+ HttpServletRequest request) {
+ Config mesAuto = configService.selectConfigByCode("CLOSE_OUTBOUND");
+ if (mesAuto != null && mesAuto.getValue().equals("0")) {
+ return R.parse("鍏抽棴鑷姩鍑哄簱");
+ }
auth(appkey, param, request);
- if (Cools.isEmpty(param.getEndLocation(),param.getBarcode(),param.getOrderNo())) {
+ if (Cools.isEmpty(param.getEndLocation(), param.getBarcode(), param.getOrderNo())) {
return R.parse(BaseRes.PARAM);
}
@@ -87,7 +126,7 @@
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam param,
- HttpServletRequest request){
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -201,6 +240,25 @@
return R.ok().add(openService.queryStock());
}
+
+ /**
+ * 杩斿洖搴撳瓨鍒╃敤鐜�
+ */
+ @Synchronized
+ @PostMapping("/stock/used/v1")
+ public R getRate(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) OpenOrderCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ int i = locMastService.selectCount(new EntityWrapper<LocMast>().in("loc_sts", "O"));
+ int i1 = locMastService.selectCount(new EntityWrapper<LocMast>().in("loc_sts", Arrays.asList("D", "F", "P", "Q", "R", "S")));
+ BigDecimal dividend = new BigDecimal(i1 - i);
+ BigDecimal divisor = new BigDecimal(i1);
+ BigDecimal quotient = dividend.divide(divisor,4, BigDecimal.ROUND_HALF_UP);
+ return R.ok().add(quotient);
+ }
+
+
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);
@@ -254,4 +312,192 @@
// System.out.println(JSON.toJSONString(param1));
// }
+ /*========================================new Agreement==============================================================*/
+
+ /**
+ * 鑾峰彇token
+ * @param param
+ * @param request
+ * @return
+ */
+ @PostMapping("/getToken")
+ public synchronized R getToken(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = true) TokenParam param,
+ HttpServletRequest request){
+ log.info("鑾峰彇Token:/getToken鎺ュ彛琚闂紝appkey={},璇锋眰鏁版嵁={}", appkey, JSON.toJSONString(param));
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+
+ String appId = param.getAppId();
+ String appSecret = param.getAppSecret();
+ 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) || !openAppId.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 TokenVo(appId, expireAt));
+
+ Map<String, Object> result = new HashMap<>();
+ result.put("token", token);
+ result.put("expireAt", expireAt);
+ return R.ok().add(result);
+ }
+
+ private void authNew(String appkey,
+ Object obj,
+ HttpServletRequest request,
+ String url) {
+ log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", url, appkey, 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 boolean validToken(String authorization){
+ if (Cools.isEmpty(authorization)) {
+ return false;
+ }
+ TokenVo tokenInfo = TOKEN_CACHE.get(authorization);
+ if (tokenInfo == null) {
+ return false;
+ }
+ if (System.currentTimeMillis() > tokenInfo.getValidTime()) {
+ TOKEN_CACHE.remove(authorization);
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * 鐗╂枡鍩虹淇℃伅鍚屾
+ * @param appkey
+ * @param param
+ * @param request
+ * @return
+ */
+ @PostMapping("/erp/mat/sync")
+ public synchronized R syncMatInfoV2(@RequestHeader(required = false) String appKey,
+ @RequestBody(required = false) List<MatSyncParam.MatParam> param,
+ HttpServletRequest request){
+ authNew(appKey, param, request, "鐗╂枡鍩虹淇℃伅鍚屾:/erp/mat/sync");
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ MatSyncParam matSyncParam = new MatSyncParam();
+ List<MatSyncParam.MatParam> objects = new ArrayList<>();
+ objects = param;
+ matSyncParam.matDetails = objects;
+
+ openService.syncMat(matSyncParam);
+ return R.ok();
+ }
+
+ /**
+ * 鍏�/鍑哄簱閫氱煡鍗曚笅鍙�
+ * @param param
+ * @return
+ */
+ @PostMapping("/erp/order/add")
+ public synchronized R addOrder(@RequestHeader(required = false) String appKey,
+ @RequestBody OpenOrderParam param,
+ HttpServletRequest request){
+ authNew(appKey, param, request, "鍏�/鍑哄簱閫氱煡鍗曚笅鍙�:/erp/order/add");
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getOrderNo())){
+ return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderType())){
+ return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getWkType())){
+ return R.error("涓氬姟绫诲瀷[wkType]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderItems())){
+ return R.error("璁㈠崟鏄庣粏[orderItems]涓嶈兘涓虹┖");
+ }
+ openService.orderCreate(param);
+ return R.ok();
+ }
+
+ /**
+ * 搴撳瓨鏄庣粏鏌ヨ
+ * @param param
+ * @return
+ */
+ @PostMapping("/erp/inventory/details")
+ public synchronized Result inventory(@RequestHeader(required = false) String appKey,
+ @RequestBody JSONObject param,
+ HttpServletRequest request){
+ authNew(appKey, param, request, "搴撳瓨鏄庣粏鏌ヨ:/erp/inventory/details");
+ try {
+ String wareHouseId = param == null ? null : param.getString("wareHouseId");
+ String locId = param == null ? null : param.getString("locId");
+ String matNr = param == null ? null : param.getString("matNr");
+ String orderNo = param == null ? null : param.getString("orderNo");
+ String batch = param == null ? null : param.getString("batch");
+ return new Result(200, "鎿嶄綔鎴愬姛", locDetlMapper.inventory(wareHouseId, locId, matNr, orderNo, batch));
+ }catch (Exception e){
+ return new Result(500, e.getMessage(), null);
+ }
+ }
+
+ /**
+ * 搴撳瓨姹囨�绘煡璇�
+ * @param param
+ * @return
+ */
+ @PostMapping("/erp/inventory/summary")
+ public synchronized Result invSummary(@RequestHeader(required = false) String appKey,
+ @RequestBody JSONObject param,
+ HttpServletRequest request){
+ authNew(appKey, param, request, "搴撳瓨姹囨�绘煡璇�:/erp/inventory/summary");
+ try {
+ String wareHouseId = param == null ? null : param.getString("wareHouseId");
+ String matNr = param == null ? null : param.getString("matNr");
+ Collection<String> matNrs = null;
+ if (!Cools.isEmpty(matNr)){
+ matNrs = Arrays.stream(matNr.split(","))
+ .map(String::trim)
+ .filter(s -> !s.isEmpty())
+ .collect(Collectors.toList());
+ }
+ return new Result(200, "鎿嶄綔鎴愬姛", locDetlMapper.invSummary(wareHouseId, matNrs));
+ }catch (Exception e){
+ return new Result(500, e.getMessage(), null);
+ }
+ }
}
--
Gitblit v1.9.1