Merge branch 'gdasrs' of https://gitee.com/luxiaotao1123/zy-asrs into gdasrs

luxiaotao1123

2020-09-15 5fe9c379f0cc696568a0db249026a1e8a3b02a5a

 src/main/webapp/views/pda/locDetlIframe.html

@@ -79,11 +79,11 @@
        <input id="locNo" type="text" disabled="disabled">
    </div>
    <div class="form-item">
        <span>物料编码</span>
        <span>产品代号</span>
        <input id="matnr" type="text" disabled="disabled">
    </div>
    <div class="form-item">
        <span>物料名称</span>
        <span>产品名称</span>
        <input id="maktx" type="text" disabled="disabled">
    </div>
    <div class="form-item">