YYC
2023-07-05 7fff423ea251afed364dc523fb5be4d0b23f39b1
出库登记
已修改8个文件
1071 ■■■■ 文件已修改
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/resources/mapper/InoutCheckMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/static/admin/inout/in-sample.js 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/static/admin/inout/out-card-back.js 362 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/static/admin/inout/out-register.js 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/templates/admin/inout/out-register.html 622 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/templates/test/qualityReport01.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -876,7 +876,7 @@
        // 质检完成触发事件
        inoutEventControl.onInCheck(data,curProgress,nextProgress);
        inoutEventControl.onInCheck(data, curProgress, nextProgress);
        return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "执行成功");
    }
@@ -994,7 +994,6 @@
    }
    /**
     *
     * @param param
     * @return
     */
igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js
@@ -25,6 +25,7 @@
    LODOP.PRINT_INIT("质检单");
    LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4");
    LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
    LODOP.SET_PRINT_MODE("PRINT_PAGE_PERCENT", "Full-Page");
    LODOP.PREVIEW();
};
print5016CheckBill = function (htmlStr) {
igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
@@ -117,6 +117,7 @@
            <if test="data.addCheck != null">ADD_CHECK_ = #{data.addCheck},</if>
            <if test="data.price != null">PRICE_ = #{data.price},</if>
            <if test="data.remarks != null">REMARKS_ = #{data.remarks},</if>
            <if test="data.updateTime != null">UPDATE_TIME_ = #{data.updateTime},</if>
        </trim>
        WHERE
        COMPANY_ID_ =#{data.companyId}
igds-web/src/main/resources/static/admin/inout/in-sample.js
@@ -358,4 +358,39 @@
            alertError("提交失败,请重新尝试");
        }
    });
}
/**
 * 弹出提醒框
 * @param msg 提醒信息
 * @param data 数据信息,可能为空
 */
