~admin/igds-v4.git

Merge remote-tracking branch 'origin/master'

vince

2023-07-07 dbbd8b7066092b3ce4eab44fa0e2b746dad16a95

Merge remote-tracking branch 'origin/master'

已修改17个文件

已添加1个文件

	igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| 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	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-web/src/main/resources/static/admin/inout/out-handle.js	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-web/src/main/resources/static/admin/inout/out-register.js	57 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-web/src/main/resources/static/admin/inout/out-weight.js	387 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-web/src/main/resources/static/admin/inout/weight.js	153 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-web/src/main/resources/templates/admin/inout/in-register.html	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-web/src/main/resources/templates/admin/inout/out-card-back.html	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-web/src/main/resources/templates/admin/inout/out-handle.html	307 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-web/src/main/resources/templates/admin/inout/out-register.html	39 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-web/src/main/resources/templates/admin/inout/out-weight.html	292 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-web/src/main/resources/templates/test/print-out.html	98 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-web/src/main/resources/templates/test/qualityReport01.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java

@@ -14,7 +14,7 @@
    /**
     * é»è®¤åºåºè¿ç£å
     */
    public static String OUT_WEIGHT_DEFAULT = "<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type'content='text/html;charset=UTF-8'><title>åºåºç§°éå</title><style>body{text-align:center;padding:10px}.tit{margin:10px;font-size:24px;font-family:'å®ä½';padding-top:15px}.div-tit{padding-top:10px}.sp1{width:33%;float:left;padding-bottom:10px}.sp2{width:25%;float:left;text-align:center}table{width:100%;border-right:1px solid;border-bottom:1px solid;font-size:14px}table td{border-left:1px solid;border-top:1px solid;height:38px}</style></head><body><h1 class='tit'>billTitle</h1><div class='div-tit'><span class='sp1'>ç»è®°æ¶é´ï¼registerTime</span><span class='sp1'>å®ææ¶é´ï¼completeTime</span><span class='sp1'>åºåºåå·ï¼serId</span></div><table cellspacing='0'cellpadding='0'><tr><td width='12.5%'>åè´§åä½</td><td colspan='3'width='37.5%'>deptName</td><td width='12.5%'>æ¶è´§åä½</td><td colspan='3'width='37.5%'>customerName</td></tr><tr><td width='12.5%'>æ¿è¿äºº</td><td width='12.5%'>driverName</td><td width='12.5%'>ç²®é£åç§</td><td width='12.5%'>foodVariety</td><td width='12.5%'>åºåºä»åº</td><td width='12.5%'>depotName</td><td width='12.5%'>ç²®é£äº§å°</td><td width='12.5%'>foodLocation</td></tr><tr><td>æ¿è¿è½¦ç</td><td>plateNum</td><td>æ¯é(KG)</td><td>fullWeight</td><td>ç®é(KG)</td><td>emptyWeight</td><td>åé(KG)</td><td>netWeight</td></tr><tr><td>å¤æ³¨</td><td colspan='3'>remark</td><td>æ°´åå¢é(KG)</td><td>deWet</td><td>ç»ç®éé(KG)</td><td>settleWeight</td></tr></table><div class='div-tit'><span class='sp2'>å¸ç£åï¼</span><span class='sp2'>çç£åï¼</span><span class='sp2'>ä¿ç®¡åï¼handleUser</span><span class='sp2'>æ¿è¿äººï¼</span></div></body></html>";
    public static String OUT_WEIGHT_DEFAULT = "<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type' content='text/html;charset=UTF-8'><title>åºåºç§°éå</title><style>body {text-align: center;padding: 10px}  .tit {margin: 10px;font-size: 24px;font-family: 'å®ä½';padding-top: 15px}  .div-tit {padding-top: 10px}  .sp1 {width: 50%;float: left;padding-bottom: 10px}  .sp2 {width: 25%;float: left;text-align: center}  table {width: 100%;border-right: 1px solid;border-bottom: 1px solid;font-size: 14px}  table td {border-left: 1px solid;border-top: 1px solid;height: 38px}</style></head><body><h1 class='tit'>billTitle</h1><div class='div-tit'><span class='sp1'>ç»è®°æ¶é´ï¼registerTime</span><span class='sp1'>åºåºåå·ï¼serId</span></div><table cellspacing='0' cellpadding='0'><tr><td width='12.5%'>åè´§åä½</td><td colspan='3' width='37.5%'>deptName</td><td width='12.5%'>æ¶è´§åä½</td><td colspan='3' width='37.5%'>customerName</td></tr><tr><td width='12.5%'>æ¿è¿äºº</td><td width='12.5%'>driverName</td><td width='12.5%'>ç²®é£åç§</td><td width='12.5%'>foodVariety</td><td width='12.5%'>åºåºä»åº</td><td width='12.5%'>depotName</td><td width='12.5%'>ç²®é£äº§å°</td><td width='12.5%'>foodLocation</td></tr><tr><td>æ¿è¿è½¦ç</td><td>plateNum</td><td>æ¯é(KG)</td><td>fullWeight</td><td>ç®é(KG)</td><td>emptyWeight</td><td>åé(KG)</td><td>netWeight</td></tr><tr><td>å¶ä»æ£é(KG)</td><td>deOther</td><td>å¼ä»æ£é(KG)</td><td>deHandle</td><td>ç»ç®éé(KG)</td><td>settleWeight</td><td colspan=\"2\"></td></tr><tr><td>å¤æ³¨</td><td colspan='7'>remark</td></tr></table><div class='div-tit'><span class='sp2'>å¸ç£åï¼</span><span class='sp2'>çç£åï¼</span><span class='sp2'>ä¿ç®¡åï¼handleUser</span><span class='sp2'>æ¿è¿äººï¼driverName</span></div><br></body><div style=\"padding-top: 10px\"><span></span></div><div style=\"text-align: left;font-size: 12px\"><span>æ³¨ï¼</span></div><div style=\"text-align: left;font-size: 12px\"><span>1.åé=æ¯é-ç®éï¼</span></div><div style=\"text-align: left;font-size: 12px\"><span>2.åºåºéé=åé-æ»æ£éï¼ç»ç®éé=åé-æ»æ£éï¼</span></div><div style=\"text-align: left;font-size: 12px\"><span>3.ç½èï¼åæ ¹ï¼ï¼çº¢èï¼è®°è´¦ï¼ï¼é»èï¼å®¢æ·ä¿çï¼</span></div></html>";
    /**
     * é»è®¤éªæ£å
     */

 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/manager/InoutReportManager.java

@@ -148,7 +148,7 @@
     */
    public String outWeightBill(InoutData data) {
        // è·åè¡¨åæ°æ®
        WeightBill bill = this.createBillData(data, "åºåºç§°éå");
        WeightBill bill = this.createBillData(data, "åºåºåç å");

        //é»è®¤æ¨¡ç
        String htmlStr = InoutBill.OUT_WEIGHT_DEFAULT;
@@ -190,7 +190,7 @@
        htmlStr = htmlStr.replace("fullTime", bill.getFullTime());
        htmlStr = htmlStr.replace("emptyTime", bill.getEmptyTime());
        htmlStr = htmlStr.replace("serId", bill.getSerId());
        htmlStr = htmlStr.replace("specType", bill.getSpecType());
//        htmlStr = htmlStr.replace("specType", bill.getSpecType());

        htmlStr = htmlStr.replace("customerName", bill.getCustomerName());
        htmlStr = htmlStr.replace("deptName", bill.getUnitName());
@@ -212,13 +212,13 @@
                new DecimalFormat("0").format(bill.getNetWeight()));

        htmlStr = htmlStr.replace("remark", bill.getRemark());
        htmlStr = htmlStr.replace("deWet", bill.getDeWet() + "");
//        htmlStr = htmlStr.replace("deWet", bill.getDeWet() + "");
        htmlStr = htmlStr.replace("settleWeight",
                new DecimalFormat("0").format(bill.getSettleWeight()));

        htmlStr = htmlStr.replace("deHandle", bill.getDeHandle() + "");
        htmlStr = htmlStr.replace("handleUser", bill.getHandleUser());
        htmlStr = htmlStr.replace("deSum", bill.getDeSum() + "");

        htmlStr = htmlStr.replace("deOther", bill.getDeOther() + "");
        htmlStr = htmlStr.replace("price", bill.getPrice());
        htmlStr = htmlStr.replace("settleMoney", bill.getSettleMoney() + "");
        htmlStr = htmlStr.replace("wet", bill.getWet() + "");

 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

@@ -116,7 +116,7 @@
    var index = layer.load();
    $.ajax({
        type : "POST",
        url : "../../basic/inout-report/inout-bill-weight",
        url: "../../basic/inout/report/bill-weight",
        dataType : "json",
        contentType : "application/json;charset=UTF-8",
        data : JSON.stringify(recordData),
@@ -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-handle.js

@@ -99,11 +99,14 @@
    });

    showProgress();

    // çå¬ééåå
    $(".weight").blur(function () {
        deAutoByHandle(this.name)
    });
    //è°æ´åæ®µä¸ç¼è¾
    $("#depotId").attr("disabled",true);
    $("#foodVariety").attr("disabled",true);
    $("#foodLevel").attr("disabled",true);
    // $("#foodLevel").attr("disabled", true);
});


@@ -191,6 +194,13 @@
    });
}

function flushPage() {
    layer.confirm('ç¡®å®è¦å·æ°é¡µé¢åï¼', {icon: 3, title: 'æç¤º'}, function (index) {
        resetForm();
        layer.close(index);
    });
}

// è¡¨åæ¸ç©º
function resetForm() {
    $("#form-data")[0].reset();
@@ -200,6 +210,7 @@
    $('#kccz-r-img3').removeAttr('src');
    form.render();
    recordData = null;
    $("#text-param").val(null);
}

// æ´æ°æ°æ®ä¿¡æ¯
@@ -241,7 +252,7 @@

// å½åå®æ
function submit() {
    if (null == recordData) {
    if (!recordData) {
        layer.alert("æ²¡ææ°æ®å¯ä»¥æäº¤ï¼ï¼ï¼");
        return;
    }
@@ -262,7 +273,7 @@

    $.ajax({
        type: "POST",
        url: "../../basic/inout/inout-next-step",
        url: "../../basic/inout/submit-handle",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify(recordData),

 igds-web/src/main/resources/static/admin/inout/out-register.js

@@ -101,9 +101,10 @@
            layer.close(index);
            var data = json.content;
            if (data === "not found") {
                layer.alert("æ²¡æè·åå°èº«ä»½è¯ä¿¡æ¯ï¼", {
                    offset: ['300px', '300px']
                });
                // layer.alert("æ²¡æè·åå°èº«ä»½è¯ä¿¡æ¯ï¼", {
                //     offset: ['300px', '300px']
                // });
                alertError("æ²¡æè·åå°èº«ä»½è¯ä¿¡æ¯ï¼");
                return;
            }
            // ä¸´æ¶èµå¼
@@ -165,32 +166,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']
        //     });
        // }
    });
}

@@ -239,15 +253,18 @@
function submit() {
    var data = form.val("form-data");
    if (!data.userName) {
        notify("æ¿è¿äººä¿¡æ¯ä¸è½ä¸ºç©º", null);
        // notify("æ¿è¿äººä¿¡æ¯ä¸è½ä¸ºç©º", null);
        alertError("æ¿è¿äººä¿¡æ¯ä¸è½ä¸ºç©º");
        return;
    }
    if (!data.plateNum) {
        notify("è½¦çå·ä¸è½ä¸ºç©º", null);
        alertError("è½¦çå·ä¸è½ä¸ºç©º");
        // notify("è½¦çå·ä¸è½ä¸ºç©º", null);
        return;
    }
    if (!data.intelCard && !data.userId) {
        notify("æºæ§å¡å·ä¸èº«ä»½è¯å·ä¸è½åæ¶ä¸ºç©º", null);
        alertError("æºæ§å¡å·ä¸èº«ä»½è¯å·ä¸è½åæ¶ä¸ºç©º");
        // notify("æºæ§å¡å·ä¸èº«ä»½è¯å·ä¸è½åæ¶ä¸ºç©º", null);
        return;
    }

@@ -299,7 +316,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/static/admin/inout/out-weight.js

@@ -48,9 +48,8 @@

    // çå¬ééåå
    $(".weight").blur(function () {
        var name = this.name;
        // deAutoByWeight(name);
        deAutoByOut(name);
        deAutoByOut(this.name)
    });

    // åå§åWebSocket
@@ -85,42 +84,42 @@
    //ææ 
}

// æ ¹æ®å½åæä½çæé®IDæ´æ°å¶ä»æé®ç¶æ
function flushBtn(btnId) {
    if ("btn-weight" == btnId) {// ç§°éåå¯ä»¥ç¹å»å®æç§°é
        $("#btn-submit").removeClass("layui-btn-disabled");
        $("#btn-submit").attr("disabled", false);
    }

    if ("btn-submit" == btnId) {
        $("#btn-submit").addClass("layui-btn-disabled");
        $("#btn-submit").attr("disabled", true);

        if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {// åºåºï¼å¦ææ¯ç©ºè½¦ç§°éï¼å®ææ¶ç´æ¥å·æ°é¡µé¢
            resetForm();
        } else {
            // å®æç§°éåæ§å¶æé®
            $("#btn-weight").addClass("layui-btn-disabled");
            $("#btn-weight").attr("disabled", true);

            $("#btn-printBill").removeClass("layui-btn-disabled");
            $("#btn-printBill").attr("disabled", false);
            addDisabled();
        }
    }
    if ("btn-printBill" == btnId) {// æå°è¿ç£åï¼è¯´æä¸å¡å®æ
        $("#btn-weight").removeClass("layui-btn-disabled");
        $("#btn-weight").attr("disabled", false);

        $("#btn-submit").addClass("layui-btn-disabled");
        $("#btn-submit").attr("disabled", true);

        $("#btn-printBill").addClass("layui-btn-disabled");
        $("#btn-printBill").attr("disabled", true);
        delDisabled();
        resetForm();
    }
}
// // æ ¹æ®å½åæä½çæé®IDæ´æ°å¶ä»æé®ç¶æ
// function flushBtn(btnId) {
//     if ("btn-weight" == btnId) {// ç§°éåå¯ä»¥ç¹å»å®æç§°é
//         $("#btn-submit").removeClass("layui-btn-disabled");
//         $("#btn-submit").attr("disabled", false);
//     }
//
//     if ("btn-submit" == btnId) {
//         $("#btn-submit").addClass("layui-btn-disabled");
//         $("#btn-submit").attr("disabled", true);
//
//         if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {// åºåºï¼å¦ææ¯ç©ºè½¦ç§°éï¼å®ææ¶ç´æ¥å·æ°é¡µé¢
//             resetForm();
//         } else {
//             // å®æç§°éåæ§å¶æé®
//             $("#btn-weight").addClass("layui-btn-disabled");
//             $("#btn-weight").attr("disabled", true);
//
//             $("#btn-printBill").removeClass("layui-btn-disabled");
//             $("#btn-printBill").attr("disabled", false);
//             addDisabled();
//         }
//     }
//     if ("btn-printBill" == btnId) {// æå°è¿ç£åï¼è¯´æä¸å¡å®æ
//         $("#btn-weight").removeClass("layui-btn-disabled");
//         $("#btn-weight").attr("disabled", false);
//
//         $("#btn-submit").addClass("layui-btn-disabled");
//         $("#btn-submit").attr("disabled", true);
//
//         $("#btn-printBill").addClass("layui-btn-disabled");
//         $("#btn-printBill").attr("disabled", true);
//         delDisabled();
//         resetForm();
//     }
// }

//æ§å¶æµç¨ç¯èæ¾ç¤º
function showProgress() {
@@ -195,17 +194,19 @@
    form.render();

    // ç¹å»ç§°éæ¶åèªå¨æææ°æ®
    layer.msg("ç³»ç»èªå¨ææä¿çè®°å½â¦â¦");
    // layer.msg("ç³»ç»èªå¨ææä¿çè®°å½â¦â¦");
    snapData = {
        companyId: companyId,
        deptId: deptId,
        progress: recordData.progress,
        bizType: bizType,
        plateNum: recordData.plateNum,

        id1: (null != snapDto1) ? snapDto1.id : null,
        id2: (null != snapDto2) ? snapDto2.id : null,
        id3: (null != snapDto3) ? snapDto3.id : null,
        id1: snapDto1.id,
        id2: snapDto2.id,
        id3: snapDto3.id,
        // id1: (null != snapDto1) ? snapDto1.id : null,
        // id2: (null != snapDto2) ? snapDto2.id : null,
        // id3: (null != snapDto3) ? snapDto3.id : null,

        sort: $("#scaleName").val(),
        weight: weightDto.weight
@@ -223,7 +224,8 @@
        success: function (result) {
            layer.close(index);
            if (result.code != "0000") {
                layer.alert(result.msg);
                alertError(result.msg);
                // layer.alert(result.msg);
            } else {
                snapData = result.data;
            }
@@ -240,8 +242,9 @@
    }

    // å·æ°ç¶æ
    flushBtn("btn-weight");
    // flushBtn("btn-weight");
}

//æ°çè¯»å¡æ¹å¼
function flushICCard() {
    if(cardDto && cardDto.protocol != "TCP_DEFAULT"){
@@ -261,7 +264,7 @@
    var index = layer.load();
    $.ajax({
        type: "POST",
        url: "../../inout/api/ic-card-num",
        url: "../../inout/api/get-icCard",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: param,
@@ -276,7 +279,9 @@
                        offset: ['300px', '300px']
                    });
                } else {
                    $("#intelCard").val(result.data.icCardNo);
                    paramIntelCard = data;
                    $("#text-param").text("è¯å«å¡å·ï¼" + paramIntelCard);
                    flushData(paramIntelCard, null);
                }
            }
            layer.close(index);
@@ -294,7 +299,7 @@
 * æ¬å°è¯»åæºæ§å¡
 */
function flushICCard1() {
    $("#intelCard").val(null);
    $("#text-param").val(null);
    $("#form-data")[0].reset();
    form.render();
    recordData = null;
@@ -313,8 +318,9 @@
            if (data === "not found") {
                layer.alert("è¯·éæ°è¯»å¡ï¼", {offset: ['300px', '300px']});
            } else {
                $("#intelCard").val(data);
                flushData();
                paramIntelCard = data;
                $("#text-param").text("è¯å«å¡å·ï¼" + paramIntelCard);
                flushData(paramIntelCard, null);
            }
        },
        error: function () {
@@ -323,7 +329,7 @@
    });
}

// ä½¿ç¨æä»¶è·åçä»½è¯
// ä½¿ç¨æä»¶è·åèº«ä»½è¯å·
function flushIdCard() {
    var index = layer.load();
    $.ajax({
@@ -343,8 +349,10 @@
                });
                return;
            }
            $("#userId").val(data.idNum);
            flushData();
            // $("#userId").val(data.idNum);
            $("#text-param").text("è¯å«èº«ä»½è¯ï¼" + paramIdCard);

            flushData(null, paramIdCard);
        },
        error: function () {
            layer.alert("èº«ä»½è¯è¯»åå¤±è´¥ï¼è¯·æå¨å½å¥ï¼", {
@@ -380,10 +388,11 @@
    });
}

