| src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/entity/CheckOrder.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -589,22 +589,22 @@ if (Objects.isNull(response) || response.trim().isEmpty()) { return XSR.error("外网接口无响应!!"); } JSONObject jsonObject = JSONObject.parseObject(response); Integer code = jsonObject.getInteger("code"); if (!Objects.isNull(code) && code.equals(200)) { // if (!Objects.isNull(order)) { // order.setReportOnce(5); // orderService.updateById(order); // } XSR jsonObject = JSONObject.parseObject(response, XSR.class); if (jsonObject.getSuccess()) { if (!Objects.isNull(order)) { order.setReportOnce(5); order.setSettle(5L); checkOrderService.updateById(order); } return XSR.ok("入库单上报完成!!"); } else { // if (!Objects.isNull(order)) { // int reportOnce = order.getReportOnce(); // reportOnce ++; // order.setReportOnce(reportOnce); // orderService.updateById(order); // } String msg = jsonObject.getString("message"); if (!Objects.isNull(order)) { int reportOnce = order.getReportOnce(); reportOnce ++; order.setReportOnce(reportOnce); checkOrderService.updateById(order); } String msg = jsonObject.getMessage(); return XSR.error(Objects.isNull(msg) ? "上报失败!!" : msg); } } catch (Exception e) { src/main/java/com/zy/asrs/entity/CheckOrder.java
@@ -265,6 +265,10 @@ @TableField("move_status") private Integer moveStatus; @ApiModelProperty("上报次数") @TableField("report_once") private Integer reportOnce; /** * 入出库类型(0:未知,1:入库,2:出库) */ src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -128,7 +128,7 @@ } /**损溢单完结上报 */ // @Scheduled(cron = "0/15 * * * * ?") @Scheduled(cron = "0/15 * * * * ?") @Async("orderThreadPool") public void completeCheckOrderReport() { if (!ErpReportOld){ src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -549,8 +549,8 @@ adjustParam.setCompany_id(order.getCstmrName()) .setWms_id(order.getId() + "") .setType(0 + "") .setUpdate_time(order.getUpdateTime$()) .setKopen_id(order.getDefNumber()); .setUpdate_time(order.getUpdateTime$()); // .setKopen_id(order.getDefNumber()); adjustParam.setBsby_no(order.getOrderNo()) .setReason("") @@ -577,7 +577,14 @@ adjustParams.add(adjustParam); XSR response = kopenApiService.reportCheckOrder(adjustParams, order); if (order.getReportOnce() < 3) { XSR response = kopenApiService.reportCheckOrder(adjustParams, order); if (response.getSuccess()) { return SUCCESS; } else { return FAIL; } } return SUCCESS; // TODO Auto-generated method stub