| src/main/java/com/zy/asrs/controller/OpenController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/common/config/ControllerResAdvice.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/common/web/WcsController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/OpenController.java
@@ -398,8 +398,11 @@ @PostMapping("/order/matSync/default/v2") // @AppAuth(memo = "商品信息同步接口") public synchronized R syncMatInfoV2(@RequestBody(required = false) List<MatSyncParam.MatParam> param){ public synchronized R syncMatInfoV2(@RequestBody(required = false) List<MatSyncParam.MatParam> param, HttpServletRequest request) { if (request != null) { request.setAttribute("cache", param); } System.out.println(param); if (Cools.isEmpty(param)) { return R.parse(BaseRes.PARAM); @@ -424,7 +427,10 @@ * return */ @PostMapping("/station/all") public synchronized R stationAll(){ public synchronized R stationAll(HttpServletRequest request) { if (request != null) { request.setAttribute("cache", JSON.toJSONString(Collections.singletonMap("op", "stationAll"))); } return openService.stationAll(); } @@ -433,7 +439,10 @@ * return */ @PostMapping("/comb/auth") public synchronized R comb(@RequestBody ArrayList<MesToCombParam> param){ public synchronized R comb(@RequestBody ArrayList<MesToCombParam> param, HttpServletRequest request) { if (request != null) { request.setAttribute("cache", param); } List<MesToCombParam> errorComb = Lists.newArrayList(); List<MesToCombParam> validComb = Lists.newArrayList(); for (MesToCombParam mesToCombParam : param) { @@ -575,7 +584,10 @@ * pause out order */ @PostMapping("/order/pakout/pause/default/v1") public synchronized R pakoutOrderPause(@RequestBody OpenOrderPakoutPauseParam param){ public synchronized R pakoutOrderPause(@RequestBody OpenOrderPakoutPauseParam param, HttpServletRequest request) { if (request != null) { request.setAttribute("cache", param); } if (Cools.isEmpty(param) || Cools.isEmpty(param.getOrderId())) { return R.error("orderNo is empty"); } @@ -697,7 +709,10 @@ * 任务查询接口 */ @PostMapping("/queryTask") public synchronized R queryTask(@RequestBody QueryTaskParam param) { public synchronized R queryTask(@RequestBody QueryTaskParam param, HttpServletRequest request) { if (request != null) { request.setAttribute("cache", param); } if (Cools.isEmpty(param)) { return R.parse(BaseRes.PARAM); } src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -97,6 +97,8 @@ private WorkService workService; @Autowired private BasCrnpService basCrnpService; @Autowired private ApiLogService apiLogService; @Override @Transactional @@ -1224,7 +1226,10 @@ stationParams.add(stationParam); } } String requestJson = JSON.toJSONString(stationParams); String response = ""; boolean pushOk = false; String pushUrl = buildMesStationRequestUrl(); try { //获取Cookie值 HashMap<String, Object> headers = new HashMap<>(); @@ -1234,21 +1239,52 @@ .setHeaders(headers) .setUri(mesUrl) .setPath(stationAddress) .setJson(JSON.toJSONString(stationParams)) .setJson(requestJson) .build() .doPost(); JSONObject jsonResponse = JSON.parseObject(response); if (jsonResponse.getInteger("code") == 200) { if (jsonResponse != null && Integer.valueOf(200).equals(jsonResponse.getInteger("code"))) { pushOk = true; } else { return R.error(); } } catch (Exception e) { e.printStackTrace(); } finally { try { apiLogService.save( "推ERP-站点同步", pushUrl, null, "127.0.0.1", requestJson, response, pushOk, "站点同步推对方" ); } catch (Exception logEx) { log.error("save station sync api log failed", logEx); } } return R.ok(); } private String buildMesStationRequestUrl() { if (Cools.isEmpty(mesUrl)) { return stationAddress; } if (stationAddress == null) { return mesUrl; } if (mesUrl.endsWith("/") && stationAddress.startsWith("/")) { return mesUrl + stationAddress.substring(1); } if (!mesUrl.endsWith("/") && !stationAddress.startsWith("/")) { return mesUrl + "/" + stationAddress; } return mesUrl + stationAddress; } @Override public R mesToComb(MesToCombParam param) { if (Cools.isEmpty(param.getPalletId())) { src/main/java/com/zy/common/config/ControllerResAdvice.java
@@ -111,13 +111,18 @@ if (uri == null) { return false; } return uri.contains("/open/asrs") || uri.contains("/wcs/openapi/report"); return uri.contains("/open/asrs") || uri.contains("/wcs/openapi/report") || uri.contains("/rpc/pakin/loc"); } private static String inboundNamespace(String uri) { if (uri != null && uri.contains("/wcs/openapi/report")) { return "WCS回写"; } if (uri != null && uri.contains("/rpc/pakin/loc")) { return "WCS入库"; } return "开放接口"; } src/main/java/com/zy/common/web/WcsController.java
@@ -20,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; @@ -58,8 +59,11 @@ @PostMapping("/pakin/loc/v1") @ResponseBody public synchronized R getLocNo(@RequestBody SearchLocParam param) { public synchronized R getLocNo(@RequestBody SearchLocParam param, HttpServletRequest request) { long startTime = System.currentTimeMillis(); if (param != null && request != null) { request.setAttribute("cache", param); } String barcode = param == null ? null : param.getBarcode(); Integer sourceStaNo = param == null ? null : param.getSourceStaNo(); try {