// æå°è¿ç£å

// ç¹å»æå°ï¼ç³»ç»å¤ææ¯å¦å·²ç»æ§è¡å®æï¼å¦æå·²ç»å®æï¼ç´æ¥æå°ï¼å¦ææªå®æååæ§è¡å®æ
function printBill() {
    if (!recordData) {
        layer.alert("æ²¡æè·åå°ä¸å¡æ°æ®ï¼ä¸æ¯ææå°ï¼");
        alertError("æ²¡æè·åå°ä¸å¡æ°æ®ï¼æå°è¢«æç»ï¼");
        return;
    }
    // ä»åå°è·åæ¨¡çå¹¶æå°
@@ -391,7 +400,27 @@
    // åå¹¶æ´æ°ç¶åç¼è¾æ°æ®
    Object.assign(recordData, data);

    printBillStep2();
    var index = layer.load();
    $.ajax({
        type: "POST",
        url: "../../basic/inout/report/bill-weight",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify(recordData),
        success: function (result) {
            layer.close(index);
            if (result.code != "0000") {
                alertError(result.msg);
            } else {
                layer.msg("å¼å§æ¸²ææå°åâ¦â¦");
                printWeight(result.data);
            }
        },
        error: function () {
            layer.close(index);
            alertError("è·åæå°æ¨¡çå¤±è´¥ï¼è¯·èç³»ç®¡çåæ¥çåå ");
        }
    });
}

// ç¹å»æå°ï¼åæ§è¡ç³»ç»é»è®¤æ§è¡å®æå¡åæ¶
@@ -399,7 +428,7 @@
    var index = layer.load();
    $.ajax({
        type: "POST",
        url: "../../basic/inout-report/inout-bill-weight",
        url: "../../basic/inout-report/bill-weight",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify(recordData),
@@ -415,7 +444,7 @@
                    printWeight(result.data);
                }
                // å·æ°æé®
                flushBtn("btn-printBill");
                // flushBtn("btn-printBill");
            }
            layer.close(index);
        },
@@ -440,26 +469,27 @@
    $("#btn-weight").removeClass("layui-btn-disabled");
    $("#btn-weight").attr("disabled", false);

    //ç©ºè½¦åæ»¡è½¦è¢«éç½®
    updateEditAndProgress();
    $("#text-param").val('');

    //æ£éä¿¡æ¯æ¡æ¢å¤ä¸ºå¯ç¼è¾
    delDisabled();
    // //ç©ºè½¦åæ»¡è½¦è¢«éç½®
    // updateEditAndProgress();
    //
    // //æ£éä¿¡æ¯æ¡æ¢å¤ä¸ºå¯ç¼è¾
    // delDisabled();
}


function flushPage() {
    layer.confirm('ç¡®å®è¦å·æ°é¡µé¢åï¼', {icon: 3, title: 'æç¤º'}, function (index) {
        resetForm();
        layer.msg("é¡µé¢éç½®å®æï¼è¯·éæ°æä½â¦â¦");
        layer.close(index);
    });
}

function flushData() {
function flushData(intelCard, userIdCard) {
    var index = layer.load();
    var userId2 = $("#userId").val();
    var intelCard = $("#intelCard").val();
    var userId2 = userIdCard;
    var intelCard = intelCard;
    var plateNum = $("#plateNum").val();
    var param = {
        type: type,
@@ -477,7 +507,7 @@
        data: JSON.stringify(param),
        success: function (result) {
            if (result.code != "0000") {
                notify(result.msg, result.data);
                notifyProgress(result.msg, result.data);
            } else {
                recordData = result.data;
                // è¿åçæ°æ®è¿è¡èµå¼
@@ -490,7 +520,8 @@
        },
        error: function () {
            layer.close(index);
            layer.alert("æ¥è¯¢å¤±è´¥ï¼è¯·éæ°å°è¯ï¼ï¼");
            alertError("æ¥è¯¢å¤±è´¥ï¼è¯·éæ°å°è¯");
            // layer.alert("æ¥è¯¢å¤±è´¥ï¼è¯·éæ°å°è¯ï¼ï¼");
        }
    });
}
@@ -542,37 +573,37 @@
}

// å½åå®æ
function submit(data) {
function submit() {
    if (null == recordData) {
        notify("æ²¡ææ°æ®å¯ä»¥æäº¤", null);
        notifyProgress("æ²¡ææ°æ®å¯ä»¥æäº¤", null);
        return;
    }
    var data = form.val("form-data");
    // æ ¡éª-åºåºç©ºè½¦
    if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
        if (data.emptyWeight <= 0.0) {
            notify("ç©ºè½¦ç§°éä¿¡æ¯å¿å¡«ï¼ï¼", null);
            notifyProgress("ç©ºè½¦ç§°éä¿¡æ¯å¿å¡«ï¼ï¼", null);
            return;
        }
        if (!data.depotId) {
            notify("è£å¸ä»åºå¿é¡»å¡«åï¼ï¼", null);
            notifyProgress("è£å¸ä»åºå¿é¡»å¡«åï¼ï¼", null);
            return;
        }
        if (!data.noticeId) {
            notify("éç¥åå¿é¡»å¡«åï¼ï¼", null);
            notifyProgress("éç¥åå¿é¡»å¡«åï¼ï¼", null);
            return;
        }
    } else {
        if (data.fullWeight <= 0.0) {
            notify("æ»¡è½¦ç§°éä¿¡æ¯å¿å¡«ï¼ï¼", null);
            notifyProgress("æ»¡è½¦ç§°éä¿¡æ¯å¿å¡«ï¼ï¼", null);
            return;
        }
        if (!data.foodVariety) {
            notify("ç²®é£åç§å¿å¡«ï¼ï¼", null);
            notifyProgress("ç²®é£åç§å¿å¡«ï¼ï¼", null);
            return;
        }
        if (!data.settleWeight || data.settleWeight <= 0.0) {
            notify("ç»ç®ééåè§ï¼è¯·æ ¸å¯¹ï¼ï¼", null);
            notifyProgress("ç»ç®ééåè§ï¼è¯·æ ¸å¯¹ï¼ï¼", null);
            return;
        }
    }
@@ -589,35 +620,34 @@
        fileName: snapData.fileName3
    }];
    recordData.files = files;

    var index = layer.load();
    $.ajax({
        type: "POST",
        url: "../../basic/inout/inout-next-step",
        url: "../../basic/inout/submit-weight",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify(recordData),
        success: function (result) {
            if (result.code != "0000") {
                notify(result.msg, result.data);
                notifyProgress(result.msg, result.data);
            } else {
                notify("æ°æ®æäº¤æå", result.data);
                notifyProgress("æ°æ®æäº¤æå", result.data);
                // æ´æ°æé®æ¾ç¤º
                flushBtn("btn-submit");
                // flushBtn("btn-submit");
            }
            layer.close(index);
        },
        error: function () {
            layer.close(index);
            notify("æäº¤å¤±è´¥ï¼è¯·éæ°å°è¯", null);
            notifyProgress("æäº¤å¤±è´¥ï¼è¯·éæ°å°è¯", null);
        }
    });

    //ä»¥ä¸é»è¾ä¸ºå¢å ä¸ä¸ªè¯é³éç¥çè°ç¨æ¹æ³ï¼ä¸èèè¿åç»æ
    var curWeight = recordData.fullWeight;
    if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
        curWeight = recordData.emptyWeight;
    }
    // var curWeight = recordData.fullWeight;
    // if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
    //     curWeight = recordData.emptyWeight;
    // }
    // var param = {
    //     sort: $("#scaleName").val(),
    //     weight: curWeight,
@@ -635,95 +665,96 @@
    // });
}


// ---------------------------éç¥å-å¼å§ -------------------//
// å¼¹åºå¾æ¥åä½ä¸ææ¡
function showNotice() {
    var index = layer.load();
    var param = {
        type: type
    };
    // æ¸²æå¾æ¥åä½åè¡¨
    table.render({
        elem: '#tableNotice',
        url: '../../basic/inout/list-noticeâout',
        page: false,
        // skin : "nob",
        // size : 'sm',
        even: true,
        method: 'POST',
        contentType: "application/json;charset=UTF-8",
        cols: [[{
            field: 'name',
            title: 'éç¥ååç§°',
            width: '15%'
        }, {
            field: 'customerName',
            title: 'æ¶è´§åä½'
        }, {
            field: 'depotName',
            title: 'ä»åºåç§°',
            width: '15%'
        }, {
            field: 'foodVarietyName',
            title: 'ç²®é£åç§',
            width: '10%'
         }, {
            field: 'year',
            title: 'å¹´ä»½',
            width: '8%'
        }, {
            field: 'contractName',
            title: 'æå±åå'
        }]],
        where: param,
        parseData: function (res) {
            if ("0000" == res.code) {
                return {
                    "code": "0",
                    "msg": res.msg,
                    "data": res.data
                }
            } else {
                return {
                    "code": "1",
                    "msg": res.msg
                }
            }
        },
        done: function (res) {
            layer.close(index);
        }
    });

    //åå»æ¾ç¤ºéä¸æ°æ®
    table.on('rowDouble(tableNotice)', function (obj) {
        var data = obj.data;
        form.val("form-data", {
            customerId: data.customerId,
            customerName: data.customerName,
            noticeId: data.id,
            foodType: data.foodType,
            foodLevel: data.foodLevel
        });
        // å³é
        layer.closeAll();
    });

    // å¼¹åºå¯¹è¯æ¡
    layer.open({
        type: 1,
        offset: ['100px', '250px'],
        title: "åºåºéç¥å",
        area: ['900px', '600px'],
        shade: 0,
        content: $('#listNotice'),
        btn: 0,
        btn: ['åæ¶'],
        yes: function () {
            layer.closeAll();
        },
        closeBtn: 0
    });
}
// ---------------------------éç¥å -ç»æ -------------------//
//-----------------------è½¬ç§»è³weight.jsä¸----------------------//
// // ---------------------------éç¥å-å¼å§ -------------------//
// // å¼¹åºå¾æ¥åä½ä¸ææ¡
// function showNotice() {
//     var index = layer.load();
//     var param = {
//         type: type
//     };
//     // æ¸²æå¾æ¥åä½åè¡¨
//     table.render({
//         elem: '#tableNotice',
//         url: '../../basic/inout/list-notice-out',
//         page: false,
//         // skin : "nob",
//         // size : 'sm',
//         even: true,
//         method: 'POST',
//         contentType: "application/json;charset=UTF-8",
//         cols: [[{
//             field: 'name',
//             title: 'éç¥ååç§°',
//             width: '15%'
//         }, {
//             field: 'customerName',
//             title: 'æ¶è´§åä½'
//         }, {
//             field: 'depotName',
//             title: 'ä»åºåç§°',
//             width: '15%'
//         }, {
//             field: 'foodVarietyName',
//             title: 'ç²®é£åç§',
//             width: '10%'
//         }, {
//             field: 'year',
//             title: 'å¹´ä»½',
//             width: '8%'
//         }, {
//             field: 'contractName',
//             title: 'æå±åå'
//         }]],
//         where: param,
//         parseData: function (res) {
//             if ("0000" == res.code) {
//                 return {
//                     "code": "0",
//                     "msg": res.msg,
//                     "data": res.data
//                 }
//             } else {
//                 return {
//                     "code": "1",
//                     "msg": res.msg
//                 }
//             }
//         },
//         done: function (res) {
//             layer.close(index);
//         }
//     });
//
//     //åå»æ¾ç¤ºéä¸æ°æ®
//     table.on('rowDouble(tableNotice)', function (obj) {
//         var data = obj.data;
//         form.val("form-data", {
//             customerId: data.customerId,
//             customerName: data.customerName,
//             noticeId: data.id,
//             foodType: data.foodType,
//             foodLevel: data.foodLevel
//         });
//         // å³é
//         layer.closeAll();
//     });
//
//     // å¼¹åºå¯¹è¯æ¡
//     layer.open({
//         type: 1,
//         offset: ['100px', '250px'],
//         title: "åºåºéç¥å",
//         area: ['900px', '600px'],
//         shade: 0,
//         content: $('#listNotice'),
//         btn: 0,
//         btn: ['åæ¶'],
//         yes: function () {
//             layer.closeAll();
//         },
//         closeBtn: 0
//     });
// }
//
// // ---------------------------éç¥å -ç»æ -------------------//

 igds-web/src/main/resources/static/admin/inout/weight.js

@@ -42,79 +42,122 @@
 */
function deAutoByOut(name) {
    var curData = form.val("form-data");

    if (curData.fullWeight == 0 || curData.emptyWeight == 0) {
        return;
    }
    //æ±æ»ç»æ
    var deSum = 0, addSum = 0, settleWeight = 0, recordWeight = 0;
    // åé
    var netWeight = curData.fullWeight - curData.emptyWeight;
    //æ£æ°´æ
    var deWet = curData.deWet, deImpurity = curData.deImpurity;

    if (netWeight <= 0) {
        layer.alert("åéå°äº0ï¼å½åç§°éåå¨é»è¾é®é¢");
        alertError("åé<=0ï¼å½åç¯èåå¨é»è¾éè¯¯ï¼è¯·æ ¸å¯¹");
        return;
    }
    //å¶ä»ä¿¡æ¯
    var deHandle = curData.deHandle, dePackage = curData.dePackage, deOther = curData.deOther, settleWeight = 0,
        recordWeight = 0, deSum = 0;
    recordWeight = Number(netWeight) - Number(deHandle) - Number(dePackage) - Number(deOther);
    settleWeight = Number(recordWeight);
    deSum = Number(deOther) + Number(deHandle)

    var deBase = 0, multiple = 0;
    //æ°´åæè´¨ï¼æ´æ¹æ¯ä¾å¹¶ä¸æ°´åæ£éè¿æ²¡è®¡ç®æåµä¸
    if ("fullWeight" == name || null == deWet) {
        var checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C01, CHECK_ST.C020101);
        if (checkItem) {
            deBase = Number(curData.wet) - Number(checkItem.upperLimit);
            if (deBase == 0) return;
            multiple = parseInt(deBase / checkItem.ruleNum);//åæ°
            deWet = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
        }
    }
    //æè´¨
    if ("fullWeight" == name || null == deImpurity) {
        checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C02, CHECK_ST.C01010301);
        if (checkItem) {
            deBase = Number(curData.impurity) - Number(checkItem.upperLimit);
            if (deBase == 0) return;
            multiple = parseInt(deBase / checkItem.ruleNum);
            deImpurity = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
        }
    }

    /** æ»æ£éï¼ä¸å«å¢é*/
    deSum = Number(curData.deOther) + Number(curData.deHandle);


    if (Number(deWet) > 0) {//å¢é
        addSum = addSum + Number(deWet);
    } else {
        deSum = deSum + Number(deWet);
    }

    if (Number(deImpurity) > 0) {//æ£é
        deSum = deSum + Number(deImpurity);
    } else {
        addSum = addSum + Number(deImpurity);
    }

    netWeight = netWeight.toFixed(0);
    recordWeight = recordWeight.toFixed(0);
    settleWeight = settleWeight.toFixed(0);
    deSum = deSum.toFixed(0);
    /** å¢éè½¬æ£æ°ï¼ä¾¿äºè®¡ç®  */
    addSum = Math.abs(addSum).toFixed(0);
    /** å¥åºéé = åé - æ»æ£é  */
    recordWeight = Number(netWeight) - Number(deSum);
    /** ç»ç®éé = åé - æ»æ£é + å¢é */
    settleWeight = Number(netWeight) - Number(deSum) + Number(addSum);

    form.val("form-data", {
        netWeight: netWeight,
        deImpurity: deImpurity,
        deWet: deWet,
        deSum: deSum,
        settleWeight: settleWeight,
        recordWeight: recordWeight
        recordWeight: recordWeight,
        deSum: deSum
    });
    form.render();
}

// function deAutoByOut(name) {
//     var curData = form.val("form-data");
//
//     if (curData.fullWeight == 0 || curData.emptyWeight == 0) {
//         return;
//     }
//     //æ±æ»ç»æ
//     var deSum = 0, addSum = 0, settleWeight = 0, recordWeight = 0;
//     // åé
//     var netWeight = curData.fullWeight - curData.emptyWeight;
//     //æ£æ°´æ
//     var deWet = curData.deWet, deImpurity = curData.deImpurity;
//
//     if (netWeight <= 0) {
//         layer.alert("åéå°äº0ï¼å½åç§°éåå¨é»è¾é®é¢");
//         return;
//     }
//
//     var deBase = 0, multiple = 0;
//     //æ°´åæè´¨ï¼æ´æ¹æ¯ä¾å¹¶ä¸æ°´åæ£éè¿æ²¡è®¡ç®æåµä¸
//     if ("fullWeight" == name || null == deWet) {
//         var checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C01, CHECK_ST.C020101);
//         if (checkItem) {
//             deBase = Number(curData.wet) - Number(checkItem.upperLimit);
//             if (deBase == 0) return;
//             multiple = parseInt(deBase / checkItem.ruleNum);//åæ°
//             deWet = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
//         }
//     }
//     //æè´¨
//     if ("fullWeight" == name || null == deImpurity) {
//         checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C02, CHECK_ST.C01010301);
//         if (checkItem) {
//             deBase = Number(curData.impurity) - Number(checkItem.upperLimit);
//             if (deBase == 0) return;
//             multiple = parseInt(deBase / checkItem.ruleNum);
//             deImpurity = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
//         }
//     }
//
//     /** æ»æ£éï¼ä¸å«å¢é*/
//     deSum = Number(curData.deOther) + Number(curData.deHandle);
//
//
//     if (Number(deWet) > 0) {//å¢é
//         addSum = addSum + Number(deWet);
//     } else {
//         deSum = deSum + Number(deWet);
//     }
//
//     if (Number(deImpurity) > 0) {//æ£é
//         deSum = deSum + Number(deImpurity);
//     } else {
//         addSum = addSum + Number(deImpurity);
//     }
//
//     deSum = deSum.toFixed(0);
//     /** å¢éè½¬æ£æ°ï¼ä¾¿äºè®¡ç®  */
//     addSum = Math.abs(addSum).toFixed(0);
//     /** å¥åºéé = åé - æ»æ£é  */
//     recordWeight = Number(netWeight) - Number(deSum);
//     /** ç»ç®éé = åé - æ»æ£é + å¢é */
//     settleWeight = Number(netWeight) - Number(deSum) + Number(addSum);
//
//     form.val("form-data", {
//         netWeight: netWeight,
//         deImpurity: deImpurity,
//         deWet: deWet,
//         deSum: deSum,
//         settleWeight: settleWeight,
//         recordWeight: recordWeight
//     });
//     form.render();
// }
function deAutoByHandle(name) {
    var curData = form.val("form-data");
    var deOther = curData.deOther, deHandle = curData.deHandle;
    deSum = Number(deOther) + Number(deHandle);
    deSum = deSum.toFixed(0);
    form.val("form-data", {
        deSum: deSum,
    });
    form.render();

}

