#

luxiaotao1123

2020-08-14 3008cbf144bd6f4cf80dcef9cf8246a31c3d8bc1

#

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

@@ -147,18 +147,18 @@
                        return R.error("数据库维护异常");
                    }

                    vo.setDevpNo(siteId);   // 站点编号
                    vo.setSiteId(siteId);   // 站点编号
                    vo.setWorkNo(staProtocol.getWorkNo());   // 工作号

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


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

@@ -10,13 +10,13 @@
public class SiteDetailVo {

    // 站点编号
    private Integer devpNo;
    private Integer siteId;

    // 工作号
    private Short workNo;

    // 工作状态
    private String workStatus = "";
    private String wrkSts = "";

    // 自动
    private String autoing;
@@ -40,8 +40,8 @@
    private String staNo = "";

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

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

 src/main/webapp/views/console.html

@@ -198,7 +198,7 @@
                <span>设备号</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="devpNo" value="" disabled="disabled" style="width: 4rem">
                <input type="text" name="siteId;" value="" disabled="disabled" style="width: 4rem">
            </div>
        </div>
        <div class="form-item" style="width: 25%">
@@ -214,7 +214,7 @@
                <span>工作状态</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="workStatus" value="" disabled="disabled" style="width: 10rem">
                <input type="text" name="wrkSts" value="" disabled="disabled" style="width: 10rem">
            </div>
        </div>

@@ -284,7 +284,7 @@
                <span>源库位</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="sourceStock" value="" disabled="disabled" style="width: 8rem">
                <input type="text" name="sourceLocNo" value="" disabled="disabled" style="width: 8rem">
            </div>
        </div>
        <div class="form-item" style="width: 40%">
@@ -292,7 +292,7 @@
                <span>目标库位</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="stock" value="" disabled="disabled" style="width: 8rem">
                <input type="text" name="locNo" value="" disabled="disabled" style="width: 8rem">
            </div>
        </div>
    </form>