完善AGV相关功能

zyx

2023-07-14 f1223c78a7b93d89017c26770390ef446cc57ac6

 src/main/webapp/views/mat/mat.html

@@ -86,19 +86,25 @@
                    <!-- 表格工具栏2 -->
                    <div id="search-box" class="layui-form toolbar"  style="padding-top: 5px">
                        <div class="layui-inline">
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">商品编号:</label>
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">物料号:</label>
                            <div class="layui-input-inline">
                                <input name="matnr" class="layui-input" placeholder="输入商品编号"/>
                            </div>
                        </div>
                        <div class="layui-inline">
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">商品名称:</label>
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">物料号:</label>
                            <div class="layui-input-inline">
                                <input name="maktx" class="layui-input" placeholder="输入商品名称"/>
                            </div>
                        </div>
                        <div class="layui-inline">
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">规格:</label>
                            <div class="layui-input-inline">
                                <input name="specs" class="layui-input" placeholder="输入规格"/>
                            </div>
                        </div>
                        <div class="layui-inline">&emsp;
                            <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                            <button class="layui-btn icon-btn" id="search" lay-filter="search" lay-submit>
                                <i class="layui-icon">&#xe615;</i>搜索
                            </button>
                            <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
@@ -161,8 +167,6 @@
        <input name="uuid" type="hidden">
        <input name="nodeId" type="hidden">
        <input name="tag_id" type="hidden">
        <input name="model" type="hidden">
        <input name="name" type="hidden">
        <input name="batch" type="hidden">
        <input name="docId" type="hidden">
        <input name="docNum" type="hidden">
@@ -174,7 +178,9 @@
        <input name="createBy" type="hidden">
        <input name="updateTime$" type="hidden">
        <input name="updateBy" type="hidden">
        <input name="status" type="hidden">
        <div class="layui-row">


            <div class="layui-col-md6">

@@ -191,18 +197,25 @@
                        <input name="maktx" placeholder="请输入商品名称" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">SKC</label>
                    <label class="layui-form-label">库存上限</label>
                    <div class="layui-input-block">
                        <input name="barcode" placeholder="请输入条码" class="layui-input">
                        <input name="storeMax" placeholder="库存上限" type="number" class="layui-input">
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">单价</label>
                    <label class="layui-form-label">库龄上限(天)</label>
                    <div class="layui-input-block">
                        <input name="price" type="number" placeholder="请输入单价" class="layui-input">
                        <input name="storeMaxDate" placeholder="库龄上限(天)" type="number" class="layui-input">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">状态:</label>
                    <div class="layui-input-block">
                        <select name="status">
                            <option value="1">正常</option>
                            <option value="0" selected>禁用</option>
                        </select>
                    </div>
                </div>

@@ -224,11 +237,12 @@
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">单位</label>
                    <label class="layui-form-label">库存下限</label>
                    <div class="layui-input-block">
                        <input name="unit" placeholder="请输入单位" class="layui-input">
                        <input name="storeMin" placeholder="库存下限" type="number" class="layui-input">
                    </div>
                </div>


                <div class="layui-form-item">
                    <label class="layui-form-label">备注</label>
@@ -236,17 +250,6 @@
                        <input name="memo" placeholder="请输入备注" class="layui-input">
                    </div>
                </div>

                <!--                <div class="layui-form-item">-->
                <!--                    <label class="layui-form-label layui-form-required">状态</label>-->
                <!--                    <div class="layui-input-block">-->
                <!--                        <select name="status" lay-vertype="tips" lay-verify="required" required="">-->
                <!--                            <option value="">请选择状态</option>-->
                <!--                            <option value="1">正常</option>-->
                <!--                            <option value="0">禁用</option>-->
                <!--                        </select>-->
                <!--                    </div>-->
                <!--                </div>-->

            </div>
        </div>
@@ -276,7 +279,7 @@
                <div id="template-preview-1" class="template-preview" style="display: inline-block">
                    <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
                        <tr style="height: 74px">
                            <td colspan="3" align="center" scope="col">商品编码</td>
                            <td colspan="3" align="center" scope="col">物料号</td>
                            <td class="barcode" colspan="9" align="center" scope="col">
                                <img class="template-code template-barcode" src="" width="90%;">
                                <div style="letter-spacing: 2px;margin-top: 1px; text-align: center;">
