#
Administrator
2026-03-29 95a5e803d2bb18f9b07df40e85e523693e28f2ac
#
6个文件已修改
32 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/OpenController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/dto/TvDataDto.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/dto/TvWrkDetlDto.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/dto/WcsStationDto.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/timer/WmsDataTimer.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OpenController.java
@@ -189,6 +189,10 @@
                continue;
            }
            if(Cools.isEmpty(wcsStationDto.getTaskNo())){
                continue;
            }
            String errorMsg = "";
            if (!Cools.isEmpty(wcsStationDto.getErrorMsg())) {
                errorMsg +=  wcsStationDto.getErrorMsg();
@@ -210,6 +214,7 @@
            tvDataDto.setBarcode(wcsStationDto.getBarcode());
            tvDataDto.setErrorMsg(errorMsg);
            tvDataDto.setIoType(wcsStationDto.getIoType());
            tvDataDto.setOrderNo(wcsStationDto.getOrderNo());
            tvDataDto.setWrkDetls(wcsStationDto.getWrkDetls());
            if (Cools.isEmpty(errorMsg)) {
src/main/java/com/zy/asrs/entity/dto/TvDataDto.java
@@ -17,6 +17,8 @@
    private Integer ioType;
    private String orderNo;
    private Object wrkDetls;
}
src/main/java/com/zy/asrs/entity/dto/TvWrkDetlDto.java
@@ -20,4 +20,8 @@
    private Double anfme;
    private String orderNo;
    private String outboundSeq;
}
src/main/java/com/zy/asrs/entity/dto/WcsStationDto.java
@@ -23,4 +23,8 @@
    private Object wrkDetls;
    private String orderNo;
    private String outboundSeq;
}
src/main/java/com/zy/asrs/timer/WmsDataTimer.java
@@ -90,10 +90,16 @@
                        tvWrkDetlDto.setSpecs(wrkDetl.getString("specs"));
                        tvWrkDetlDto.setBatch(wrkDetl.getString("batch"));
                        tvWrkDetlDto.setAnfme(wrkDetl.getDouble("anfme"));
                        tvWrkDetlDto.setBarcode(wrkDetl.getString("zpallet"));
                        wcsStationDto.setBarcode(wrkDetl.getString("zpallet"));
                        tvWrkDetlDto.setOutboundSeq(wrkDetl.getString("supp"));
                        tvWrkDetlDto.setOrderNo(wrkDetl.getString("orderNo"));
                        wcsStationDto.setOrderNo(wrkDetl.getString("orderNo"));
                        list.add(tvWrkDetlDto);
                    }
                    wcsStationDto.setIoType(data.getInteger("ioType"));
                    wcsStationDto.setWrkDetls(list);
                    stationUtils.stationMap.put(wcsStationDto.getStationId(), wcsStationDto);
                }
@@ -138,7 +144,7 @@
                if(Objects.equals(barcode, "NoRead")){
                    continue;
                }
                requestParam.put("barcode", barcode);
                requestParam.put("taskNo", wcsStationDto.getTaskNo());
                response = new HttpHandler.Builder()
                        .setUri(wmsCombQueryUrl)
                        .setJson(JSON.toJSONString(requestParam))
@@ -152,7 +158,7 @@
                        continue;
                    }
                    List<TvWrkDetlDto> list = new ArrayList<>();
                    for (Object o : data.getJSONArray("waitPakins")) {
                    for (Object o : data.getJSONArray("wrkDetls")) {
                        JSONObject wrkDetl = (JSONObject) o;
                        TvWrkDetlDto tvWrkDetlDto = new TvWrkDetlDto();
//                        list.add(tvWrkDetlDto);
@@ -162,9 +168,6 @@
                        tvWrkDetlDto.setSpecs(wrkDetl.getString("specs"));
                        tvWrkDetlDto.setBatch(wrkDetl.getString("batch"));
                        tvWrkDetlDto.setAnfme(wrkDetl.getDouble("anfme"));
                        tvWrkDetlDto.setBarcode(barcode);
                        tvWrkDetlDto.setLocNo(wrkDetl.getString("zpallet"));
                        list.add(tvWrkDetlDto);
                    }
                    wcsStationDto.setIoType(1);
src/main/resources/application.yml
@@ -66,9 +66,9 @@
# APK打包服务配置
apk-build:
  # 打包和查询状态的服务器地址
  build-server-url: http://172.16.3.7:8088
  build-server-url: http://net.zoneyung.net:8088
  # 下载APK的服务器地址
  download-server-url: http://172.16.3.7:8088
  download-server-url: http://net.zoneyung.net:8088
  # API认证Token
  x-token: uzCHJUQSb7tl2ZTjB0wI3XViqMgxRhvYL9EP
  # APK下载保存路径(必须是绝对路径)