Merge remote-tracking branch 'origin/fyxc_shuttle_wcs' into fyxc_shuttle_wcs

zc

昨天 aee6386344123c250b3ddfa3efa9a7e3ff8f6cbb

Merge remote-tracking branch 'origin/fyxc_shuttle_wcs' into fyxc_shuttle_wcs

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.domain.dto.AxisBean;
import com.zy.asrs.domain.dto.LocChartPie;
@@ -18,6 +19,7 @@
import com.zy.common.service.CommonService;
import com.zy.common.utils.RedisUtil;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.ShuttleProtocolStatusType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.LedSlave;
import com.zy.core.model.ShuttleSlave;
@@ -334,20 +336,21 @@
                break;
        }
        if (!Cools.isEmpty(wrkMastList1)) {
            String msg = "站点在入库";
            String msg = "站点在入库;";
            Set<Integer> set = new HashSet<>();
            for (WrkMast wrkMast : wrkMastList1) {
                set.add(wrkMast.getSourceStaNo());
            }
            return R.ok().add(set.toString() + msg);

            return R.ok().add(set.toString() + msg + DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
        }
        if (!Cools.isEmpty(wrkMastList2)) {
            String msg = "站点在出库";
            String msg = "站点在出库;";
            Set<Integer> set = new HashSet<>();
            for (WrkMast wrkMast : wrkMastList2) {
                set.add(wrkMast.getStaNo());
            }
            return R.ok().add(set.toString() + msg);
            return R.ok().add(set.toString() + msg + DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
        }
        return R.ok();
    }
@@ -371,18 +374,24 @@
                continue;
            }
            HashMap<String, Object> map = new HashMap<>();
            if (Cools.isEmpty(shuttleProtocol.getErrorCode())) {
                continue;
            }
            int i = Integer.parseInt(shuttleProtocol.getErrorCode());
            if (i > 0) {
                BasShuttleErr basShuttleErr = basShuttleErrService.queryByCode(i);
            if (!Cools.isEmpty(shuttleProtocol.getErrorCode()) && Integer.parseInt(shuttleProtocol.getErrorCode()) > 0 && !Cools.isEmpty(shuttleProtocol.getErrorCode())) {
                BasShuttleErr basShuttleErr = basShuttleErrService.queryByCode(Integer.parseInt(shuttleProtocol.getErrorCode()));
                String errName = basShuttleErr == null ? "未知异常" : basShuttleErr.getErrName();
                //故障中
                map.put("deviceNo", shuttleProtocol.getShuttleNo());//设备号-小车号
                map.put("errorMsg", errName);//异常信息
                map.put("device", "四向车");//异常信息
                list.add(map);
            } else if (shuttleProtocol.getMode() != 1) {
                map.put("deviceNo", shuttleProtocol.getShuttleNo());//设备号-小车号
                map.put("errorMsg", shuttleProtocol.getMode$());//异常信息
                map.put("device", "四向车");//异常信息
                list.add(map);
            } else if (shuttleProtocol.getProtocolStatusType() != ShuttleProtocolStatusType.IDLE) {
                map.put("deviceNo", shuttleProtocol.getShuttleNo());//设备号-小车号
                map.put("errorMsg", shuttleProtocol.getProtocolStatus$());//异常信息
                map.put("device", "四向车");//异常信息
                list.add(map);
            }
        }
        return R.ok().add(list);

 src/main/webapp/views/login.html

@@ -120,7 +120,7 @@
            <label class="layui-icon layui-icon-password layadmin-user-login-icon"></label>
            <input id="password" class="layui-input" type="password" name="password" lay-verify="password" placeholder="密码">
        </div>
        <div id="code-box" class="layui-form-item" style="">
        <div id="code-box" class="layui-form-item" style="display: none">
            <label id="code-label" class="layui-icon layui-icon-vercode layadmin-user-login-icon"></label>
            <input id="code" class="layui-input" type="text" name="password" lay-verify="code" placeholder="验证码">
            <img id="codeImg" title="看不清？点击换一张。">
@@ -141,12 +141,12 @@
<script type="text/javascript">

    // 验证码开关
    var codeSwitch = 'Y';
    var codeSwitch = 'N';
    $.ajax({
        url: baseUrl+"/code/switch.action",
        async: false,
        success: function (res) {
            if (res.data === 'N'){
            if (res.data === 'Y'){
                codeSwitch = res.data;
                $('#code-box').css("display", "none");
            }