#

lsh

2024-05-16 9dd3b9931d4fdf76de7d1989ef32ed00ec952c9a

#

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

@@ -119,6 +119,11 @@
            vo.setPakMk(staProtocol.isPakMk()?"Y":"N");       // 入库标记
            vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N");     // 空板信号
            vo.setStaNo(staProtocol.getStaNo());                // 目标站
            vo.setStaNo(staProtocol.getStaNo());                // 目标站
            vo.setStaNo(staProtocol.getStaNo());                // 目标站
            vo.setFullPlt(staProtocol.isFullPlt()?"Y":"N");
            vo.setLow(staProtocol.isLow()?"Y":"N");
            vo.setCar(staProtocol.isCar()?"Y":"N");
//            vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "低" : "高");     //高低库位
            vo.setLocType1(devp.getDevNo()==102 ? "高" : "低");
            vo.setBarcode(staProtocol.getBarcode());

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

@@ -39,4 +39,6 @@
    private String locType1 = "-";
    private String car = "-";
    private String barcode = "-";
    private String fullPlt = "-";
    private String low = "-";
}

 src/main/java/com/zy/core/MainProcess.java

@@ -48,7 +48,7 @@
//                    mainService.RGVDemoShow1();
                    mainService.RGVDemoShow2();
                    //机械臂允许取货、允许放货
                    mainService.ExtTaskAndPut();
//                    mainService.ExtTaskAndPut();


                } catch (Exception e) {

 src/main/webapp/views/deviceOperate/devpOperate.html

@@ -30,39 +30,39 @@
        </div>

        <div style="width: 100%;display: flex;justify-content: center;margin-top: 10px;">
            <div style="width: 55%;margin-right: 10px;">
                <el-card class="box-card">
                    <div slot="header" class="clearfix">
                        <span>设备调试</span>
                    </div>
                    <div>
                        <el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline">
                            <el-form-item label="工作号">
                                <el-input v-model="formParam.workNo" placeholder="工作号"></el-input>
                            </el-form-item>
                            <el-form-item label="目标站">
                                <el-input v-model="formParam.staNo" placeholder="目标站"></el-input>
                            </el-form-item>
                            <el-form-item label="入库标记">
                                <el-input v-model="formParam.pakMk" placeholder="入库标记"></el-input>
                            </el-form-item>
                        </el-form>
                        <el-form label-position="top" :inline="true" class="demo-form-inline">
                            <el-form-item label="">
                                <el-checkbox v-model="formParam.inEnable">可入</el-checkbox>
                            </el-form-item>
                            <el-form-item label="">
                                <el-checkbox v-model="formParam.outEnable">可出</el-checkbox>
                            </el-form-item>
                        </el-form>
                        <div>
                            <el-button @click="requestOperate('update')" type="primary">更新</el-button>
                            <el-button @click="requestOperate('out')" type="warning">取货完成</el-button>
                            <el-button @click="requestOperate('in')" type="warning">放货完成</el-button>
                        </div>
                    </div>
                </el-card>
            </div>
<!--            <div style="width: 55%;margin-right: 10px;">-->
<!--                <el-card class="box-card">-->
<!--                    <div slot="header" class="clearfix">-->
<!--                        <span>设备调试</span>-->
<!--                    </div>-->
<!--                    <div>-->
<!--                        <el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline">-->
<!--                            <el-form-item label="工作号">-->
<!--                                <el-input v-model="formParam.workNo" placeholder="工作号"></el-input>-->
<!--                            </el-form-item>-->
<!--                            <el-form-item label="目标站">-->
<!--                                <el-input v-model="formParam.staNo" placeholder="目标站"></el-input>-->
<!--                            </el-form-item>-->
<!--                            <el-form-item label="入库标记">-->
<!--                                <el-input v-model="formParam.pakMk" placeholder="入库标记"></el-input>-->
<!--                            </el-form-item>-->
<!--                        </el-form>-->
<!--                        <el-form label-position="top" :inline="true" class="demo-form-inline">-->
<!--                            <el-form-item label="">-->
<!--                                <el-checkbox v-model="formParam.inEnable">可入</el-checkbox>-->
<!--                            </el-form-item>-->
<!--                            <el-form-item label="">-->
<!--                                <el-checkbox v-model="formParam.outEnable">可出</el-checkbox>-->
<!--                            </el-form-item>-->
<!--                        </el-form>-->
<!--                        <div>-->
<!--                            <el-button @click="requestOperate('update')" type="primary">更新</el-button>-->
<!--                            <el-button @click="requestOperate('out')" type="warning">取货完成</el-button>-->
<!--                            <el-button @click="requestOperate('in')" type="warning">放货完成</el-button>-->
<!--                        </div>-->
<!--                    </div>-->
<!--                </el-card>-->
<!--            </div>-->
            <div style="width: 45%;">
                <el-card class="box-card">
                    <div slot="header" class="clearfix">
@@ -73,27 +73,27 @@
                            <el-empty description="请选择设备"></el-empty>
                        </div>
                        <div v-else>
                            <el-descriptions :title="currentTitle" direction="vertical" :column="4" border>
                            <el-descriptions :title="currentTitle" direction="vertical" :column="2" border>
                                <el-descriptions-item label="站点">{{ tableData[currentIndex].devNo }}
                                </el-descriptions-item>
                                <el-descriptions-item label="工作号">
                                    {{ tableData[currentIndex].workNo }}
                                </el-descriptions-item>
                                <el-descriptions-item label="自动">{{ tableData[currentIndex].autoing }}
                                <el-descriptions-item label="输送线 ==》 氮气1">{{ tableData[currentIndex].autoing }}
                                </el-descriptions-item>
                                <el-descriptions-item label="有物">{{ tableData[currentIndex].loading }}
                                <el-descriptions-item label="输送线 ==》 氮气2">{{ tableData[currentIndex].loading }}
                                </el-descriptions-item>
                                <el-descriptions-item label="可入">{{ tableData[currentIndex].inEnable }}
                                <el-descriptions-item label="输送线 ==》 氮气3">{{ tableData[currentIndex].inEnable }}
                                </el-descriptions-item>
                                <el-descriptions-item label="可出">{{ tableData[currentIndex].outEnable }}
                                <el-descriptions-item label="输送线 ==》 氮气4">{{ tableData[currentIndex].outEnable }}
                                </el-descriptions-item>
                                <el-descriptions-item label="入库标记">{{ tableData[currentIndex].pakMk }}
                                <el-descriptions-item label="氮气1 ==》 下料位">{{ tableData[currentIndex].emptyMk }}
                                </el-descriptions-item>
                                <el-descriptions-item label="空板信号">{{ tableData[currentIndex].emptyMk }}
                                <el-descriptions-item label="氮气2 ==》 下料位">{{ tableData[currentIndex].fullPlt }}
                                </el-descriptions-item>
                                <el-descriptions-item label="目标站">{{ tableData[currentIndex].staNo }}
                                <el-descriptions-item label="氮气3 ==》 下料位">{{ tableData[currentIndex].car }}
                                </el-descriptions-item>
                                <el-descriptions-item label="高低库位">{{ tableData[currentIndex].locType1 }}
                                <el-descriptions-item label="氮气4 ==》 下料位">{{ tableData[currentIndex].low }}
                                </el-descriptions-item>
                            </el-descriptions>
                        </div>