@@ -287,7 +290,7 @@
                        <tr style="height: 74px">
                            <td align="center" colspan="3">商品</td>
                            <td align="center" colspan="5">xxxxxx-xx/xx</td>
                            <td align="center" colspan="2">备注</td>
                            <td align="center" colspan="2">规格</td>
                            <td align="center" colspan="2">xx</td>
                        </tr>
                    </table>
@@ -301,7 +304,7 @@
                            <td align="center" width="80%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
                        </tr>
                        <tr style="height: 30px">
                            <td align="center" width="20%">备注</td>
                            <td align="center" width="20%">规格</td>
                            <td align="center" width="80%">xxxxxxxx</td>
                        </tr>
                        <tr style="height: 75px;">
@@ -329,7 +332,7 @@
                            </td>
                        </tr>
                        <tr style="height: 74px">
                            <td align="center" colspan="1">备注</td>
                            <td align="center" colspan="1">规格</td>
                            <td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
                        </tr>
                    </table>
@@ -355,7 +358,7 @@
    {{#each data}}
    <table class="contain" width="280" style="overflow: hidden;font-size: small;table-layout: fixed;">
        <tr style="height: 74px">
            <td align="center" colspan="3" scope="col">商品编码</td>
            <td align="center" colspan="3" scope="col">物料号</td>
            <td align="center" class="barcode" colspan="9" scope="col">
                <img class="template-code" src="{{this.barcodeUrl}}" width="90%">
                <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
@@ -366,8 +369,8 @@
        <tr style="height: 74px">
            <td align="center" colspan="3">商品</td>
            <td align="center" colspan="5" style="overflow: hidden; white-space: nowrap;text-overflow: ellipsis;">{{this.maktx}}</td>
            <td align="center" colspan="2">备注</td>
            <td align="center" colspan="2">{{this.memo}}</td>
            <td align="center" colspan="2">规格</td>
            <td align="center" colspan="2">{{this.specs}}</td>
        </tr>
    </table>
    {{/each}}
@@ -381,13 +384,13 @@
            <td align="center" width="80%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.maktx}}</td>
        </tr>
        <tr style="height: 35px">
            <td align="center" width="20%">备注</td>
            <td align="center" width="80%">{{this.memo}}</td>
            <td align="center" width="20%">规格</td>
            <td align="center" width="80%">{{this.specs}}</td>
        </tr>
        <tr style="height: 79px;">
            <td align="center" colspan="2" width="100%" style="border: none">
                <img class="template-code" src="{{this.barcodeUrl}}" width="80%">
                <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
                <div style="letter-spacing: 2px;margin-top: 1px; text-align: center" >
                    <span>{{this.matnr}}</span>
                </div>
            </td>
@@ -398,33 +401,35 @@
<!-- 模板3 -->
<script type="text/template" id="templatePreview3" class="template-qrcode">
    {{#each data}}
    <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
        <tr style="height: 74px" >
            <td align="center" scope="col" colspan="1">商品</td>
            <td align="center" scope="col" colspan="1" style="
                display: inline-block;
                line-height: 20px;
                vertical-align: middle;
    <table class="contain" width="400px" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
        <tr style="height: 74px;font-size: 18px" >
            <td width="50px" align="center" scope="col" colspan="1"><strong>商品</strong></td>
            <td width="150px" align="center" scope="col" colspan="1" style="
                border: none;
                border-top: 1px solid #000;
                overflow: hidden;
                text-overflow: ellipsis;
                display: -webkit-box;
                -webkit-line-clamp: 3;
                -webkit-box-orient: vertical;
                    ">
                {{this.maktx}}
                font-family: 宋体;
                font-size: 18px">
                <strong>{{this.maktx}}</strong>
            </td>
            <td align="center" scope="col" colspan="2" rowspan="2">
                <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="80%">
                <div style="letter-spacing: 1px;margin-top: 1px; text-align: center">
                    <span>{{this.matnr}}</span>
                    <span><strong>{{this.matnr}}</strong></span>
                </div>
            </td>
        </tr>
        <tr style="height: 74px">
            <td align="center" colspan="1">备注</td>
            <td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.memo}}</td>
        <tr style="height: 74px; font-family: 宋体; font-size: 18px">
            <td width="50px" align="center" colspan="1"><strong>规格</strong></td>
            <td align="center" colspan="1" style="
                overflow:hidden;
                text-overflow:ellipsis;
                -webkit-line-clamp: 3;
                -webkit-box-orient: vertical;
            "><strong>{{this.specs}}</strong></td>
        </tr>
    </table>
    {{/each}}