function notify(msg, data) {
    if (data) {
        //赋值
        $("#resultMsg").text(msg);
        $("#resultUserName").text(data.userName);
        $("#resultPlateNum").text(data.plateNum);
        if ("IN" == data.type) {
            $("#resultType").text("入库-" + INOUT_PROGRESS_MSG(data.progress));
        } else {
            $("#resultType").text("出库-" + INOUT_PROGRESS_MSG(data.progress));
        }
        $("#resultIntelCard").text(data.intelCard);
        layer.open({
            type: 1,
            offset: ['150px', '200px'],
            area: '450px;',
            shade: 0.8,
            id: 'dialog_notify_info',
            btn: ['确定'],
            content: $('#dialog-from-notify'),
            yes: function (index) {
                layer.closeAll();
            }
        });
    } else {
        layer.alert(msg, {offset: ['300px', '300px']});
    }
}
igds-web/src/main/resources/static/admin/inout/out-card-back.js
@@ -2,226 +2,226 @@
var layer;
var form;
var recordData = null;
$(function() {
    layui.use([ 'layer', 'laydate', 'form', 'util' ], function() {
        layer = layui.layer;
        form = layui.form;
        layui.laydate.render({
            elem : '#test1',
            theme : '#7b8e9f'
        });
$(function () {
    layui.use(['layer', 'laydate', 'form', 'util'], function () {
        layer = layui.layer;
        form = layui.form;
        layui.laydate.render({
            elem: '#test1',
            theme: '#7b8e9f'
        });
    });
    });
    showProgress();
    showProgress();
});
//控制流程环节显示
function showProgress() {
    if(!inoutProgress){
        return;
    }
    if (!inoutProgress) {
        return;
    }
    if(inoutProgress.indexOf("REGISTER") == -1){
        $("#progress-register").css("display", "none");
    }
    if(inoutProgress.indexOf("WEIGHT_FULL") == -1){
        $("#progress-fullWeight").css("display", "none");
    }
    if(inoutProgress.indexOf("HANDLE") == -1){
        $("#progress-hand").css("display", "none");
    }
    if(inoutProgress.indexOf("WEIGHT_EMPTY") == -1){
        $("#progress-emptyWeight").css("display", "none");
    }
    if(inoutProgress.indexOf("CARD_BACK") == -1){
        $("#progress-cardBack").css("display", "none");
    }
    if (inoutProgress.indexOf("REGISTER") == -1) {
        $("#progress-register").css("display", "none");
    }
    if (inoutProgress.indexOf("WEIGHT_FULL") == -1) {
        $("#progress-fullWeight").css("display", "none");
    }
    if (inoutProgress.indexOf("HANDLE") == -1) {
        $("#progress-hand").css("display", "none");
    }
    if (inoutProgress.indexOf("WEIGHT_EMPTY") == -1) {
        $("#progress-emptyWeight").css("display", "none");
    }
    if (inoutProgress.indexOf("CARD_BACK") == -1) {
        $("#progress-cardBack").css("display", "none");
    }
}
//新的读卡方式
function flushICCard() {
    $("#intelCard").val(null);
    resetForm();
    $.ajax({
        type: "GET",
        async: true,
        url: "http://127.0.0.1:9111/ICCARD",
        data: {},
        dataType: "jsonp",
        jsonp: "callback",
        jsonpCallback: "jsonpCallback",
        success: function (json) {
            //console.log(json);
            var data = json.no;
            //console.log(data);
            if (data === "not found") {
                layer.alert("请重新读卡!", {offset: ['300px', '300px']});
            } else {
                $("#intelCard").val(data);
                flushData();
            }
        },
        error: function () {
            layer.alert("IC卡读取出错!", {offset: ['300px', '300px']});
        }
    });
    $("#intelCard").val(null);
    resetForm();
    $.ajax({
        type: "GET",
        async: true,
        url: "http://127.0.0.1:9111/ICCARD",
        data: {},
        dataType: "jsonp",
        jsonp: "callback",
        jsonpCallback: "jsonpCallback",
        success: function (json) {
            //console.log(json);
            var data = json.no;
            //console.log(data);
            if (data === "not found") {
                layer.alert("请重新读卡!", {offset: ['300px', '300px']});
            } else {
                $("#intelCard").val(data);
                flushData();
            }
        },
        error: function () {
            layer.alert("IC卡读取出错!", {offset: ['300px', '300px']});
        }
    });
}
// 使用插件获取省份证
function flushIdCard() {
    var index = layer.load();
    $.ajax({
        type: "GET",
        async: true,
        url: "http://127.0.0.1:9111/IDCARD",
        data: {},
        dataType: "jsonp",
        jsonp: "callback",
        jsonpCallback: "jsonpCallback",
        success: function (json) {
            layer.close(index);
            var data = json.content;
            if (data === "not found") {
                layer.alert("没有读取到身份证信息,请手动录入!", {
                    offset: ['300px', '300px']
                });
                return;
            }
            $("#userId").val(data.idNum);
            flushData();
        },
        error: function () {
            layer.alert("身份证读取失败,请手动录入!", {
                offset: ['300px', '300px']
            });
            layer.close(index);
        }
    });
    var index = layer.load();
    $.ajax({
        type: "GET",
        async: true,
        url: "http://127.0.0.1:9111/IDCARD",
        data: {},
        dataType: "jsonp",
        jsonp: "callback",
        jsonpCallback: "jsonpCallback",
        success: function (json) {
            layer.close(index);
            var data = json.content;
            if (data === "not found") {
                layer.alert("没有读取到身份证信息,请手动录入!", {
                    offset: ['300px', '300px']
                });
                return;
            }
            $("#userId").val(data.idNum);
            flushData();
        },
        error: function () {
            layer.alert("身份证读取失败,请手动录入!", {
                offset: ['300px', '300px']
            });
            layer.close(index);
        }
    });
}
// 打印过磅单
function printBill() {
    if (!recordData) {
        layer.alert("没有获取到业务数据,不支持打印!");
        return;
    }
    if (!recordData) {
        layer.alert("没有获取到业务数据,不支持打印!");
        return;
    }
    if(InoutProgress.CARD_BACK != recordData.progress){
        layer.alert("当前数据不完整,不支持打印!");
        return;
    }
    if (InoutProgress.CARD_BACK != recordData.progress) {
        layer.alert("当前数据不完整,不支持打印!");
        return;
    }
    //从后台获取模版并打印
    var index = layer.load();
    $.ajax({
        type : "POST",
        url : "../../basic/inout-report/inout-bill-weight",
        dataType : "json",
        contentType : "application/json;charset=UTF-8",
        data : JSON.stringify(recordData),
        success : function(result) {
            if (result.code != "0000") {
                layer.msg(result.msg);
            } else {
                layer.msg("开始渲染打印单……");
                printWeight(result.data);
            }
            layer.close(index);
        },
        error : function() {
            layer.close(index);
            layer.msg("获取打印模版失败,请联系管理员查看原因!!");
        }
    });
    //从后台获取模版并打印
    var index = layer.load();
    $.ajax({
        type: "POST",
        url: "../../basic/inout-report/inout-bill-weight",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify(recordData),
        success: function (result) {
            if (result.code != "0000") {
                layer.msg(result.msg);
            } else {
                layer.msg("开始渲染打印单……");
                printWeight(result.data);
            }
            layer.close(index);
        },
        error: function () {
            layer.close(index);
            layer.msg("获取打印模版失败,请联系管理员查看原因!!");
        }
    });
}
// 打印抽样单
function showCheck() {
    if (null == recordData) {
        layer.alert("没有获取到业务数据,无法查看!");
    }
    if (null == recordData) {
        layer.alert("没有获取到业务数据,无法查看!");
    }
}
// 表单清空
function resetForm() {
    $("#form-data")[0].reset();
    $("#form-basic")[0].reset();
    $("#form-data")[0].reset();
    $("#form-basic")[0].reset();
    form.render();
    form.render();
    recordData = null;
    recordData = null;
}
// 更新数据信息
function flushData() {
    var index = layer.load();
    var plateNum = $("#plateNum").val();
    var userId2 = $("#userId").val();
    var intelCard = $("#intelCard").val();
    var param = {
        type : type,
        progress : progress,
        userId: userId2,
        intelCard: intelCard,
        plateNum : plateNum
    };
    var index = layer.load();
    var plateNum = $("#plateNum").val();
    var userId2 = $("#userId").val();
    var intelCard = $("#intelCard").val();
    var param = {
        type: type,
        progress: progress,
        userId: userId2,
        intelCard: intelCard,
        plateNum: plateNum
    };
    $.ajax({
        type : "POST",
        url : "../../basic/inout/inout-query-back",
        dataType : "json",
        contentType : "application/json;charset=UTF-8",
        data : JSON.stringify(param),
        success : function(result) {
            if (result.code != "0000") {
                layer.alert(result.msg);
            } else {
                recordData = result.data;
                // 返回的数据进行赋值
                form.val("form-data", recordData);
                form.val("form-basic", recordData);
                form.render();
            }
            layer.close(index);
        },
        error : function() {
            layer.close(index);
            layer.alert("查询失败,请重新尝试!!");
        }
    });
    $.ajax({
        type: "POST",
        url: "../../basic/inout/inout-query-back",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify(param),
        success: function (result) {
            if (result.code != "0000") {
                layer.alert(result.msg);
            } else {
                recordData = result.data;
                // 返回的数据进行赋值
                form.val("form-data", recordData);
                form.val("form-basic", recordData);
                form.render();
            }
            layer.close(index);
        },
        error: function () {
            layer.close(index);
            layer.alert("查询失败,请重新尝试!!");
        }
    });
}
// 当前完成
function submit(data) {
    if (!recordData) {
        layer.alert("没有数据可以提交!!!");
        return;
    }
    // 提交数据比较特殊,不用考虑基本信息提交
    var index = layer.load();
    var data = form.val("form-data");
    Object.assign(recordData, data);
    if (!recordData) {
        layer.alert("没有数据可以提交!!!");
        return;
    }
    // 提交数据比较特殊,不用考虑基本信息提交
    var index = layer.load();
    var data = form.val("form-data");
    Object.assign(recordData, data);
    $.ajax({
        type : "POST",
        url : "../../basic/inout/inout-back-submit",
        dataType : "json",
        contentType : "application/json;charset=UTF-8",
        data : JSON.stringify(recordData),
        success : function(result) {
            if (result.code != "0000") {
                layer.msg(result.msg);
            } else {
                layer.alert("卡片回收成功!");
                // 重置页面
                resetForm();
            }
            layer.close(index);
        },
        error : function() {
            layer.close(index);
            layer.msg("卡片回收失败,请重新尝试!!");
        }
    });
    $.ajax({
        type: "POST",
        url: "../../basic/inout/submit-card-back",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify(recordData),
        success: function (result) {
            if (result.code != "0000") {
                layer.msg(result.msg);
            } else {
                layer.alert("卡片回收成功!");
                // 重置页面
                resetForm();
            }
            layer.close(index);
        },
        error: function () {
            layer.close(index);
            layer.msg("卡片回收失败,请重新尝试!!");
        }
    });
}
igds-web/src/main/resources/static/admin/inout/out-register.js
@@ -29,7 +29,7 @@
                        shadeClose: true,
                        shade: 0.3,
                        closeBtn: 2,
                        offset: ['50px','50px'],
                        offset: ['50px', '50px'],
                        area: ['1000px', '640px'],
                        content: '../../basic/inout/inout-progress?type=' + type + "&t=" + Math.random()
                    });
