#

LSH

2023-02-11 6d7aa57dc2769a36a4f00241f7b0014be79bb54f

#

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -199,7 +199,6 @@
            orderDetails.add(detlDto);
        }
        System.out.println(JSON.toJSONString(param));
        // 2
        System.out.println("======================================");
        OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
        param1.setOrderNo("963001846497017856");
@@ -208,7 +207,7 @@

    /*...........................赣州新增..............以下.............赣州新增...........................*/
    @PostMapping("/rpc/watchDog/auth/v1")
//    @AppAuth(memo = "心跳接口调用")
    @AppAuth(memo = "心跳接口调用")
    public synchronized R hostName(@RequestHeader(required = false) String appkey,
                                   @RequestBody(required = false) HeartBeat param,
                                   HttpServletRequest request){
@@ -226,7 +225,7 @@
    }

    @PostMapping("/rpc/pakIn/auth/v1")
//    @AppAuth(memo = "入库通知单接口调用")
    @AppAuth(memo = "入库通知单接口调用")
    public synchronized R combPack(@RequestHeader(required = false) String appkey,
                                   @RequestBody(required = false) CombParam param,
                                   HttpServletRequest request){
@@ -254,8 +253,9 @@
        map.put("isComplete",true);
        return R.ok(map);
    }

    @PostMapping("/rpc/pakOut/auth/v1")
//    @AppAuth(memo = "出库通知单接口调用")
    @AppAuth(memo = "出库通知单接口调用")
    public synchronized R combpakOut(@RequestHeader(required = false) String appkey,
                                   @RequestBody(required = false) CombParam param,
                                   HttpServletRequest request){
@@ -273,7 +273,7 @@
    }

    @PostMapping("/rpv/infoReview/auth/v1")
//    @AppAuth(memo = "测试条码信息复核请求")
    @AppAuth(memo = "测试条码信息复核请求")
    public synchronized R infoReview(@RequestHeader(required = false) String appkey,
                                   @RequestBody(required = false) Review param,
                                   HttpServletRequest request){
@@ -290,8 +290,9 @@
        }
        return R.error();
    }

    @PostMapping("/rpv/testFinish/auth/v1")
//    @AppAuth(memo = "测试完成")
    @AppAuth(memo = "测试完成")
    public synchronized R testFinish(@RequestHeader(required = false) String appkey,
                                @RequestBody(required = false) Review param,
                                HttpServletRequest request){

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -715,17 +715,19 @@
            review.setBarcode(testMast.getBarcode());
            review.setChannel(testMast.getChannel().toString());
            review.setRequestTime(DateUtils.convert(new Date()));
            if (testMast.getChannel()>=1 && testMast.getChannel()<=8){
            if (testMast.getChannel()<1 || testMast.getChannel()>48){
                log.error("通道有误，请查看！");
            } else if (testMast.getChannel()<=8){
                renUrl=renUrl1;
            }else if (testMast.getChannel()>=9 && testMast.getChannel()<=16){
            }else if (testMast.getChannel()<=16){
                renUrl=renUrl2;
            }else if (testMast.getChannel()>=17 && testMast.getChannel()<=24){
            }else if (testMast.getChannel()<=24){
                renUrl=renUrl3;
            }else if (testMast.getChannel()>=25 && testMast.getChannel()<=32){
            }else if (testMast.getChannel()<=32){
                renUrl=renUrl4;
            }else if (testMast.getChannel()>=33 && testMast.getChannel()<=40){
            }else if (testMast.getChannel()<=40){
                renUrl=renUrl5;
            }else if (testMast.getChannel()>=41 && testMast.getChannel()<=48){
            }else if (testMast.getChannel()<=48){
                renUrl=renUrl6;
            }
            return postMesData(renUrl,startUpTestPACK,review);
@@ -805,6 +807,8 @@
                case "48":
                    renUrl=renUrl6;
                    break;
                default:
                    log.error("通道有误，请查看！");
            }
            return postMesData(renUrl,suspendTestPACK,review);
        }catch (Exception e) {
@@ -831,6 +835,8 @@
            name="测试系统";
        }else if (URL.equals(renUrl6)){
            name="测试系统";
        }else {
            log.error("查询连接失败，请查看！");
        }
        if(combParam != null){
            String response = "";

 src/main/java/com/zy/common/service/CommonService.java

@@ -52,6 +52,7 @@

    /**
     * 生成工作号
     *
     * @param wrkMk 0:入库 1 - 3000 ; 1:拣料/并板/盘点 3001 - 6000 ; 2: 出库 6001 -9000 ; 3:其他 9001 -9999
     * @return workNo(工作号)
     */
@@ -91,6 +92,7 @@

    /**
     * 检索库位号
     *
     * @param whsType 类型 1:双深式货架
     * @param staDescId 路径工作类型
     * @param sourceStaNo 源站
@@ -102,8 +104,10 @@

        if (sourceStaNo.equals(100)){
            whsType=1;
            locTypeDto.setLocType1((short) 1);
        }else if (sourceStaNo.equals(200)){
            whsType=2;
            locTypeDto.setLocType1((short) 2);
        }

        StartupDto startupDto = new StartupDto();
@@ -153,9 +157,8 @@
        rowLastno.setCurrentRow(curRow);
        rowLastnoService.updateById(rowLastno);

        // 开始查找库位 ==============================>>
        if (Cools.isEmpty(locMast)) {
            Integer ruleId = Integer.parseInt(Parameter.get().getFindLocRule());
        // 开始查找库位 ==============================>
        int ruleId = Integer.parseInt(Parameter.get().getFindLocRule());
            if (whsType!=1){
                locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
            } else if (ruleId == 1){  //按测试设备排序，优先排满单台设备
@@ -166,7 +169,6 @@
            } else { //默认规则
                locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
            }
        }

        // 2.库位当前所属尺寸无空库位时，调整尺寸参数，向上兼容检索库位
        if (Cools.isEmpty(locMast)) {
@@ -175,7 +177,6 @@
                times = times + 1;
                return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
            }

            log.error("系统没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times);
            throw new CoolException("没有空库位");
        }
@@ -202,7 +203,6 @@
                locType2=(short)i;
            }
        }

        return locType2;
    }