#

18516761980

2020-09-22 9afb595b24138004879b62eee43ded425b497c58

#

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

@@ -207,6 +207,7 @@
        command.setDestinationPosX(param.getRow());     // 目标库位排
        command.setDestinationPosY(param.getBay());     // 目标库位列
        command.setDestinationPosZ(param.getLev());     // 目标库位层
        staNoProcess(param, command);
        return crnControl(command)?R.ok():R.error();
    }

@@ -224,6 +225,7 @@
        command.setDestinationPosX(param.getRow());     // 目标库位排
        command.setDestinationPosY(param.getBay());     // 目标库位列
        command.setDestinationPosZ(param.getLev());     // 目标库位层
        staNoProcess(param, command);
        return crnControl(command)?R.ok():R.error();
    }

@@ -241,6 +243,7 @@
        command.setDestinationPosX(param.getRow());     // 目标库位排
        command.setDestinationPosY(param.getBay());     // 目标库位列
        command.setDestinationPosZ(param.getLev());     // 目标库位层
        staNoProcess(param, command);
        return crnControl(command)?R.ok():R.error();
    }

@@ -258,6 +261,7 @@
        command.setDestinationPosX(param.getStaNo());     // 目标库位排
        command.setDestinationPosY((short) 0);     // 目标库位列
        command.setDestinationPosZ((short) 1);     // 目标库位层
        staNoProcess(param, command);
        return crnControl(command)?R.ok():R.error();
    }

@@ -309,6 +313,7 @@
        command.setDestinationPosX(param.getRow());     // 目标库位排
        command.setDestinationPosY(param.getBay());     // 目标库位列
        command.setDestinationPosZ(param.getLev());     // 目标库位层
        staNoProcess(param, command);
        return crnControl(command)?R.ok():R.error();
    }

@@ -422,4 +427,30 @@
        return false;
    }

    private void staNoProcess(CrnOperatorParam param, CrnCommand command){
        if (param.getSourceStaNo()!=null) {
            if (param.getSourceStaNo() == 5) {
                command.setSourcePosX((short) 2);     // 源库位排
                command.setSourcePosY((short) 0);     // 源库位列
                command.setSourcePosZ((short) 1);     // 源库位层
            } else if (param.getSourceStaNo() == 6) {
                command.setSourcePosX((short) 1);     // 源库位排
                command.setSourcePosY((short) 0);     // 源库位列
                command.setSourcePosZ((short) 1);     // 源库位层
            }
        }
        if (param.getStaNo()!=null) {
            if (param.getStaNo() == 5) {
                command.setDestinationPosX((short) 2);     // 目标库位排
                command.setDestinationPosY((short) 0);     // 目标库位列
                command.setDestinationPosZ((short) 1);     // 目标库位层
            } else if (param.getStaNo() == 6) {
                command.setDestinationPosX((short) 1);     // 目标库位排
                command.setDestinationPosY((short) 0);     // 目标库位列
                command.setDestinationPosZ((short) 1);     // 目标库位层
            }
        }
    }


}

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

@@ -148,7 +148,8 @@
    @ManagerAuth(memo = "修改站点数据")
    public R siteDetlUpdate(@RequestParam Integer siteId,
                            @RequestParam Short workNo,
                            @RequestParam Short staNo){
                            @RequestParam Short staNo,
                            @RequestParam String pakMk){
        for (DevpSlave devp : slaveProperties.getDevp()) {
            DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
            Map<Integer, StaProtocol> station = devpThread.getStation();
@@ -161,6 +162,9 @@
                    if (staNo != null) {
                        staProtocol.setStaNo(staNo);
                    }
                    if (pakMk != null) {
                        staProtocol.setPakMk(pakMk.equals("Y"));
                    }
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    if (result) {
                        return R.ok();

 src/main/webapp/static/js/common.js

@@ -140,7 +140,7 @@
                    if (res.code === 200){
                        callback(res);
                    } else if (res.code === 403){
                        window.location.href = baseUrl+"/login";
                        parent.location.href = baseUrl+"/login";
                    }  else {
                        layer.msg(res.msg, {icon: 2});
                    }

 src/main/webapp/views/login.html

@@ -14,8 +14,8 @@
        body.login-bg {
            color: #777;
            height: 100%;
            background-image: linear-gradient(to right, #ff9569 0%, #e92758 100%);
            /*background-image: linear-gradient(-90deg, #29bdd9 0%, #276ace 100%);*/
            /*background-image: linear-gradient(to right, #ff9569 0%, #e92758 100%);*/
            background-image: linear-gradient(-90deg, #a2e7f3 0%, #98baee 100%);
            /*background: -webkit-linear-gradient(red, blue); !* Safari 5.1 - 6.0 *!;*/
            /*background-image: url("../static/image/login_bg.jpg");*/
            /*background-repeat: no-repeat;*/

 src/main/webapp/views/pipeline.html

@@ -96,6 +96,12 @@
                <input id="staNo" name="staNo" type="number" class="layui-input" lay-verify="number" autocomplete="off">
            </div>
        </div>
        <div class="form-item">
            <label class="form-label">入库标记:</label>
            <div class="form-input">
                <input id="pakMk" name="pakMk" type="text" class="layui-input" autocomplete="off">
            </div>
        </div>
        <div class="form-item form-button-container">
            <button class="form-button" id="save">保存</button>
            <button class="form-button" id="cancel" style="background-color: #D0D0D0">取消</button>
@@ -280,7 +286,7 @@
                offset: 'rt',
                anim: 5,
                shade: [0],
                area: ['340px', '215px'],
                area: ['340px', '255px'],
                closeBtn: 0,
                content: $("#site-detl"),
                success: function(layero, index){
@@ -288,12 +294,14 @@
                        $('#siteId').val(siteId);
                        $('#workNo').val(res.data.workNo);
                        $('#staNo').val(res.data.staNo);
                        $('#pakMk').val(res.data.pakMk);
                    })
                },
                end: function () {
                    $('#siteId').val("");
                    $('#workNo').val("");
                    $('#staNo').val("");
                    $('#pakMk').val("");
                }
            })
        }
@@ -303,7 +311,8 @@
        http.post(baseUrl+ "/site//detl/update", {
            siteId: $('#siteId').val(),
            workNo: $('#workNo').val(),
            staNo:  $('#staNo').val()
            staNo:  $('#staNo').val(),
            pakMk: $('#pakMk').val()
        }, function (res) {
            layer.msg("修改成功",{icon: 1,});
        })
@@ -312,6 +321,7 @@
        $('#siteId').val("");
        $('#workNo').val("");
        $('#staNo').val("");
        $('#pakMk').val("");
        layer.close(layerDetl);
    })