初步调试

zc

3 天以前 61dbf118522a9ac98027b624b5d46761fe536bbe

初步调试

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

@@ -225,13 +225,13 @@
     */
    @GetMapping("/led")
    public R monitorLed(@RequestParam("ledId") Integer ledId) {
        int dev_no = 1012;
        int dev_no = 1011;
        if (ledId == 1) {
            dev_no = 1012;
            dev_no = 1011;
        } else if (ledId == 2) {
            dev_no = 1014;
        } else if (ledId == 3) {
            dev_no = 1022;
            dev_no = 1021;
        } else if (ledId == 4) {
            dev_no = 1025;
        }
@@ -239,36 +239,30 @@
        if (Cools.isEmpty(basDevp)) {
            return R.ok();
        }
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wms_wrk_no", basDevp.getWrkNo()));
        if (Cools.isEmpty(wrkMast)) {
        if (Cools.isEmpty(basDevp.getWrkNo1())) {
            return R.ok();
        }
        List<LedCommand> commands = new ArrayList<>();

        if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
            Map<String, Object> param = new HashMap<>();
            param.put("taskNo", wrkMast.getWmsWrkNo());
            param.put("sta", wrkMast.getStaNo());
            String response = null;
            try {
                response = new HttpHandler.Builder()
                        .setUri(wmsUrl)
                        .setPath("/rpc/led/getTask2")
                        .setJson(JSON.toJSONString(param))
                        .build()
                        .doPost();
            } catch (IOException e) {
                e.printStackTrace();
            }
            JSONObject jsonObject = JSON.parseObject(response);
            Integer code = jsonObject.getInteger("code");
            if (code.equals(200)) {
                String data = jsonObject.getString("data");
                List<LedCommand> wrkDetls = JSONArray.parseArray(data, LedCommand.class);
                commands.addAll(wrkDetls);
            }
        Map<String, Object> param = new HashMap<>();
        param.put("taskNo", basDevp.getWrkNo1());
        String response = null;
        try {
            response = new HttpHandler.Builder()
                    .setUri(wmsUrl)
                    .setPath("/rpc/led/getTask2")
                    .setJson(JSON.toJSONString(param))
                    .build()
                    .doPost();
        } catch (IOException e) {
            e.printStackTrace();
        }

        JSONObject jsonObject = JSON.parseObject(response);
        Integer code = jsonObject.getInteger("code");
        if (code.equals(200)) {
            String data = jsonObject.getString("data");
            List<LedCommand> wrkDetls = JSONArray.parseArray(data, LedCommand.class);
            commands.addAll(wrkDetls);
        }
        return R.ok().add(commands);
    }


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

@@ -1289,8 +1289,8 @@
            //获取提升机命令
            List<LiftCommand> liftCommands = liftThread.getPalletOutCommand(wrkMast.getWrkNo(), sourceLev, wrkMast.getStaNo());
            LiftCommand liftCommand = liftCommands.get(0);
            if (wrkMast.getStaNo() == 1031) {
                liftCommand.setTaskNo(wrkMast.getWrkNo());
            if (wrkMast.getMainWrkNo() != null) {
                liftCommand.setTaskNo(wrkMast.getMainWrkNo());
            } else {
                int deviceWrk = commonService.getWorkNo(8);//生成提升机设备工作号
                liftCommand.setTaskNo(deviceWrk);//更换随机任务号

 src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java

@@ -436,7 +436,7 @@
                        //给工作档绑定小车号
                        diffShuttles.put(-1, shuttleThread);
                    } else {
                        if (tongLev) {
                        if (tongLev && diffLev.size() >= 2) {
                            //当前穿梭车线程到目标地点距离
                            List<NavigateNode> currentShuttlePath = navigateUtils.calc(currentLocNo, locNo, NavigationMapType.NORMAL.id, Utils.getShuttlePoints(shuttleProtocol.getShuttleNo(), Utils.getLev(currentLocNo)), null);//搜索空闲穿梭车，使用正常通道地图
                            if (currentShuttlePath == null) {

 src/main/java/com/zy/core/model/protocol/StaProtocol.java

@@ -110,6 +110,7 @@
        basDevp.setAutoing(autoing ? "Y" : "N");
        basDevp.setLoading(loading ? "Y" : "N");
        basDevp.setInEnable(inEnable ? "Y" : "N");
        basDevp.setWrkNo1(finishWorkNo.intValue());
        if (siteId == 105 || siteId == 205 || siteId == 346) {
            basDevp.setOutEnable(outInModel == 2 ? "Y" : "N");
        } else {

 src/main/java/com/zy/core/thread/impl/FyDevpThread.java

@@ -204,11 +204,7 @@
                    BasDevp sqlModel = staProtocol.toSqlModel();
                    stations.add(sqlModel);

                    //暂时写入数据库
                    BasDevp basDevp = basConveyorStaService.selectById(sta);
                    if (basDevp == null) {
                        basConveyorStaService.insert(sqlModel);
                    }

                }
                if (!stations.isEmpty()) {
                    if (null != basConveyorStaService && !basConveyorStaService.updateBatchById(stations)) {