/**
 * æ ¹æ®åéªé¡¹åä¼ éè¿æ¥çåæ°è·åå½ååæ°çéç½®ä¿¡æ¯
 * @param checkItems

 igds-web/src/main/resources/templates/admin/inout/in-register.html

@@ -230,7 +230,8 @@
                                <div class="rkbk-quick layui-text-center">
                                    <button id="button_readID" type="button"
                                        onclick="flushIdCard()"
                                        class="rkbk-quick-btn layui-btn btn-blue">è¯»åèº«ä»½è¯</button>
                                        class="rkbk-quick-btn layui-btn btn-blue">è¯»åèº«ä»½è¯
                                </button>
                                </div>

                            </div>
@@ -278,7 +279,8 @@
                                            <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
                                                                                            name="transType" value="3"
                                                                                            title="è½®è¹"> <input
                                                type="radio" name="transType" value="9" title="å¶ä»">
                                        </div>
                                    </div>
@@ -300,11 +302,10 @@
                                        <span id="plateNum2">æªè¯å«</span>
                                        <p>è½¦çè¯å«</p>
                                    </div>
									
                                     <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active mt-10"> <span class="kccz-r-pz"></span>
                                <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active mt-10"> <span
                                        class="kccz-r-pz"></span>
                                        <p>ç³»ç»èªå¨ææ</p>
                                    </a>
									
                                </div>
                            </div>
                        </div>

 igds-web/src/main/resources/templates/admin/inout/out-card-back.html

@@ -299,6 +299,13 @@
                                           autocomplete="off" class="layui-input rkbk-search-input" disabled>
                                </div>
                            </div>

                            <div class="rkbk-quick layui-text-center">
                                <button class="rkbk-quick-btn layui-btn btn-green" type='button'
                                        onclick="submit()">
                                    <i><img th:src="@{../../static/images/icon-ok.png}"/></i> åºåºæ¶å¡
                                </button>
                            </div>
                        </form>
                    </div>
                </div>

 igds-web/src/main/resources/templates/admin/inout/out-handle.html

@@ -30,11 +30,20 @@
            background: #eff4f6;
        }

        #text-param {
            font-size: 14px;
            color: red;
            padding-left: 10px;
        }

        .rk-step-wrap {
            padding: 0px;
            border-bottom: 0px;
            text-align: center;
        }

        .kccz-left-box2 {
            height: 560px;
        }

        .qyzj-btnbox {
@@ -49,12 +58,42 @@
            min-height: 38px;
            padding-top: 2px;
        }

        .kccz-con {
            margin: 15px 0;
        }

        .rkbk-search-btn {
            width: 100px;
            height: 30px;
            line-height: 30px;
            font-size: 16px;
        }

        .kccz-r-btnbox {
            width: 86px !important;
        }

        .kccz-r-btn {
            width: 86px !important;
        }

        .rkbk-search-input {
            background: #FFF !important;
        }

        .color-red {
            color: red !important;
        }

        .r-240 {
            right: 240px;
        }

        .r-120 {
            right: 120px;
        }

    </style>

</head>
@@ -71,6 +110,10 @@
                <button class="rkbk-quick-btn layui-btn btn-green btn-sm"
                        onclick="submit()">
                    <i><img th:src="@{../../static/images/icon-ok.png}"/></i>å¼ä»å®æ
                </button>
                <button class="rkbk-quick-btn layui-btn btn-violet btn-sm"
                        onclick="flushPage()">
                    <i><img th:src="@{../../static/images/icon-shuaxin2.png}"/></i>å·æ°é¡µé¢
                </button>
            </div>

@@ -119,11 +162,20 @@
        <div class="kccz-con">
            <div class="kccz-left radius-6 fl bg-fff">

                <div class="kccz-left-box2 ">
                <div class="kccz-left-box2 radius-6">

                    <div class="rkbk-tit">
                        <i></i>
                        <h3>åºåºä¿¡æ¯</h3>
                        <h3>åºåºä¿¡æ¯<span id="text-param"></span></h3>
                        <div>
                            <input type="button" value="è¯»æºæ§å¡"
                                   class="rkbk-search-btn layui-btn r-240" onclick="flushICCard()">
                            <input type="button" value="è¯»èº«ä»½è¯"
                                   class="rkbk-search-btn layui-btn r-120" onclick="flushIdCard()">
                            <input type="button" value="æå¨æ¥è¯¢"
                                   class="rkbk-search-btn layui-btn" onclick="flushData()">

                        </div>
                    </div>

                    <div class="kccz-data-form layui-row">
@@ -162,10 +214,10 @@

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">èº«ä»½è¯å·</label>
                                    <label class="layui-form-label color-red">æ¿è¿äºº</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="userId" id="userId"
                                               placeholder="æ¿è¿äººèº«ä»½è¯å·" autocomplete="off" class="layui-input">
                                        <input type="text" name="userName" id="userName"
                                               placeholder="ä¸å¯ç¼è¾" autocomplete="off" class="layui-input" disabled>
                                    </div>
                                </div>

@@ -174,48 +226,49 @@

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">è½¦çå·</label>
                                    <label class="layui-form-label color-red">è½¦çå·</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="plateNum" id="plateNum"
                                               autocomplete="off" class="layui-input">
                                               placeholder="èªå¨å¸¦å¥/æå¨å½å¥" autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <div class="layui-col-xs4 kccz-data-btnbox">
                                        <input type="button" value="è¯»èº«ä»½è¯"
                                               class="rkbk-search-btn layui-btn"
                                               onclick="flushIdCard()">
                                    </div>
                                    <div class="layui-col-xs4 kccz-data-btnbox">
                                        <input type="button" value="è¯»å¡"
                                               class="rkbk-search-btn layui-btn"
                                               onclick="flushICCard()">
                                    </div>
                                    <div class="layui-col-xs4 kccz-data-btnbox">
                                        <input type="button" value="æ¥&nbsp;&nbsp;è¯¢"
                                               class="rkbk-search-btn layui-btn" onclick="flushData()">
                                    </div>
                                </div>
                            </div>
                            <!--  <div class="layui-col-xs4">-->
                            <!--      <div class="layui-form-item">-->
                            <!--          <div class="layui-col-xs4 kccz-data-btnbox">-->
                            <!--              <input type="button" value="è¯»èº«ä»½è¯"-->
                            <!--                     class="rkbk-search-btn layui-btn"-->
                            <!--                     onclick="flushIdCard()">-->
                            <!--          </div>-->
                            <!--          <div class="layui-col-xs4 kccz-data-btnbox">-->
                            <!--              <input type="button" value="è¯»æºæ§å¡"-->
                            <!--                     class="rkbk-search-btn layui-btn"-->
                            <!--                     onclick="flushICCard()">-->
                            <!--          </div>-->
                            <!--          <div class="layui-col-xs4 kccz-data-btnbox">-->
                            <!--              <input type="button" value="æå¨æ¥è¯¢"-->
                            <!--                     class="rkbk-search-btn layui-btn" onclick="flushData()">-->
                            <!--          </div>-->
                            <!--      </div>-->
                            <!--  </div>-->
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">æºæ§å¡å·</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="intelCard" id="intelCard"
                                               placeholder="æºæ§å¡å·" autocomplete="off" class="layui-input">
                                               placeholder="èªå¨å¸¦å¥/æå¨å½å¥" autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">ç©ºè½¦ç§°é</label>
                                    <label class="layui-form-label color-red">ç®é(ç©ºè½¦)</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="emptyWeight" autocomplete="off" placeholder="ä¸å¯æ¹"
                                               class="layui-input rkbk-search-input" disabled> <em
                                        <input type="text" name="emptyWeight" autocomplete="off" placeholder="ä¸å¯ç¼è¾"
                                               class="layui-input rkbk-search-input" disabled>
                                        <em
                                            class="kccz-data-dw">KG</em>
                                    </div>
                                </div>
@@ -223,9 +276,9 @@

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">æ»¡è½¦ç§°é</label>
                                    <label class="layui-form-label">æ¯é(æ»¡è½¦)</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="fullWeight" autocomplete="off" placeholder="ä¸å¯æ¹"
                                        <input type="text" name="fullWeight" autocomplete="off" placeholder="ä¸å¯ç¼è¾"
                                               class="layui-input rkbk-search-input" disabled> <em
                                            class="kccz-data-dw">KG</em>
                                    </div>
@@ -233,10 +286,10 @@
                            </div>
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">è£å¸ä»åº</label>
                                    <label class="layui-form-label color-red">è£å¸ä»åº</label>
                                    <div class="layui-input-block">
                                        <select name="depotId" id="depotId">
                                            <option value="">ä¸å¯æ¹</option>
                                            <option value="">ä¸å¯ç¼è¾</option>
                                            <option th:each="depot,depotSet:${listDepot}"
                                                    th:value="${depot.id}" th:text="${depot.name}"></option>
                                        </select>
@@ -244,40 +297,40 @@
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">å&nbsp;&nbsp;&nbsp;&nbsp;é</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="netWeight" autocomplete="off" placeholder="ä¸å¯æ¹"
                                               class="layui-input rkbk-search-input" disabled> <em
                                            class="kccz-data-dw">KG</em>
                                    </div>
                                </div>
                            </div>
                            <!--                            <div class="layui-col-xs4">-->
                            <!--                                <div class="layui-form-item">-->
                            <!--                                    <label class="layui-form-label">å&nbsp;&nbsp;&nbsp;&nbsp;é</label>-->
                            <!--                                    <div class="layui-input-block">-->
                            <!--                                        <input type="text" name="netWeight" autocomplete="off" placeholder="ä¸å¯ç¼è¾"-->
                            <!--                                               class="layui-input rkbk-search-input" disabled> <em-->
                            <!--                                            class="kccz-data-dw">KG</em>-->
                            <!--                                    </div>-->
                            <!--                                </div>-->
                            <!--                            </div>-->


                            <div class="layui-col-xs4">
                                <div class="layui-form-item kccz-data-group-md">
                                    <label class="layui-form-label">æè´¨æ£é</label>
                                    <div class="posi-r kccz-data-bfb fr">
                                        <input type="text" name="impurity" placeholder="ä¸å¯æ¹"
                                               autocomplete="off" class="layui-input rkbk-search-input"
                                               disabled> <em class="kccz-data-dw">%</em>
                                    </div>
                                    <div class="layui-input-block">
                                        <div class="posi-r">
                                            <input type="text" name="deImpurity" placeholder="ä¸å¯æ¹"
                                                   autocomplete="off" class="layui-input rkbk-search-input"
                                                   disabled> <em class="kccz-data-dw">KG</em>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <!-- <div class="layui-col-xs4">-->
                            <!--     <div class="layui-form-item kccz-data-group-md">-->
                            <!--         <label class="layui-form-label">æè´¨æ£é</label>-->
                            <!--         <div class="posi-r kccz-data-bfb fr">-->
                            <!--             <input type="text" name="impurity" placeholder="ä¸å¯ç¼è¾"-->
                            <!--                    autocomplete="off" class="layui-input rkbk-search-input"-->
                            <!--                    disabled> <em class="kccz-data-dw">%</em>-->
                            <!--         </div>-->
                            <!--         <div class="layui-input-block">-->
                            <!--             <div class="posi-r">-->
                            <!--                 <input type="text" name="deImpurity" placeholder="ä¸å¯ç¼è¾"-->
                            <!--                        autocomplete="off" class="layui-input rkbk-search-input"-->
                            <!--                        disabled> <em class="kccz-data-dw">KG</em>-->
                            <!--             </div>-->
                            <!--         </div>-->
                            <!--     </div>-->
                            <!-- </div>-->
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">å¾æ¥åä½</label>
                                    <label class="layui-form-label color-red">å®¢æ·ä¿¡æ¯</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="customerName" placeholder="ä¸å¯æ¹"
                                        <input type="text" name="customerName" placeholder="ä¸å¯ç¼è¾"
                                               autocomplete="off" class="layui-input rkbk-search-input"
                                               disabled>
                                    </div>
@@ -288,37 +341,37 @@
                                <div class="layui-form-item">
                                    <label class="layui-form-label">ç²®é£ççº§</label>
                                    <div class="layui-input-block">
                                        <select name="foodLevel" id="foodLevel">
                                            <option value="">ä¸å¯æ¹</option>
                                        <select name="foodLevel" id="foodLevel" lay-filter="select_foodLevel">
                                            <option value="">è¯·éæ©</option>
                                            <option th:each="dic,dicSet:${listFoodLevel}"
                                                    th:value="${dic.code}" th:text="${dic.name}"></option>
                                        </select>
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs4">
                                <div class="layui-form-item kccz-data-group-md">
                                    <label class="layui-form-label">æ°´åå¢é</label>
                                    <div class="posi-r kccz-data-bfb fr">
                                        <input type="text" name="wet" placeholder="ä¸å¯æ¹"
                                               autocomplete="off" class="layui-input rkbk-search-input"
                                               disabled> <em class="kccz-data-dw">%</em>
                                    </div>
                                    <div class="layui-input-block">
                                        <div class="posi-r">
                                            <input type="text" name="deWet" placeholder="ä¸å¯æ¹"
                                                   autocomplete="off" class="layui-input rkbk-search-input"
                                                   disabled> <em class="kccz-data-dw">KG</em>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <!--<div class="layui-col-xs4">-->
                            <!--    <div class="layui-form-item kccz-data-group-md">-->
                            <!--        <label class="layui-form-label">æ°´åå¢é</label>-->
                            <!--        <div class="posi-r kccz-data-bfb fr">-->
                            <!--            <input type="text" name="wet" placeholder="ä¸å¯ç¼è¾"-->
                            <!--                   autocomplete="off" class="layui-input rkbk-search-input"-->
                            <!--                   disabled> <em class="kccz-data-dw">%</em>-->
                            <!--        </div>-->
                            <!--        <div class="layui-input-block">-->
                            <!--            <div class="posi-r">-->
                            <!--                <input type="text" name="deWet" placeholder="ä¸å¯ç¼è¾"-->
                            <!--                       autocomplete="off" class="layui-input rkbk-search-input"-->
                            <!--                       disabled> <em class="kccz-data-dw">KG</em>-->
                            <!--            </div>-->
                            <!--        </div>-->
                            <!--    </div>-->
                            <!--</div>-->
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">ç²®é£åç§</label>
                                    <div class="layui-input-block">
                                        <select name="foodVariety" id="foodVariety">
                                            <option value="">ä¸å¯æ¹</option>
                                            <option value="">è¯·éæ©</option>
                                            <option th:each="dic,dicSet:${listFoodVariety}"
                                                    th:value="${dic.code}" th:text="${dic.name}"></option>
                                        </select>
@@ -330,73 +383,91 @@
                                <div class="layui-form-item">
                                    <label class="layui-form-label">å¶ä»æ£é</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="deOther" autocomplete="off" placeholder="ä¸å¯æ¹"
                                               class="layui-input rkbk-search-input" disabled> <em
                                        <input type="text" name="deOther" autocomplete="off" placeholder="è¯·è¾å¥"
                                               class="layui-input rkbk-search-input weight"> <em
                                            class="kccz-data-dw">KG</em>
                                    </div>
                                </div>
                            </div>




                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">æ»æ£é</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="deSum" placeholder="ä¸å¯æ¹"
                                               autocomplete="off" class="layui-input rkbk-search-input"
                                               disabled> <em class="kccz-data-dw">KG</em>
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">å¼ä»å¼å§</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="handleStart" id="handleStart"
                                               placeholder="å¹´-æ-æ¥ æ¶:å" autocomplete="off"
                                               class="layui-input bg-date">
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">ç°åºæ£é</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="deHandle" placeholder="è¯·è¾å¥"
                                               autocomplete="off" class="layui-input"> <em class="kccz-data-dw">KG</em>
                                               autocomplete="off" class="layui-input weight"> <em class="kccz-data-dw">KG</em>
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">æ£éååé</label>
                                    <label class="layui-form-label">æ»æ£é</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="settleWeight" placeholder="ä¸å¯æ¹"
                                        <input type="text" name="deSum" placeholder="ä¸å¯ç¼è¾"
                                               autocomplete="off" class="layui-input rkbk-search-input"
                                               disabled> <em class="kccz-data-dw">KG</em>
                                    </div>
                                </div>
                            </div>

                            <!--<div class="layui-col-xs4">-->
                            <!--    <div class="layui-form-item">-->
                            <!--        <label class="layui-form-label">å¼ä»å¼å§</label>-->
                            <!--        <div class="layui-input-block">-->
                            <!--            <input type="text" name="handleStart" id="handleStart"-->
                            <!--                   placeholder="å¹´-æ-æ¥ æ¶:å" autocomplete="off"-->
                            <!--                   class="layui-input bg-date">-->
                            <!--        </div>-->
                            <!--    </div>-->
                            <!--</div>-->


                            <!--                            <div class="layui-col-xs4">-->
                            <!--                                <div class="layui-form-item">-->
                            <!--                                    <label class="layui-form-label">ç»ç®éé</label>-->
                            <!--                                    <div class="layui-input-block">-->
                            <!--                                        <input type="text" name="settleWeight" placeholder="ä¸å¯ç¼è¾"-->
                            <!--                                               autocomplete="off" class="layui-input rkbk-search-input"-->
                            <!--                                               disabled> <em class="kccz-data-dw">KG</em>-->
                            <!--                                    </div>-->
                            <!--                                </div>-->
                            <!--                            </div>-->

                            <!--<div class="layui-col-xs4">-->
                            <!--    <div class="layui-form-item">-->
                            <!--        <label class="layui-form-label">å¼ä»ç»æ</label>-->
                            <!--        <div class="layui-input-block">-->
                            <!--            <input type="text" name="handleEnd" id="handleEnd"-->
                            <!--                   placeholder="å¹´-æ-æ¥ æ¶:å" autocomplete="off"-->
                            <!--                   class="layui-input bg-date">-->
                            <!--        </div>-->
                            <!--    </div>-->
                            <!--</div>-->
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">å¼ä»ç»æ</label>
                                    <label class="layui-form-label color-red">å¼ä»äºº</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="handleEnd" id="handleEnd"
                                               placeholder="å¹´-æ-æ¥ æ¶:å" autocomplete="off"
                                               class="layui-input bg-date">
                                        <input type="text" name="handleUser" autocomplete="off"
                                               placeholder="æå¨å½å¥" class="layui-input">
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs8">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">å¶ä»è¯´æ</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="deOtherInfo" placeholder="å¶ä»æ£éè¯´æ"
                                               autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs12">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">å¤&nbsp;æ³¨</label>
                                    <label class="layui-form-label">å¤æ³¨è¯´æ</label>
                                    <div class="layui-input-block">
                                            <textarea name="remarks" placeholder="è¯·è¾å¥åå®¹"
                                                      class="layui-textarea"></textarea>
                                                      autocomplete="off" class="layui-textarea"></textarea>
                                    </div>
                                </div>
                            </div>
@@ -505,6 +576,8 @@
<script th:src="@{../../static/js/jquery.min.js}"></script>
<script th:src="@{../../static/js/constant.js}"></script>
<script th:src="@{../../static/js/igds-common.js}"></script>
<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
<script th:src="@{../../static/admin/inout/weight.js}"></script>
<script th:src="@{../../static/admin/inout/out-handle.js}"></script>

<!-- å¼¹åºæ¡çä¿¡æ¯ -->

 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;
        }
@@ -90,10 +94,10 @@
                        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>
                <!--                <button class="rkbk-quick-btn layui-btn btn-violet"-->
                <!--                        onclick="resetPlateNum()">-->
                <!--                    <i><img th:src="@{../../static/images/icon-che.png}"/></i>éç½®è½¦çè¯å«-->
                <!--                </button>-->
            </div>

            <!--æµç¨å¼å¯¼-->
@@ -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" style="width: 110px">
                                    <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>
@@ -339,6 +351,7 @@
<script th:src="@{../../static/js/constant.js}"></script>
<script th:src="@{../../static/js/igds-common.js}"></script>
<script th:src="@{../../static/admin/inout/video-play.js}"></script>
<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
<script th:src="@{../../static/admin/inout/out-register.js}"></script>

<!-- å¼¹åºæ¡çä¿¡æ¯ -->

 igds-web/src/main/resources/templates/admin/inout/out-weight.html

@@ -17,6 +17,14 @@
    <script th:src="@{../../static/plugins/lodop/LodopFuncs.js}"></script>

    <style>
        .kccz-r-btnbox {
            width: 86px !important;
        }

        .kccz-r-btn {
            width: 86px !important;
        }

        .display-none {
            display: none;
        }
@@ -33,7 +41,7 @@
        }

        .kccz-left-box2 {
            height: 500px;
            height: 560px;
        }

        .color-red {
@@ -72,6 +80,12 @@

        .border-no {
            border: 0px;
        }

        #text-param {
            font-size: 14px;
            color: red;
            padding-left: 10px;
        }

        .qyzj-btnbox {
@@ -124,21 +138,19 @@
            <div class="rkbk-quick fl">
                <button id="btn-weight" class="rkbk-quick-btn layui-btn btn-blue"
                        onclick="weight()">
                    <i><img th:src="@{../../static/images/icon-chengzhong.png}"/></i>ç§°é
                    <i><img th:src="@{../../static/images/icon-chengzhong.png}"/></i>æ¥éª¤ä¸ï¼ç§°éç¡®è®¤
                </button>
                <button id="btn-submit"
                        class="rkbk-quick-btn layui-btn btn-green layui-btn-disabled"
                        disabled=true onclick="submit()">
                    <i><img th:src="@{../../static/images/icon-ok.png}"/></i>å®æç§°é
                        class="rkbk-quick-btn layui-btn btn-green" onclick="submit()">
                    <i><img th:src="@{../../static/images/icon-ok.png}"/></i>æ¥éª¤äºï¼å®æç§°é
                </button>
                <button id="btn-printBill"
                        class="rkbk-quick-btn layui-btn btn-blue layui-btn-disabled"
                        disabled=true onclick="printBill()">
                    <i><img th:src="@{../../static/images/icon-dayin.png}"/></i>æå°è¿ç£å
                        class="rkbk-quick-btn layui-btn btn-blue" onclick="printBill()">
                    <i><img th:src="@{../../static/images/icon-dayin.png}"/></i>æ¥éª¤ä¸ï¼æå°è¿ç£å
                </button>
                <button class="rkbk-quick-btn layui-btn btn-violet"
                        onclick="flushPage()">
                    <i><img th:src="@{../../static/images/icon-shuaxin2.png}"/></i>éæ°ç§°é
                    <i><img th:src="@{../../static/images/icon-shuaxin2.png}"/></i>å·æ°é¡µé¢
                </button>
            </div>

@@ -229,7 +241,7 @@

                    <div class="rkbk-tit">
                        <i></i>
                        <h3>ä¸å¡æ°æ®</h3>
                        <h3>ä¸å¡æ°æ®<span id="text-param"></span></h3>
                        <div>
                            <input type="button" value="è¯»æºæ§å¡"
                                   class="rkbk-search-btn layui-btn r-240"
@@ -276,37 +288,37 @@

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">æºæ§å¡å·</label>
                                    <label class="layui-form-label color-red">æºæ§å¡å·</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="intelCard" id="intelCard"
                                               placeholder="æºæ§å¡å·" autocomplete="off" class="layui-input">
                                               placeholder="å·å¡/æå¨å½å¥" autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">è½¦çå·</label>
                                    <label class="layui-form-label color-red">è½¦çå·</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="plateNum" id="plateNum" placeholder="è½¦çå·"
                                        <input type="text" name="plateNum" id="plateNum" placeholder="èªå¨å½å¥/æå¨å½å¥"
                                               autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">èº«ä»½è¯å·</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="userId" id="userId"
                                               placeholder="æ¿è¿äººèº«ä»½è¯å·" autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                            </div>
                            <!--<div class="layui-col-xs4">-->
                            <!--    <div class="layui-form-item">-->
                            <!--        <label class="layui-form-label">èº«ä»½è¯å·</label>-->
                            <!--        <div class="layui-input-block">-->
                            <!--            <input type="text" name="userId" id="userId"-->
                            <!--                   placeholder="æ¿è¿äººèº«ä»½è¯å·" autocomplete="off" class="layui-input">-->
                            <!--        </div>-->
                            <!--    </div>-->
                            <!--</div>-->

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">æ¿è¿äºº</label>
                                    <label class="layui-form-label color-red">æ¿è¿äºº</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="userName" placeholder="ä¸å¯ç¼è¾" class="layui-input"
                                               disabled>
@@ -344,7 +356,7 @@
                                    <div class="layui-input-block">
                                        <input type="text" name="customerName" placeholder="è¯·éæ©ï¼ä¸å¯æå¨å½å¥"
                                               autocomplete="off" class="layui-input" disabled="disabled"> <em
                                            class="kccz-data-dw cursor" onclick="showNotice()">â¦</em>
                                            class="kccz-data-dw cursor" onclick="showNotice()">â¦â¦</em>
                                    </div>
                                </div>
                            </div>
@@ -361,23 +373,23 @@
                            </div>


                            <div class="layui-col-xs4">
                                <div class="layui-form-item kccz-data-group-md">
                                    <label class="layui-form-label">æè´¨æ£é</label>
                                    <div class="posi-r kccz-data-bfb fr">
                                        <input id="impurity" type="text" name="impurity" placeholder="è¯·è¾å¥"
                                               autocomplete="off" class="layui-input weight"> <em
                                            class="kccz-data-dw">%</em>
                                    </div>
                                    <div class="layui-input-block">
                                        <div class="posi-r">
                                            <input id="deImpurity" type="text" name="deImpurity" placeholder="è¯·è¾å¥"
                                                   autocomplete="off" class="layui-input weight"> <em
                                                class="kccz-data-dw">KG</em>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <!--<div class="layui-col-xs4">-->
                            <!--    <div class="layui-form-item kccz-data-group-md">-->
                            <!--        <label class="layui-form-label">æè´¨æ£é</label>-->
                            <!--        <div class="posi-r kccz-data-bfb fr">-->
                            <!--            <input id="impurity" type="text" name="impurity" placeholder="è¯·è¾å¥"-->
                            <!--                   autocomplete="off" class="layui-input weight"> <em-->
                            <!--                class="kccz-data-dw">%</em>-->
                            <!--        </div>-->
                            <!--        <div class="layui-input-block">-->
                            <!--            <div class="posi-r">-->
                            <!--                <input id="deImpurity" type="text" name="deImpurity" placeholder="è¯·è¾å¥"-->
                            <!--                       autocomplete="off" class="layui-input weight"> <em-->
                            <!--                    class="kccz-data-dw">KG</em>-->
                            <!--            </div>-->
                            <!--        </div>-->
                            <!--    </div>-->
                            <!--</div>-->
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label" id="label4">è£å¸ä»åº</label>
@@ -390,7 +402,6 @@
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">ç°åºæ£é</label>
@@ -402,23 +413,23 @@
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item kccz-data-group-md">
                                    <label class="layui-form-label">æ°´åå¢é</label>
                                    <div class="posi-r kccz-data-bfb fr">
                                        <input id="wet" type="text" name="wet" placeholder="è¯·è¾å¥"
                                               autocomplete="off" class="layui-input weight"> <em
                                            class="kccz-data-dw">%</em>
                                    </div>
                                    <div class="layui-input-block">
                                        <div class="posi-r">
                                            <input id="deWet" type="text" name="deWet" placeholder="è¯·è¾å¥"
                                                   autocomplete="off" class="layui-input weight"> <em
                                                class="kccz-data-dw">KG</em>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <!--<div class="layui-col-xs4">-->
                            <!--    <div class="layui-form-item kccz-data-group-md">-->
                            <!--        <label class="layui-form-label">æ°´åå¢é</label>-->
                            <!--        <div class="posi-r kccz-data-bfb fr">-->
                            <!--            <input id="wet" type="text" name="wet" placeholder="è¯·è¾å¥"-->
                            <!--                   autocomplete="off" class="layui-input weight"> <em-->
                            <!--                class="kccz-data-dw">%</em>-->
                            <!--        </div>-->
                            <!--        <div class="layui-input-block">-->
                            <!--            <div class="posi-r">-->
                            <!--                <input id="deWet" type="text" name="deWet" placeholder="è¯·è¾å¥"-->
                            <!--                       autocomplete="off" class="layui-input weight"> <em-->
                            <!--                    class="kccz-data-dw">KG</em>-->
                            <!--            </div>-->
                            <!--        </div>-->
                            <!--    </div>-->
                            <!--</div>-->
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">ç²®é£åç§</label>
@@ -442,6 +453,15 @@
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">å¶ä»è¯´æ</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="deOtherInfo" autocomplete="off"
                                               placeholder="å¶ä»æ£éè¯´æ" class="layui-input">
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
@@ -453,51 +473,29 @@
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">è§&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;æ ¼</label>
                                    <div class="layui-input-block">
                                        <select name="specType" id="specType">
                                            <option value="æ£ç²®">æ£ç²®</option>
                                            <option value="25kg">25kg</option>
                                            <option value="50kg">50kg</option>
                                        </select>
                                    </div>
                                </div>
                            </div>
                            <!--<div class="layui-col-xs4">-->
                            <!--    <div class="layui-form-item">-->
                            <!--        <label class="layui-form-label">è§&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;æ ¼</label>-->
                            <!--        <div class="layui-input-block">-->
                            <!--            <select name="specType" id="specType">-->
                            <!--                <option value="æ£ç²®">æ£ç²®</option>-->
                            <!--                <option value="25kg">25kg</option>-->
                            <!--                <option value="50kg">50kg</option>-->
                            <!--            </select>-->
                            <!--        </div>-->
                            <!--    </div>-->
                            <!--</div>-->
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">ç²®é£äº§å°</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="foodLocation" placeholder="è¯·éæ©"
                                               autocomplete="off" class="layui-input"> <em
                                            class="kccz-data-dw cursor" onclick="showFoodLocation()">â¦</em>
                                            class="kccz-data-dw cursor" onclick="showFoodLocation()">â¦â¦</em>
                                    </div>
                                </div>
                            </div>


                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">åä»·</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="price" placeholder="è¯·è¾å¥åä»·"
                                               class="layui-input"> <em class="kccz-data-dw">å/å¬æ¤</em>
                                    </div>
                                </div>
                            </div>



                            <div class="layui-col-xs8">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">å¤æ³¨è¯´æ</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="remarks" placeholder="è¯·è¾å¥åå®¹"
                                               class="layui-input">
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label color-red">ç»ç®éé</label>
@@ -508,17 +506,28 @@
                                    </div>
                                </div>
                            </div>
                            <!--<div class="layui-col-xs4">-->
                            <!--    <div class="layui-form-item">-->
                            <!--        <label class="layui-form-label">åä»·</label>-->
                            <!--        <div class="layui-input-block">-->
                            <!--            <input type="text" name="price" placeholder="è¯·è¾å¥åä»·"-->
                            <!--                   class="layui-input"> <em class="kccz-data-dw">å/å¬æ¤</em>-->
                            <!--        </div>-->
                            <!--    </div>-->
                            <!--</div>-->


                            <div class="layui-col-xs8">
                                    <span style="padding-left: 50px;color: blue;">
                                        æ³¨æï¼1ãæ°´åå¢éï¼æ£æ°=å¢å  <br>
                                    </span>
                                <span style="padding-left: 93px;color: blue;">
                                        2ãåé = æ¯é - ç®é ï¼æ»æ£é = æ£æ°´æï¼å¤§äº0ï¼ + ç°åºæ£é + å¶ä»æ£é<br>
                                    </span>
                                <span style="padding-left: 93px;color: blue;">
                                        3ãç»ç®éé = åé - æ»æ£é + æ°´æå¢éï¼åºåºéé = åé - æ»æ£é
                                    </span>
                                <div class="layui-form-item">
                                    <label class="layui-form-label">å¤æ³¨è¯´æ</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="remarks" placeholder="è¯·è¾å¥åå®¹"
                                               autocomplete="off" class="layui-input">
                            </div>
                                </div>
                            </div>


                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label color-red">åºåºéé</label>
@@ -529,6 +538,80 @@
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs8">
                                <span style="padding-left: 93px;color: blue;">
                                       è¯´æï¼ 1ãåé = æ¯é - ç®é ï¼æ»æ£é =  ç°åºæ£é + å¶ä»æ£é<br>
                                    </span>
                                <span style="padding-left: 93px;color: blue;">
                                        2ãç»ç®éé = åé - æ»æ£é ï¼åºåºéé = åé - æ»æ£é
                                    </span>
                            </div>

                            <div class="layui-col-xs12">
                                <div class="line-container">
                                    <div class="line"></div>
                                    <div class="line-text">ä»¥ä¸æ ¹æ®åºåºç§°éä½ä¸è¦æ±å¡«å</div>
                                    <div class="line"></div>
                                </div>
                            </div>

                            <!-- è¡¥ååæ®µé»è®¤éè -->
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">åè£ç©</label>
                                    <div class="layui-input-block">
                                        <input type="radio" name="bzw" value="1" title="éº»è¢">
                                        <input type="radio" name="bzw"
                                               value="2" title="ç¼ç»è¢">
                                        <input type="radio" name="bzw"
                                               value="3" title="æ£è£" checked>
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">åè£æ£é</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="dePackage" autocomplete="off"
                                               placeholder="è¯·è¾å¥" class="layui-input weight"> <em
                                            class="kccz-data-dw">KG</em>
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">åä»·</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="price" placeholder="è¯·è¾å¥"
                                               class="layui-input"> <em class="kccz-data-dw">å/å¬æ¤</em>
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">æ ååé</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="dbz" autocomplete="off"
                                               placeholder="è¯·è¾å¥" class="layui-input"> <em
                                            class="kccz-data-dw">KG</em>
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">åä»¶æ»æ°</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="bzbjs" autocomplete="off"
                                               placeholder="è¯·è¾å¥" class="layui-input"> <em
                                            class="kccz-data-dw">ä»¶</em>
                                    </div>
                                </div>
                            </div>

                        </form>
                    </div>
                </div>
@@ -662,6 +745,7 @@
<script th:src="@{../../static/js/igds-common.js}"></script>
<script th:src="@{../../static/admin/inout/inout-print.js}"></script>
<script th:src="@{../../static/admin/inout/video-play.js}"></script>
<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
<script th:src="@{../../static/admin/inout/weight.js}"></script>
<script th:src="@{../../static/admin/inout/out-weight.js}"></script>
</body>

 igds-web/src/main/resources/templates/test/print-out.html

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,98 @@
<!DOCTYPE html>
<html lang='zh-cn'>
<head>
    <meta http-equiv='Content-Type' content='text/html;charset=UTF-8'>
    <title>åºåºç§°éå</title>
    <style>body {
        text-align: center;
        padding: 10px
    }

    .tit {
        margin: 10px;
        font-size: 24px;
        font-family: 'å®ä½';
        padding-top: 15px
    }

    .div-tit {
        padding-top: 10px
    }

    .sp1 {
        width: 50%;
        float: left;
        padding-bottom: 10px
    }

    .sp2 {
        width: 25%;
        float: left;
        text-align: center
    }

    table {
        width: 100%;
        border-right: 1px solid;
        border-bottom: 1px solid;
        font-size: 14px
    }

    table td {
        border-left: 1px solid;
        border-top: 1px solid;
        height: 38px
    }</style>
</head>
<body><h1 class='tit'>billTitle</h1>
<div class='div-tit'><span class='sp1'>ç»è®°æ¶é´ï¼registerTime</span><span class='sp1'>åºåºåå·ï¼serId</span></div>
<table cellspacing='0' cellpadding='0'>
    <tr>
        <td width='12.5%'>åè´§åä½</td>
        <td colspan='3' width='37.5%'>deptName</td>
        <td width='12.5%'>æ¶è´§åä½</td>
        <td colspan='3' width='37.5%'>customerName</td>
    </tr>
    <tr>
        <td width='12.5%'>æ¿è¿äºº</td>
        <td width='12.5%'>driverName</td>
        <td width='12.5%'>ç²®é£åç§</td>
        <td width='12.5%'>foodVariety</td>
        <td width='12.5%'>åºåºä»åº</td>
        <td width='12.5%'>depotName</td>
        <td width='12.5%'>ç²®é£äº§å°</td>
        <td width='12.5%'>foodLocation</td>
    </tr>
    <tr>
        <td>æ¿è¿è½¦ç</td>
        <td>plateNum</td>
        <td>æ¯é(KG)</td>
        <td>fullWeight</td>
        <td>ç®é(KG)</td>
        <td>emptyWeight</td>
        <td>åé(KG)</td>
        <td>netWeight</td>
    </tr>
    <tr>
        <td>å¶ä»æ£é</td>
        <td>deOther</td>
        <td>å¼ä»æ£é(KG)</td>
        <td>deHandle</td>
        <td>ç»ç®éé(KG)</td>
        <td>settleWeight</td>
        <td colspan="2"></td>
    </tr>
    <tr>
        <td>å¤æ³¨</td>
        <td colspan='7'>remark</td>
    </tr>
</table>
<div class='div-tit'><span class='sp2'>å¸ç£åï¼</span><span class='sp2'>çç£åï¼</span><span
        class='sp2'>ä¿ç®¡åï¼handleUser</span><span class='sp2'>æ¿è¿äººï¼driverName</span></div>
<br></body>
<div style="padding-top: 10px"><span></span></div>
<div style="text-align: left;font-size: 12px"><span>æ³¨ï¼</span></div>
<div style="text-align: left;font-size: 12px"><span>1.åé=æ¯é-ç®éï¼</span></div>
<div style="text-align: left;font-size: 12px"><span>2.åºåºéé=åé-æ»æ£éï¼ç»ç®éé=åé-æ»æ£éï¼</span></div>
<div style="text-align: left;font-size: 12px"><span>3.ç½èï¼åæ ¹ï¼ï¼çº¢èï¼è®°è´¦ï¼ï¼é»èï¼å®¢æ·ä¿çï¼</span></div>
</html>

 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>

			@@ -14,7 +14,7 @@
			/**
			* é»è®¤åºåºè¿ç£å
			*/
			public static String OUT_WEIGHT_DEFAULT = "<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type'content='text/html;charset=UTF-8'><title>åºåºç§°éå</title><style>body{text-align:center;padding:10px}.tit{margin:10px;font-size:24px;font-family:'å®ä½';padding-top:15px}.div-tit{padding-top:10px}.sp1{width:33%;float:left;padding-bottom:10px}.sp2{width:25%;float:left;text-align:center}table{width:100%;border-right:1px solid;border-bottom:1px solid;font-size:14px}table td{border-left:1px solid;border-top:1px solid;height:38px}</style></head><body><h1 class='tit'>billTitle</h1><div class='div-tit'><span class='sp1'>ç»è®°æ¶é´ï¼registerTime</span><span class='sp1'>å®ææ¶é´ï¼completeTime</span><span class='sp1'>åºåºåå·ï¼serId</span></div><table cellspacing='0'cellpadding='0'><tr><td width='12.5%'>åè´§åä½</td><td colspan='3'width='37.5%'>deptName</td><td width='12.5%'>æ¶è´§åä½</td><td colspan='3'width='37.5%'>customerName</td></tr><tr><td width='12.5%'>æ¿è¿äºº</td><td width='12.5%'>driverName</td><td width='12.5%'>ç²®é£åç§</td><td width='12.5%'>foodVariety</td><td width='12.5%'>åºåºä»åº</td><td width='12.5%'>depotName</td><td width='12.5%'>ç²®é£äº§å°</td><td width='12.5%'>foodLocation</td></tr><tr><td>æ¿è¿è½¦ç</td><td>plateNum</td><td>æ¯é(KG)</td><td>fullWeight</td><td>ç®é(KG)</td><td>emptyWeight</td><td>åé(KG)</td><td>netWeight</td></tr><tr><td>å¤æ³¨</td><td colspan='3'>remark</td><td>æ°´åå¢é(KG)</td><td>deWet</td><td>ç»ç®éé(KG)</td><td>settleWeight</td></tr></table><div class='div-tit'><span class='sp2'>å¸ç£åï¼</span><span class='sp2'>çç£åï¼</span><span class='sp2'>ä¿ç®¡åï¼handleUser</span><span class='sp2'>æ¿è¿äººï¼</span></div></body></html>";
			public static String OUT_WEIGHT_DEFAULT = "<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type' content='text/html;charset=UTF-8'><title>åºåºç§°éå</title><style>body {text-align: center;padding: 10px} .tit {margin: 10px;font-size: 24px;font-family: 'å®ä½';padding-top: 15px} .div-tit {padding-top: 10px} .sp1 {width: 50%;float: left;padding-bottom: 10px} .sp2 {width: 25%;float: left;text-align: center} table {width: 100%;border-right: 1px solid;border-bottom: 1px solid;font-size: 14px} table td {border-left: 1px solid;border-top: 1px solid;height: 38px}</style></head><body><h1 class='tit'>billTitle</h1><div class='div-tit'><span class='sp1'>ç»è®°æ¶é´ï¼registerTime</span><span class='sp1'>åºåºåå·ï¼serId</span></div><table cellspacing='0' cellpadding='0'><tr><td width='12.5%'>åè´§åä½</td><td colspan='3' width='37.5%'>deptName</td><td width='12.5%'>æ¶è´§åä½</td><td colspan='3' width='37.5%'>customerName</td></tr><tr><td width='12.5%'>æ¿è¿äºº</td><td width='12.5%'>driverName</td><td width='12.5%'>ç²®é£åç§</td><td width='12.5%'>foodVariety</td><td width='12.5%'>åºåºä»åº</td><td width='12.5%'>depotName</td><td width='12.5%'>ç²®é£äº§å°</td><td width='12.5%'>foodLocation</td></tr><tr><td>æ¿è¿è½¦ç</td><td>plateNum</td><td>æ¯é(KG)</td><td>fullWeight</td><td>ç®é(KG)</td><td>emptyWeight</td><td>åé(KG)</td><td>netWeight</td></tr><tr><td>å¶ä»æ£é(KG)</td><td>deOther</td><td>å¼ä»æ£é(KG)</td><td>deHandle</td><td>ç»ç®éé(KG)</td><td>settleWeight</td><td colspan=\"2\"></td></tr><tr><td>å¤æ³¨</td><td colspan='7'>remark</td></tr></table><div class='div-tit'><span class='sp2'>å¸ç£åï¼</span><span class='sp2'>çç£åï¼</span><span class='sp2'>ä¿ç®¡åï¼handleUser</span><span class='sp2'>æ¿è¿äººï¼driverName</span></div><br></body><div style=\"padding-top: 10px\"><span></span></div><div style=\"text-align: left;font-size: 12px\"><span>æ³¨ï¼</span></div><div style=\"text-align: left;font-size: 12px\"><span>1.åé=æ¯é-ç®éï¼</span></div><div style=\"text-align: left;font-size: 12px\"><span>2.åºåºéé=åé-æ»æ£éï¼ç»ç®éé=åé-æ»æ£éï¼</span></div><div style=\"text-align: left;font-size: 12px\"><span>3.ç½èï¼åæ ¹ï¼ï¼çº¢èï¼è®°è´¦ï¼ï¼é»èï¼å®¢æ·ä¿çï¼</span></div></html>";
			/**
			* é»è®¤éªæ£å
			*/

			@@ -148,7 +148,7 @@
			*/
			public String outWeightBill(InoutData data) {
			// è·åè¡¨åæ°æ®
			WeightBill bill = this.createBillData(data, "åºåºç§°éå");
			WeightBill bill = this.createBillData(data, "åºåºåç å");

			//é»è®¤æ¨¡ç
			String htmlStr = InoutBill.OUT_WEIGHT_DEFAULT;
			@@ -190,7 +190,7 @@
			htmlStr = htmlStr.replace("fullTime", bill.getFullTime());
			htmlStr = htmlStr.replace("emptyTime", bill.getEmptyTime());
			htmlStr = htmlStr.replace("serId", bill.getSerId());
			htmlStr = htmlStr.replace("specType", bill.getSpecType());
			// htmlStr = htmlStr.replace("specType", bill.getSpecType());

			htmlStr = htmlStr.replace("customerName", bill.getCustomerName());
			htmlStr = htmlStr.replace("deptName", bill.getUnitName());
			@@ -212,13 +212,13 @@
			new DecimalFormat("0").format(bill.getNetWeight()));

			htmlStr = htmlStr.replace("remark", bill.getRemark());
			htmlStr = htmlStr.replace("deWet", bill.getDeWet() + "");
			// htmlStr = htmlStr.replace("deWet", bill.getDeWet() + "");
			htmlStr = htmlStr.replace("settleWeight",
			new DecimalFormat("0").format(bill.getSettleWeight()));

			htmlStr = htmlStr.replace("deHandle", bill.getDeHandle() + "");
			htmlStr = htmlStr.replace("handleUser", bill.getHandleUser());
			htmlStr = htmlStr.replace("deSum", bill.getDeSum() + "");

			htmlStr = htmlStr.replace("deOther", bill.getDeOther() + "");
			htmlStr = htmlStr.replace("price", bill.getPrice());
			htmlStr = htmlStr.replace("settleMoney", bill.getSettleMoney() + "");
			htmlStr = htmlStr.replace("wet", bill.getWet() + "");

			@@ -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) {

			@@ -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}

			@@ -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']});
			}
			}

			@@ -116,7 +116,7 @@
			var index = layer.load();
			$.ajax({
			type : "POST",
			url : "../../basic/inout-report/inout-bill-weight",
			url: "../../basic/inout/report/bill-weight",
			dataType : "json",
			contentType : "application/json;charset=UTF-8",
			data : JSON.stringify(recordData),
			@@ -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),

			@@ -99,11 +99,14 @@
			});

			showProgress();

			// çå¬ééåå
			$(".weight").blur(function () {
			deAutoByHandle(this.name)
			});
			//è°æ´åæ®µä¸ç¼è¾
			$("#depotId").attr("disabled",true);
			$("#foodVariety").attr("disabled",true);
			$("#foodLevel").attr("disabled",true);
			// $("#foodLevel").attr("disabled", true);
			});


			@@ -191,6 +194,13 @@
			});
			}

			function flushPage() {
			layer.confirm('ç¡®å®è¦å·æ°é¡µé¢åï¼', {icon: 3, title: 'æç¤º'}, function (index) {
			resetForm();
			layer.close(index);
			});
			}

			// è¡¨åæ¸ç©º
			function resetForm() {
			$("#form-data")[0].reset();
			@@ -200,6 +210,7 @@
			$('#kccz-r-img3').removeAttr('src');
			form.render();
			recordData = null;
			$("#text-param").val(null);
			}

			// æ´æ°æ°æ®ä¿¡æ¯
			@@ -241,7 +252,7 @@

			// å½åå®æ
			function submit() {
			if (null == recordData) {
			if (!recordData) {
			layer.alert("æ²¡ææ°æ®å¯ä»¥æäº¤ï¼ï¼ï¼");
			return;
			}
			@@ -262,7 +273,7 @@

			$.ajax({
			type: "POST",
			url: "../../basic/inout/inout-next-step",
			url: "../../basic/inout/submit-handle",
			dataType: "json",
			contentType: "application/json;charset=UTF-8",
			data: JSON.stringify(recordData),

			@@ -101,9 +101,10 @@
			layer.close(index);
			var data = json.content;
			if (data === "not found") {
			layer.alert("æ²¡æè·åå°èº«ä»½è¯ä¿¡æ¯ï¼", {
			offset: ['300px', '300px']
			});
			// layer.alert("æ²¡æè·åå°èº«ä»½è¯ä¿¡æ¯ï¼", {
			// offset: ['300px', '300px']
			// });
			alertError("æ²¡æè·åå°èº«ä»½è¯ä¿¡æ¯ï¼");
			return;
			}
			// ä¸´æ¶èµå¼
			@@ -165,32 +166,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']
			// });
			// }
			});
			}

			@@ -239,15 +253,18 @@
			function submit() {
			var data = form.val("form-data");
			if (!data.userName) {
			notify("æ¿è¿äººä¿¡æ¯ä¸è½ä¸ºç©º", null);
			// notify("æ¿è¿äººä¿¡æ¯ä¸è½ä¸ºç©º", null);
			alertError("æ¿è¿äººä¿¡æ¯ä¸è½ä¸ºç©º");
			return;
			}
			if (!data.plateNum) {
			notify("è½¦çå·ä¸è½ä¸ºç©º", null);
			alertError("è½¦çå·ä¸è½ä¸ºç©º");
			// notify("è½¦çå·ä¸è½ä¸ºç©º", null);
			return;
			}
			if (!data.intelCard && !data.userId) {
			notify("æºæ§å¡å·ä¸èº«ä»½è¯å·ä¸è½åæ¶ä¸ºç©º", null);
			alertError("æºæ§å¡å·ä¸èº«ä»½è¯å·ä¸è½åæ¶ä¸ºç©º");
			// notify("æºæ§å¡å·ä¸èº«ä»½è¯å·ä¸è½åæ¶ä¸ºç©º", null);
			return;
			}

			@@ -299,7 +316,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),

			@@ -48,9 +48,8 @@

			// çå¬ééåå
			$(".weight").blur(function () {
			var name = this.name;
			// deAutoByWeight(name);
			deAutoByOut(name);
			deAutoByOut(this.name)
			});

			// åå§åWebSocket
			@@ -85,42 +84,42 @@
			//ææ
			}

			// æ ¹æ®å½åæä½çæé®IDæ´æ°å¶ä»æé®ç¶æ
			function flushBtn(btnId) {
			if ("btn-weight" == btnId) {// ç§°éåå¯ä»¥ç¹å»å®æç§°é
			$("#btn-submit").removeClass("layui-btn-disabled");
			$("#btn-submit").attr("disabled", false);
			}

			if ("btn-submit" == btnId) {
			$("#btn-submit").addClass("layui-btn-disabled");
			$("#btn-submit").attr("disabled", true);

			if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {// åºåºï¼å¦ææ¯ç©ºè½¦ç§°éï¼å®ææ¶ç´æ¥å·æ°é¡µé¢
			resetForm();
			} else {
			// å®æç§°éåæ§å¶æé®
			$("#btn-weight").addClass("layui-btn-disabled");
			$("#btn-weight").attr("disabled", true);

			$("#btn-printBill").removeClass("layui-btn-disabled");
			$("#btn-printBill").attr("disabled", false);
			addDisabled();
			}
			}
			if ("btn-printBill" == btnId) {// æå°è¿ç£åï¼è¯´æä¸å¡å®æ
			$("#btn-weight").removeClass("layui-btn-disabled");
			$("#btn-weight").attr("disabled", false);

			$("#btn-submit").addClass("layui-btn-disabled");
			$("#btn-submit").attr("disabled", true);

			$("#btn-printBill").addClass("layui-btn-disabled");
			$("#btn-printBill").attr("disabled", true);
			delDisabled();
			resetForm();
			}
			}
			// // æ ¹æ®å½åæä½çæé®IDæ´æ°å¶ä»æé®ç¶æ
			// function flushBtn(btnId) {
			// if ("btn-weight" == btnId) {// ç§°éåå¯ä»¥ç¹å»å®æç§°é
			// $("#btn-submit").removeClass("layui-btn-disabled");
			// $("#btn-submit").attr("disabled", false);
			// }
			//
			// if ("btn-submit" == btnId) {
			// $("#btn-submit").addClass("layui-btn-disabled");
			// $("#btn-submit").attr("disabled", true);
			//
			// if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {// åºåºï¼å¦ææ¯ç©ºè½¦ç§°éï¼å®ææ¶ç´æ¥å·æ°é¡µé¢
			// resetForm();
			// } else {
			// // å®æç§°éåæ§å¶æé®
			// $("#btn-weight").addClass("layui-btn-disabled");
			// $("#btn-weight").attr("disabled", true);
			//
			// $("#btn-printBill").removeClass("layui-btn-disabled");
			// $("#btn-printBill").attr("disabled", false);
			// addDisabled();
			// }
			// }
			// if ("btn-printBill" == btnId) {// æå°è¿ç£åï¼è¯´æä¸å¡å®æ
			// $("#btn-weight").removeClass("layui-btn-disabled");
			// $("#btn-weight").attr("disabled", false);
			//
			// $("#btn-submit").addClass("layui-btn-disabled");
			// $("#btn-submit").attr("disabled", true);
			//
			// $("#btn-printBill").addClass("layui-btn-disabled");
			// $("#btn-printBill").attr("disabled", true);
			// delDisabled();
			// resetForm();
			// }
			// }

			//æ§å¶æµç¨ç¯èæ¾ç¤º
			function showProgress() {
			@@ -195,17 +194,19 @@
			form.render();

			// ç¹å»ç§°éæ¶åèªå¨æææ°æ®
			layer.msg("ç³»ç»èªå¨ææä¿çè®°å½â¦â¦");
			// layer.msg("ç³»ç»èªå¨ææä¿çè®°å½â¦â¦");
			snapData = {
			companyId: companyId,
			deptId: deptId,
			progress: recordData.progress,
			bizType: bizType,
			plateNum: recordData.plateNum,

			id1: (null != snapDto1) ? snapDto1.id : null,
			id2: (null != snapDto2) ? snapDto2.id : null,
			id3: (null != snapDto3) ? snapDto3.id : null,
			id1: snapDto1.id,
			id2: snapDto2.id,
			id3: snapDto3.id,
			// id1: (null != snapDto1) ? snapDto1.id : null,
			// id2: (null != snapDto2) ? snapDto2.id : null,
			// id3: (null != snapDto3) ? snapDto3.id : null,

			sort: $("#scaleName").val(),
			weight: weightDto.weight
			@@ -223,7 +224,8 @@
			success: function (result) {
			layer.close(index);
			if (result.code != "0000") {
			layer.alert(result.msg);
			alertError(result.msg);
			// layer.alert(result.msg);
			} else {
			snapData = result.data;
			}
			@@ -240,8 +242,9 @@
			}

			// å·æ°ç¶æ
			flushBtn("btn-weight");
			// flushBtn("btn-weight");
			}

			//æ°çè¯»å¡æ¹å¼
			function flushICCard() {
			if(cardDto && cardDto.protocol != "TCP_DEFAULT"){
			@@ -261,7 +264,7 @@
			var index = layer.load();
			$.ajax({
			type: "POST",
			url: "../../inout/api/ic-card-num",
			url: "../../inout/api/get-icCard",
			dataType: "json",
			contentType: "application/json;charset=UTF-8",
			data: param,
			@@ -276,7 +279,9 @@
			offset: ['300px', '300px']
			});
			} else {
			$("#intelCard").val(result.data.icCardNo);
			paramIntelCard = data;
			$("#text-param").text("è¯å«å¡å·ï¼" + paramIntelCard);
			flushData(paramIntelCard, null);
			}
			}
			layer.close(index);
			@@ -294,7 +299,7 @@
			* æ¬å°è¯»åæºæ§å¡
			*/
			function flushICCard1() {
			$("#intelCard").val(null);
			$("#text-param").val(null);
			$("#form-data")[0].reset();
			form.render();
			recordData = null;
			@@ -313,8 +318,9 @@
			if (data === "not found") {
			layer.alert("è¯·éæ°è¯»å¡ï¼", {offset: ['300px', '300px']});
			} else {
			$("#intelCard").val(data);
			flushData();
			paramIntelCard = data;
			$("#text-param").text("è¯å«å¡å·ï¼" + paramIntelCard);
			flushData(paramIntelCard, null);
			}
			},
			error: function () {
			@@ -323,7 +329,7 @@
			});
			}

			// ä½¿ç¨æä»¶è·åçä»½è¯
			// ä½¿ç¨æä»¶è·åèº«ä»½è¯å·
			function flushIdCard() {
			var index = layer.load();
			$.ajax({
			@@ -343,8 +349,10 @@
			});
			return;
			}
			$("#userId").val(data.idNum);
			flushData();
			// $("#userId").val(data.idNum);
			$("#text-param").text("è¯å«èº«ä»½è¯ï¼" + paramIdCard);

			flushData(null, paramIdCard);
			},
			error: function () {
			layer.alert("èº«ä»½è¯è¯»åå¤±è´¥ï¼è¯·æå¨å½å¥ï¼", {
			@@ -380,10 +388,11 @@
			});
			}

			// æå°è¿ç£å

			// ç¹å»æå°ï¼ç³»ç»å¤ææ¯å¦å·²ç»æ§è¡å®æï¼å¦æå·²ç»å®æï¼ç´æ¥æå°ï¼å¦ææªå®æååæ§è¡å®æ
			function printBill() {
			if (!recordData) {
			layer.alert("æ²¡æè·åå°ä¸å¡æ°æ®ï¼ä¸æ¯ææå°ï¼");
			alertError("æ²¡æè·åå°ä¸å¡æ°æ®ï¼æå°è¢«æç»ï¼");
			return;
			}
			// ä»åå°è·åæ¨¡çå¹¶æå°
			@@ -391,7 +400,27 @@
			// åå¹¶æ´æ°ç¶åç¼è¾æ°æ®
			Object.assign(recordData, data);

			printBillStep2();
			var index = layer.load();
			$.ajax({
			type: "POST",
			url: "../../basic/inout/report/bill-weight",
			dataType: "json",
			contentType: "application/json;charset=UTF-8",
			data: JSON.stringify(recordData),
			success: function (result) {
			layer.close(index);
			if (result.code != "0000") {
			alertError(result.msg);
			} else {
			layer.msg("å¼å§æ¸²ææå°åâ¦â¦");
			printWeight(result.data);
			}
			},
			error: function () {
			layer.close(index);
			alertError("è·åæå°æ¨¡çå¤±è´¥ï¼è¯·èç³»ç®¡çåæ¥çåå ");
			}
			});
			}

			// ç¹å»æå°ï¼åæ§è¡ç³»ç»é»è®¤æ§è¡å®æå¡åæ¶
			@@ -399,7 +428,7 @@
			var index = layer.load();
			$.ajax({
			type: "POST",
			url: "../../basic/inout-report/inout-bill-weight",
			url: "../../basic/inout-report/bill-weight",
			dataType: "json",
			contentType: "application/json;charset=UTF-8",
			data: JSON.stringify(recordData),
			@@ -415,7 +444,7 @@
			printWeight(result.data);
			}
			// å·æ°æé®
			flushBtn("btn-printBill");
			// flushBtn("btn-printBill");
			}
			layer.close(index);
			},
			@@ -440,26 +469,27 @@
			$("#btn-weight").removeClass("layui-btn-disabled");
			$("#btn-weight").attr("disabled", false);

			//ç©ºè½¦åæ»¡è½¦è¢«éç½®
			updateEditAndProgress();
			$("#text-param").val('');

			//æ£éä¿¡æ¯æ¡æ¢å¤ä¸ºå¯ç¼è¾
			delDisabled();
			// //ç©ºè½¦åæ»¡è½¦è¢«éç½®
			// updateEditAndProgress();
			//
			// //æ£éä¿¡æ¯æ¡æ¢å¤ä¸ºå¯ç¼è¾
			// delDisabled();
			}


			function flushPage() {
			layer.confirm('ç¡®å®è¦å·æ°é¡µé¢åï¼', {icon: 3, title: 'æç¤º'}, function (index) {
			resetForm();
			layer.msg("é¡µé¢éç½®å®æï¼è¯·éæ°æä½â¦â¦");
			layer.close(index);
			});
			}

			function flushData() {
			function flushData(intelCard, userIdCard) {
			var index = layer.load();
			var userId2 = $("#userId").val();
			var intelCard = $("#intelCard").val();
			var userId2 = userIdCard;
			var intelCard = intelCard;
			var plateNum = $("#plateNum").val();
			var param = {
			type: type,
			@@ -477,7 +507,7 @@
			data: JSON.stringify(param),
			success: function (result) {
			if (result.code != "0000") {
			notify(result.msg, result.data);
			notifyProgress(result.msg, result.data);
			} else {
			recordData = result.data;
			// è¿åçæ°æ®è¿è¡èµå¼
			@@ -490,7 +520,8 @@
			},
			error: function () {
			layer.close(index);
			layer.alert("æ¥è¯¢å¤±è´¥ï¼è¯·éæ°å°è¯ï¼ï¼");
			alertError("æ¥è¯¢å¤±è´¥ï¼è¯·éæ°å°è¯");
			// layer.alert("æ¥è¯¢å¤±è´¥ï¼è¯·éæ°å°è¯ï¼ï¼");
			}
			});
			}
			@@ -542,37 +573,37 @@
			}

			// å½åå®æ
			function submit(data) {
			function submit() {
			if (null == recordData) {
			notify("æ²¡ææ°æ®å¯ä»¥æäº¤", null);
			notifyProgress("æ²¡ææ°æ®å¯ä»¥æäº¤", null);
			return;
			}
			var data = form.val("form-data");
			// æ ¡éª-åºåºç©ºè½¦
			if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
			if (data.emptyWeight <= 0.0) {
			notify("ç©ºè½¦ç§°éä¿¡æ¯å¿å¡«ï¼ï¼", null);
			notifyProgress("ç©ºè½¦ç§°éä¿¡æ¯å¿å¡«ï¼ï¼", null);
			return;
			}
			if (!data.depotId) {
			notify("è£å¸ä»åºå¿é¡»å¡«åï¼ï¼", null);
			notifyProgress("è£å¸ä»åºå¿é¡»å¡«åï¼ï¼", null);
			return;
			}
			if (!data.noticeId) {
			notify("éç¥åå¿é¡»å¡«åï¼ï¼", null);
			notifyProgress("éç¥åå¿é¡»å¡«åï¼ï¼", null);
			return;
			}
			} else {
			if (data.fullWeight <= 0.0) {
			notify("æ»¡è½¦ç§°éä¿¡æ¯å¿å¡«ï¼ï¼", null);
			notifyProgress("æ»¡è½¦ç§°éä¿¡æ¯å¿å¡«ï¼ï¼", null);
			return;
			}
			if (!data.foodVariety) {
			notify("ç²®é£åç§å¿å¡«ï¼ï¼", null);
			notifyProgress("ç²®é£åç§å¿å¡«ï¼ï¼", null);
			return;
			}
			if (!data.settleWeight \|\| data.settleWeight <= 0.0) {
			notify("ç»ç®ééåè§ï¼è¯·æ ¸å¯¹ï¼ï¼", null);
			notifyProgress("ç»ç®ééåè§ï¼è¯·æ ¸å¯¹ï¼ï¼", null);
			return;
			}
			}
			@@ -589,35 +620,34 @@
			fileName: snapData.fileName3
			}];
			recordData.files = files;

			var index = layer.load();
			$.ajax({
			type: "POST",
			url: "../../basic/inout/inout-next-step",
			url: "../../basic/inout/submit-weight",
			dataType: "json",
			contentType: "application/json;charset=UTF-8",
			data: JSON.stringify(recordData),
			success: function (result) {
			if (result.code != "0000") {
			notify(result.msg, result.data);
			notifyProgress(result.msg, result.data);
			} else {
			notify("æ°æ®æäº¤æå", result.data);
			notifyProgress("æ°æ®æäº¤æå", result.data);
			// æ´æ°æé®æ¾ç¤º
			flushBtn("btn-submit");
			// flushBtn("btn-submit");
			}
			layer.close(index);
			},
			error: function () {
			layer.close(index);
			notify("æäº¤å¤±è´¥ï¼è¯·éæ°å°è¯", null);
			notifyProgress("æäº¤å¤±è´¥ï¼è¯·éæ°å°è¯", null);
			}
			});

			//ä»¥ä¸é»è¾ä¸ºå¢å ä¸ä¸ªè¯é³éç¥çè°ç¨æ¹æ³ï¼ä¸èèè¿åç»æ
			var curWeight = recordData.fullWeight;
			if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
			curWeight = recordData.emptyWeight;
			}
			// var curWeight = recordData.fullWeight;
			// if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
			// curWeight = recordData.emptyWeight;
			// }
			// var param = {
			// sort: $("#scaleName").val(),
			// weight: curWeight,
			@@ -635,95 +665,96 @@
			// });
			}


			// ---------------------------éç¥å-å¼å§ -------------------//
			// å¼¹åºå¾æ¥åä½ä¸ææ¡
			function showNotice() {
			var index = layer.load();
			var param = {
			type: type
			};
			// æ¸²æå¾æ¥åä½åè¡¨
			table.render({
			elem: '#tableNotice',
			url: '../../basic/inout/list-noticeâout',
			page: false,
			// skin : "nob",
			// size : 'sm',
			even: true,
			method: 'POST',
			contentType: "application/json;charset=UTF-8",
			cols: [[{
			field: 'name',
			title: 'éç¥ååç§°',
			width: '15%'
			}, {
			field: 'customerName',
			title: 'æ¶è´§åä½'
			}, {
			field: 'depotName',
			title: 'ä»åºåç§°',
			width: '15%'
			}, {
			field: 'foodVarietyName',
			title: 'ç²®é£åç§',
			width: '10%'
			}, {
			field: 'year',
			title: 'å¹´ä»½',
			width: '8%'
			}, {
			field: 'contractName',
			title: 'æå±åå'
			}]],
			where: param,
			parseData: function (res) {
			if ("0000" == res.code) {
			return {
			"code": "0",
			"msg": res.msg,
			"data": res.data
			}
			} else {
			return {
			"code": "1",
			"msg": res.msg
			}
			}
			},
			done: function (res) {
			layer.close(index);
			}
			});

			//åå»æ¾ç¤ºéä¸æ°æ®
			table.on('rowDouble(tableNotice)', function (obj) {
			var data = obj.data;
			form.val("form-data", {
			customerId: data.customerId,
			customerName: data.customerName,
			noticeId: data.id,
			foodType: data.foodType,
			foodLevel: data.foodLevel
			});
			// å³é
			layer.closeAll();
			});

			// å¼¹åºå¯¹è¯æ¡
			layer.open({
			type: 1,
			offset: ['100px', '250px'],
			title: "åºåºéç¥å",
			area: ['900px', '600px'],
			shade: 0,
			content: $('#listNotice'),
			btn: 0,
			btn: ['åæ¶'],
			yes: function () {
			layer.closeAll();
			},
			closeBtn: 0
			});
			}
			// ---------------------------éç¥å -ç»æ -------------------//
			//-----------------------è½¬ç§»è³weight.jsä¸----------------------//
			// // ---------------------------éç¥å-å¼å§ -------------------//
			// // å¼¹åºå¾æ¥åä½ä¸ææ¡
			// function showNotice() {
			// var index = layer.load();
			// var param = {
			// type: type
			// };
			// // æ¸²æå¾æ¥åä½åè¡¨
			// table.render({
			// elem: '#tableNotice',
			// url: '../../basic/inout/list-notice-out',
			// page: false,
			// // skin : "nob",
			// // size : 'sm',
			// even: true,
			// method: 'POST',
			// contentType: "application/json;charset=UTF-8",
			// cols: [[{
			// field: 'name',
			// title: 'éç¥ååç§°',
			// width: '15%'
			// }, {
			// field: 'customerName',
			// title: 'æ¶è´§åä½'
			// }, {
			// field: 'depotName',
			// title: 'ä»åºåç§°',
			// width: '15%'
			// }, {
			// field: 'foodVarietyName',
			// title: 'ç²®é£åç§',
			// width: '10%'
			// }, {
			// field: 'year',
			// title: 'å¹´ä»½',
			// width: '8%'
			// }, {
			// field: 'contractName',
			// title: 'æå±åå'
			// }]],
			// where: param,
			// parseData: function (res) {
			// if ("0000" == res.code) {
			// return {
			// "code": "0",
			// "msg": res.msg,
			// "data": res.data
			// }
			// } else {
			// return {
			// "code": "1",
			// "msg": res.msg
			// }
			// }
			// },
			// done: function (res) {
			// layer.close(index);
			// }
			// });
			//
			// //åå»æ¾ç¤ºéä¸æ°æ®
			// table.on('rowDouble(tableNotice)', function (obj) {
			// var data = obj.data;
			// form.val("form-data", {
			// customerId: data.customerId,
			// customerName: data.customerName,
			// noticeId: data.id,
			// foodType: data.foodType,
			// foodLevel: data.foodLevel
			// });
			// // å³é
			// layer.closeAll();
			// });
			//
			// // å¼¹åºå¯¹è¯æ¡
			// layer.open({
			// type: 1,
			// offset: ['100px', '250px'],
			// title: "åºåºéç¥å",
			// area: ['900px', '600px'],
			// shade: 0,
			// content: $('#listNotice'),
			// btn: 0,
			// btn: ['åæ¶'],
			// yes: function () {
			// layer.closeAll();
			// },
			// closeBtn: 0
			// });
			// }
			//
			// // ---------------------------éç¥å -ç»æ -------------------//

			@@ -42,79 +42,122 @@
			*/
			function deAutoByOut(name) {
			var curData = form.val("form-data");

			if (curData.fullWeight == 0 \|\| curData.emptyWeight == 0) {
			return;
			}
			//æ±æ»ç»æ
			var deSum = 0, addSum = 0, settleWeight = 0, recordWeight = 0;
			// åé
			var netWeight = curData.fullWeight - curData.emptyWeight;
			//æ£æ°´æ
			var deWet = curData.deWet, deImpurity = curData.deImpurity;

			if (netWeight <= 0) {
			layer.alert("åéå°äº0ï¼å½åç§°éåå¨é»è¾é®é¢");
			alertError("åé<=0ï¼å½åç¯èåå¨é»è¾éè¯¯ï¼è¯·æ ¸å¯¹");
			return;
			}
			//å¶ä»ä¿¡æ¯
			var deHandle = curData.deHandle, dePackage = curData.dePackage, deOther = curData.deOther, settleWeight = 0,
			recordWeight = 0, deSum = 0;
			recordWeight = Number(netWeight) - Number(deHandle) - Number(dePackage) - Number(deOther);
			settleWeight = Number(recordWeight);
			deSum = Number(deOther) + Number(deHandle)

			var deBase = 0, multiple = 0;
			//æ°´åæè´¨ï¼æ´æ¹æ¯ä¾å¹¶ä¸æ°´åæ£éè¿æ²¡è®¡ç®æåµä¸
			if ("fullWeight" == name \|\| null == deWet) {
			var checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C01, CHECK_ST.C020101);
			if (checkItem) {
			deBase = Number(curData.wet) - Number(checkItem.upperLimit);
			if (deBase == 0) return;
			multiple = parseInt(deBase / checkItem.ruleNum);//åæ°
			deWet = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
			}
			}
			//æè´¨
			if ("fullWeight" == name \|\| null == deImpurity) {
			checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C02, CHECK_ST.C01010301);
			if (checkItem) {
			deBase = Number(curData.impurity) - Number(checkItem.upperLimit);
			if (deBase == 0) return;
			multiple = parseInt(deBase / checkItem.ruleNum);
			deImpurity = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
			}
			}

			/** æ»æ£éï¼ä¸å«å¢é*/
			deSum = Number(curData.deOther) + Number(curData.deHandle);


			if (Number(deWet) > 0) {//å¢é
			addSum = addSum + Number(deWet);
			} else {
			deSum = deSum + Number(deWet);
			}

			if (Number(deImpurity) > 0) {//æ£é
			deSum = deSum + Number(deImpurity);
			} else {
			addSum = addSum + Number(deImpurity);
			}

			netWeight = netWeight.toFixed(0);
			recordWeight = recordWeight.toFixed(0);
			settleWeight = settleWeight.toFixed(0);
			deSum = deSum.toFixed(0);
			/** å¢éè½¬æ£æ°ï¼ä¾¿äºè®¡ç® */
			addSum = Math.abs(addSum).toFixed(0);
			/** å¥åºéé = åé - æ»æ£é */
			recordWeight = Number(netWeight) - Number(deSum);
			/** ç»ç®éé = åé - æ»æ£é + å¢é */
			settleWeight = Number(netWeight) - Number(deSum) + Number(addSum);

			form.val("form-data", {
			netWeight: netWeight,
			deImpurity: deImpurity,
			deWet: deWet,
			deSum: deSum,
			settleWeight: settleWeight,
			recordWeight: recordWeight
			recordWeight: recordWeight,
			deSum: deSum
			});
			form.render();
			}

			// function deAutoByOut(name) {
			// var curData = form.val("form-data");
			//
			// if (curData.fullWeight == 0 \|\| curData.emptyWeight == 0) {
			// return;
			// }
			// //æ±æ»ç»æ
			// var deSum = 0, addSum = 0, settleWeight = 0, recordWeight = 0;
			// // åé
			// var netWeight = curData.fullWeight - curData.emptyWeight;
			// //æ£æ°´æ
			// var deWet = curData.deWet, deImpurity = curData.deImpurity;
			//
			// if (netWeight <= 0) {
			// layer.alert("åéå°äº0ï¼å½åç§°éåå¨é»è¾é®é¢");
			// return;
			// }
			//
			// var deBase = 0, multiple = 0;
			// //æ°´åæè´¨ï¼æ´æ¹æ¯ä¾å¹¶ä¸æ°´åæ£éè¿æ²¡è®¡ç®æåµä¸
			// if ("fullWeight" == name \|\| null == deWet) {
			// var checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C01, CHECK_ST.C020101);
			// if (checkItem) {
			// deBase = Number(curData.wet) - Number(checkItem.upperLimit);
			// if (deBase == 0) return;
			// multiple = parseInt(deBase / checkItem.ruleNum);//åæ°
			// deWet = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
			// }
			// }
			// //æè´¨
			// if ("fullWeight" == name \|\| null == deImpurity) {
			// checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C02, CHECK_ST.C01010301);
			// if (checkItem) {
			// deBase = Number(curData.impurity) - Number(checkItem.upperLimit);
			// if (deBase == 0) return;
			// multiple = parseInt(deBase / checkItem.ruleNum);
			// deImpurity = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
			// }
			// }
			//
			// /** æ»æ£éï¼ä¸å«å¢é*/
			// deSum = Number(curData.deOther) + Number(curData.deHandle);
			//
			//
			// if (Number(deWet) > 0) {//å¢é
			// addSum = addSum + Number(deWet);
			// } else {
			// deSum = deSum + Number(deWet);
			// }
			//
			// if (Number(deImpurity) > 0) {//æ£é
			// deSum = deSum + Number(deImpurity);
			// } else {
			// addSum = addSum + Number(deImpurity);
			// }
			//
			// deSum = deSum.toFixed(0);
			// /** å¢éè½¬æ£æ°ï¼ä¾¿äºè®¡ç® */
			// addSum = Math.abs(addSum).toFixed(0);
			// /** å¥åºéé = åé - æ»æ£é */
			// recordWeight = Number(netWeight) - Number(deSum);
			// /** ç»ç®éé = åé - æ»æ£é + å¢é */
			// settleWeight = Number(netWeight) - Number(deSum) + Number(addSum);
			//
			// form.val("form-data", {
			// netWeight: netWeight,
			// deImpurity: deImpurity,
			// deWet: deWet,
			// deSum: deSum,
			// settleWeight: settleWeight,
			// recordWeight: recordWeight
			// });
			// form.render();
			// }
			function deAutoByHandle(name) {
			var curData = form.val("form-data");
			var deOther = curData.deOther, deHandle = curData.deHandle;
			deSum = Number(deOther) + Number(deHandle);
			deSum = deSum.toFixed(0);
			form.val("form-data", {
			deSum: deSum,
			});
			form.render();

			}

			/**
			* æ ¹æ®åéªé¡¹åä¼ éè¿æ¥çåæ°è·åå½ååæ°çéç½®ä¿¡æ¯
			* @param checkItems

			@@ -230,7 +230,8 @@
			<div class="rkbk-quick layui-text-center">
			<button id="button_readID" type="button"
			onclick="flushIdCard()"
			class="rkbk-quick-btn layui-btn btn-blue">è¯»åèº«ä»½è¯</button>
			class="rkbk-quick-btn layui-btn btn-blue">è¯»åèº«ä»½è¯
			</button>
			</div>

			</div>
			@@ -278,7 +279,8 @@
			<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
			name="transType" value="3"
			title="è½®è¹"> <input
			type="radio" name="transType" value="9" title="å¶ä»">
			</div>
			</div>
			@@ -300,11 +302,10 @@
			<span id="plateNum2">æªè¯å«</span>
			<p>è½¦çè¯å«</p>
			</div>

			<a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active mt-10"> <span class="kccz-r-pz"></span>
			<a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active mt-10"> <span
			class="kccz-r-pz"></span>
			<p>ç³»ç»èªå¨ææ</p>
			</a>

			</div>
			</div>
			</div>

			@@ -299,6 +299,13 @@
			autocomplete="off" class="layui-input rkbk-search-input" disabled>
			</div>
			</div>

			<div class="rkbk-quick layui-text-center">
			<button class="rkbk-quick-btn layui-btn btn-green" type='button'
			onclick="submit()">
			<i><img th:src="@{../../static/images/icon-ok.png}"/></i> åºåºæ¶å¡
			</button>
			</div>
			</form>
			</div>
			</div>

			@@ -30,11 +30,20 @@
			background: #eff4f6;
			}

			#text-param {
			font-size: 14px;
			color: red;
			padding-left: 10px;
			}

			.rk-step-wrap {
			padding: 0px;
			border-bottom: 0px;
			text-align: center;
			}

			.kccz-left-box2 {
			height: 560px;
			}

			.qyzj-btnbox {
			@@ -49,12 +58,42 @@
			min-height: 38px;
			padding-top: 2px;
			}

			.kccz-con {
			margin: 15px 0;
			}

			.rkbk-search-btn {
			width: 100px;
			height: 30px;
			line-height: 30px;
			font-size: 16px;
			}

			.kccz-r-btnbox {
			width: 86px !important;
			}

			.kccz-r-btn {
			width: 86px !important;
			}

			.rkbk-search-input {
			background: #FFF !important;
			}

			.color-red {
			color: red !important;
			}

			.r-240 {
			right: 240px;
			}

			.r-120 {
			right: 120px;
			}

			</style>

			</head>
			@@ -71,6 +110,10 @@
			<button class="rkbk-quick-btn layui-btn btn-green btn-sm"
			onclick="submit()">
			<i><img th:src="@{../../static/images/icon-ok.png}"/></i>å¼ä»å®æ
			</button>
			<button class="rkbk-quick-btn layui-btn btn-violet btn-sm"
			onclick="flushPage()">
			<i><img th:src="@{../../static/images/icon-shuaxin2.png}"/></i>å·æ°é¡µé¢
			</button>
			</div>

			@@ -119,11 +162,20 @@
			<div class="kccz-con">
			<div class="kccz-left radius-6 fl bg-fff">

			<div class="kccz-left-box2 ">
			<div class="kccz-left-box2 radius-6">

			<div class="rkbk-tit">
			<i></i>
			<h3>åºåºä¿¡æ¯</h3>
			<h3>åºåºä¿¡æ¯<span id="text-param"></span></h3>
			<div>
			<input type="button" value="è¯»æºæ§å¡"
			class="rkbk-search-btn layui-btn r-240" onclick="flushICCard()">
			<input type="button" value="è¯»èº«ä»½è¯"
			class="rkbk-search-btn layui-btn r-120" onclick="flushIdCard()">
			<input type="button" value="æå¨æ¥è¯¢"
			class="rkbk-search-btn layui-btn" onclick="flushData()">

			</div>
			</div>

			<div class="kccz-data-form layui-row">
			@@ -162,10 +214,10 @@

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">èº«ä»½è¯å·</label>
			<label class="layui-form-label color-red">æ¿è¿äºº</label>
			<div class="layui-input-block">
			<input type="text" name="userId" id="userId"
			placeholder="æ¿è¿äººèº«ä»½è¯å·" autocomplete="off" class="layui-input">
			<input type="text" name="userName" id="userName"
			placeholder="ä¸å¯ç¼è¾" autocomplete="off" class="layui-input" disabled>
			</div>
			</div>

			@@ -174,48 +226,49 @@

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">è½¦çå·</label>
			<label class="layui-form-label color-red">è½¦çå·</label>
			<div class="layui-input-block">
			<input type="text" name="plateNum" id="plateNum"
			autocomplete="off" class="layui-input">
			placeholder="èªå¨å¸¦å¥/æå¨å½å¥" autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<div class="layui-col-xs4 kccz-data-btnbox">
			<input type="button" value="è¯»èº«ä»½è¯"
			class="rkbk-search-btn layui-btn"
			onclick="flushIdCard()">
			</div>
			<div class="layui-col-xs4 kccz-data-btnbox">
			<input type="button" value="è¯»å¡"
			class="rkbk-search-btn layui-btn"
			onclick="flushICCard()">
			</div>
			<div class="layui-col-xs4 kccz-data-btnbox">
			<input type="button" value="æ¥  è¯¢"
			class="rkbk-search-btn layui-btn" onclick="flushData()">
			</div>
			</div>
			</div>
			<!-- <div class="layui-col-xs4">-->
			<!-- <div class="layui-form-item">-->
			<!-- <div class="layui-col-xs4 kccz-data-btnbox">-->
			<!-- <input type="button" value="è¯»èº«ä»½è¯"-->
			<!-- class="rkbk-search-btn layui-btn"-->
			<!-- onclick="flushIdCard()">-->
			<!-- </div>-->
			<!-- <div class="layui-col-xs4 kccz-data-btnbox">-->
			<!-- <input type="button" value="è¯»æºæ§å¡"-->
			<!-- class="rkbk-search-btn layui-btn"-->
			<!-- onclick="flushICCard()">-->
			<!-- </div>-->
			<!-- <div class="layui-col-xs4 kccz-data-btnbox">-->
			<!-- <input type="button" value="æå¨æ¥è¯¢"-->
			<!-- class="rkbk-search-btn layui-btn" onclick="flushData()">-->
			<!-- </div>-->
			<!-- </div>-->
			<!-- </div>-->
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">æºæ§å¡å·</label>
			<div class="layui-input-block">
			<input type="text" name="intelCard" id="intelCard"
			placeholder="æºæ§å¡å·" autocomplete="off" class="layui-input">
			placeholder="èªå¨å¸¦å¥/æå¨å½å¥" autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">ç©ºè½¦ç§°é</label>
			<label class="layui-form-label color-red">ç®é(ç©ºè½¦)</label>
			<div class="layui-input-block">
			<input type="text" name="emptyWeight" autocomplete="off" placeholder="ä¸å¯æ¹"
			class="layui-input rkbk-search-input" disabled> <em
			<input type="text" name="emptyWeight" autocomplete="off" placeholder="ä¸å¯ç¼è¾"
			class="layui-input rkbk-search-input" disabled>
			<em
			class="kccz-data-dw">KG</em>
			</div>
			</div>
			@@ -223,9 +276,9 @@

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">æ»¡è½¦ç§°é</label>
			<label class="layui-form-label">æ¯é(æ»¡è½¦)</label>
			<div class="layui-input-block">
			<input type="text" name="fullWeight" autocomplete="off" placeholder="ä¸å¯æ¹"
			<input type="text" name="fullWeight" autocomplete="off" placeholder="ä¸å¯ç¼è¾"
			class="layui-input rkbk-search-input" disabled> <em
			class="kccz-data-dw">KG</em>
			</div>
			@@ -233,10 +286,10 @@
			</div>
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">è£å¸ä»åº</label>
			<label class="layui-form-label color-red">è£å¸ä»åº</label>
			<div class="layui-input-block">
			<select name="depotId" id="depotId">
			<option value="">ä¸å¯æ¹</option>
			<option value="">ä¸å¯ç¼è¾</option>
			<option th:each="depot,depotSet:${listDepot}"
			th:value="${depot.id}" th:text="${depot.name}"></option>
			</select>
			@@ -244,40 +297,40 @@
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">å    é</label>
			<div class="layui-input-block">
			<input type="text" name="netWeight" autocomplete="off" placeholder="ä¸å¯æ¹"
			class="layui-input rkbk-search-input" disabled> <em
			class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>
			<!-- <div class="layui-col-xs4">-->
			<!-- <div class="layui-form-item">-->
			<!-- <label class="layui-form-label">å    é</label>-->
			<!-- <div class="layui-input-block">-->
			<!-- <input type="text" name="netWeight" autocomplete="off" placeholder="ä¸å¯ç¼è¾"-->
			<!-- class="layui-input rkbk-search-input" disabled> <em-->
			<!-- class="kccz-data-dw">KG</em>-->
			<!-- </div>-->
			<!-- </div>-->
			<!-- </div>-->


			<div class="layui-col-xs4">
			<div class="layui-form-item kccz-data-group-md">
			<label class="layui-form-label">æè´¨æ£é</label>
			<div class="posi-r kccz-data-bfb fr">
			<input type="text" name="impurity" placeholder="ä¸å¯æ¹"
			autocomplete="off" class="layui-input rkbk-search-input"
			disabled> <em class="kccz-data-dw">%</em>
			</div>
			<div class="layui-input-block">
			<div class="posi-r">
			<input type="text" name="deImpurity" placeholder="ä¸å¯æ¹"
			autocomplete="off" class="layui-input rkbk-search-input"
			disabled> <em class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>
			</div>
			<!-- <div class="layui-col-xs4">-->
			<!-- <div class="layui-form-item kccz-data-group-md">-->
			<!-- <label class="layui-form-label">æè´¨æ£é</label>-->
			<!-- <div class="posi-r kccz-data-bfb fr">-->
			<!-- <input type="text" name="impurity" placeholder="ä¸å¯ç¼è¾"-->
			<!-- autocomplete="off" class="layui-input rkbk-search-input"-->
			<!-- disabled> <em class="kccz-data-dw">%</em>-->
			<!-- </div>-->
			<!-- <div class="layui-input-block">-->
			<!-- <div class="posi-r">-->
			<!-- <input type="text" name="deImpurity" placeholder="ä¸å¯ç¼è¾"-->
			<!-- autocomplete="off" class="layui-input rkbk-search-input"-->
			<!-- disabled> <em class="kccz-data-dw">KG</em>-->
			<!-- </div>-->
			<!-- </div>-->
			<!-- </div>-->
			<!-- </div>-->
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">å¾æ¥åä½</label>
			<label class="layui-form-label color-red">å®¢æ·ä¿¡æ¯</label>
			<div class="layui-input-block">
			<input type="text" name="customerName" placeholder="ä¸å¯æ¹"
			<input type="text" name="customerName" placeholder="ä¸å¯ç¼è¾"
			autocomplete="off" class="layui-input rkbk-search-input"
			disabled>
			</div>
			@@ -288,37 +341,37 @@
			<div class="layui-form-item">
			<label class="layui-form-label">ç²®é£ççº§</label>
			<div class="layui-input-block">
			<select name="foodLevel" id="foodLevel">
			<option value="">ä¸å¯æ¹</option>
			<select name="foodLevel" id="foodLevel" lay-filter="select_foodLevel">
			<option value="">è¯·éæ©</option>
			<option th:each="dic,dicSet:${listFoodLevel}"
			th:value="${dic.code}" th:text="${dic.name}"></option>
			</select>
			</div>
			</div>
			</div>
			<div class="layui-col-xs4">
			<div class="layui-form-item kccz-data-group-md">
			<label class="layui-form-label">æ°´åå¢é</label>
			<div class="posi-r kccz-data-bfb fr">
			<input type="text" name="wet" placeholder="ä¸å¯æ¹"
			autocomplete="off" class="layui-input rkbk-search-input"
			disabled> <em class="kccz-data-dw">%</em>
			</div>
			<div class="layui-input-block">
			<div class="posi-r">
			<input type="text" name="deWet" placeholder="ä¸å¯æ¹"
			autocomplete="off" class="layui-input rkbk-search-input"
			disabled> <em class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>
			</div>
			<!--<div class="layui-col-xs4">-->
			<!-- <div class="layui-form-item kccz-data-group-md">-->
			<!-- <label class="layui-form-label">æ°´åå¢é</label>-->
			<!-- <div class="posi-r kccz-data-bfb fr">-->
			<!-- <input type="text" name="wet" placeholder="ä¸å¯ç¼è¾"-->
			<!-- autocomplete="off" class="layui-input rkbk-search-input"-->
			<!-- disabled> <em class="kccz-data-dw">%</em>-->
			<!-- </div>-->
			<!-- <div class="layui-input-block">-->
			<!-- <div class="posi-r">-->
			<!-- <input type="text" name="deWet" placeholder="ä¸å¯ç¼è¾"-->
			<!-- autocomplete="off" class="layui-input rkbk-search-input"-->
			<!-- disabled> <em class="kccz-data-dw">KG</em>-->
			<!-- </div>-->
			<!-- </div>-->
			<!-- </div>-->
			<!--</div>-->
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">ç²®é£åç§</label>
			<div class="layui-input-block">
			<select name="foodVariety" id="foodVariety">
			<option value="">ä¸å¯æ¹</option>
			<option value="">è¯·éæ©</option>
			<option th:each="dic,dicSet:${listFoodVariety}"
			th:value="${dic.code}" th:text="${dic.name}"></option>
			</select>
			@@ -330,73 +383,91 @@
			<div class="layui-form-item">
			<label class="layui-form-label">å¶ä»æ£é</label>
			<div class="layui-input-block">
			<input type="text" name="deOther" autocomplete="off" placeholder="ä¸å¯æ¹"
			class="layui-input rkbk-search-input" disabled> <em
			<input type="text" name="deOther" autocomplete="off" placeholder="è¯·è¾å¥"
			class="layui-input rkbk-search-input weight"> <em
			class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>




			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">æ»æ£é</label>
			<div class="layui-input-block">
			<input type="text" name="deSum" placeholder="ä¸å¯æ¹"
			autocomplete="off" class="layui-input rkbk-search-input"
			disabled> <em class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">å¼ä»å¼å§</label>
			<div class="layui-input-block">
			<input type="text" name="handleStart" id="handleStart"
			placeholder="å¹´-æ-æ¥ æ¶:å" autocomplete="off"
			class="layui-input bg-date">
			</div>
			</div>
			</div>
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">ç°åºæ£é</label>
			<div class="layui-input-block">
			<input type="text" name="deHandle" placeholder="è¯·è¾å¥"
			autocomplete="off" class="layui-input"> <em class="kccz-data-dw">KG</em>
			autocomplete="off" class="layui-input weight"> <em class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">æ£éååé</label>
			<label class="layui-form-label">æ»æ£é</label>
			<div class="layui-input-block">
			<input type="text" name="settleWeight" placeholder="ä¸å¯æ¹"
			<input type="text" name="deSum" placeholder="ä¸å¯ç¼è¾"
			autocomplete="off" class="layui-input rkbk-search-input"
			disabled> <em class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>

			<!--<div class="layui-col-xs4">-->
			<!-- <div class="layui-form-item">-->
			<!-- <label class="layui-form-label">å¼ä»å¼å§</label>-->
			<!-- <div class="layui-input-block">-->
			<!-- <input type="text" name="handleStart" id="handleStart"-->
			<!-- placeholder="å¹´-æ-æ¥ æ¶:å" autocomplete="off"-->
			<!-- class="layui-input bg-date">-->
			<!-- </div>-->
			<!-- </div>-->
			<!--</div>-->


			<!-- <div class="layui-col-xs4">-->
			<!-- <div class="layui-form-item">-->
			<!-- <label class="layui-form-label">ç»ç®éé</label>-->
			<!-- <div class="layui-input-block">-->
			<!-- <input type="text" name="settleWeight" placeholder="ä¸å¯ç¼è¾"-->
			<!-- autocomplete="off" class="layui-input rkbk-search-input"-->
			<!-- disabled> <em class="kccz-data-dw">KG</em>-->
			<!-- </div>-->
			<!-- </div>-->
			<!-- </div>-->

			<!--<div class="layui-col-xs4">-->
			<!-- <div class="layui-form-item">-->
			<!-- <label class="layui-form-label">å¼ä»ç»æ</label>-->
			<!-- <div class="layui-input-block">-->
			<!-- <input type="text" name="handleEnd" id="handleEnd"-->
			<!-- placeholder="å¹´-æ-æ¥ æ¶:å" autocomplete="off"-->
			<!-- class="layui-input bg-date">-->
			<!-- </div>-->
			<!-- </div>-->
			<!--</div>-->
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">å¼ä»ç»æ</label>
			<label class="layui-form-label color-red">å¼ä»äºº</label>
			<div class="layui-input-block">
			<input type="text" name="handleEnd" id="handleEnd"
			placeholder="å¹´-æ-æ¥ æ¶:å" autocomplete="off"
			class="layui-input bg-date">
			<input type="text" name="handleUser" autocomplete="off"
			placeholder="æå¨å½å¥" class="layui-input">
			</div>
			</div>
			</div>
			<div class="layui-col-xs8">
			<div class="layui-form-item">
			<label class="layui-form-label">å¶ä»è¯´æ</label>
			<div class="layui-input-block">
			<input type="text" name="deOtherInfo" placeholder="å¶ä»æ£éè¯´æ"
			autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>
			<div class="layui-col-xs12">
			<div class="layui-form-item">
			<label class="layui-form-label">å¤ æ³¨</label>
			<label class="layui-form-label">å¤æ³¨è¯´æ</label>
			<div class="layui-input-block">
			<textarea name="remarks" placeholder="è¯·è¾å¥åå®¹"
			class="layui-textarea"></textarea>
			autocomplete="off" class="layui-textarea"></textarea>
			</div>
			</div>
			</div>
			@@ -505,6 +576,8 @@
			<script th:src="@{../../static/js/jquery.min.js}"></script>
			<script th:src="@{../../static/js/constant.js}"></script>
			<script th:src="@{../../static/js/igds-common.js}"></script>
			<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
			<script th:src="@{../../static/admin/inout/weight.js}"></script>
			<script th:src="@{../../static/admin/inout/out-handle.js}"></script>

			<!-- å¼¹åºæ¡çä¿¡æ¯ -->

			@@ -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;
			}
			@@ -90,10 +94,10 @@
			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>
			<!-- <button class="rkbk-quick-btn layui-btn btn-violet"-->
			<!-- onclick="resetPlateNum()">-->
			<!-- <i><img th:src="@{../../static/images/icon-che.png}"/></i>éç½®è½¦çè¯å«-->
			<!-- </button>-->
			</div>

			<!--æµç¨å¼å¯¼-->
			@@ -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" style="width: 110px">
			<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>
			@@ -339,6 +351,7 @@
			<script th:src="@{../../static/js/constant.js}"></script>
			<script th:src="@{../../static/js/igds-common.js}"></script>
			<script th:src="@{../../static/admin/inout/video-play.js}"></script>
			<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
			<script th:src="@{../../static/admin/inout/out-register.js}"></script>

			<!-- å¼¹åºæ¡çä¿¡æ¯ -->

			@@ -17,6 +17,14 @@
			<script th:src="@{../../static/plugins/lodop/LodopFuncs.js}"></script>

			<style>
			.kccz-r-btnbox {
			width: 86px !important;
			}

			.kccz-r-btn {
			width: 86px !important;
			}

			.display-none {
			display: none;
			}
			@@ -33,7 +41,7 @@
			}

			.kccz-left-box2 {
			height: 500px;
			height: 560px;
			}

			.color-red {
			@@ -72,6 +80,12 @@

			.border-no {
			border: 0px;
			}

			#text-param {
			font-size: 14px;
			color: red;
			padding-left: 10px;
			}

			.qyzj-btnbox {
			@@ -124,21 +138,19 @@
			<div class="rkbk-quick fl">
			<button id="btn-weight" class="rkbk-quick-btn layui-btn btn-blue"
			onclick="weight()">
			<i><img th:src="@{../../static/images/icon-chengzhong.png}"/></i>ç§°é
			<i><img th:src="@{../../static/images/icon-chengzhong.png}"/></i>æ¥éª¤ä¸ï¼ç§°éç¡®è®¤
			</button>
			<button id="btn-submit"
			class="rkbk-quick-btn layui-btn btn-green layui-btn-disabled"
			disabled=true onclick="submit()">
			<i><img th:src="@{../../static/images/icon-ok.png}"/></i>å®æç§°é
			class="rkbk-quick-btn layui-btn btn-green" onclick="submit()">
			<i><img th:src="@{../../static/images/icon-ok.png}"/></i>æ¥éª¤äºï¼å®æç§°é
			</button>
			<button id="btn-printBill"
			class="rkbk-quick-btn layui-btn btn-blue layui-btn-disabled"
			disabled=true onclick="printBill()">
			<i><img th:src="@{../../static/images/icon-dayin.png}"/></i>æå°è¿ç£å
			class="rkbk-quick-btn layui-btn btn-blue" onclick="printBill()">
			<i><img th:src="@{../../static/images/icon-dayin.png}"/></i>æ¥éª¤ä¸ï¼æå°è¿ç£å
			</button>
			<button class="rkbk-quick-btn layui-btn btn-violet"
			onclick="flushPage()">
			<i><img th:src="@{../../static/images/icon-shuaxin2.png}"/></i>éæ°ç§°é
			<i><img th:src="@{../../static/images/icon-shuaxin2.png}"/></i>å·æ°é¡µé¢
			</button>
			</div>

			@@ -229,7 +241,7 @@

			<div class="rkbk-tit">
			<i></i>
			<h3>ä¸å¡æ°æ®</h3>
			<h3>ä¸å¡æ°æ®<span id="text-param"></span></h3>
			<div>
			<input type="button" value="è¯»æºæ§å¡"
			class="rkbk-search-btn layui-btn r-240"
			@@ -276,37 +288,37 @@

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">æºæ§å¡å·</label>
			<label class="layui-form-label color-red">æºæ§å¡å·</label>
			<div class="layui-input-block">
			<input type="text" name="intelCard" id="intelCard"
			placeholder="æºæ§å¡å·" autocomplete="off" class="layui-input">
			placeholder="å·å¡/æå¨å½å¥" autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">è½¦çå·</label>
			<label class="layui-form-label color-red">è½¦çå·</label>
			<div class="layui-input-block">
			<input type="text" name="plateNum" id="plateNum" placeholder="è½¦çå·"
			<input type="text" name="plateNum" id="plateNum" placeholder="èªå¨å½å¥/æå¨å½å¥"
			autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">èº«ä»½è¯å·</label>
			<div class="layui-input-block">
			<input type="text" name="userId" id="userId"
			placeholder="æ¿è¿äººèº«ä»½è¯å·" autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>
			<!--<div class="layui-col-xs4">-->
			<!-- <div class="layui-form-item">-->
			<!-- <label class="layui-form-label">èº«ä»½è¯å·</label>-->
			<!-- <div class="layui-input-block">-->
			<!-- <input type="text" name="userId" id="userId"-->
			<!-- placeholder="æ¿è¿äººèº«ä»½è¯å·" autocomplete="off" class="layui-input">-->
			<!-- </div>-->
			<!-- </div>-->
			<!--</div>-->

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">æ¿è¿äºº</label>
			<label class="layui-form-label color-red">æ¿è¿äºº</label>
			<div class="layui-input-block">
			<input type="text" name="userName" placeholder="ä¸å¯ç¼è¾" class="layui-input"
			disabled>
			@@ -344,7 +356,7 @@
			<div class="layui-input-block">
			<input type="text" name="customerName" placeholder="è¯·éæ©ï¼ä¸å¯æå¨å½å¥"
			autocomplete="off" class="layui-input" disabled="disabled"> <em
			class="kccz-data-dw cursor" onclick="showNotice()">â¦</em>
			class="kccz-data-dw cursor" onclick="showNotice()">â¦â¦</em>
			</div>
			</div>
			</div>
			@@ -361,23 +373,23 @@
			</div>


			<div class="layui-col-xs4">
			<div class="layui-form-item kccz-data-group-md">
			<label class="layui-form-label">æè´¨æ£é</label>
			<div class="posi-r kccz-data-bfb fr">
			<input id="impurity" type="text" name="impurity" placeholder="è¯·è¾å¥"
			autocomplete="off" class="layui-input weight"> <em
			class="kccz-data-dw">%</em>
			</div>
			<div class="layui-input-block">
			<div class="posi-r">
			<input id="deImpurity" type="text" name="deImpurity" placeholder="è¯·è¾å¥"
			autocomplete="off" class="layui-input weight"> <em
			class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>
			</div>
			<!--<div class="layui-col-xs4">-->
			<!-- <div class="layui-form-item kccz-data-group-md">-->
			<!-- <label class="layui-form-label">æè´¨æ£é</label>-->
			<!-- <div class="posi-r kccz-data-bfb fr">-->
			<!-- <input id="impurity" type="text" name="impurity" placeholder="è¯·è¾å¥"-->
			<!-- autocomplete="off" class="layui-input weight"> <em-->
			<!-- class="kccz-data-dw">%</em>-->
			<!-- </div>-->
			<!-- <div class="layui-input-block">-->
			<!-- <div class="posi-r">-->
			<!-- <input id="deImpurity" type="text" name="deImpurity" placeholder="è¯·è¾å¥"-->
			<!-- autocomplete="off" class="layui-input weight"> <em-->
			<!-- class="kccz-data-dw">KG</em>-->
			<!-- </div>-->
			<!-- </div>-->
			<!-- </div>-->
			<!--</div>-->
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label" id="label4">è£å¸ä»åº</label>
			@@ -390,7 +402,6 @@
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">ç°åºæ£é</label>
			@@ -402,23 +413,23 @@
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item kccz-data-group-md">
			<label class="layui-form-label">æ°´åå¢é</label>
			<div class="posi-r kccz-data-bfb fr">
			<input id="wet" type="text" name="wet" placeholder="è¯·è¾å¥"
			autocomplete="off" class="layui-input weight"> <em
			class="kccz-data-dw">%</em>
			</div>
			<div class="layui-input-block">
			<div class="posi-r">
			<input id="deWet" type="text" name="deWet" placeholder="è¯·è¾å¥"
			autocomplete="off" class="layui-input weight"> <em
			class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>
			</div>
			<!--<div class="layui-col-xs4">-->
			<!-- <div class="layui-form-item kccz-data-group-md">-->
			<!-- <label class="layui-form-label">æ°´åå¢é</label>-->
			<!-- <div class="posi-r kccz-data-bfb fr">-->
			<!-- <input id="wet" type="text" name="wet" placeholder="è¯·è¾å¥"-->
			<!-- autocomplete="off" class="layui-input weight"> <em-->
			<!-- class="kccz-data-dw">%</em>-->
			<!-- </div>-->
			<!-- <div class="layui-input-block">-->
			<!-- <div class="posi-r">-->
			<!-- <input id="deWet" type="text" name="deWet" placeholder="è¯·è¾å¥"-->
			<!-- autocomplete="off" class="layui-input weight"> <em-->
			<!-- class="kccz-data-dw">KG</em>-->
			<!-- </div>-->
			<!-- </div>-->
			<!-- </div>-->
			<!--</div>-->
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">ç²®é£åç§</label>
			@@ -442,6 +453,15 @@
			</div>
			</div>
			</div>
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">å¶ä»è¯´æ</label>
			<div class="layui-input-block">
			<input type="text" name="deOtherInfo" autocomplete="off"
			placeholder="å¶ä»æ£éè¯´æ" class="layui-input">
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			@@ -453,51 +473,29 @@
			</div>
			</div>
			</div>
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">è§      æ ¼</label>
			<div class="layui-input-block">
			<select name="specType" id="specType">
			<option value="æ£ç²®">æ£ç²®</option>
			<option value="25kg">25kg</option>
			<option value="50kg">50kg</option>
			</select>
			</div>
			</div>
			</div>
			<!--<div class="layui-col-xs4">-->
			<!-- <div class="layui-form-item">-->
			<!-- <label class="layui-form-label">è§      æ ¼</label>-->
			<!-- <div class="layui-input-block">-->
			<!-- <select name="specType" id="specType">-->
			<!-- <option value="æ£ç²®">æ£ç²®</option>-->
			<!-- <option value="25kg">25kg</option>-->
			<!-- <option value="50kg">50kg</option>-->
			<!-- </select>-->
			<!-- </div>-->
			<!-- </div>-->
			<!--</div>-->
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">ç²®é£äº§å°</label>
			<div class="layui-input-block">
			<input type="text" name="foodLocation" placeholder="è¯·éæ©"
			autocomplete="off" class="layui-input"> <em
			class="kccz-data-dw cursor" onclick="showFoodLocation()">â¦</em>
			class="kccz-data-dw cursor" onclick="showFoodLocation()">â¦â¦</em>
			</div>
			</div>
			</div>


			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">åä»·</label>
			<div class="layui-input-block">
			<input type="text" name="price" placeholder="è¯·è¾å¥åä»·"
			class="layui-input"> <em class="kccz-data-dw">å/å¬æ¤</em>
			</div>
			</div>
			</div>



			<div class="layui-col-xs8">
			<div class="layui-form-item">
			<label class="layui-form-label">å¤æ³¨è¯´æ</label>
			<div class="layui-input-block">
			<input type="text" name="remarks" placeholder="è¯·è¾å¥åå®¹"
			class="layui-input">
			</div>
			</div>
			</div>
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label color-red">ç»ç®éé</label>
			@@ -508,17 +506,28 @@
			</div>
			</div>
			</div>
			<!--<div class="layui-col-xs4">-->
			<!-- <div class="layui-form-item">-->
			<!-- <label class="layui-form-label">åä»·</label>-->
			<!-- <div class="layui-input-block">-->
			<!-- <input type="text" name="price" placeholder="è¯·è¾å¥åä»·"-->
			<!-- class="layui-input"> <em class="kccz-data-dw">å/å¬æ¤</em>-->
			<!-- </div>-->
			<!-- </div>-->
			<!--</div>-->


			<div class="layui-col-xs8">
			<span style="padding-left: 50px;color: blue;">
			æ³¨æï¼1ãæ°´åå¢éï¼æ£æ°=å¢å <br>
			</span>
			<span style="padding-left: 93px;color: blue;">
			2ãåé = æ¯é - ç®é ï¼æ»æ£é = æ£æ°´æï¼å¤§äº0ï¼ + ç°åºæ£é + å¶ä»æ£é<br>
			</span>
			<span style="padding-left: 93px;color: blue;">
			3ãç»ç®éé = åé - æ»æ£é + æ°´æå¢éï¼åºåºéé = åé - æ»æ£é
			</span>
			<div class="layui-form-item">
			<label class="layui-form-label">å¤æ³¨è¯´æ</label>
			<div class="layui-input-block">
			<input type="text" name="remarks" placeholder="è¯·è¾å¥åå®¹"
			autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>


			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label color-red">åºåºéé</label>
			@@ -529,6 +538,80 @@
			</div>
			</div>
			</div>
			<div class="layui-col-xs8">
			<span style="padding-left: 93px;color: blue;">
			è¯´æï¼ 1ãåé = æ¯é - ç®é ï¼æ»æ£é = ç°åºæ£é + å¶ä»æ£é<br>
			</span>
			<span style="padding-left: 93px;color: blue;">
			2ãç»ç®éé = åé - æ»æ£é ï¼åºåºéé = åé - æ»æ£é
			</span>
			</div>

			<div class="layui-col-xs12">
			<div class="line-container">
			<div class="line"></div>
			<div class="line-text">ä»¥ä¸æ ¹æ®åºåºç§°éä½ä¸è¦æ±å¡«å</div>
			<div class="line"></div>
			</div>
			</div>

			<!-- è¡¥ååæ®µé»è®¤éè -->
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">åè£ç©</label>
			<div class="layui-input-block">
			<input type="radio" name="bzw" value="1" title="éº»è¢">
			<input type="radio" name="bzw"
			value="2" title="ç¼ç»è¢">
			<input type="radio" name="bzw"
			value="3" title="æ£è£" checked>
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">åè£æ£é</label>
			<div class="layui-input-block">
			<input type="text" name="dePackage" autocomplete="off"
			placeholder="è¯·è¾å¥" class="layui-input weight"> <em
			class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">åä»·</label>
			<div class="layui-input-block">
			<input type="text" name="price" placeholder="è¯·è¾å¥"
			class="layui-input"> <em class="kccz-data-dw">å/å¬æ¤</em>
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">æ ååé</label>
			<div class="layui-input-block">
			<input type="text" name="dbz" autocomplete="off"
			placeholder="è¯·è¾å¥" class="layui-input"> <em
			class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">åä»¶æ»æ°</label>
			<div class="layui-input-block">
			<input type="text" name="bzbjs" autocomplete="off"
			placeholder="è¯·è¾å¥" class="layui-input"> <em
			class="kccz-data-dw">ä»¶</em>
			</div>
			</div>
			</div>

			</form>
			</div>
			</div>
			@@ -662,6 +745,7 @@
			<script th:src="@{../../static/js/igds-common.js}"></script>
			<script th:src="@{../../static/admin/inout/inout-print.js}"></script>
			<script th:src="@{../../static/admin/inout/video-play.js}"></script>
			<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
			<script th:src="@{../../static/admin/inout/weight.js}"></script>
			<script th:src="@{../../static/admin/inout/out-weight.js}"></script>
			</body>

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,98 @@
			<!DOCTYPE html>
			<html lang='zh-cn'>
			<head>
			<meta http-equiv='Content-Type' content='text/html;charset=UTF-8'>
			<title>åºåºç§°éå</title>
			<style>body {
			text-align: center;
			padding: 10px
			}

			.tit {
			margin: 10px;
			font-size: 24px;
			font-family: 'å®ä½';
			padding-top: 15px
			}

			.div-tit {
			padding-top: 10px
			}

			.sp1 {
			width: 50%;
			float: left;
			padding-bottom: 10px
			}

			.sp2 {
			width: 25%;
			float: left;
			text-align: center
			}

			table {
			width: 100%;
			border-right: 1px solid;
			border-bottom: 1px solid;
			font-size: 14px
			}

			table td {
			border-left: 1px solid;
			border-top: 1px solid;
			height: 38px
			}</style>
			</head>
			<body><h1 class='tit'>billTitle</h1>
			<div class='div-tit'><span class='sp1'>ç»è®°æ¶é´ï¼registerTime</span><span class='sp1'>åºåºåå·ï¼serId</span></div>
			<table cellspacing='0' cellpadding='0'>
			<tr>
			<td width='12.5%'>åè´§åä½</td>
			<td colspan='3' width='37.5%'>deptName</td>
			<td width='12.5%'>æ¶è´§åä½</td>
			<td colspan='3' width='37.5%'>customerName</td>
			</tr>
			<tr>
			<td width='12.5%'>æ¿è¿äºº</td>
			<td width='12.5%'>driverName</td>
			<td width='12.5%'>ç²®é£åç§</td>
			<td width='12.5%'>foodVariety</td>
			<td width='12.5%'>åºåºä»åº</td>
			<td width='12.5%'>depotName</td>
			<td width='12.5%'>ç²®é£äº§å°</td>
			<td width='12.5%'>foodLocation</td>
			</tr>
			<tr>
			<td>æ¿è¿è½¦ç</td>
			<td>plateNum</td>
			<td>æ¯é(KG)</td>
			<td>fullWeight</td>
			<td>ç®é(KG)</td>
			<td>emptyWeight</td>
			<td>åé(KG)</td>
			<td>netWeight</td>
			</tr>
			<tr>
			<td>å¶ä»æ£é</td>
			<td>deOther</td>
			<td>å¼ä»æ£é(KG)</td>
			<td>deHandle</td>
			<td>ç»ç®éé(KG)</td>
			<td>settleWeight</td>
			<td colspan="2"></td>
			</tr>
			<tr>
			<td>å¤æ³¨</td>
			<td colspan='7'>remark</td>
			</tr>
			</table>
			<div class='div-tit'><span class='sp2'>å¸ç£åï¼</span><span class='sp2'>çç£åï¼</span><span
			class='sp2'>ä¿ç®¡åï¼handleUser</span><span class='sp2'>æ¿è¿äººï¼driverName</span></div>
			<br></body>
			<div style="padding-top: 10px"><span></span></div>
			<div style="text-align: left;font-size: 12px"><span>æ³¨ï¼</span></div>
			<div style="text-align: left;font-size: 12px"><span>1.åé=æ¯é-ç®éï¼</span></div>
			<div style="text-align: left;font-size: 12px"><span>2.åºåºéé=åé-æ»æ£éï¼ç»ç®éé=åé-æ»æ£éï¼</span></div>
			<div style="text-align: left;font-size: 12px"><span>3.ç½èï¼åæ ¹ï¼ï¼çº¢èï¼è®°è´¦ï¼ï¼é»èï¼å®¢æ·ä¿çï¼</span></div>
			</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>