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

@@ -17,6 +17,7 @@
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.mapper.TaskWrkMapper;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.DeviceErrorService;
@@ -42,6 +43,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.*;

@@ -70,6 +72,9 @@
    private DeviceErrorService deviceErrorService;
    @Autowired
    private BasCrnpService basCrnpService;

    @Resource
    private TaskWrkMapper taskWrkMapper;

    @PostMapping("/system/running/status")
    @ManagerAuth(memo = "系统运行状态")
@@ -143,7 +148,7 @@
//            Short totalBay = locMastMapper.selectTotalBay();

            vo.setOffset((double) new Random().nextInt(560));     //  堆垛机偏移量
            vo.setBay((short) (crnProtocol.getBay() - crn.getOffset()));    //  当前列
            vo.setBay(crnProtocol.getBay());    //  当前列
            /**
             * 堆垛机状态判断
             */
@@ -151,9 +156,10 @@
                vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
            } else {
                if (crnProtocol.getTaskNo() > 0) {
                    WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                    if (wrkMast != null) {
                        vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
//                    WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                    TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(crnProtocol.getTaskNo()));
                    if (taskWrk != null) {
                        vo.setCrnStatus(CrnStatusType.process(taskWrk.getIoType()));
                    } else {
                        vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO) ? CrnStatusType.MACHINE_AUTO : CrnStatusType.MACHINE_UN_AUTO);
                    }
@@ -279,14 +285,16 @@
                    vo.setWorkNo(staProtocol.getWorkNo());   // 工作号

                    if (staProtocol.getWorkNo() > 0) {
                        WrkMast wrkMast = wrkMastService.selectById(staProtocol.getWorkNo());
                        if (wrkMast != null) {
                            vo.setWrkSts(wrkMast.getWrkSts$());   // 工作状态
                            vo.setIoType(wrkMast.getIoType$());   //  入出库类型
                            vo.setSourceStaNo(wrkMast.getSourceStaNo$());
                            vo.setStaNo(wrkMast.getStaNo$());
                            vo.setSourceLocNo(wrkMast.getSourceLocNo$());
                            vo.setLocNo(wrkMast.getLocNo$());
//                        WrkMast wrkMast = wrkMastService.selectById(staProtocol.getWorkNo());
                        TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(staProtocol.getWorkNo()));

                        if (taskWrk != null) {
                            vo.setWrkSts(taskWrk.getWrkSts$());   // 工作状态
                            vo.setIoType(taskWrk.getIoType$());   //  入出库类型
                            vo.setSourceStaNo(taskWrk.getStartPoint());
                            vo.setStaNo(taskWrk.getTargetPoint());
                            vo.setSourceLocNo(taskWrk.getStartPoint());
                            vo.setLocNo(taskWrk.getTargetPoint());
                        }
                    }

@@ -330,14 +338,15 @@
                }

                if (crnProtocol.getTaskNo() > 0) {
                    WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                    if (wrkMast != null) {
                        vo.setSourceStaNo(wrkMast.getSourceStaNo$());
                        vo.setStaNo(wrkMast.getStaNo$());
                        vo.setWrkSts(wrkMast.getWrkSts$());   // 工作状态
                        vo.setIoType(wrkMast.getIoType$());   //  入出库类型
                        vo.setSourceLocNo(wrkMast.getSourceLocNo$());
                        vo.setLocNo(wrkMast.getLocNo$());
                    TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(crnProtocol.getTaskNo()));
//                    WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                    if (taskWrk != null) {
                        vo.setSourceStaNo(taskWrk.getStartPoint());
                        vo.setStaNo(taskWrk.getTargetPoint());
                        vo.setWrkSts(taskWrk.getWrkSts$());   // 工作状态
                        vo.setIoType(taskWrk.getIoType$());   //  入出库类型
                        vo.setSourceLocNo(taskWrk.getStartPoint());
                        vo.setLocNo(taskWrk.getTargetPoint());
                        vo.setCrnStatus(crnProtocol.getStatusType().desc);
                        vo.setError("");    // todo
                    }

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

@@ -155,7 +155,7 @@
            }
        }
        if (locMast.getLocSts().equals("O")) {
            locMast.setBarcode(null);
            locMast.setBarcode("");
        }
        locMast.setModiUser(getUserId());
        locMast.setModiTime(new Date());

 src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java

@@ -30,7 +30,7 @@
    }

    public static CrnStatusType process(Integer ioType) {
        if (ioType > 100) {
        if (ioType == 2) {
            return MACHINE_PAKOUT;
        } else if (ioType < 100 && ioType != 3 && ioType != 6 && ioType != 11) {
            return MACHINE_PAKIN;

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

@@ -118,9 +118,6 @@
            for (DevpSlave devp : slaveProperties.getDevp()) {
                // 遍历入库口
                for (DevpSlave.Sta inSta : devp.getInSta()) {
                    if (inSta.getStaNo() != 114) {
                        continue;
                    }
                    StorageEscalationParam storageEscalationParam = new StorageEscalationParam();
                    storageEscalationParam.setStationCode(inSta.getStaNo());
                    // 获取入库站信息

 src/main/java/com/zy/core/thread/BarcodeThread.java

@@ -22,6 +22,8 @@
    private Slave slave;
    private StringBuffer barcode = new StringBuffer();

    private String lastBarcode = "";

    public BarcodeThread(Slave slave) {
        this.slave = slave;
    }
@@ -33,7 +35,8 @@
    public void setBarcode(String barcode) {
        this.barcode.delete(0, this.barcode.length());
        this.barcode.append(barcode);
        if (!Cools.isEmpty(barcode)) {
        if (!Cools.isEmpty(barcode) && !lastBarcode.equals(barcode)) {
            lastBarcode = barcode;
            log.info("{}号条码器，检索数据：{}", slave.getId(), this.barcode);
            JSONObject jsonObject = new JSONObject();
            jsonObject.put("time", DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));

 src/main/java/com/zy/system/controller/UserController.java

@@ -112,6 +112,9 @@
        if (user.getMobile() != null) {
            entity.setMobile(user.getMobile());
        }
        if(user.getRoleId() != null) {
            entity.setRoleId(user.getRoleId());
        }
        userService.updateById(entity);
        return R.ok();
    }

 src/main/webapp/views/realtimeWatch/console.html

@@ -635,19 +635,25 @@
                    for (var i = 0; i < crns.length; i++) {
                        var crnEl = $("#crn-" + crns[i].crnId);
                        crnEl.attr("class", "machine " + crns[i].crnStatus);
                        var unit = 20.6;//($('.item').eq(0).width() + 13) / 2;
                        if (crns[i].bay < 0) {
                            crns[i].bay = 1;
                        }
                        // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
                        // crns[i].bay = 1;

                        var offSet = 800;
                        // crns[i].bay = 41;
                        if(crns[i].bay === 1){
                            crnEl.animate({left: offSet + 'px'}, 1000);
                        if (crns[i].crnId === 1) {
                            let unit = 111
                            let offSet = 600;
                            if(crns[i].bay === 1){
                                crnEl.animate({left: offSet + 'px'}, 1000);
                            } else {
                                crnEl.animate({left: (offSet + unit*(crns[i].bay-1)) + 'px'}, 1000);
                            }
                        } else {
                            crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
                            let unit = 83
                            let offSet = 600;
                            if(crns[i].bay === 1){
                                crnEl.animate({left: offSet + 'px'}, 1000);
                            } else {
                                crnEl.animate({left: (offSet + unit*(crns[i].bay -1)) + 'px'}, 1000);
                            }
                        }

                    }

 src/main/webapp/views/realtimeWatch/crn2.html

@@ -71,24 +71,24 @@
          <!--            <span>&nbsp;</span>-->
          <input id="crn3" disabled="disabled">
        </div>
        <div class="crn-command-item">
          <label>4#</label>
<!--          <button id="demoBtn-4" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
          <!--            <span>&nbsp;</span>-->
          <input id="crn4" disabled="disabled">
        </div>
        <div class="crn-command-item">
          <label>5#</label>
<!--          <button id="demoBtn-5" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
          <!--            <span>&nbsp;</span>-->
          <input id="crn5" disabled="disabled">
        </div>
        <div class="crn-command-item">
          <label>6#</label>
<!--          <button id="demoBtn-6" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
          <!--            <span>&nbsp;</span>-->
          <input id="crn6" disabled="disabled">
        </div>
<!--        <div class="crn-command-item">-->
<!--          <label>4#</label>-->
<!--&lt;!&ndash;          <button id="demoBtn-4" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>&ndash;&gt;-->
<!--          &lt;!&ndash;            <span>&nbsp;</span>&ndash;&gt;-->
<!--          <input id="crn4" disabled="disabled">-->
<!--        </div>-->
<!--        <div class="crn-command-item">-->
<!--          <label>5#</label>-->
<!--&lt;!&ndash;          <button id="demoBtn-5" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>&ndash;&gt;-->
<!--          &lt;!&ndash;            <span>&nbsp;</span>&ndash;&gt;-->
<!--          <input id="crn5" disabled="disabled">-->
<!--        </div>-->
<!--        <div class="crn-command-item">-->
<!--          <label>6#</label>-->
<!--&lt;!&ndash;          <button id="demoBtn-6" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>&ndash;&gt;-->
<!--          &lt;!&ndash;            <span>&nbsp;</span>&ndash;&gt;-->
<!--          <input id="crn6" disabled="disabled">-->
<!--        </div>-->
      </div>
      <!-- 堆垛机状态位信息 -->
      <div class="crn-state">

 src/main/webapp/views/taskWrkLog/taskWrkLog.html

@@ -38,17 +38,17 @@
                        </el-form-item>
                    </el-form>
                    <el-table ref="singleTable" :data="tableData" style="width: 100%;">
                        <el-table-column label="操作" width="100">
                            <template slot-scope="scope">
                                <el-dropdown @command="(command)=>{handleCommand(command, scope.row)}">
                                    <el-button icon="el-icon-more" size="mini" type="primary"></el-button>
                                    <el-dropdown-menu slot="dropdown">
                                        <el-dropdown-item command="resubmitTheTask">重新上报任务完结</el-dropdown-item>
                                        <el-dropdown-item command="showCommand">查看指令</el-dropdown-item>
                                    </el-dropdown-menu>
                                </el-dropdown>
                            </template>
                        </el-table-column>
<!--                        <el-table-column label="操作" width="100">-->
<!--                            <template slot-scope="scope">-->
<!--                                <el-dropdown @command="(command)=>{handleCommand(command, scope.row)}">-->
<!--                                    <el-button icon="el-icon-more" size="mini" type="primary"></el-button>-->
<!--                                    <el-dropdown-menu slot="dropdown">-->
<!--                                        <el-dropdown-item command="resubmitTheTask">重新上报任务完结</el-dropdown-item>-->
<!--                                        <el-dropdown-item command="showCommand">查看指令</el-dropdown-item>-->
<!--                                    </el-dropdown-menu>-->
<!--                                </el-dropdown>-->
<!--                            </template>-->
<!--                        </el-table-column>-->
                        <el-table-column property="taskNo" label="任务号">
                        </el-table-column>
                        <el-table-column property="status$" label="任务状态">