#输送站点限时托盘码

zjj

2024-01-02 da4b6eeafd41105a44753bae1ae24fb86ac8b0de

#输送站点限时托盘码

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

@@ -18,6 +18,7 @@
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.DevpThread;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.SiemensDevpThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -113,6 +114,7 @@
            vo.setStaNo(staProtocol.getStaNo());                // 目标站
//            vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "低" : "高");     //高低库位
            vo.setLocType1(devp.getDevNo()==102 ? "高" : "低");
            vo.setBarcode(staProtocol.getBarcode());
        }
        return R.ok().add(list);
    }

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

@@ -38,4 +38,5 @@
    //高低库位
    private String locType1 = "-";
    private String car = "-";
    private String barcode = "-";
}

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

@@ -181,6 +181,7 @@
                        continue;
                    }
                    String barcode = barcodeThread.getBarcode();
                    staProtocol.setBarcode(barcode);
                    if(!Cools.isEmpty(barcode)) {
                        StaDescService staDescService = SpringUtils.getBean(StaDescService.class);


 src/main/java/com/zy/core/model/protocol/StaProtocol.java

@@ -65,6 +65,9 @@
    //指令ID
    private Integer commandId;

    //条码
    private String barcode = null;

    // 外形检测 ------------------------------------------------------------------------

    // 前超限

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

@@ -24,6 +24,8 @@
                </el-table-column>
                <el-table-column property="pakMk" label="入库标记">
                </el-table-column>
                <el-table-column property="barcode" label="条码">
                </el-table-column>
            </el-table>
        </div>