zwl
2025-03-08 284aa3875e3d441147c576d4185c3cbf717b3427
初始化
4个文件已修改
66 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/OpenController.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/utils/Utils.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-prod.yml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OpenController.java
@@ -313,6 +313,7 @@
    @PostMapping("/outboundTaskSend")
    @Transactional
    public HashMap<String, Object> outboundTaskSend(@RequestBody HashMap<String,Object> hashMap) {
        log.info("任务下发接口调用={}",hashMap);
        String jsonString = JSON.toJSONString(hashMap.get("TaskList"));
        List<CarryParam> params= JSONObject.parseArray(jsonString,CarryParam.class);
        HashMap<String, Object> map = new HashMap<>();
@@ -336,12 +337,14 @@
            LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
            if(Cools.isEmpty(locMast)){
                map.put("Code","0");
                map.put("Msg","初始库位无法找到!");
                map.put("Msg",param.getStartPoint()+"初始库位无法找到!");
                return map;
            }
        }
        for(CarryParam param:params){
            HashMap<String,Object> r = new HashMap<>();
            LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
            if(param.getStereoscopicTaskType() == 2){
                //出库任务创建
                StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -105,28 +105,28 @@
            param.setContainerTypeCode(locMast.getContainerTypeCode());
        }
        try {
            response = new HttpHandler.Builder()
                    .setHeaders(map)
                    .setUri(wmsUrl)
                    .setPath("wcsManager/wcsInterface/locationUpdate")
                    .setJson(JSON.toJSONString(param))
                    .build()
                    .doPost();
        }catch (Exception e){
            log.error("堆垛机任务完成,请求wms任务完成接口失败");
        }
        JSONObject jsonObject = JSON.parseObject(response);
        apiLogService.save("Wms变更货位状态"
                ,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply"
                ,null
                ,"127.0.0.1"
                ,JSON.toJSONString(param)
                ,response
                ,true
        );
//        try {
//            response = new HttpHandler.Builder()
//                    .setHeaders(map)
//                    .setUri(wmsUrl)
//                    .setPath("wcsManager/wcsInterface/locationUpdate")
//                    .setJson(JSON.toJSONString(param))
//                    .build()
//                    .doPost();
//        }catch (Exception e){
//            log.error("堆垛机任务完成,请求wms任务完成接口失败");
//        }
//        JSONObject jsonObject = JSON.parseObject(response);
//
//
//        apiLogService.save("Wms变更货位状态"
//                ,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply"
//                ,null
//                ,"127.0.0.1"
//                ,JSON.toJSONString(param)
//                ,response
//                ,true
//        );
        return null;
    }
src/main/java/com/zy/asrs/utils/Utils.java
@@ -427,7 +427,12 @@
    }
    public static String Fusion(int x, int y, int z){
        String locNo="0"+x;
        String locNo="";
        if(x>=10){
            locNo=x+"";
        }else{
            locNo="0"+x;
        }
        if(z>=10){
            locNo=locNo+"0"+z;
        }else{
src/main/resources/application-prod.yml
@@ -5,7 +5,7 @@
  # 堆垛机1
  crn[0]:
    id: 1
    ip: 10.10.10.110
    ip: 10.10.10.1101
    port: 102
    rack: 0
    slot: 0
@@ -29,7 +29,7 @@
  # 堆垛机2
  crn[1]:
    id: 2
    ip: 10.10.10.120
    ip: 10.10.10.1201
    port: 102
    rack: 0
    slot: 0
@@ -53,7 +53,7 @@
  # 堆垛机3
  crn[2]:
    id: 3
    ip: 10.10.10.130
    ip: 10.10.10.1301
    port: 102
    rack: 0
    slot: 0
@@ -77,7 +77,7 @@
  # 堆垛机4
  crn[3]:
    id: 4
    ip: 10.10.10.140
    ip: 10.10.10.1401
    port: 102
    rack: 0
    slot: 0