YYC
2023-07-05 7fff423ea251afed364dc523fb5be4d0b23f39b1
出库登记
已修改8个文件
113 ■■■■ 文件已修改
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java 1 ●●●● 补丁 | 查看 | 原始文档 | 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 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/static/admin/inout/out-register.js 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/templates/admin/inout/out-register.html 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/templates/test/qualityReport01.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -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
@@ -359,3 +359,38 @@
        }
    });
}
/**
 * 弹出提醒框
 * @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
@@ -205,7 +205,7 @@
    $.ajax({
        type : "POST",
        url : "../../basic/inout/inout-back-submit",
        url: "../../basic/inout/submit-card-back",
        dataType : "json",
        contentType : "application/json;charset=UTF-8",
        data : JSON.stringify(recordData),
igds-web/src/main/resources/static/admin/inout/out-register.js
@@ -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']
                });
            } else {
                if (result.data.errorMsg) {
                    layer.alert(result.data.errorMsg, {
                        offset: ['300px', '300px']
                    });
                alertError(result.msg);
                } else {
                    $("#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
@@ -60,15 +60,19 @@
        .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;
        }
@@ -248,7 +252,8 @@
                        <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()"/>
                                <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
@@ -291,18 +296,25 @@
                            <h3>登记视频</h3>
                        </div>
                        <div class="kccz-r-con2">
                            <div class="kccz-r-vedio" id="kccz-r-video1">
                            </div>
                            <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>
                                <div class="kccz-r-div">
                                    <span id="plateNum2">未识别</span>
                                    <p>车牌识别</p>
                                </a>
                                <a href="javascript:;" class="kccz-r-btn mt-10">
                                    <span id="pz-img" class="kccz-r-img"></span>
                                </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>
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>