自动化立体仓库 - WMS系统
zhangchao
2024-11-21 f4214b3e0764ab116fc6975dbbc5bb4fc80f9fcd
rcs超时
10个文件已修改
49 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/OpenController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/param/OrderProdSyncParam.java 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-dev.yml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-loc.yml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-prod.yml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OpenController.java
@@ -156,6 +156,13 @@
            case "生产材料出库补料":
                mappingPakOutOrderParam(param, false, "银座生产材料出库补料");
                break;
            case "半成品入库单":
                mappingPakOutOrderParam(param, true, "半成品入库单");
                break;
            case "成品入库单":
                mappingPakOutOrderParam(param, true, "成品入库单");
                break;
            default:
                log.info("未知的单据类型:{}", param);
                mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get操作单据());
src/main/java/com/zy/asrs/entity/param/OrderProdSyncParam.java
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -23,6 +23,7 @@
import java.io.IOException;
import java.util.*;
import java.util.concurrent.TimeUnit;
@Service
@Slf4j
@@ -85,7 +86,6 @@
    // TODO 判断规则
    private boolean checkWrkSts(AgvWrkMast agvWrkMast,long wrkSts){
        return true;
@@ -277,6 +277,7 @@
            response = new HttpHandler.Builder()
                    .setUri(url)
                    .setPath(path)
                    .setTimeout(30, TimeUnit.SECONDS)
                    .setJson(JSONObject.toJSONString(requestParam))
                    .build()
                    .doPost();
@@ -284,7 +285,14 @@
            int code = Integer.parseInt(jsonObject.get("code").toString());
            if(code != 0){
                //TODO 张超
                if (code == 6) {
                    log.info("AGV任务单号已上报:{}", response);
                    String message = jsonObject.getString("message");
                    if (!Cools.isEmpty(message) && message.contains("已存在任务单头为")) {
                        success = true;
                        return 0;
                    }
                }
                throw new CoolException("调用AGV响应错误");
                //return code;
            }
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -30,6 +30,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.concurrent.TimeUnit;
@Slf4j
@Service("orderService")
@@ -290,6 +291,7 @@
            response = new HttpHandler.Builder()
                    .setUri(url)
                    .setPath(path)
                    .setTimeout(30, TimeUnit.SECONDS)
                    .setJson(JSONObject.toJSONString(requestParam))
                    .build()
                    .doPost();
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -26,6 +26,7 @@
import java.io.IOException;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@Slf4j
@@ -704,12 +705,12 @@
                reportMesPakinOrder(agvWrkMast, agvWrkDetls);
            }
        }
//        if (OUT_TYPE_List.contains(agvWrkMast.getIoType())) {
//            reportMesPakoutOrder(agvWrkMast, agvWrkDetls);
//        }
//        if (MOVE_TYPE_List.contains(agvWrkMast.getIoType())) {
//            generateMesParam(agvWrkMast, agvWrkDetls);
//        }
        if (OUT_TYPE_List.contains(agvWrkMast.getIoType())) {
            reportMesPakoutOrder(agvWrkMast, agvWrkDetls);
        }
        if (MOVE_TYPE_List.contains(agvWrkMast.getIoType())) {
            generateMesParam(agvWrkMast, agvWrkDetls);
        }
    }
    private void reportMesPakinOrder(AgvWrkMast agvWrkMast, List<AgvWrkDetl> agvWrkDetls) {
@@ -868,7 +869,7 @@
        boolean success = false;
        try {
            response = new HttpHandler.Builder().setUri(url).setPath(path).setHeaders(headParam).setJson(JSONObject.toJSONString(requestParam)).setHttps(true).build().doPost();
            response = new HttpHandler.Builder().setUri(url).setPath(path).setTimeout(30, TimeUnit.SECONDS).setHeaders(headParam).setJson(JSONObject.toJSONString(requestParam)).setHttps(true).build().doPost();
            JSONObject jsonObject = JSON.parseObject(response);
            if (Cools.isEmpty(jsonObject.get("code")) || Integer.parseInt(jsonObject.get("code").toString()) != 200) {
src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java
@@ -21,6 +21,7 @@
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.concurrent.TimeUnit;
@Slf4j
@Service
@@ -123,6 +124,7 @@
            response = new HttpHandler.Builder()
                    .setUri(url)
                    .setPath(path)
                    .setTimeout(30, TimeUnit.SECONDS)
                    .setJson(JSONObject.toJSONString(requestParam))
                    .build()
                    .doPost();
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -49,6 +49,9 @@
    @Value("${spring.profiles.active}")
    private String active;
    @Value("${u8.report}")
    private Boolean report;
    @Value("${u8.url}")
    private String url;
@@ -84,6 +87,9 @@
    @Transactional
    public void timelyStart(Order order) {
        if (!report){
            return;
        }
        List<String> docNames = new ArrayList<>(Arrays.asList("银座采购入库单", "银座委外材料出库单", "银座生产材料出库单"));
src/main/resources/application-dev.yml
@@ -85,6 +85,7 @@
  containerArrivedPath: /conveyor/containerArrived
u8:
  report: false
  url: http://192.168.9.3:8877
  orderReportPath: /DBMS/U8/CM/add
#ERP:
src/main/resources/application-loc.yml
@@ -85,13 +85,14 @@
  containerArrivedPath: /conveyor/containerArrived
u8:
  report: false
  url: http://192.168.9.3:8877
  orderReportPath: /DBMS/U8/CM/add
#ERP:
#  url: http://39.184.149.30:8877
#  orderReportPath: /DBMS/U8/CM/add
mes:
  report: false
  report: true
  url: https://v3-ali.blacklake.cn/api/openapi/domain/web/v1/route
  orderReportPath: /inventory/open/v2/transfer_order/ordinary/_execute
  pakinReportPath: /inventory/open/v2/inbound_order/execute/_inbound
src/main/resources/application-prod.yml
@@ -85,6 +85,7 @@
  containerArrivedPath: /conveyor/containerArrived
u8:
  report: true
  url: http://192.168.9.3:8877
  orderReportPath: /DBMS/U8/CM/add
#ERP: