zy-wcs.git - Gitblit

parent: 538496d2 | 补丁 | 提交 | ignore whitespace

luxiaotao1123

2020-08-15 4c72c2172ac6573e0ce9fcc3a6402e1518723833

4个文件已修改

	src/main/java/com/zy/asrs/controller/CrnController.java	44 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java	122 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/crn.html	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -79,10 +79,10 @@
            if (crnProtocol.getTaskNo()>0) {
                WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                if (wrkMast != null) {
                    vo.setStatusType(CrnStatusType.process(wrkMast.getIoType()));   //  模式状态
                    vo.setStatusType(CrnStatusType.process(wrkMast.getIoType()).getDesc());   //  模式状态
                }
            } else {
                vo.setStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO: CrnStatusType.UN_AUTO);   //  模式状态
                vo.setStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO.getDesc(): CrnStatusType.UN_AUTO.getDesc());   //  模式状态
            }
            vo.setStatus(crnProtocol.getStatusType().desc);     //  状态
            vo.setWarn(""); //  报警 todo
@@ -100,25 +100,37 @@
    @ManagerAuth(memo = "堆垛机数据表")
    public R crnMsgTable(){
        List<CrnMsgTableVo> list = new ArrayList<>();
        for (int i=1;i<=4;i++){
        for (CrnSlave crn : slaveProperties.getCrn()) {
            // 获取堆垛机信息
            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
            if (crnThread == null) {
                log.error("{}号堆垛机连接失败", crn.getId());
                continue;
            }
            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
            if (crnProtocol == null) {
                log.error("{}号堆垛机连接失败", crn.getId());
                continue;
            }
            // 表格行
            CrnMsgTableVo vo = new CrnMsgTableVo();
            vo.setCrnNo(String.valueOf(i));
            vo.setCommand("28283E23132D23");
            vo.setError("");
            vo.setLocNo("0601812");
            vo.setOrigin("0");
            vo.setSourceLocNo("");
            vo.setSourceStaNo("0");
            vo.setStaNo("2112");
            vo.setStatus("空闲");
            if (integer.get()%5 == 0) {
                vo.setWorkNo("0000");
            vo.setCrnNo(crn.getId());   //  堆垛机号
            vo.setWorkNo(crnProtocol.getTaskNo());  //  任务号
            if (crnProtocol.getTaskNo()>0) {
                WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                if (wrkMast != null) {
                    vo.setStatus(CrnStatusType.process(wrkMast.getIoType()).getDesc());   //  模式状态
                    vo.setSourceStaNo(wrkMast.getSourceStaNo$());    //  源站
                    vo.setStaNo(wrkMast.getStaNo$());   //  目标站
                    vo.setSourceLocNo(wrkMast.getSourceLocNo());    //  源库位
                    vo.setLocNo(wrkMast.getLocNo());    //  目标库位
                }
            } else {
                vo.setWorkNo("9998");
                vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO.getDesc(): CrnStatusType.UN_AUTO.getDesc());   //  模式状态
            }
            list.add(vo);

        }
        integer.getAndIncrement();
        return R.ok().add(list);
    }


 src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java

@@ -1,133 +1,41 @@
package com.zy.asrs.domain.vo;

import lombok.Data;

/**
 * Created by vincent on 2020-06-02
 */
@Data
public class CrnMsgTableVo {

    // 堆垛机号
    private String crnNo;

    // 状态
    private String status;
    private Integer crnNo;

    // 工作号
    private String workNo;
    private Short workNo;

    // 状态
    private String status = "";

    // 源站
    private String sourceStaNo;
    private String sourceStaNo = "";

    // 目标站
    private String staNo;
    private String staNo = "";

    // 源库位
    private String sourceLocNo;
    private String sourceLocNo = "";

    // 目标库位
    private String locNo;
    private String locNo = "";

    // 异常
    private String error;
    private String error = "";

    // 原点
    private String origin;
    private String origin = "";

    // 命令
    private String command;
    private String command = "";

    public CrnMsgTableVo() {
    }

    public CrnMsgTableVo(String crnNo, String status, String workNo, String sourceStaNo, String staNo, String sourceLocNo, String locNo, String error, String origin, String command) {
        this.crnNo = crnNo;
        this.status = status;
        this.workNo = workNo;
        this.sourceStaNo = sourceStaNo;
        this.staNo = staNo;
        this.sourceLocNo = sourceLocNo;
        this.locNo = locNo;
        this.error = error;
        this.origin = origin;
        this.command = command;
    }

    public String getCrnNo() {
        return crnNo;
    }

    public void setCrnNo(String crnNo) {
        this.crnNo = crnNo;
    }

    public String getStatus() {
        return status;
    }

    public void setStatus(String status) {
        this.status = status;
    }

    public String getWorkNo() {
        return workNo;
    }

    public void setWorkNo(String workNo) {
        this.workNo = workNo;
    }

    public String getSourceStaNo() {
        return sourceStaNo;
    }

    public void setSourceStaNo(String sourceStaNo) {
        this.sourceStaNo = sourceStaNo;
    }

    public String getStaNo() {
        return staNo;
    }

    public void setStaNo(String staNo) {
        this.staNo = staNo;
    }

    public String getSourceLocNo() {
        return sourceLocNo;
    }

    public void setSourceLocNo(String sourceLocNo) {
        this.sourceLocNo = sourceLocNo;
    }

    public String getLocNo() {
        return locNo;
    }

    public void setLocNo(String locNo) {
        this.locNo = locNo;
    }

    public String getError() {
        return error;
    }

    public void setError(String error) {
        this.error = error;
    }

    public String getOrigin() {
        return origin;
    }

    public void setOrigin(String origin) {
        this.origin = origin;
    }

    public String getCommand() {
        return command;
    }

    public void setCommand(String command) {
        this.command = command;
    }
}

 src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java

@@ -1,6 +1,5 @@
package com.zy.asrs.domain.vo;

import com.zy.asrs.domain.enums.CrnStatusType;
import lombok.Data;

/**
@@ -13,7 +12,7 @@
    private Integer crnNo;

    // 模式
    private CrnStatusType statusType;
    private String statusType;

    // 报警
    private String warn;

 src/main/webapp/views/crn.html

@@ -61,15 +61,12 @@
        <thead>
            <tr>
                <th>堆垛机</th>
                <th>状态</th>
                <th>工作号</th>
                <th>状态</th>
                <th>源站</th>
                <th>目标站</th>
                <th>源库位</th>
                <th>目标库位</th>
                <th>异常</th>
                <th>原点</th>
                <th>命令</th>
            </tr>
        </thead>
        <tbody>
@@ -282,15 +279,12 @@
                    for (var i=1;i<=table.length;i++){
                        var tr = tableEl.find("tr").eq(i);
                        setVal(tr.children("td").eq(0), table[i-1].crnNo);
                        setVal(tr.children("td").eq(1), table[i-1].status);
                        setVal(tr.children("td").eq(2), table[i-1].workNo);
                        setVal(tr.children("td").eq(1), table[i-1].status);
                        setVal(tr.children("td").eq(3), table[i-1].sourceStaNo);
                        setVal(tr.children("td").eq(4), table[i-1].staNo);
                        setVal(tr.children("td").eq(5), table[i-1].sourceLocNo);
                        setVal(tr.children("td").eq(6), table[i-1].locNo);
                        setVal(tr.children("td").eq(7), table[i-1].error);
                        setVal(tr.children("td").eq(8), table[i-1].origin);
                        setVal(tr.children("td").eq(9), table[i-1].command);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
@@ -463,9 +457,6 @@
        var html = "";
        for (var i = 0; i < line; i ++){
            html += " <tr>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +

			@@ -79,10 +79,10 @@
			if (crnProtocol.getTaskNo()>0) {
			WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
			if (wrkMast != null) {
			vo.setStatusType(CrnStatusType.process(wrkMast.getIoType())); // 模式状态
			vo.setStatusType(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 模式状态
			}
			} else {
			vo.setStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO: CrnStatusType.UN_AUTO); // 模式状态
			vo.setStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO.getDesc(): CrnStatusType.UN_AUTO.getDesc()); // 模式状态
			}
			vo.setStatus(crnProtocol.getStatusType().desc); // 状态
			vo.setWarn(""); // 报警 todo
			@@ -100,25 +100,37 @@
			@ManagerAuth(memo = "堆垛机数据表")
			public R crnMsgTable(){
			List<CrnMsgTableVo> list = new ArrayList<>();
			for (int i=1;i<=4;i++){
			for (CrnSlave crn : slaveProperties.getCrn()) {
			// 获取堆垛机信息
			CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
			if (crnThread == null) {
			log.error("{}号堆垛机连接失败", crn.getId());
			continue;
			}
			CrnProtocol crnProtocol = crnThread.getCrnProtocol();
			if (crnProtocol == null) {
			log.error("{}号堆垛机连接失败", crn.getId());
			continue;
			}
			// 表格行
			CrnMsgTableVo vo = new CrnMsgTableVo();
			vo.setCrnNo(String.valueOf(i));
			vo.setCommand("28283E23132D23");
			vo.setError("");
			vo.setLocNo("0601812");
			vo.setOrigin("0");
			vo.setSourceLocNo("");
			vo.setSourceStaNo("0");
			vo.setStaNo("2112");
			vo.setStatus("空闲");
			if (integer.get()%5 == 0) {
			vo.setWorkNo("0000");
			vo.setCrnNo(crn.getId()); // 堆垛机号
			vo.setWorkNo(crnProtocol.getTaskNo()); // 任务号
			if (crnProtocol.getTaskNo()>0) {
			WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
			if (wrkMast != null) {
			vo.setStatus(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 模式状态
			vo.setSourceStaNo(wrkMast.getSourceStaNo$()); // 源站
			vo.setStaNo(wrkMast.getStaNo$()); // 目标站
			vo.setSourceLocNo(wrkMast.getSourceLocNo()); // 源库位
			vo.setLocNo(wrkMast.getLocNo()); // 目标库位
			}
			} else {
			vo.setWorkNo("9998");
			vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO.getDesc(): CrnStatusType.UN_AUTO.getDesc()); // 模式状态
			}
			list.add(vo);

			}
			integer.getAndIncrement();
			return R.ok().add(list);
			}

			@@ -1,133 +1,41 @@
			package com.zy.asrs.domain.vo;

			import lombok.Data;

			/**
			* Created by vincent on 2020-06-02
			*/
			@Data
			public class CrnMsgTableVo {

			// 堆垛机号
			private String crnNo;

			// 状态
			private String status;
			private Integer crnNo;

			// 工作号
			private String workNo;
			private Short workNo;

			// 状态
			private String status = "";

			// 源站
			private String sourceStaNo;
			private String sourceStaNo = "";

			// 目标站
			private String staNo;
			private String staNo = "";

			// 源库位
			private String sourceLocNo;
			private String sourceLocNo = "";

			// 目标库位
			private String locNo;
			private String locNo = "";

			// 异常
			private String error;
			private String error = "";

			// 原点
			private String origin;
			private String origin = "";

			// 命令
			private String command;
			private String command = "";

			public CrnMsgTableVo() {
			}

			public CrnMsgTableVo(String crnNo, String status, String workNo, String sourceStaNo, String staNo, String sourceLocNo, String locNo, String error, String origin, String command) {
			this.crnNo = crnNo;
			this.status = status;
			this.workNo = workNo;
			this.sourceStaNo = sourceStaNo;
			this.staNo = staNo;
			this.sourceLocNo = sourceLocNo;
			this.locNo = locNo;
			this.error = error;
			this.origin = origin;
			this.command = command;
			}

			public String getCrnNo() {
			return crnNo;
			}

			public void setCrnNo(String crnNo) {
			this.crnNo = crnNo;
			}

			public String getStatus() {
			return status;
			}

			public void setStatus(String status) {
			this.status = status;
			}

			public String getWorkNo() {
			return workNo;
			}

			public void setWorkNo(String workNo) {
			this.workNo = workNo;
			}

			public String getSourceStaNo() {
			return sourceStaNo;
			}

			public void setSourceStaNo(String sourceStaNo) {
			this.sourceStaNo = sourceStaNo;
			}

			public String getStaNo() {
			return staNo;
			}

			public void setStaNo(String staNo) {
			this.staNo = staNo;
			}

			public String getSourceLocNo() {
			return sourceLocNo;
			}

			public void setSourceLocNo(String sourceLocNo) {
			this.sourceLocNo = sourceLocNo;
			}

			public String getLocNo() {
			return locNo;
			}

			public void setLocNo(String locNo) {
			this.locNo = locNo;
			}

			public String getError() {
			return error;
			}

			public void setError(String error) {
			this.error = error;
			}

			public String getOrigin() {
			return origin;
			}

			public void setOrigin(String origin) {
			this.origin = origin;
			}

			public String getCommand() {
			return command;
			}

			public void setCommand(String command) {
			this.command = command;
			}
			}

			@@ -1,6 +1,5 @@
			package com.zy.asrs.domain.vo;

			import com.zy.asrs.domain.enums.CrnStatusType;
			import lombok.Data;

			/**
			@@ -13,7 +12,7 @@
			private Integer crnNo;

			// 模式
			private CrnStatusType statusType;
			private String statusType;

			// 报警
			private String warn;

			@@ -61,15 +61,12 @@
			<thead>
			<tr>
			<th>堆垛机</th>
			<th>状态</th>
			<th>工作号</th>
			<th>状态</th>
			<th>源站</th>
			<th>目标站</th>
			<th>源库位</th>
			<th>目标库位</th>
			<th>异常</th>
			<th>原点</th>
			<th>命令</th>
			</tr>
			</thead>
			<tbody>
			@@ -282,15 +279,12 @@
			for (var i=1;i<=table.length;i++){
			var tr = tableEl.find("tr").eq(i);
			setVal(tr.children("td").eq(0), table[i-1].crnNo);
			setVal(tr.children("td").eq(1), table[i-1].status);
			setVal(tr.children("td").eq(2), table[i-1].workNo);
			setVal(tr.children("td").eq(1), table[i-1].status);
			setVal(tr.children("td").eq(3), table[i-1].sourceStaNo);
			setVal(tr.children("td").eq(4), table[i-1].staNo);
			setVal(tr.children("td").eq(5), table[i-1].sourceLocNo);
			setVal(tr.children("td").eq(6), table[i-1].locNo);
			setVal(tr.children("td").eq(7), table[i-1].error);
			setVal(tr.children("td").eq(8), table[i-1].origin);
			setVal(tr.children("td").eq(9), table[i-1].command);
			}
			} else if (res.code === 403){
			window.location.href = baseUrl+"/login";
			@@ -463,9 +457,6 @@
			var html = "";
			for (var i = 0; i < line; i ++){
			html += " <tr>\n" +
			" <td></td>\n" +
			" <td></td>\n" +
			" <td></td>\n" +
			" <td></td>\n" +
			" <td></td>\n" +
			" <td></td>\n" +