From e8cd55e424fba183553c13d23c77895592b7ab29 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 11 三月 2023 09:28:38 +0800
Subject: [PATCH] erp
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 2
src/main/java/com/zy/asrs/service/LocDetlService.java | 2
src/main/java/com/zy/asrs/controller/OpenController.java | 8 ++--
src/main/resources/mapper/LocDetlMapper.xml | 2
src/main/java/com/zy/asrs/task/handler/ErpAccessTokenHandler.java | 51 ++++++++++++++++---------
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 6 ++-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 4 +-
src/main/java/com/zy/asrs/service/OpenService.java | 2
8 files changed, 46 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 5ad85ce..72ef5d7 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -6,6 +6,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;
@@ -105,11 +106,10 @@
*/
@RequestMapping("/stock/default/v1")
public R queryStock(@RequestHeader(required = false) String appkey,
- @RequestParam("matnr") String matnr,
- @RequestParam("batch") String batch,
+ @RequestBody StockVo stockVo,
HttpServletRequest request) {
- auth(appkey, null, request);
- return R.ok().add(openService.queryStock());
+ // auth(appkey, null, request);
+ return R.ok().add(openService.queryStock(stockVo));
}
private void auth(String appkey, Object obj, HttpServletRequest request) {
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index c33ab13..6238035 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -58,7 +58,7 @@
Double queryStockAnfme(String matnr, String batch);
- List<StockVo> queryStockTotal();
+ List<StockVo> queryStockTotal(@Param("matnr")String matnr,@Param("batch")String batch);
Integer sum();
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 0023ecf..5bf12ab 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -47,7 +47,7 @@
Double queryStockAnfme(String matnr, String batch);
- List<StockVo> queryStockTotal();
+ List<StockVo> queryStockTotal(StockVo stockVo);
Integer sum();
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index bd22c5e..be4655c 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -32,7 +32,7 @@
/**
* 搴撳瓨缁熻
*/
- List<StockVo> queryStock();
+ List<StockVo> queryStock(StockVo stockVo);
// ------------------------------------------
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 44bdd07..8cc6a1f 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -87,8 +87,10 @@
}
@Override
- public List<StockVo> queryStockTotal() {
- return this.baseMapper.queryStockTotal();
+ public List<StockVo> queryStockTotal(StockVo stockVo) {
+ String matnr=stockVo.getMatnr();
+ String batch=stockVo.getBatch();
+ return this.baseMapper.queryStockTotal(matnr,batch);
}
/**
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 7c0de39..eb62cae 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -335,8 +335,8 @@
@Override
@Transactional
- public List<StockVo> queryStock() {
- return locDetlService.queryStockTotal();
+ public List<StockVo> queryStock(StockVo stockVo) {
+ return locDetlService.queryStockTotal(stockVo);
}
@Override
diff --git a/src/main/java/com/zy/asrs/task/handler/ErpAccessTokenHandler.java b/src/main/java/com/zy/asrs/task/handler/ErpAccessTokenHandler.java
index e504be8..185e247 100644
--- a/src/main/java/com/zy/asrs/task/handler/ErpAccessTokenHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ErpAccessTokenHandler.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.core.exception.CoolException;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.ErpAccessTokenScheduler;
import com.zy.common.utils.HttpHandler;
@@ -16,15 +17,13 @@
private String erpIp = "http://10.100.221.19:81";
-
-
public void getAccessToken() {
JSONObject appTokenJson = new JSONObject();
- appTokenJson.put("appId","ESB");
- appTokenJson.put("appSecuret","123456789");
- appTokenJson.put("tenantid","ierp");
- appTokenJson.put("accountId","1492035591649364992");
- appTokenJson.put("language","zh_CN");
+ appTokenJson.put("appId", "ESB");
+ appTokenJson.put("appSecuret", "123456789");
+ appTokenJson.put("tenantid", "ierp");
+ appTokenJson.put("accountId", "1492035591649364992");
+ appTokenJson.put("language", "zh_CN");
JSONObject appTokenResp;
@@ -37,18 +36,26 @@
.build()
.doPost());
} catch (IOException e) {
- throw new RuntimeException(e);
+ log.info("杩炴帴erp鏈嶅姟鍣ㄨ秴鏃�");
+ return;
}
- JSONObject data = (JSONObject) appTokenResp.get("data");
+ JSONObject data = null;
+ try {
+ data = (JSONObject) appTokenResp.get("data");
+
+ } catch (Exception e) {
+ System.out.println("鑾峰彇appToken涓虹┖");
+ throw new CoolException(e);
+ }
//鑾峰彇access_token
if ((boolean) data.get("success")) {
JSONObject accessTokenJson = new JSONObject();
- accessTokenJson.put("user","13800000000");
- accessTokenJson.put("apptoken",(String) data.get("app_token"));
- accessTokenJson.put("tenantid","ierp");
- accessTokenJson.put("accountId","1492035591649364992");
- accessTokenJson.put("usertype","Mobile");
+ accessTokenJson.put("user", "13800000000");
+ accessTokenJson.put("apptoken", (String) data.get("app_token"));
+ accessTokenJson.put("tenantid", "ierp");
+ accessTokenJson.put("accountId", "1492035591649364992");
+ accessTokenJson.put("usertype", "Mobile");
JSONObject accessTokenResp;
//鑾峰彇app_token锛岀敤app_token鑾峰彇access_token
@@ -62,14 +69,20 @@
} catch (IOException e) {
throw new RuntimeException(e);
}
- JSONObject accessTokenData = (JSONObject) accessTokenResp.get("data");
- if ((boolean)accessTokenData.get("success")) {
- ErpAccessTokenScheduler.accessToken = (String)accessTokenData.get("access_token");
- log.info("鏇存柊access_token, 鏂皌oken涓�:" + (String)accessTokenData.get("access_token"));
+ JSONObject accessTokenData = null;
+ try {
+ accessTokenData = (JSONObject) accessTokenResp.get("data");
+ } catch (Exception e) {
+ System.out.println("鑾峰彇accessToken涓虹┖");
+ throw new CoolException(e);
+ }
+
+ if ((boolean) accessTokenData.get("success")) {
+ ErpAccessTokenScheduler.accessToken = (String) accessTokenData.get("access_token");
+ log.info("鏇存柊access_token, 鏂皌oken涓�:" + (String) accessTokenData.get("access_token"));
}
}
-
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 2fdc9e2..81c8ca0 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -295,7 +295,7 @@
select
matnr,
batch,
- count(anfme) as count
+ sum(anfme) as count
from asr_loc_detl
where 1=1
<if test="batch != null and batch != ''">
--
Gitblit v1.9.1