@@ -165,32 +165,45 @@
    var index = layer.load();
    $.ajax({
        type: "POST",
        url: "../../inout/api/flush-lpr",
        url: "../../inout/api/get-plateNum",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: param,
        success: function (result) {
            if (result.code != "0000") {
                layer.alert(result.msg, {
                    offset: ['300px', '300px']
                });
                alertError(result.msg);
            } else {
                if (result.data.errorMsg) {
                    layer.alert(result.data.errorMsg, {
                        offset: ['300px', '300px']
                    });
                } else {
                    $("#plateNum").val(result.data.plateNum);
                }
                $("#plateNum").val(result.data.plateNum);
                $("#plateNum2").val(result.data.plateNum);
            }
            layer.close(index);
        },
        error: function () {
            layer.close(index);
            layer.alert("车牌识别失败!", {
                offset: ['300px', '300px']
            });
            alertError("车牌识别失败!");
        }
        // success: function (result) {
        //     if (result.code != "0000") {
        //         layer.alert(result.msg, {
        //             offset: ['300px', '300px']
        //         });
        //     } else {
        //         if (result.data.errorMsg) {
        //             layer.alert(result.data.errorMsg, {
        //                 offset: ['300px', '300px']
        //             });
        //         } else {
        //             $("#plateNum").val(result.data.plateNum);
        //         }
        //     }
        //     layer.close(index);
        // },
        // error: function () {
        //     layer.close(index);
        //     layer.alert("车牌识别失败!", {
        //         offset: ['300px', '300px']
        //     });
        // }
    });
}
@@ -299,7 +312,7 @@
    $.ajax({
        type: "POST",
        url: "../../basic/inout/inout-next-step",
        url: "../../basic/inout/submit-register",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify(data),
igds-web/src/main/resources/templates/admin/inout/out-register.html
@@ -1,337 +1,349 @@
<!DOCTYPE html>
<html lang="zh-cn" xmlns:th=http://www.thymeleaf.org>
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="viewport"
          content="width=device-width, initial-scale=1, maximum-scale=1">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="renderer" content="webkit">
    <title>出入库管理-出库登记</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="viewport"
          content="width=device-width, initial-scale=1, maximum-scale=1">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="renderer" content="webkit">
    <title>出入库管理-出库登记</title>
    <link rel="stylesheet" type="text/css"
          th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
    <link rel="stylesheet" type="text/css"
          th:href="@{../../static/admin/inout/style.css}">
    <link rel="stylesheet" type="text/css"
          th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
    <link rel="stylesheet" type="text/css"
          th:href="@{../../static/admin/inout/style.css}">
    <style>
        .display-none {
            display: none;
        }
    <style>
        .display-none {
            display: none;
        }
        .kccz-r-con2 {
            /* height: 230px; */
            padding-right: 120px;
            position: relative;
            margin-top: 10px;
        }
        .kccz-r-con2 {
            /* height: 230px; */
            padding-right: 120px;
            position: relative;
            margin-top: 10px;
        }
        .kccz-r-vedio {
            width: 100%;
            height: 280px;
            /*     background: #dee6ec; */
            background: #000;
            color: #FFF;
            text-align: center;
        }
        .kccz-r-vedio {
            width: 100%;
            height: 280px;
            /*     background: #dee6ec; */
            background: #000;
            color: #FFF;
            text-align: center;
        }
        .kccz-r-btnbox {
            width: 100px;
            position: absolute;
            right: 0px;
            top: 0px;
            z-index: 99;
        }
        .kccz-r-btnbox {
            width: 100px;
            position: absolute;
            right: 0px;
            top: 0px;
            z-index: 99;
        }
        .layui-form-label {
            font-weight: bold;
        }
        .layui-form-label {
            font-weight: bold;
        }
        .ckdj-radiobox .layui-form-item {
            margin-bottom: 0px;
            margin-top: 10px;
        }
        .ckdj-radiobox .layui-form-item {
            margin-bottom: 0px;
            margin-top: 10px;
        }
        .rk-step-wrap {
            padding: 0px;
            border-bottom: 0px;
            text-align: center;
        }
        .rk-step-wrap {
            padding: 0px;
            border-bottom: 0px;
            text-align: center;
        }
        .qyzj-btnbox .rkbk-quick {
            margin-top: 15px !important;
        }
        .color-red {
            color: red !important;
        }
        .layui-form-item .layui-input-inline {
            width: unset;
        }
        .rkbk-search-input{
            background: #FFF !important;
        }
        .rkbk-search-input.bg-date {
            background: #FFF !important;
        }
    </style>
        .qyzj-btnbox .rkbk-quick {
            margin-top: 15px !important;
        }
        .color-red {
            color: red !important;
        }
        .layui-form-item .layui-input-inline {
            width: unset;
        }
        .rkbk-search-input {
            background: #FFF !important;
        }
        .rkbk-search-input.bg-date {
            background: #FFF !important;
        }
    </style>
</head>
<body>
<div class="l-container layui-clear">
    <div class="rk-main">
    <div class="rk-main">
        <div class="qyzj-btnbox layui-clear">
            <!-- 操作菜单-->
            <div class="rkbk-quick fl">
                <button class="rkbk-quick-btn layui-btn btn-red"
                        onclick="resetForm()">
                    <i><img th:src="@{../../static/images/icon-clear.png}"/></i> 清空数据
                </button>
                <button class="rkbk-quick-btn layui-btn btn-green"
                        onclick="submit()">
                    <i><img th:src="@{../../static/images/icon-ok.png}"/></i> 完成登记
                </button>
                <button class="rkbk-quick-btn layui-btn btn-violet"
                        onclick="resetPlateNum()">
                    <i><img th:src="@{../../static/images/icon-che.png}"/></i>重置车牌识别
                </button>
            </div>
        <div class="qyzj-btnbox layui-clear">
            <!-- 操作菜单-->
            <div class="rkbk-quick fl">
                <button class="rkbk-quick-btn layui-btn btn-red"
                        onclick="resetForm()">
                    <i><img th:src="@{../../static/images/icon-clear.png}"/></i> 清空数据
                </button>
                <button class="rkbk-quick-btn layui-btn btn-green"
                        onclick="submit()">
                    <i><img th:src="@{../../static/images/icon-ok.png}"/></i> 完成登记
                </button>
                <button class="rkbk-quick-btn layui-btn btn-violet"
                        onclick="resetPlateNum()">
                    <i><img th:src="@{../../static/images/icon-che.png}"/></i>重置车牌识别
                </button>
            </div>
            <!--流程引导-->
            <div class="rk-step-wrap fr">
                <ul class="rk-step">
                    <li id="progress-register" class="active rk-step-first">
            <!--流程引导-->
            <div class="rk-step-wrap fr">
                <ul class="rk-step">
                    <li id="progress-register" class="active rk-step-first">
                        <span class="rk-step-span">
                            <img th:src="@{../../static/images/icon-dengji.png}"/>
                        </span>
                        <p>出库登记</p>
                    </li>
                    <li id="progress-emptyWeight">
                        <p>出库登记</p>
                    </li>
                    <li id="progress-emptyWeight">
                        <span class="rk-step-span">
                            <img th:src="@{../../static/images/icon-chengzhong.png}"/>
                        </span>
                        <p>空车称重</p>
                    </li>
                    <li id="progress-hand">
                        <p>空车称重</p>
                    </li>
                    <li id="progress-hand">
                        <span class="rk-step-span">
                            <img th:src="@{../../static/images/icon-xiehuo.png}"/>
                        </span>
                        <p>出库值仓</p>
                    </li>
                    <li id="progress-fullWeight">
                        <p>出库值仓</p>
                    </li>
                    <li id="progress-fullWeight">
                        <span class="rk-step-span">
                            <img th:src="@{../../static/images/icon-chengzhong.png}"/>
                        </span>
                        <p>满车称重</p>
                    </li>
                    <li id="progress-cardBack">
                        <p>满车称重</p>
                    </li>
                    <li id="progress-cardBack">
                        <span class="rk-step-span">
                            <img th:src="@{../../static/images/icon-banli.png}"/>
                        </span>
                        <p>离库确认</p>
                    </li>
                </ul>
            </div>
            <!--流程引导结束-->
        </div>
                        <p>离库确认</p>
                    </li>
                </ul>
            </div>
            <!--流程引导结束-->
        </div>
        <form class="layui-form" action="" id="form-data"
              lay-filter="form-data">
        <form class="layui-form" action="" id="form-data"
              lay-filter="form-data">
            <div class="rkbk-con">
            <div class="rkbk-con">
                <div class="radius-6 rkbk-left-wrap fl">
                    <div class="rkbk-left">
                        <div class="rkbk-tit">
                            <i></i>
                            <h3>承运人信息</h3>
                        </div>
                        <div class="rkbk-left-form">
                <div class="radius-6 rkbk-left-wrap fl">
                    <div class="rkbk-left">
                        <div class="rkbk-tit">
                            <i></i>
                            <h3>承运人信息</h3>
                        </div>
                        <div class="rkbk-left-form">
                            <div class="rkbk-form-box1">
                            <div class="rkbk-form-box1">
                                <div class="layui-form-item display-none">
                                    <label class="layui-form-label">隐藏字段-类型</label>
                                        <input type="text" name="type" th:value="${type}" >
                                </div>
                                <div class="layui-form-item display-none">
                                    <label class="layui-form-label">隐藏字段-类型</label>
                                    <input type="text" name="type" th:value="${type}">
                                </div>
                                <div class="rkbk-form-left">
                                    <div class="layui-form-item">
                                        <label class="layui-form-label color-red">姓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;名:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userName" id="userName" required
                                                   lay-verify="required" placeholder="必填信息" autocomplete="off"
                                                   class="layui-input rkbk-search-input">
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label color-red">身份证号:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userId" id="userId" required
                                                   lay-verify="required" placeholder="必填信息" autocomplete="off"
                                                   class="layui-input rkbk-search-input">
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">联系方式:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userContact" id="userContact"
                                                   placeholder="请输入" autocomplete="off"
                                                   class="layui-input rkbk-search-input">
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">出生日期:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userBirthday" id="userBirthday"
                                                   placeholder="yyyy-MM-dd" autocomplete="off"
                                                   class="layui-input rkbk-search-input bg-date">
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">性&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;别:</label>
                                        <div class="layui-input-block rkbk-selBox">
                                            <input type="radio" name="userSex" id="userSex" value="男"
                                                   title="男" checked> <input type="radio"
                                                                             name="userSex" value="女" title="女">
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">民&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;族:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userNation" id="userNation"
                                                   required lay-verify="required" placeholder="请输入"
                                                   autocomplete="off" class="layui-input rkbk-search-input">
                                        </div>
                                    </div>
                                </div>
                                <!--rk-form-left end-->
                                <div class="rkbk-form-left">
                                    <div class="layui-form-item">
                                        <label class="layui-form-label color-red">姓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;名:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userName" id="userName" required
                                                   lay-verify="required" placeholder="必填信息" autocomplete="off"
                                                   class="layui-input rkbk-search-input">
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label color-red">身份证号:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userId" id="userId" required
                                                   lay-verify="required" placeholder="必填信息" autocomplete="off"
                                                   class="layui-input rkbk-search-input">
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">联系方式:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userContact" id="userContact"
                                                   placeholder="请输入" autocomplete="off"
                                                   class="layui-input rkbk-search-input">
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">出生日期:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userBirthday" id="userBirthday"
                                                   placeholder="yyyy-MM-dd" autocomplete="off"
                                                   class="layui-input rkbk-search-input bg-date">
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">性&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;别:</label>
                                        <div class="layui-input-block rkbk-selBox">
                                            <input type="radio" name="userSex" id="userSex" value="男"
                                                   title="男" checked> <input type="radio"
                                                                             name="userSex" value="女" title="女">
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">民&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;族:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userNation" id="userNation"
                                                   required lay-verify="required" placeholder="请输入"
                                                   autocomplete="off" class="layui-input rkbk-search-input">
                                        </div>
                                    </div>
                                </div>
                                <!--rk-form-left end-->
                                <div class="rkbk-photo">
                                    <a href="#"><img id="id_img_pers"
                                                     th:src="@{../../static/images/rkbk-photo_03.png}"/></a>
                                </div>
                                <div class="rkbk-photo">
                                    <a href="#"><img id="id_img_pers"
                                                     th:src="@{../../static/images/rkbk-photo_03.png}"/></a>
                                </div>
                            </div>
                            <!--rkbk-form-box1 end-->
                            </div>
                            <!--rkbk-form-box1 end-->
                            <div class="rkbk-form-box2" style="padding-top: 20px;">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;址:</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="userAddress" id="userAddress"
                                               placeholder="请输入" autocomplete="off"
                                               class="layui-input rkbk-search-input">
                                    </div>
                                </div>
                            </div>
                            <!--rkbk-form-box2 end-->
                            <div class="rkbk-form-box2" style="padding-top: 20px;">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;址:</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="userAddress" id="userAddress"
                                               placeholder="请输入" autocomplete="off"
                                               class="layui-input rkbk-search-input">
                                    </div>
                                </div>
                            </div>
                            <!--rkbk-form-box2 end-->
                            <div class="rkbk-quick layui-text-center">
                                <button id="button_readID" type="button"
                                        onclick="flushIdCard()"
                                        class="rkbk-quick-btn layui-btn btn-blue">读取身份证
                                </button>
                            </div>
                            <div class="rkbk-quick layui-text-center">
                                <button id="button_readID" type="button"
                                        onclick="flushIdCard()"
                                        class="rkbk-quick-btn layui-btn btn-blue">读取身份证
                                </button>
                            </div>
                        </div>
                    </div>
                        </div>
                    </div>
                </div>
                <!--rkbk-left end-->
                </div>
                <!--rkbk-left end-->
                <div class="radius-6 rkbk-right-wrap fr" style="height: 512px;">
                    <div class="rkbk-left">
                        <div class="rkbk-tit">
                            <i></i>
                            <h3>运输信息</h3>
                        </div>
                <div class="radius-6 rkbk-right-wrap fr" style="height: 512px;">
                    <div class="rkbk-left">
                        <div class="rkbk-tit">
                            <i></i>
                            <h3>运输信息</h3>
                        </div>
                        <div class="rkbk-left-form rkbk-right-form">
                            <div class="layui-form-item">
                                <input type="button" value="读卡" class="rkbk-r-btn fr layui-btn" onclick="flushICCard()"/>
                                <label class="layui-form-label color-red">智慧卡号:</label>
                                <div class="layui-input-block">
                                    <input type="text" name="intelCard" id="intelCard" required
                                           lay-verify="required" placeholder="先放卡,然后点击读卡"
                                           autocomplete="off" class="layui-input rkbk-search-input">
                                </div>
                            </div>
                        <div class="rkbk-left-form rkbk-right-form">
                            <div class="layui-form-item">
                                <input type="button" value="读卡" class="rkbk-r-btn fr layui-btn"
                                       onclick="flushICCard()"/>
                                <label class="layui-form-label color-red">智慧卡号:</label>
                                <div class="layui-input-block">
                                    <input type="text" name="intelCard" id="intelCard" required
                                           lay-verify="required" placeholder="先放卡,然后点击读卡"
                                           autocomplete="off" class="layui-input rkbk-search-input">
                                </div>
                            </div>
                            <div class="layui-form-item">
                                <input type="button" value="读车牌"
                                       class="rkbk-r-btn fr layui-btn layui-btn-normal"
                                       onclick="flushPlateNum()"/>
                                <label class="layui-form-label color-red">运输车牌:</label>
                                <div class="layui-input-block">
                                    <input type="text" name="plateNum" id="plateNum" required  placeholder="无车牌车辆,填写 无车牌"
                                           lay-verify="required" autocomplete="off"
                                           class="layui-input rkbk-search-input">
                                </div>
                            </div>
                            <div class="layui-form-item">
                                <input type="button" value="读车牌"
                                       class="rkbk-r-btn fr layui-btn layui-btn-normal"
                                       onclick="flushPlateNum()"/>
                                <label class="layui-form-label color-red">运输车牌:</label>
                                <div class="layui-input-block">
                                    <input type="text" name="plateNum" id="plateNum" required placeholder="无车牌车辆,填写 无车牌"
                                           lay-verify="required" autocomplete="off"
                                           class="layui-input rkbk-search-input">
                                </div>
                            </div>
                            <div class="layui-form-item">
                                <div class="layui-inline">
                                    <label class="layui-form-label">运输方式:</label>
                                    <div class="layui-input-inline">
                                        <input type="radio" name="transType" value="1" title="汽车" checked>
                                        <input type="radio" name="transType" value="2" title="火车">
                                        <input type="radio" name="transType" value="3" title="轮船">
                                        <input type="radio" name="transType" value="9" title="其他">
                                    </div>
                                </div>
                            </div>
                        </div>
                            <div class="layui-form-item">
                                <div class="layui-inline">
                                    <label class="layui-form-label">运输方式:</label>
                                    <div class="layui-input-inline">
                                        <input type="radio" name="transType" value="1" title="汽车" checked>
                                        <input type="radio" name="transType" value="2" title="火车">
                                        <input type="radio" name="transType" value="3" title="轮船">
                                        <input type="radio" name="transType" value="9" title="其他">
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
                    </div>
                    <!-- 视频 -->
                    <div class="rkbk-left">
                        <div class="rkbk-tit">
                            <i></i>
                            <h3>登记视频</h3>
                        </div>
                        <div class="kccz-r-con2">
                            <div class="kccz-r-vedio" id="kccz-r-video1">
                            </div>
                            <div class="kccz-r-btnbox">
                                <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active">
                                    <span class="kccz-r-pz"></span>
                                    <p>车牌识别</p>
                                </a>
                                <a href="javascript:;" class="kccz-r-btn mt-10">
                                    <span id="pz-img" class="kccz-r-img"></span>
                                    <p id="pz-text">自动抓拍</p>
                                </a>
                            </div>
                        </div>
                    </div>
                </div>
                <!--rkbk-right end-->
            </div>
            <!--rkbk-con end-->
        </form>
    </div>
    <!--rk-main end-->
                    <!-- 视频 -->
                    <div class="rkbk-left">
                        <div class="rkbk-tit">
                            <i></i>
                            <h3>登记视频</h3>
                        </div>
                        <div class="kccz-r-con2">
                            <div class="kccz-r-vedio" id="kccz-r-video1"></div>
                            <div class="kccz-r-btnbox">
                                <div class="kccz-r-div">
                                    <span id="plateNum2">未识别</span>
                                    <p>车牌识别</p>
                                </div>
                                <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active mt-10">
                                    <span id="pz-img" class="kccz-r-pz"></span>
                                    <p id="pz-text">自动抓拍</p>
                                </a>
                                <!--                                <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active">-->
                                <!--                                    <span class="kccz-r-pz"></span>-->
                                <!--                                    <span id="plateNum2">未识别</span>-->
                                <!--                                    <p>车牌识别</p>-->
                                <!--                                </a>-->
                                <!--                                <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active mt-10">-->
                                <!--                                    <span id="pz-img" class="kccz-r-img"></span>-->
                                <!--                                    <p id="pz-text">自动抓拍</p>-->
                                <!--                                </a>-->
                            </div>
                        </div>
                    </div>
                </div>
                <!--rkbk-right end-->
            </div>
            <!--rkbk-con end-->
        </form>
    </div>
    <!--rk-main end-->
</div>
<!--l-container end-->
<script th:inline="javascript">
    //流程环节
    var inoutProgress = [[${inoutProgress}]];
    //当前节点
    var progress = [[${progress}]];
    //业务步骤
    var bizType = [[${bizType}]];
    var deptId = [[${deptId}]];
    //出入库类型
    var type = [[${type}]];
    var userId = [[${loginUser.username}]];
    var companyId = [[${loginUser.companyId}]];
    //车牌识别
    var lprDto = [[${lprDto}]];
    var ship = null; //是否船运页面标识
    //流程环节
    var inoutProgress = [[${inoutProgress}]];
    //当前节点
    var progress = [[${progress}]];
    //业务步骤
    var bizType = [[${bizType}]];
    var deptId = [[${deptId}]];
    //出入库类型
    var type = [[${type}]];
    var userId = [[${loginUser.username}]];
    var companyId = [[${loginUser.companyId}]];
    //车牌识别
    var lprDto = [[${lprDto}]];
    var ship = null; //是否船运页面标识
</script>
<script th:src="@{../../static/plugins/layui/layui.js}"></script>
@@ -343,33 +355,33 @@
<!-- 弹出框的信息 -->
<div class="layui-tab-content" id="dialog-from-notify" style="display: none;">
    <table class="layui-table">
        <colgroup>
            <col width="100">
        </colgroup>
        <tbody>
        <tr>
            <td>返回信息</td>
            <td id="resultMsg" style="color: red;font-weight: bold;"></td>
        </tr>
        <tr>
            <td>承运人</td>
            <td id="resultUserName" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>车牌号</td>
            <td id="resultPlateNum" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>下一步</td>
            <td id="resultType" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>智慧卡号</td>
            <td id="resultIntelCard" style="font-weight: bold;"></td>
        </tr>
        </tbody>
    </table>
    <table class="layui-table">
        <colgroup>
            <col width="100">
        </colgroup>
        <tbody>
        <tr>
            <td>返回信息</td>
            <td id="resultMsg" style="color: red;font-weight: bold;"></td>
        </tr>
        <tr>
            <td>承运人</td>
            <td id="resultUserName" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>车牌号</td>
            <td id="resultPlateNum" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>下一步</td>
            <td id="resultType" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>智慧卡号</td>
            <td id="resultIntelCard" style="font-weight: bold;"></td>
        </tr>
        </tbody>
    </table>
</div>
</body>
igds-web/src/main/resources/templates/test/qualityReport01.html
@@ -36,7 +36,7 @@
    </style>
</head>
<body><h1 class='tit'>质检报告(foodVariety)</h1>
<div class='div-tit'>单号:serId</div>
<div class='div-tit'>编码:serId</div>
<table cellspacing='0' cellpadding='0'>
    <tr>
        <td colspan='2' rowspan="5" `width`="15%">样品信息</td>