src/main/java/com/zy/asrs/controller/OpenController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/LocDetlService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/OpenService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/task/handler/ErpAccessTokenHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/LocDetlMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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) { 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(); 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(); src/main/java/com/zy/asrs/service/OpenService.java
@@ -32,7 +32,7 @@ /** * 库存统计 */ List<StockVo> queryStock(); List<StockVo> queryStock(StockVo stockVo); // ------------------------------------------ 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); } /** 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 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, 新token为:" + (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, 新token为:" + (String) accessTokenData.get("access_token")); } } } 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 != ''">