vince
2023-07-07 dbbd8b7066092b3ce4eab44fa0e2b746dad16a95
Merge remote-tracking branch 'origin/master'
已修改17个文件
已添加1个文件
4284 ■■■■ 文件已修改
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 7 ●●●●● 补丁 | 查看 | 原始文档 | 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 362 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/static/admin/inout/out-handle.js 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/static/admin/inout/out-register.js 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/static/admin/inout/out-weight.js 393 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/static/admin/inout/weight.js 153 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/templates/admin/inout/in-register.html 623 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/templates/admin/inout/out-card-back.html 595 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/templates/admin/inout/out-handle.html 967 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/templates/admin/inout/out-register.html 623 ●●●● 补丁 | 查看 | 原始文档 | 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
@@ -876,7 +876,7 @@
        // è´¨æ£€å®Œæˆè§¦å‘事件
        inoutEventControl.onInCheck(data,curProgress,nextProgress);
        inoutEventControl.onInCheck(data, curProgress, nextProgress);
        return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "执行成功");
    }
@@ -994,7 +994,6 @@
    }
    /**
     *
     * @param param
     * @return
     */
@@ -1021,8 +1020,8 @@
        }
    }
    public void initInoutWeight(List<InoutConf> listInoutConf,String sort) {
        inoutEventControl.initInoutWeight(listInoutConf,sort);
    public void initInoutWeight(List<InoutConf> listInoutConf, String sort) {
        inoutEventControl.initInoutWeight(listInoutConf, sort);
    }
}
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
@@ -358,4 +358,39 @@
            alertError("提交失败,请重新尝试");
        }
    });
}
/**
 * å¼¹å‡ºæé†’框
 * @param msg æé†’信息
 * @param data æ•°æ®ä¿¡æ¯ï¼Œå¯èƒ½ä¸ºç©º
 */
function notify(msg, data) {
    if (data) {
        //赋值
        $("#resultMsg").text(msg);
        $("#resultUserName").text(data.userName);
        $("#resultPlateNum").text(data.plateNum);
        if ("IN" == data.type) {
            $("#resultType").text("入库-" + INOUT_PROGRESS_MSG(data.progress));
        } else {
            $("#resultType").text("出库-" + INOUT_PROGRESS_MSG(data.progress));
        }
        $("#resultIntelCard").text(data.intelCard);
        layer.open({
            type: 1,
            offset: ['150px', '200px'],
            area: '450px;',
            shade: 0.8,
            id: 'dialog_notify_info',
            btn: ['确定'],
            content: $('#dialog-from-notify'),
            yes: function (index) {
                layer.closeAll();
            }
        });
    } else {
        layer.alert(msg, {offset: ['300px', '300px']});
    }
}
igds-web/src/main/resources/static/admin/inout/out-card-back.js
@@ -2,226 +2,226 @@
var layer;
var form;
var recordData = null;
$(function() {
    layui.use([ 'layer', 'laydate', 'form', 'util' ], function() {
        layer = layui.layer;
        form = layui.form;
        layui.laydate.render({
            elem : '#test1',
            theme : '#7b8e9f'
        });
$(function () {
    layui.use(['layer', 'laydate', 'form', 'util'], function () {
        layer = layui.layer;
        form = layui.form;
        layui.laydate.render({
            elem: '#test1',
            theme: '#7b8e9f'
        });
    });
    });
    showProgress();
    showProgress();
});
//控制流程环节显示
function showProgress() {
    if(!inoutProgress){
        return;
    }
    if (!inoutProgress) {
        return;
    }
    if(inoutProgress.indexOf("REGISTER") == -1){
        $("#progress-register").css("display", "none");
    }
    if(inoutProgress.indexOf("WEIGHT_FULL") == -1){
        $("#progress-fullWeight").css("display", "none");
    }
    if(inoutProgress.indexOf("HANDLE") == -1){
        $("#progress-hand").css("display", "none");
    }
    if(inoutProgress.indexOf("WEIGHT_EMPTY") == -1){
        $("#progress-emptyWeight").css("display", "none");
    }
    if(inoutProgress.indexOf("CARD_BACK") == -1){
        $("#progress-cardBack").css("display", "none");
    }
    if (inoutProgress.indexOf("REGISTER") == -1) {
        $("#progress-register").css("display", "none");
    }
    if (inoutProgress.indexOf("WEIGHT_FULL") == -1) {
        $("#progress-fullWeight").css("display", "none");
    }
    if (inoutProgress.indexOf("HANDLE") == -1) {
        $("#progress-hand").css("display", "none");
    }
    if (inoutProgress.indexOf("WEIGHT_EMPTY") == -1) {
        $("#progress-emptyWeight").css("display", "none");
    }
    if (inoutProgress.indexOf("CARD_BACK") == -1) {
        $("#progress-cardBack").css("display", "none");
    }
}
//新的读卡方式
function flushICCard() {
    $("#intelCard").val(null);
    resetForm();
    $.ajax({
        type: "GET",
        async: true,
        url: "http://127.0.0.1:9111/ICCARD",
        data: {},
        dataType: "jsonp",
        jsonp: "callback",
        jsonpCallback: "jsonpCallback",
        success: function (json) {
            //console.log(json);
            var data = json.no;
            //console.log(data);
            if (data === "not found") {
                layer.alert("请重新读卡!", {offset: ['300px', '300px']});
            } else {
                $("#intelCard").val(data);
                flushData();
            }
        },
        error: function () {
            layer.alert("IC卡读取出错!", {offset: ['300px', '300px']});
        }
    });
    $("#intelCard").val(null);
    resetForm();
    $.ajax({
        type: "GET",
        async: true,
        url: "http://127.0.0.1:9111/ICCARD",
        data: {},
        dataType: "jsonp",
        jsonp: "callback",
        jsonpCallback: "jsonpCallback",
        success: function (json) {
            //console.log(json);
            var data = json.no;
            //console.log(data);
            if (data === "not found") {
                layer.alert("请重新读卡!", {offset: ['300px', '300px']});
            } else {
                $("#intelCard").val(data);
                flushData();
            }
        },
        error: function () {
            layer.alert("IC卡读取出错!", {offset: ['300px', '300px']});
        }
    });
}
// ä½¿ç”¨æ’件获取省份证
function flushIdCard() {
    var index = layer.load();
    $.ajax({
        type: "GET",
        async: true,
        url: "http://127.0.0.1:9111/IDCARD",
        data: {},
        dataType: "jsonp",
        jsonp: "callback",
        jsonpCallback: "jsonpCallback",
        success: function (json) {
            layer.close(index);
            var data = json.content;
            if (data === "not found") {
                layer.alert("没有读取到身份证信息,请手动录入!", {
                    offset: ['300px', '300px']
                });
                return;
            }
            $("#userId").val(data.idNum);
            flushData();
        },
        error: function () {
            layer.alert("身份证读取失败,请手动录入!", {
                offset: ['300px', '300px']
            });
            layer.close(index);
        }
    });
    var index = layer.load();
    $.ajax({
        type: "GET",
        async: true,
        url: "http://127.0.0.1:9111/IDCARD",
        data: {},
        dataType: "jsonp",
        jsonp: "callback",
        jsonpCallback: "jsonpCallback",
        success: function (json) {
            layer.close(index);
            var data = json.content;
            if (data === "not found") {
                layer.alert("没有读取到身份证信息,请手动录入!", {
                    offset: ['300px', '300px']
                });
                return;
            }
            $("#userId").val(data.idNum);
            flushData();
        },
        error: function () {
            layer.alert("身份证读取失败,请手动录入!", {
                offset: ['300px', '300px']
            });
            layer.close(index);
        }
    });
}
// æ‰“印过磅单
function printBill() {
    if (!recordData) {
        layer.alert("没有获取到业务数据,不支持打印!");
        return;
    }
    if (!recordData) {
        layer.alert("没有获取到业务数据,不支持打印!");
        return;
    }
    if(InoutProgress.CARD_BACK != recordData.progress){
        layer.alert("当前数据不完整,不支持打印!");
        return;
    }
    if (InoutProgress.CARD_BACK != recordData.progress) {
        layer.alert("当前数据不完整,不支持打印!");
        return;
    }
    //从后台获取模版并打印
    var index = layer.load();
    $.ajax({
        type : "POST",
        url : "../../basic/inout-report/inout-bill-weight",
        dataType : "json",
        contentType : "application/json;charset=UTF-8",
        data : JSON.stringify(recordData),
        success : function(result) {
            if (result.code != "0000") {
                layer.msg(result.msg);
            } else {
                layer.msg("开始渲染打印单……");
                printWeight(result.data);
            }
            layer.close(index);
        },
        error : function() {
            layer.close(index);
            layer.msg("获取打印模版失败,请联系管理员查看原因!!");
        }
    });
    //从后台获取模版并打印
    var index = layer.load();
    $.ajax({
        type: "POST",
        url: "../../basic/inout/report/bill-weight",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify(recordData),
        success: function (result) {
            if (result.code != "0000") {
                layer.msg(result.msg);
            } else {
                layer.msg("开始渲染打印单……");
                printWeight(result.data);
            }
            layer.close(index);
        },
        error: function () {
            layer.close(index);
            layer.msg("获取打印模版失败,请联系管理员查看原因!!");
        }
    });
}
// æ‰“印抽样单
function showCheck() {
    if (null == recordData) {
        layer.alert("没有获取到业务数据,无法查看!");
    }
    if (null == recordData) {
        layer.alert("没有获取到业务数据,无法查看!");
    }
}
// è¡¨å•清空
function resetForm() {
    $("#form-data")[0].reset();
    $("#form-basic")[0].reset();
    $("#form-data")[0].reset();
    $("#form-basic")[0].reset();
    form.render();
    form.render();
    recordData = null;
    recordData = null;
}
// æ›´æ–°æ•°æ®ä¿¡æ¯
function flushData() {
    var index = layer.load();
    var plateNum = $("#plateNum").val();
    var userId2 = $("#userId").val();
    var intelCard = $("#intelCard").val();
    var param = {
        type : type,
        progress : progress,
        userId: userId2,
        intelCard: intelCard,
        plateNum : plateNum
    };
    var index = layer.load();
    var plateNum = $("#plateNum").val();
    var userId2 = $("#userId").val();
    var intelCard = $("#intelCard").val();
    var param = {
        type: type,
        progress: progress,
        userId: userId2,
        intelCard: intelCard,
        plateNum: plateNum
    };
    $.ajax({
        type : "POST",
        url : "../../basic/inout/inout-query-back",
        dataType : "json",
        contentType : "application/json;charset=UTF-8",
        data : JSON.stringify(param),
        success : function(result) {
            if (result.code != "0000") {
                layer.alert(result.msg);
            } else {
                recordData = result.data;
                // è¿”回的数据进行赋值
                form.val("form-data", recordData);
                form.val("form-basic", recordData);
                form.render();
            }
            layer.close(index);
        },
        error : function() {
            layer.close(index);
            layer.alert("查询失败,请重新尝试!!");
        }
    });
    $.ajax({
        type: "POST",
        url: "../../basic/inout/inout-query-back",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify(param),
        success: function (result) {
            if (result.code != "0000") {
                layer.alert(result.msg);
            } else {
                recordData = result.data;
                // è¿”回的数据进行赋值
                form.val("form-data", recordData);
                form.val("form-basic", recordData);
                form.render();
            }
            layer.close(index);
        },
        error: function () {
            layer.close(index);
            layer.alert("查询失败,请重新尝试!!");
        }
    });
}
// å½“前完成
function submit(data) {
    if (!recordData) {
        layer.alert("没有数据可以提交!!!");
        return;
    }
    // æäº¤æ•°æ®æ¯”较特殊,不用考虑基本信息提交
    var index = layer.load();
    var data = form.val("form-data");
    Object.assign(recordData, data);
    if (!recordData) {
        layer.alert("没有数据可以提交!!!");
        return;
    }
    // æäº¤æ•°æ®æ¯”较特殊,不用考虑基本信息提交
    var index = layer.load();
    var data = form.val("form-data");
    Object.assign(recordData, data);
    $.ajax({
        type : "POST",
        url : "../../basic/inout/inout-back-submit",
        dataType : "json",
        contentType : "application/json;charset=UTF-8",
        data : JSON.stringify(recordData),
        success : function(result) {
            if (result.code != "0000") {
                layer.msg(result.msg);
            } else {
                layer.alert("卡片回收成功!");
                // é‡ç½®é¡µé¢
                resetForm();
            }
            layer.close(index);
        },
        error : function() {
            layer.close(index);
            layer.msg("卡片回收失败,请重新尝试!!");
        }
    });
    $.ajax({
        type: "POST",
        url: "../../basic/inout/submit-card-back",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify(recordData),
        success: function (result) {
            if (result.code != "0000") {
                layer.msg(result.msg);
            } else {
                layer.alert("卡片回收成功!");
                // é‡ç½®é¡µé¢
                resetForm();
            }
            layer.close(index);
        },
        error: function () {
            layer.close(index);
            layer.msg("卡片回收失败,请重新尝试!!");
        }
    });
}
igds-web/src/main/resources/static/admin/inout/out-handle.js
@@ -27,11 +27,11 @@
        upload.render({
            elem: '#kccz-r-btn1',
            url: '../file/update-file', //上传接口
            size: 4*1024, //限制文件大小,单位KB, æœ€å¤§ä¸Šä¼ 4MB
            size: 4 * 1024, //限制文件大小,单位KB, æœ€å¤§ä¸Šä¼ 4MB
            accept: 'images',
            before: function (obj) {
                var plateNum = $("#plateNum").val();
                this.data={"plateNum":plateNum}; //携带参数
                this.data = {"plateNum": plateNum}; //携带参数
                //预读本地文件示例,不支持ie8
                obj.preview(function (index, file, result) {
                    $('#kccz-r-img1').attr('src', result); //图片链接(base64)
@@ -51,11 +51,11 @@
        upload.render({
            elem: '#kccz-r-btn2',
            url: '../file/update-file', //上传接口
            size: 4*1024, //限制文件大小,单位KB, æœ€å¤§ä¸Šä¼ 4MB
            size: 4 * 1024, //限制文件大小,单位KB, æœ€å¤§ä¸Šä¼ 4MB
            accept: 'images',
            before: function (obj) {
                var plateNum = $("#plateNum").val();
                this.data={"plateNum":plateNum}; //携带参数
                this.data = {"plateNum": plateNum}; //携带参数
                //预读本地文件示例,不支持ie8
                obj.preview(function (index, file, result) {
                    $('#kccz-r-img2').attr('src', result); //图片链接(base64)
@@ -75,11 +75,11 @@
        upload.render({
            elem: '#kccz-r-btn3',
            url: '../file/update-file', //上传接口
            size: 4*1024, //限制文件大小,单位KB, æœ€å¤§ä¸Šä¼ 4MB
            size: 4 * 1024, //限制文件大小,单位KB, æœ€å¤§ä¸Šä¼ 4MB
            accept: 'images',
            before: function (obj) {
                var plateNum = $("#plateNum").val();
                this.data={"plateNum":plateNum}; //携带参数
                this.data = {"plateNum": plateNum}; //携带参数
                //预读本地文件示例,不支持ie8
                obj.preview(function (index, file, result) {
                    $('#kccz-r-img3').attr('src', result); //图片链接(base64)
@@ -99,33 +99,36 @@
    });
    showProgress();
    // ç›‘听重量变化
    $(".weight").blur(function () {
        deAutoByHandle(this.name)
    });
    //调整字段不编辑
    $("#depotId").attr("disabled",true);
    $("#foodVariety").attr("disabled",true);
    $("#foodLevel").attr("disabled",true);
    $("#depotId").attr("disabled", true);
    $("#foodVariety").attr("disabled", true);
    // $("#foodLevel").attr("disabled", true);
});
//控制流程环节显示
function showProgress() {
    if(!inoutProgress){
    if (!inoutProgress) {
        return;
    }
    if(inoutProgress.indexOf("REGISTER") == -1){
    if (inoutProgress.indexOf("REGISTER") == -1) {
        $("#progress-register").css("display", "none");
    }
    if(inoutProgress.indexOf("WEIGHT_FULL") == -1){
    if (inoutProgress.indexOf("WEIGHT_FULL") == -1) {
        $("#progress-fullWeight").css("display", "none");
    }
    if(inoutProgress.indexOf("HANDLE") == -1){
    if (inoutProgress.indexOf("HANDLE") == -1) {
        $("#progress-hand").css("display", "none");
    }
    if(inoutProgress.indexOf("WEIGHT_EMPTY") == -1){
    if (inoutProgress.indexOf("WEIGHT_EMPTY") == -1) {
        $("#progress-emptyWeight").css("display", "none");
    }
    if(inoutProgress.indexOf("CARD_BACK") == -1){
    if (inoutProgress.indexOf("CARD_BACK") == -1) {
        $("#progress-cardBack").css("display", "none");
    }
}
@@ -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);
}
// æ›´æ–°æ•°æ®ä¿¡æ¯
@@ -210,8 +221,8 @@
    var param = {
        type: type,
        progress: progress,
        userId:userId2,
        intelCard:intelCard,
        userId: userId2,
        intelCard: intelCard,
        plateNum: plateNum
    };
    var index = layer.load();
@@ -223,7 +234,7 @@
        data: JSON.stringify(param),
        success: function (result) {
            if (result.code != "0000") {
                notify(result.msg,result.data);
                notify(result.msg, result.data);
            } else {
                recordData = result.data;
                // è¿”回的数据进行赋值
@@ -241,7 +252,7 @@
// å½“前完成
function submit() {
    if (null == recordData) {
    if (!recordData) {
        layer.alert("没有数据可以提交!!!");
        return;
    }
@@ -262,15 +273,15 @@
    $.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),
        success: function (result) {
            if (result.code != "0000") {
                notify(result.msg,result.data);
                notify(result.msg, result.data);
            } else {
                notify("值仓完成",result.data);
                notify("值仓完成", result.data);
                // é‡ç½®é¡µé¢
                resetForm();
            }
@@ -278,7 +289,7 @@
        },
        error: function () {
            layer.close(index);
            notify("提交失败,请重新尝试",null);
            notify("提交失败,请重新尝试", null);
        }
    });
}
igds-web/src/main/resources/static/admin/inout/out-register.js
@@ -29,7 +29,7 @@
                        shadeClose: true,
                        shade: 0.3,
                        closeBtn: 2,
                        offset: ['50px','50px'],
                        offset: ['50px', '50px'],
                        area: ['1000px', '640px'],
                        content: '../../basic/inout/inout-progress?type=' + type + "&t=" + Math.random()
                    });
@@ -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']
                });
                alertError(result.msg);
            } else {
                if (result.data.errorMsg) {
                    layer.alert(result.data.errorMsg, {
                        offset: ['300px', '300px']
                    });
                } else {
                    $("#plateNum").val(result.data.plateNum);
                }
                $("#plateNum").val(result.data.plateNum);
                $("#plateNum2").val(result.data.plateNum);
            }
            layer.close(index);
        },
        error: function () {
            layer.close(index);
            layer.alert("车牌识别失败!", {
                offset: ['300px', '300px']
            });
            alertError("车牌识别失败!");
        }
        // success: function (result) {
        //     if (result.code != "0000") {
        //         layer.alert(result.msg, {
        //             offset: ['300px', '300px']
        //         });
        //     } else {
        //         if (result.data.errorMsg) {
        //             layer.alert(result.data.errorMsg, {
        //                 offset: ['300px', '300px']
        //             });
        //         } else {
        //             $("#plateNum").val(result.data.plateNum);
        //         }
        //     }
        //     layer.close(index);
        // },
        // error: function () {
        //     layer.close(index);
        //     layer.alert("车牌识别失败!", {
        //         offset: ['300px', '300px']
        //     });
        // }
    });
}
@@ -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
@@ -34,7 +34,7 @@
                        shadeClose: true,
                        shade: 0.3,
                        closeBtn: 2,
                        offset: ['50px','120px'],
                        offset: ['50px', '120px'],
                        area: ['1000px', '640px'],
                        content: '../../basic/inout/inout-progress?type=' + type + "&t=" + Math.random()
                    });
@@ -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,14 +242,15 @@
    }
    // åˆ·æ–°çŠ¶æ€
    flushBtn("btn-weight");
    // flushBtn("btn-weight");
}
//新的读卡方式
function flushICCard() {
    if(cardDto && cardDto.protocol != "TCP_DEFAULT"){
    if (cardDto && cardDto.protocol != "TCP_DEFAULT") {
        //协议获取
        flushICCard2();
    }else {
    } else {
        //本地读取
        flushICCard1();
    }
@@ -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
@@ -1,325 +1,326 @@
<!DOCTYPE html>
<html lang="zh-cn" xmlns:th=http://www.thymeleaf.org>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport"
    content="width=device-width, initial-scale=1, maximum-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="renderer" content="webkit">
<title>出入库管理-入库登记</title>
<link rel="stylesheet" type="text/css"
    th:href="@{../../static/plugins/layui/css/layui.css}">
<link rel="stylesheet" type="text/css"
    th:href="@{../../static/admin/inout/style.css}">
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="viewport"
          content="width=device-width, initial-scale=1, maximum-scale=1">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="renderer" content="webkit">
    <title>出入库管理-入库登记</title>
    <link rel="stylesheet" type="text/css"
          th:href="@{../../static/plugins/layui/css/layui.css}">
    <link rel="stylesheet" type="text/css"
          th:href="@{../../static/admin/inout/style.css}">
<style>
.display-none {
    display: none;
}
    <style>
        .display-none {
            display: none;
        }
.kccz-r-con2 {
    padding-right: 120px;
    position: relative;
    margin-top: 10px;
    z-index: 99;
}
        .kccz-r-con2 {
            padding-right: 120px;
            position: relative;
            margin-top: 10px;
            z-index: 99;
        }
.kccz-r-vedio {
    width: 100%;
    height: 280px;
    background: #000;
    color: #FFF;
    text-align: center;
}
        .kccz-r-vedio {
            width: 100%;
            height: 280px;
            background: #000;
            color: #FFF;
            text-align: center;
        }
.layui-form-label {
    font-weight: bold;
}
        .layui-form-label {
            font-weight: bold;
        }
.iframe-video {
    position: absolute;
    visibility: inherit;
    top: 0px;
    left: 0px;
    z-index: -1;
    width: 100%;
    height: 100%;
}
        .iframe-video {
            position: absolute;
            visibility: inherit;
            top: 0px;
            left: 0px;
            z-index: -1;
            width: 100%;
            height: 100%;
        }
.ckdj-radiobox .layui-form-item {
    margin-bottom: 0px;
    margin-top: 10px;
}
        .ckdj-radiobox .layui-form-item {
            margin-bottom: 0px;
            margin-top: 10px;
        }
.rk-step-wrap {
    padding: 0px;
    border-bottom: 0px;
    text-align: center;
}
        .rk-step-wrap {
            padding: 0px;
            border-bottom: 0px;
            text-align: center;
        }
.qyzj-btnbox .rkbk-quick {
    margin-top: 15px !important;
}
        .qyzj-btnbox .rkbk-quick {
            margin-top: 15px !important;
        }
.color-red {
    color: red !important;
}
        .color-red {
            color: red !important;
        }
.layui-form-item .layui-input-inline {
    width: unset;
}
        .layui-form-item .layui-input-inline {
            width: unset;
        }
.rkbk-search-input {
    background: #FFF !important;
}
        .rkbk-search-input {
            background: #FFF !important;
        }
.rkbk-search-input.bg-date {
    background: #FFF !important;
}
</style>
        .rkbk-search-input.bg-date {
            background: #FFF !important;
        }
    </style>
</head>
<body>
    <div class="l-container layui-clear">
        <div class="rk-main">
<div class="l-container layui-clear">
    <div class="rk-main">
            <!-- æ“ä½œèœå•-->
            <div class="qyzj-btnbox layui-clear">
                <div class="rkbk-quick fl">
                    <button class="rkbk-quick-btn layui-btn btn-red"
                        onclick="resetForm()">
                        <i><img th:src="@{../../static/images/icon-clear.png}" /></i> æ¸…空数据
                    </button>
                    <button class="rkbk-quick-btn layui-btn btn-green"
                        onclick="submit()">
                        <i><img th:src="@{../../static/images/icon-ok.png}" /></i> å®Œæˆç™»è®°
                    </button>
                </div>
        <!-- æ“ä½œèœå•-->
        <div class="qyzj-btnbox layui-clear">
            <div class="rkbk-quick fl">
                <button class="rkbk-quick-btn layui-btn btn-red"
                        onclick="resetForm()">
                    <i><img th:src="@{../../static/images/icon-clear.png}"/></i> æ¸…空数据
                </button>
                <button class="rkbk-quick-btn layui-btn btn-green"
                        onclick="submit()">
                    <i><img th:src="@{../../static/images/icon-ok.png}"/></i> å®Œæˆç™»è®°
                </button>
            </div>
                <!--流程引导-->
                <div class="rk-step-wrap fr">
                    <ul class="rk-step">
                        <li id="progress-register" class="active rk-step-first"><span
                            class="rk-step-span"> <img
                                th:src="@{../../static/images/icon-dengji.png}" />
            <!--流程引导-->
            <div class="rk-step-wrap fr">
                <ul class="rk-step">
                    <li id="progress-register" class="active rk-step-first"><span
                            class="rk-step-span"> <img
                            th:src="@{../../static/images/icon-dengji.png}"/>
                        </span>
                            <p>入库登记</p></li>
                        <li id="progress-check"><span class="rk-step-span"> <img
                                th:src="@{../../static/images/icon-zhijian.png}" />
                        <p>入库登记</p></li>
                    <li id="progress-check"><span class="rk-step-span"> <img
                            th:src="@{../../static/images/icon-zhijian.png}"/>
                        </span>
                            <p>扦样质检</p></li>
                        <li id="progress-fullWeight"><span class="rk-step-span">
                                <img th:src="@{../../static/images/icon-chengzhong.png}" />
                        <p>扦样质检</p></li>
                    <li id="progress-fullWeight"><span class="rk-step-span">
                                <img th:src="@{../../static/images/icon-chengzhong.png}"/>
                        </span>
                            <p>满车称重</p></li>
                        <li id="progress-hand"><span class="rk-step-span"> <img
                                th:src="@{../../static/images/icon-xiehuo.png}" />
                        <p>满车称重</p></li>
                    <li id="progress-hand"><span class="rk-step-span"> <img
                            th:src="@{../../static/images/icon-xiehuo.png}"/>
                        </span>
                            <p>入库值仓</p></li>
                        <li id="progress-emptyWeight"><span class="rk-step-span">
                                <img th:src="@{../../static/images/icon-chengzhong.png}" />
                        <p>入库值仓</p></li>
                    <li id="progress-emptyWeight"><span class="rk-step-span">
                                <img th:src="@{../../static/images/icon-chengzhong.png}"/>
                        </span>
                            <p>空车称重</p></li>
                        <li id="progress-cardBack"><span class="rk-step-span">
                                <img th:src="@{../../static/images/icon-banli.png}" />
                        <p>空车称重</p></li>
                    <li id="progress-cardBack"><span class="rk-step-span">
                                <img th:src="@{../../static/images/icon-banli.png}"/>
                        </span>
                            <p>离库确认</p></li>
                    </ul>
                </div>
                <!--流程引导结束-->
            </div>
                        <p>离库确认</p></li>
                </ul>
            </div>
            <!--流程引导结束-->
        </div>
            <!-- ä¸»ä½“信息 -->
            <form class="layui-form" action="" id="form-data"
                lay-filter="form-data">
        <!-- ä¸»ä½“信息 -->
        <form class="layui-form" action="" id="form-data"
              lay-filter="form-data">
                <div class="rkbk-con">
                    <div class="radius-6 rkbk-left-wrap fl">
                        <div class="rkbk-left">
                            <div class="rkbk-tit">
                                <i></i>
                                <h3>承运人信息</h3>
                            </div>
                            <div class="rkbk-left-form">
                                <div class="rkbk-form-box1">
                                    <div class="layui-form-item display-none">
                                        <label class="layui-form-label">隐藏-类型</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="type" autocomplete="off"
                                                th:value="${type}" class="layui-input rkbk-search-input">
                                        </div>
                                    </div>
            <div class="rkbk-con">
                <div class="radius-6 rkbk-left-wrap fl">
                    <div class="rkbk-left">
                        <div class="rkbk-tit">
                            <i></i>
                            <h3>承运人信息</h3>
                        </div>
                        <div class="rkbk-left-form">
                            <div class="rkbk-form-box1">
                                <div class="layui-form-item display-none">
                                    <label class="layui-form-label">隐藏-类型</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="type" autocomplete="off"
                                               th:value="${type}" class="layui-input rkbk-search-input">
                                    </div>
                                </div>
                                    <div class="rkbk-form-left">
                                        <div class="layui-form-item">
                                            <label class="layui-form-label color-red">姓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;名:</label>
                                            <div class="layui-input-block">
                                                <input type="text" name="userName" id="userName"
                                                    lay-verify="required" placeholder="必填信息" autocomplete="off"
                                                    class="layui-input rkbk-search-input">
                                            </div>
                                        </div>
                                <div class="rkbk-form-left">
                                    <div class="layui-form-item">
                                        <label class="layui-form-label color-red">姓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;名:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userName" id="userName"
                                                   lay-verify="required" placeholder="必填信息" autocomplete="off"
                                                   class="layui-input rkbk-search-input">
                                        </div>
                                    </div>
                                        <div class="layui-form-item">
                                            <label class="layui-form-label color-red">身份证号:</label>
                                            <div class="layui-input-block">
                                                <input type="text" name="userId" id="userId"
                                                    lay-verify="required" placeholder="必填信息" autocomplete="off"
                                                    class="layui-input rkbk-search-input">
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <label class="layui-form-label">联系方式:</label>
                                            <div class="layui-input-block">
                                                <input type="text" name="userContact" id="userContact"
                                                    placeholder="请输入" autocomplete="off"
                                                    class="layui-input rkbk-search-input">
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <label class="layui-form-label">出生日期:</label>
                                            <div class="layui-input-block">
                                                <input type="text" name="userBirthday" id="userBirthday"
                                                    placeholder="yyyy-MM-dd" autocomplete="off"
                                                    class="layui-input rkbk-search-input bg-date">
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <label class="layui-form-label">性&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;别:</label>
                                            <div class="layui-input-block rkbk-selBox">
                                                <input type="radio" name="userSex" id="userSex" value="男"
                                                    title="男" checked> <input type="radio"
                                                    name="userSex" value="女" title="女">
                                            </div>
                                        </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label color-red">身份证号:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userId" id="userId"
                                                   lay-verify="required" placeholder="必填信息" autocomplete="off"
                                                   class="layui-input rkbk-search-input">
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">联系方式:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userContact" id="userContact"
                                                   placeholder="请输入" autocomplete="off"
                                                   class="layui-input rkbk-search-input">
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">出生日期:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userBirthday" id="userBirthday"
                                                   placeholder="yyyy-MM-dd" autocomplete="off"
                                                   class="layui-input rkbk-search-input bg-date">
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">性&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;别:</label>
                                        <div class="layui-input-block rkbk-selBox">
                                            <input type="radio" name="userSex" id="userSex" value="男"
                                                   title="男" checked> <input type="radio"
                                                                             name="userSex" value="女" title="女">
                                        </div>
                                    </div>
                                        <div class="layui-form-item">
                                            <label class="layui-form-label">民&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;族:</label>
                                            <div class="layui-input-block">
                                                <input type="text" name="userNation" id="userNation"
                                                    placeholder="请输入" autocomplete="off"
                                                    class="layui-input rkbk-search-input">
                                            </div>
                                        </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">民&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;族:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userNation" id="userNation"
                                                   placeholder="请输入" autocomplete="off"
                                                   class="layui-input rkbk-search-input">
                                        </div>
                                    </div>
                                    </div>
                                    <!--rk-form-left end-->
                                </div>
                                <!--rk-form-left end-->
                                    <div class="rkbk-photo">
                                        <a href="#"><img id="id_img_pers"
                                            th:src="@{../../static/images/rkbk-photo_03.png}" /></a>
                                    </div>
                                <div class="rkbk-photo">
                                    <a href="#"><img id="id_img_pers"
                                                     th:src="@{../../static/images/rkbk-photo_03.png}"/></a>
                                </div>
                                </div>
                                <!--rkbk-form-box1 end-->
                            </div>
                            <!--rkbk-form-box1 end-->
                                <div class="rkbk-form-box2" style="padding-top: 20px;">
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;址:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userAddress" id="userAddress"
                                                placeholder="请输入" autocomplete="off"
                                                class="layui-input rkbk-search-input">
                                        </div>
                                    </div>
                                </div>
                                <!--rkbk-form-box2 end-->
                            <div class="rkbk-form-box2" style="padding-top: 20px;">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;址:</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="userAddress" id="userAddress"
                                               placeholder="请输入" autocomplete="off"
                                               class="layui-input rkbk-search-input">
                                    </div>
                                </div>
                            </div>
                            <!--rkbk-form-box2 end-->
                                <div class="rkbk-quick layui-text-center">
                                    <button id="button_readID" type="button"
                                        onclick="flushIdCard()"
                                        class="rkbk-quick-btn layui-btn btn-blue">读取身份证</button>
                                </div>
                            <div class="rkbk-quick layui-text-center">
                                <button id="button_readID" type="button"
                                        onclick="flushIdCard()"
                                        class="rkbk-quick-btn layui-btn btn-blue">读取身份证
                                </button>
                            </div>
                            </div>
                        </div>
                        </div>
                    </div>
                    </div>
                    <!--rkbk-left end-->
                </div>
                <!--rkbk-left end-->
                    <div class="radius-6 rkbk-right-wrap fr" style="height: 512px;">
                        <div class="rkbk-left">
                            <div class="rkbk-tit">
                                <i></i>
                                <h3>登记信息</h3>
                            </div>
                <div class="radius-6 rkbk-right-wrap fr" style="height: 512px;">
                    <div class="rkbk-left">
                        <div class="rkbk-tit">
                            <i></i>
                            <h3>登记信息</h3>
                        </div>
                            <div class="rkbk-left-form rkbk-right-form">
                                <div class="layui-form-item">
                                    <input type="button" value="读卡" class="rkbk-r-btn fr layui-btn"
                                        onclick="flushICCard()" /> <label
                                        class="layui-form-label  color-red">智慧卡号:</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="intelCard" id="intelCard" required
                                            lay-verify="required" placeholder="先放卡,后点击读卡"
                                            autocomplete="off" class="layui-input rkbk-search-input">
                                    </div>
                                </div>
                        <div class="rkbk-left-form rkbk-right-form">
                            <div class="layui-form-item">
                                <input type="button" value="读卡" class="rkbk-r-btn fr layui-btn"
                                       onclick="flushICCard()"/> <label
                                    class="layui-form-label  color-red">智慧卡号:</label>
                                <div class="layui-input-block">
                                    <input type="text" name="intelCard" id="intelCard" required
                                           lay-verify="required" placeholder="先放卡,后点击读卡"
                                           autocomplete="off" class="layui-input rkbk-search-input">
                                </div>
                            </div>
                                <div class="layui-form-item">
                                    <input type="button" value="读车牌"
                                        class="rkbk-r-btn fr layui-btn layui-btn-normal"
                                        onclick="getPlateNum()" /> <label
                                        class="layui-form-label color-red">运输车牌:</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="plateNum" id="plateNum"
                                            placeholder="无车牌车辆,填写 æ— è½¦ç‰Œ" lay-verify="required"
                                            autocomplete="off" class="layui-input rkbk-search-input">
                                    </div>
                                </div>
                            <div class="layui-form-item">
                                <input type="button" value="读车牌"
                                       class="rkbk-r-btn fr layui-btn layui-btn-normal"
                                       onclick="getPlateNum()"/> <label
                                    class="layui-form-label color-red">运输车牌:</label>
                                <div class="layui-input-block">
                                    <input type="text" name="plateNum" id="plateNum"
                                           placeholder="无车牌车辆,填写 æ— è½¦ç‰Œ" lay-verify="required"
                                           autocomplete="off" class="layui-input rkbk-search-input">
                                </div>
                            </div>
                                <div class="layui-form-item">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">运输工具:</label>
                                        <div class="layui-input-block">
                                            <input type="radio" name="transType" value="1" title="汽车"
                                                checked> <input type="radio" name="transType"
                                                value="2" title="火车"> <input type="radio"
                                                name="transType" value="3" title="轮船"> <input
                                                type="radio" name="transType" value="9" title="其他">
                                        </div>
                                    </div>
                                </div>
                            <div class="layui-form-item">
                                <div class="layui-inline">
                                    <label class="layui-form-label">运输工具:</label>
                                    <div class="layui-input-block">
                                        <input type="radio" name="transType" value="1" title="汽车"
                                               checked> <input type="radio" name="transType"
                                                               value="2" title="火车"> <input type="radio"
                                                                                            name="transType" value="3"
                                                                                            title="轮船"> <input
                                            type="radio" name="transType" value="9" title="其他">
                                    </div>
                                </div>
                            </div>
                            </div>
                        </div>
                        </div>
                    </div>
                        <!-- è§†é¢‘ -->
                        <div class="rkbk-left">
                            <div class="rkbk-tit">
                                <i></i>
                                <h3>登记视频</h3>
                            </div>
                            <div class="kccz-r-con2">
                                <div class="kccz-r-vedio" id="kccz-r-video1"></div>
                                <div class="kccz-r-btnbox">
                                    <div class="kccz-r-div">
                                        <span id="plateNum2">未识别</span>
                                        <p>车牌识别</p>
                                    </div>
                                     <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active mt-10"> <span class="kccz-r-pz"></span>
                                        <p>系统自动抓拍</p>
                                    </a>
                                </div>
                            </div>
                        </div>
                    </div>
                    <!--rkbk-right end-->
                </div>
                <!--rkbk-con end-->
            </form>
        </div>
        <!--rk-main end-->
                    <!-- è§†é¢‘ -->
                    <div class="rkbk-left">
                        <div class="rkbk-tit">
                            <i></i>
                            <h3>登记视频</h3>
                        </div>
                        <div class="kccz-r-con2">
                            <div class="kccz-r-vedio" id="kccz-r-video1"></div>
                            <div class="kccz-r-btnbox">
                                <div class="kccz-r-div">
                                    <span id="plateNum2">未识别</span>
                                    <p>车牌识别</p>
                                </div>
                                <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active mt-10"> <span
                                        class="kccz-r-pz"></span>
                                    <p>系统自动抓拍</p>
                                </a>
                            </div>
                        </div>
                    </div>
                </div>
                <!--rkbk-right end-->
            </div>
            <!--rkbk-con end-->
        </form>
    </div>
    <!--rk-main end-->
    </div>
    <!--l-container end-->
</div>
<!--l-container end-->
    <script th:inline="javascript">
<script th:inline="javascript">
    //流程环节
    var inoutProgress = [[${inoutProgress}]];
    //当前节点
@@ -336,44 +337,44 @@
    var ship = null; //是否船运页面标识
</script>
    <script th:src="@{../../static/plugins/layui/layui.js}"></script>
    <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/video-play.js}"></script>
    <script th:src="@{../../static/admin/inout/inout-common.js}"></script>
    <script th:src="@{../../static/admin/inout/in-register.js}"></script>
<script th:src="@{../../static/plugins/layui/layui.js}"></script>
<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/video-play.js}"></script>
<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
<script th:src="@{../../static/admin/inout/in-register.js}"></script>
    <!-- å¼¹å‡ºæ¡†çš„信息 -->
    <div class="layui-tab-content" id="dialog-from-notify"
        style="display: none;">
        <table class="layui-table">
            <colgroup>
                <col width="100">
            </colgroup>
            <tbody>
                <tr>
                    <td>返回信息</td>
                    <td id="resultMsg" style="color: red; font-weight: bold;"></td>
                </tr>
                <tr>
                    <td>承运人</td>
                    <td id="resultUserName" style="font-weight: bold;"></td>
                </tr>
                <tr>
                    <td>车牌号</td>
                    <td id="resultPlateNum" style="font-weight: bold;"></td>
                </tr>
                <tr>
                    <td>下一步</td>
                    <td id="resultType" style="font-weight: bold;"></td>
                </tr>
                <tr>
                    <td>智慧卡号</td>
                    <td id="resultIntelCard" style="font-weight: bold;"></td>
                </tr>
            </tbody>
        </table>
    </div>
<!-- å¼¹å‡ºæ¡†çš„信息 -->
<div class="layui-tab-content" id="dialog-from-notify"
     style="display: none;">
    <table class="layui-table">
        <colgroup>
            <col width="100">
        </colgroup>
        <tbody>
        <tr>
            <td>返回信息</td>
            <td id="resultMsg" style="color: red; font-weight: bold;"></td>
        </tr>
        <tr>
            <td>承运人</td>
            <td id="resultUserName" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>车牌号</td>
            <td id="resultPlateNum" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>下一步</td>
            <td id="resultType" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>智慧卡号</td>
            <td id="resultIntelCard" style="font-weight: bold;"></td>
        </tr>
        </tbody>
    </table>
</div>
</body>
</html>
igds-web/src/main/resources/templates/admin/inout/out-card-back.html
@@ -1,335 +1,342 @@
<!DOCTYPE html>
<html lang="zh-cn" xmlns:th=http://www.thymeleaf.org>
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="viewport"
          content="width=device-width, initial-scale=1, maximum-scale=1">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="renderer" content="webkit">
    <title>出入库管理-卡回收</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="viewport"
          content="width=device-width, initial-scale=1, maximum-scale=1">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="renderer" content="webkit">
    <title>出入库管理-卡回收</title>
    <link rel="stylesheet" type="text/css"
          th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
    <link rel="stylesheet" type="text/css"
          th:href="@{../../static/admin/inout/style.css}">
    <link rel="stylesheet" type="text/css"
          th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
    <link rel="stylesheet" type="text/css"
          th:href="@{../../static/admin/inout/style.css}">
    <!--使用打印插件 éšè—å½“前插件 -->
    <script th:src="@{../../static/plugins/lodop/LodopFuncs.js}"></script>
    <object id="LODOP_OB"
            classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0
            style="display: none;">
        <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0
               style="display: none;"></embed>
    </object>
    <!--使用打印插件 éšè—å½“前插件 -->
    <script th:src="@{../../static/plugins/lodop/LodopFuncs.js}"></script>
    <object id="LODOP_OB"
            classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0
            style="display: none;">
        <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0
               style="display: none;"></embed>
    </object>
    <style>
        .display-none {
            display: none;
        }
    <style>
        .display-none {
            display: none;
        }
        .rk-step-wrap {
            padding: 0px;
            border-bottom: 0px;
            text-align: center;
        }
        .rk-step-wrap {
            padding: 0px;
            border-bottom: 0px;
            text-align: center;
        }
        .qyzj-btnbox .rkbk-quick {
            margin-top: 15px;
        }
    </style>
        .qyzj-btnbox .rkbk-quick {
            margin-top: 15px;
        }
    </style>
</head>
<body>
<div class="l-container layui-clear">
    <div class="rk-main">
    <div class="rk-main">
        <div class="qyzj-btnbox layui-clear">
        <div class="qyzj-btnbox layui-clear">
            <div class="rkbk-quick fl">
                <button class="rkbk-quick-btn layui-btn btn-green"
                        onclick="submit()">
                    <i><img th:src="@{../../static/images/icon-ok.png}"/></i> å‡ºåº“收卡
                </button>
                <button class="rkbk-quick-btn layui-btn btn-violet"
                        onclick="printBill()">
                    <i><img th:src="@{../../static/images/icon-dayin.png}"/></i>
                    æ‰“印过磅单
                </button>
            </div>
            <div class="rkbk-quick fl">
                <button class="rkbk-quick-btn layui-btn btn-green"
                        onclick="submit()">
                    <i><img th:src="@{../../static/images/icon-ok.png}"/></i> å‡ºåº“收卡
                </button>
                <button class="rkbk-quick-btn layui-btn btn-violet"
                        onclick="printBill()">
                    <i><img th:src="@{../../static/images/icon-dayin.png}"/></i>
                    æ‰“印过磅单
                </button>
            </div>
            <!-- æµç¨‹å¼•导 -->
            <div class="rk-step-wrap fr">
                <ul class="rk-step">
                    <li id="progress-register" class="active rk-step-first">
            <!-- æµç¨‹å¼•导 -->
            <div class="rk-step-wrap fr">
                <ul class="rk-step">
                    <li id="progress-register" class="active rk-step-first">
                        <span class="rk-step-span">
                            <img th:src="@{../../static/images/icon-dengji.png}"/>
                        </span>
                        <p>出库登记</p>
                    </li>
                    <li id="progress-emptyWeight" class="active">
                        <p>出库登记</p>
                    </li>
                    <li id="progress-emptyWeight" class="active">
                        <span class="rk-step-span">
                            <img th:src="@{../../static/images/icon-chengzhong.png}"/>
                        </span>
                        <p>空车称重</p>
                    </li>
                    <li id="progress-hand" class="active">
                        <p>空车称重</p>
                    </li>
                    <li id="progress-hand" class="active">
                        <span class="rk-step-span">
                            <img th:src="@{../../static/images/icon-xiehuo.png}"/>
                        </span>
                        <p>出库值仓</p>
                    </li>
                    <li id="progress-fullWeight" class="active">
                        <p>出库值仓</p>
                    </li>
                    <li id="progress-fullWeight" class="active">
                        <span class="rk-step-span">
                            <img th:src="@{../../static/images/icon-chengzhong.png}"/>
                        </span>
                        <p>满车称重</p>
                    </li>
                    <li id="progress-cardBack" class="active">
                        <p>满车称重</p>
                    </li>
                    <li id="progress-cardBack" class="active">
                        <span class="rk-step-span">
                            <img th:src="@{../../static/images/icon-banli.png}"/>
                        </span>
                        <p>离库确认</p>
                    </li>
                </ul>
                        <p>离库确认</p>
                    </li>
                </ul>
            </div>
            <!-- æµç¨‹å¼•导EDN -->
            </div>
            <!-- æµç¨‹å¼•导EDN -->
        </div>
        </div>
        <div class="rkbk-con">
        <div class="rkbk-con">
            <div class="radius-6 rkbk-left-wrap fl">
                <div class="rkbk-left">
                    <div class="rkbk-tit">
                        <i></i>
                        <h3>承运人信息</h3>
                    </div>
                    <div class="rkbk-left-form">
                        <form class="layui-form" action="" id="form-basic"
                              lay-filter="form-basic">
            <div class="radius-6 rkbk-left-wrap fl">
                <div class="rkbk-left">
                    <div class="rkbk-tit">
                        <i></i>
                        <h3>承运人信息</h3>
                    </div>
                    <div class="rkbk-left-form">
                        <form class="layui-form" action="" id="form-basic"
                              lay-filter="form-basic">
                            <div class="rkbk-form-box1">
                            <div class="rkbk-form-box1">
                                <div class="rkbk-form-left">
                                <div class="rkbk-form-left">
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">姓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;名</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userName" placeholder="自动获取"
                                                   autocomplete="off" class="layui-input rkbk-search-input" disabled>
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">身份证号</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userId" placeholder="自动获取"
                                                   autocomplete="off" class="layui-input rkbk-search-input" disabled>
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">姓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;名</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userName" placeholder="自动获取"
                                                   autocomplete="off" class="layui-input rkbk-search-input" disabled>
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">身份证号</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userId" placeholder="自动获取"
                                                   autocomplete="off" class="layui-input rkbk-search-input" disabled>
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">联系方式</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userContact" placeholder="自动获取"
                                                   autocomplete="off" class="layui-input rkbk-search-input" disabled>
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">出生日期</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userBirthday"
                                                   placeholder="yyyy-MM-dd" autocomplete="off"
                                                   class="layui-input rkbk-search-input bg-date" id="test1" disabled>
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">性&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;别</label>
                                        <div class="layui-input-block rkbk-selBox">
                                            <input type="radio" name="userSex" value="男" title="男"
                                                   checked disabled> <input type="radio" name="userSex"
                                                                            value="女" title="女" disabled>
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">联系方式</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userContact" placeholder="自动获取"
                                                   autocomplete="off" class="layui-input rkbk-search-input" disabled>
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">出生日期</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userBirthday"
                                                   placeholder="yyyy-MM-dd" autocomplete="off"
                                                   class="layui-input rkbk-search-input bg-date" id="test1" disabled>
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">性&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;别</label>
                                        <div class="layui-input-block rkbk-selBox">
                                            <input type="radio" name="userSex" value="男" title="男"
                                                   checked disabled> <input type="radio" name="userSex"
                                                                            value="女" title="女" disabled>
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">民&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;族</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userNation" placeholder="自动获取"
                                                   autocomplete="off" class="layui-input rkbk-search-input" disabled>
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">民&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;族</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userNation" placeholder="自动获取"
                                                   autocomplete="off" class="layui-input rkbk-search-input" disabled>
                                        </div>
                                    </div>
                                </div>
                                <!--rk-form-left end-->
                                </div>
                                <!--rk-form-left end-->
                                <div class="rkbk-photo">
                                    <a href="#"><img
                                            th:src="@{../../static/images/rkbk-photo_03.png}"/></a>
                                </div>
                                <div class="rkbk-photo">
                                    <a href="#"><img
                                            th:src="@{../../static/images/rkbk-photo_03.png}"/></a>
                                </div>
                            </div>
                            <!--rkbk-form-box1 end-->
                            </div>
                            <!--rkbk-form-box1 end-->
                            <div class="rkbk-form-box2" style="padding-top: 20px;">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;址</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="userAddress" placeholder="自动获取"
                                               autocomplete="off" class="layui-input rkbk-search-input" disabled>
                                    </div>
                                </div>
                            </div>
                            <div class="rkbk-quick layui-text-center">
                                <button id="button_readID" type="button"
                                        onclick="flushIdCard()"
                                        class="rkbk-quick-btn layui-btn btn-blue">读取身份证
                                </button>
                            </div>
                            <!--rkbk-form-box2 end-->
                        </form>
                            <div class="rkbk-form-box2" style="padding-top: 20px;">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;址</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="userAddress" placeholder="自动获取"
                                               autocomplete="off" class="layui-input rkbk-search-input" disabled>
                                    </div>
                                </div>
                            </div>
                            <div class="rkbk-quick layui-text-center">
                                <button id="button_readID" type="button"
                                        onclick="flushIdCard()"
                                        class="rkbk-quick-btn layui-btn btn-blue">读取身份证
                                </button>
                            </div>
                            <!--rkbk-form-box2 end-->
                        </form>
                    </div>
                </div>
                    </div>
                </div>
            </div>
            <!--rkbk-left end-->
            </div>
            <!--rkbk-left end-->
            <div class="radius-6 rkbk-right-wrap fr">
                <div class="rkbk-left">
                    <div class="rkbk-tit">
                        <i></i>
                        <h3>业务数据</h3>
                    </div>
            <div class="radius-6 rkbk-right-wrap fr">
                <div class="rkbk-left">
                    <div class="rkbk-tit">
                        <i></i>
                        <h3>业务数据</h3>
                    </div>
                    <div class="rkbk-left-form rkbk-right-form">
                        <form class="layui-form" action="" id="form-data"
                              lay-filter="form-data">
                    <div class="rkbk-left-form rkbk-right-form">
                        <form class="layui-form" action="" id="form-data"
                              lay-filter="form-data">
                            <div class="layui-form-item display-none">
                                <label class="layui-form-label">隐藏字段-ID</label>
                                <div class="layui-input-block">
                                    <input type="text" name="id" autocomplete="off"
                                           class="layui-input rkbk-search-input">
                                </div>
                            </div>
                            <div class="layui-form-item display-none">
                                <label class="layui-form-label">隐藏字段-流程节点</label>
                                <div class="layui-input-block">
                                    <input type="text" name="progress" autocomplete="off"
                                           class="layui-input rkbk-search-input">
                                </div>
                            </div>
                            <div class="layui-form-item display-none">
                                <label class="layui-form-label">隐藏字段-业务类型</label>
                                <div class="layui-input-block">
                                    <input type="text" name="type" autocomplete="off"
                                           class="layui-input rkbk-search-input">
                                </div>
                            </div>
                            <div class="layui-form-item">
                            <div class="layui-form-item display-none">
                                <label class="layui-form-label">隐藏字段-ID</label>
                                <div class="layui-input-block">
                                    <input type="text" name="id" autocomplete="off"
                                           class="layui-input rkbk-search-input">
                                </div>
                            </div>
                            <div class="layui-form-item display-none">
                                <label class="layui-form-label">隐藏字段-流程节点</label>
                                <div class="layui-input-block">
                                    <input type="text" name="progress" autocomplete="off"
                                           class="layui-input rkbk-search-input">
                                </div>
                            </div>
                            <div class="layui-form-item display-none">
                                <label class="layui-form-label">隐藏字段-业务类型</label>
                                <div class="layui-input-block">
                                    <input type="text" name="type" autocomplete="off"
                                           class="layui-input rkbk-search-input">
                                </div>
                            </div>
                            <div class="layui-form-item">
                                <input type="button" value="读卡" class="rkbk-r-btn fr layui-btn" onclick="flushICCard()">
                                <label class="layui-form-label">智慧卡号</label>
                                <div class="layui-input-block">
                                    <input type="text" name="intelCard" id="intelCard"
                                           placeholder="先点击读卡,后放卡......" autocomplete="off"
                                           class="layui-input">
                                </div>
                            </div>
                                <input type="button" value="读卡" class="rkbk-r-btn fr layui-btn" onclick="flushICCard()">
                                <label class="layui-form-label">智慧卡号</label>
                                <div class="layui-input-block">
                                    <input type="text" name="intelCard" id="intelCard"
                                           placeholder="先点击读卡,后放卡......" autocomplete="off"
                                           class="layui-input">
                                </div>
                            </div>
                            <div class="layui-form-item">
                                <input type="button" value="查询" class="rkbk-r-btn fr layui-btn" onclick="flushData()">
                                <label class="layui-form-label">车牌号</label>
                                <div class="layui-input-block">
                                    <input type="text" name="plateNum" id="plateNum"
                                           placeholder="输入车牌号进行查询" autocomplete="off"
                                           class="layui-input">
                                </div>
                            </div>
                            <div class="layui-form-item">
                                <input type="button" value="查询" class="rkbk-r-btn fr layui-btn" onclick="flushData()">
                                <label class="layui-form-label">车牌号</label>
                                <div class="layui-input-block">
                                    <input type="text" name="plateNum" id="plateNum"
                                           placeholder="输入车牌号进行查询" autocomplete="off"
                                           class="layui-input">
                                </div>
                            </div>
                            <div class="layui-form-item">
                                <label class="layui-form-label">装卸仓库</label>
                                <div class="layui-input-block">
                                    <select name="depotId" id="depotId" disabled>
                                        <option value="">自动获取</option>
                                        <option th:each="depot,depotSet:${listDepot}"
                                                th:value="${depot.id}" th:text="${depot.name}"></option>
                                    </select>
                                </div>
                            </div>
                            <div class="layui-form-item">
                                <label class="layui-form-label">装卸仓库</label>
                                <div class="layui-input-block">
                                    <select name="depotId" id="depotId" disabled>
                                        <option value="">自动获取</option>
                                        <option th:each="depot,depotSet:${listDepot}"
                                                th:value="${depot.id}" th:text="${depot.name}"></option>
                                    </select>
                                </div>
                            </div>
                            <div class="layui-form-item">
                                <label class="layui-form-label">粮食品种</label>
                                <div class="layui-input-block">
                                    <select name="foodVariety" disabled>
                                        <option value="">自动获取</option>
                                        <option th:each="dic,dicSet:${listFoodVariety}"
                                                th:value="${dic.code}" th:text="${dic.name}"></option>
                                    </select>
                                </div>
                            </div>
                            <div class="layui-form-item">
                                <label class="layui-form-label">粮食品种</label>
                                <div class="layui-input-block">
                                    <select name="foodVariety" disabled>
                                        <option value="">自动获取</option>
                                        <option th:each="dic,dicSet:${listFoodVariety}"
                                                th:value="${dic.code}" th:text="${dic.name}"></option>
                                    </select>
                                </div>
                            </div>
                            <div class="layui-form-item">
                                <label class="layui-form-label">粮食等级</label>
                                <div class="layui-input-block">
                                    <select name="foodLevel" disabled>
                                        <option value="">自动获取</option>
                                        <option th:each="dic,dicSet:${listFoodLevel}"
                                                th:value="${dic.code}" th:text="${dic.name}"></option>
                                    </select>
                                </div>
                            </div>
                            <div class="layui-form-item">
                                <label class="layui-form-label">粮食等级</label>
                                <div class="layui-input-block">
                                    <select name="foodLevel" disabled>
                                        <option value="">自动获取</option>
                                        <option th:each="dic,dicSet:${listFoodLevel}"
                                                th:value="${dic.code}" th:text="${dic.name}"></option>
                                    </select>
                                </div>
                            </div>
                            <div class="layui-form-item">
                                <label class="layui-form-label">往来单位</label>
                                <div class="layui-input-block">
                                    <input type="text" name="customerName" placeholder="自动获取"
                                           autocomplete="off" class="layui-input rkbk-search-input" disabled>
                                </div>
                            </div>
                            <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 rkbk-search-input" disabled>
                                </div>
                            </div>
                        </form>
                    </div>
                </div>
            </div>
            <!--rkbk-right end-->
                            <div class="layui-form-item">
                                <label class="layui-form-label">往来单位</label>
                                <div class="layui-input-block">
                                    <input type="text" name="customerName" placeholder="自动获取"
                                           autocomplete="off" class="layui-input rkbk-search-input" disabled>
                                </div>
                            </div>
                            <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 rkbk-search-input" disabled>
                                </div>
                            </div>
        </div>
        <!--rkbk-con end-->
                            <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>
            </div>
            <!--rkbk-right end-->
    </div>
    <!--rk-main end-->
        </div>
        <!--rkbk-con end-->
    </div>
    <!--rk-main end-->
</div>
<!--l-container end-->
<script th:inline="javascript">
    //流程环节
    var inoutProgress = [[${inoutProgress}]];
    var progress = [[${progress}]];
    var listDepot = [[${listDepot}]];
    //业务步骤
    var bizType = [[${bizType}]];
    var deptId = [[${deptId}]];
    //userId
    var userId = [[${loginUser.username}]];
    var companyId = [[${loginUser.companyId}]];
    //出入库类型
    var type = [[${type}]];
    //品种
    var listFoodVariety = [[${listFoodVariety}]];
    var listFoodLevel = [[${listFoodLevel}]];
    //流程环节
    var inoutProgress = [[${inoutProgress}]];
    var progress = [[${progress}]];
    var listDepot = [[${listDepot}]];
    //业务步骤
    var bizType = [[${bizType}]];
    var deptId = [[${deptId}]];
    //userId
    var userId = [[${loginUser.username}]];
    var companyId = [[${loginUser.companyId}]];
    //出入库类型
    var type = [[${type}]];
    //品种
    var listFoodVariety = [[${listFoodVariety}]];
    var listFoodLevel = [[${listFoodLevel}]];
</script>
@@ -342,33 +349,33 @@
<!-- å¼¹å‡ºæ¡†çš„信息 -->
<div class="layui-tab-content" id="dialog-from-notify" style="display: none;">
    <table class="layui-table">
        <colgroup>
            <col width="100">
        </colgroup>
        <tbody>
        <tr>
            <td>返回信息</td>
            <td id="resultMsg" style="color: red;font-weight: bold;"></td>
        </tr>
        <tr>
            <td>承运人</td>
            <td id="resultUserName" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>车牌号</td>
            <td id="resultPlateNum" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>下一步</td>
            <td id="resultType" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>智慧卡号</td>
            <td id="resultIntelCard" style="font-weight: bold;"></td>
        </tr>
        </tbody>
    </table>
    <table class="layui-table">
        <colgroup>
            <col width="100">
        </colgroup>
        <tbody>
        <tr>
            <td>返回信息</td>
            <td id="resultMsg" style="color: red;font-weight: bold;"></td>
        </tr>
        <tr>
            <td>承运人</td>
            <td id="resultUserName" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>车牌号</td>
            <td id="resultPlateNum" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>下一步</td>
            <td id="resultType" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>智慧卡号</td>
            <td id="resultIntelCard" style="font-weight: bold;"></td>
        </tr>
        </tbody>
    </table>
</div>
</body>
igds-web/src/main/resources/templates/admin/inout/out-handle.html
@@ -1,503 +1,574 @@
<!DOCTYPE html>
<html lang="zh-cn" xmlns:th=http://www.thymeleaf.org>
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="viewport"
          content="width=device-width, initial-scale=1, maximum-scale=1">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="renderer" content="webkit">
    <title>出入库管理-值仓管理</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="viewport"
          content="width=device-width, initial-scale=1, maximum-scale=1">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="renderer" content="webkit">
    <title>出入库管理-值仓管理</title>
    <link rel="stylesheet" type="text/css"
          th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
    <link rel="stylesheet" type="text/css"
          th:href="@{../../static/admin/inout/style.css}">
    <link rel="stylesheet" type="text/css"
          th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
    <link rel="stylesheet" type="text/css"
          th:href="@{../../static/admin/inout/style.css}">
    <style>
        .display-none {
            display: none;
        }
    <style>
        .display-none {
            display: none;
        }
        .layui-select-disabled .layui-disabled {
            color: #000 !important;
        }
        .layui-select-disabled .layui-disabled {
            color: #000 !important;
        }
        .depot-food input {
            line-height: 34px;
            padding-right: 10px;
            font-size: 16px;
            color: #666;
            background: #eff4f6;
        }
        .depot-food input {
            line-height: 34px;
            padding-right: 10px;
            font-size: 16px;
            color: #666;
            background: #eff4f6;
        }
        #text-param {
            font-size: 14px;
            color: red;
            padding-left: 10px;
        }
        .rk-step-wrap {
            padding: 0px;
            border-bottom: 0px;
            text-align: center;
        }
        .rk-step-wrap {
            padding: 0px;
            border-bottom: 0px;
            text-align: center;
        }
        .qyzj-btnbox {
            margin-top: 10px;
        }
        .kccz-left-box2 {
            height: 560px;
        }
        .qyzj-btnbox .rkbk-quick {
            margin-top: 20px;
        }
        .qyzj-btnbox {
            margin-top: 10px;
        }
        .kccz-data-btnbox {
            min-height: 38px;
            padding-top: 2px;
        }
        .kccz-con {
            margin: 15px 0;
        }
        .rkbk-search-btn {
            width: 100px;
        }
    </style>
        .qyzj-btnbox .rkbk-quick {
            margin-top: 20px;
        }
        .kccz-data-btnbox {
            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>
<body>
<div class="l-container layui-clear">
    <div class="rk-main">
    <div class="rk-main">
        <div class="qyzj-btnbox layui-clear">
        <div class="qyzj-btnbox layui-clear">
            <div class="rkbk-quick fl">
                <button class="rkbk-quick-btn layui-btn btn-green btn-sm"
                        onclick="submit()">
                    <i><img th:src="@{../../static/images/icon-ok.png}"/></i>值仓完成
                </button>
            </div>
            <div class="rkbk-quick fl">
                <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>
            <!-- æµç¨‹å¼•导-->
            <div class="rk-step-wrap  fr">
                <ul class="rk-step">
                    <li id="progress-register" class="active rk-step-first">
            <!-- æµç¨‹å¼•导-->
            <div class="rk-step-wrap  fr">
                <ul class="rk-step">
                    <li id="progress-register" class="active rk-step-first">
                        <span class="rk-step-span">
                            <img th:src="@{../../static/images/icon-dengji.png}"/>
                        </span>
                        <p>出库登记</p>
                    </li>
                    <li id="progress-emptyWeight" class="active">
                        <p>出库登记</p>
                    </li>
                    <li id="progress-emptyWeight" class="active">
                        <span class="rk-step-span">
                            <img th:src="@{../../static/images/icon-chengzhong.png}"/>
                        </span>
                        <p>空车称重</p>
                    </li>
                    <li id="progress-hand" class="active">
                        <p>空车称重</p>
                    </li>
                    <li id="progress-hand" class="active">
                        <span class="rk-step-span">
                            <img th:src="@{../../static/images/icon-xiehuo.png}"/>
                        </span>
                        <p>出库值仓</p>
                    </li>
                    <li id="progress-fullWeight">
                        <p>出库值仓</p>
                    </li>
                    <li id="progress-fullWeight">
                        <span class="rk-step-span">
                            <img th:src="@{../../static/images/icon-chengzhong.png}"/>
                        </span>
                        <p>满车称重</p>
                    </li>
                    <li id="progress-cardBack">
                        <p>满车称重</p>
                    </li>
                    <li id="progress-cardBack">
                        <span class="rk-step-span">
                            <img th:src="@{../../static/images/icon-banli.png}"/>
                        </span>
                        <p>离库确认</p>
                    </li>
                </ul>
            </div>
                        <p>离库确认</p>
                    </li>
                </ul>
            </div>
            <!-- æµç¨‹å¼•导 END -->
            <!-- æµç¨‹å¼•导 END -->
        </div>
        <!--qyzj-btnbox end-->
        </div>
        <!--qyzj-btnbox end-->
        <div class="kccz-con">
            <div class="kccz-left radius-6 fl bg-fff">
        <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>
                    </div>
                    <div class="rkbk-tit">
                        <i></i>
                        <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 class="kccz-data-form layui-row">
                        <form class="layui-form" action="" id="form-data"
                              lay-filter="form-data">
                            <div class="layui-form-item display-none">
                                <label class="layui-form-label">隐藏字段-ID</label>
                                <div class="layui-input-block">
                                    <input type="text" name="id" autocomplete="off"
                                           class="layui-input rkbk-search-input">
                                </div>
                            </div>
                        </div>
                    </div>
                            <div class="layui-form-item display-none">
                                <label class="layui-form-label">隐藏字段-流程节点</label>
                                <div class="layui-input-block">
                                    <input type="text" name="progress" autocomplete="off"
                                           class="layui-input rkbk-search-input">
                                </div>
                            </div>
                    <div class="kccz-data-form layui-row">
                        <form class="layui-form" action="" id="form-data"
                              lay-filter="form-data">
                            <div class="layui-form-item display-none">
                                <label class="layui-form-label">隐藏字段-ID</label>
                                <div class="layui-input-block">
                                    <input type="text" name="id" autocomplete="off"
                                           class="layui-input rkbk-search-input">
                                </div>
                            </div>
                            <div class="layui-form-item display-none">
                                <label class="layui-form-label">隐藏字段-业务类型</label>
                                <div class="layui-input-block">
                                    <input type="text" name="type" autocomplete="off"
                                           class="layui-input rkbk-search-input">
                                </div>
                            </div>
                            <div class="layui-form-item display-none">
                                <label class="layui-form-label">隐藏字段-通知单id</label>
                                <div class="layui-input-block">
                                    <input type="text" name="noticeId" autocomplete="off"
                                           class="layui-input rkbk-search-input">
                                </div>
                            </div>
                            <div class="layui-form-item display-none">
                                <label class="layui-form-label">隐藏字段-流程节点</label>
                                <div class="layui-input-block">
                                    <input type="text" name="progress" autocomplete="off"
                                           class="layui-input rkbk-search-input">
                                </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 class="layui-form-item display-none">
                                <label class="layui-form-label">隐藏字段-业务类型</label>
                                <div class="layui-input-block">
                                    <input type="text" name="type" autocomplete="off"
                                           class="layui-input rkbk-search-input">
                                </div>
                            </div>
                            <div class="layui-form-item display-none">
                                <label class="layui-form-label">隐藏字段-通知单id</label>
                                <div class="layui-input-block">
                                    <input type="text" name="noticeId" autocomplete="off"
                                           class="layui-input rkbk-search-input">
                                </div>
                            </div>
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label color-red">承运人</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="userName" id="userName"
                                               placeholder="不可编辑" autocomplete="off" class="layui-input" disabled>
                                    </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">
                                        <input type="text" name="plateNum" id="plateNum"
                                               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>
                                    <div class="layui-input-block">
                                        <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">
                                    <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">
                                    <label class="layui-form-label">智慧卡号</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="intelCard" id="intelCard"
                                               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">
                                    <label class="layui-form-label">智慧卡号</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="intelCard" id="intelCard"
                                               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="emptyWeight" 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 color-red">皮重(空车)</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="emptyWeight" 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="fullWeight" 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">
                                        <select name="depotId" id="depotId">
                                            <option value="">不可改</option>
                                            <option th:each="depot,depotSet:${listDepot}"
                                                    th:value="${depot.id}" th:text="${depot.name}"></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="fullWeight" 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 color-red">装卸仓库</label>
                                    <div class="layui-input-block">
                                        <select name="depotId" id="depotId">
                                            <option value="">不可编辑</option>
                                            <option th:each="depot,depotSet:${listDepot}"
                                                    th:value="${depot.id}" th:text="${depot.name}"></option>
                                        </select>
                                    </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">-->
                            <!--                                    <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">
                                    <label class="layui-form-label">往来单位</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="customerName" placeholder="不可改"
                                               autocomplete="off" class="layui-input rkbk-search-input"
                                               disabled>
                                    </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 color-red">客户信息</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="customerName" placeholder="不可编辑"
                                               autocomplete="off" class="layui-input rkbk-search-input"
                                               disabled>
                                    </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="foodLevel" id="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">
                                    <label class="layui-form-label">粮食品种</label>
                                    <div class="layui-input-block">
                                        <select name="foodVariety" id="foodVariety">
                                            <option value="">不可改</option>
                                            <option th:each="dic,dicSet:${listFoodVariety}"
                                                    th:value="${dic.code}" th:text="${dic.name}"></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="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">
                                    <label class="layui-form-label">粮食品种</label>
                                    <div class="layui-input-block">
                                        <select name="foodVariety" id="foodVariety">
                                            <option value="">请选择</option>
                                            <option th:each="dic,dicSet:${listFoodVariety}"
                                                    th:value="${dic.code}" th:text="${dic.name}"></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="deOther" 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="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="deHandle" placeholder="请输入"
                                               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>
                                    <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="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="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>
                                    </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-xs12">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">备&nbsp;注</label>
                                    <div class="layui-input-block">
                            <!--<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 color-red">值仓人</label>
                                    <div class="layui-input-block">
                                        <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>
                                    <div class="layui-input-block">
                                            <textarea name="remarks" placeholder="请输入内容"
                                                      class="layui-textarea"></textarea>
                                    </div>
                                </div>
                            </div>
                        </form>
                    </div>
                </div>
                <!--kccz-left-box2 end-->
                                                      autocomplete="off" class="layui-textarea"></textarea>
                                    </div>
                                </div>
                            </div>
                        </form>
                    </div>
                </div>
                <!--kccz-left-box2 end-->
            </div>
            <!--kccz-left end-->
            <div class="kccz-right fr bg-ef">
                <div class="kccz-r-item radius-6">
                    <div class="kccz-r-box">
                        <div class="rkbk-tit">
                            <i></i>
                            <h3>值仓记录1</h3>
                        </div>
                        <div class="kccz-r-con">
                            <div class="kccz-r-vedio"><img id="kccz-r-img1"></div>
                            <div class="kccz-r-btnbox">
                                <a href="javascript:;" class="kccz-r-btn" id="kccz-r-btn1"> <span
                                        class="kccz-r-img"></span>
                                    <p>上传图片</p>
                                </a>
                            </div>
                        </div>
            </div>
            <!--kccz-left end-->
            <div class="kccz-right fr bg-ef">
                <div class="kccz-r-item radius-6">
                    <div class="kccz-r-box">
                        <div class="rkbk-tit">
                            <i></i>
                            <h3>值仓记录1</h3>
                        </div>
                        <div class="kccz-r-con">
                            <div class="kccz-r-vedio"><img id="kccz-r-img1"></div>
                            <div class="kccz-r-btnbox">
                                <a href="javascript:;" class="kccz-r-btn" id="kccz-r-btn1"> <span
                                        class="kccz-r-img"></span>
                                    <p>上传图片</p>
                                </a>
                            </div>
                        </div>
                    </div>
                    </div>
                </div>
                <!--kccz-r-item end-->
                </div>
                <!--kccz-r-item end-->
                <div class="kccz-r-item radius-6 mt-10">
                    <div class="kccz-r-box">
                        <div class="rkbk-tit">
                            <i></i>
                            <h3>值仓记录2</h3>
                        </div>
                        <div class="kccz-r-con">
                            <div class="kccz-r-vedio"><img id="kccz-r-img2"></div>
                            <div class="kccz-r-btnbox">
                                <a href="javascript:;" class="kccz-r-btn" id="kccz-r-btn2"> <span
                                        class="kccz-r-img"></span>
                                    <p>上传图片</p>
                                </a>
                            </div>
                        </div>
                <div class="kccz-r-item radius-6 mt-10">
                    <div class="kccz-r-box">
                        <div class="rkbk-tit">
                            <i></i>
                            <h3>值仓记录2</h3>
                        </div>
                        <div class="kccz-r-con">
                            <div class="kccz-r-vedio"><img id="kccz-r-img2"></div>
                            <div class="kccz-r-btnbox">
                                <a href="javascript:;" class="kccz-r-btn" id="kccz-r-btn2"> <span
                                        class="kccz-r-img"></span>
                                    <p>上传图片</p>
                                </a>
                            </div>
                        </div>
                    </div>
                    </div>
                </div>
                <!--kccz-r-item end-->
                </div>
                <!--kccz-r-item end-->
                <div class="kccz-r-item radius-6 mt-10">
                    <div class="kccz-r-box">
                        <div class="rkbk-tit">
                            <i></i>
                            <h3>值仓记录3</h3>
                        </div>
                        <div class="kccz-r-con">
                            <div class="kccz-r-vedio"><img id="kccz-r-img3"></div>
                            <div class="kccz-r-btnbox">
                                <a href="javascript:;" class="kccz-r-btn" id="kccz-r-btn3"> <span
                                        class="kccz-r-img"></span>
                                    <p>上传图片</p>
                                </a>
                            </div>
                        </div>
                <div class="kccz-r-item radius-6 mt-10">
                    <div class="kccz-r-box">
                        <div class="rkbk-tit">
                            <i></i>
                            <h3>值仓记录3</h3>
                        </div>
                        <div class="kccz-r-con">
                            <div class="kccz-r-vedio"><img id="kccz-r-img3"></div>
                            <div class="kccz-r-btnbox">
                                <a href="javascript:;" class="kccz-r-btn" id="kccz-r-btn3"> <span
                                        class="kccz-r-img"></span>
                                    <p>上传图片</p>
                                </a>
                            </div>
                        </div>
                    </div>
                    </div>
                </div>
                <!--kccz-r-item end-->
                </div>
                <!--kccz-r-item end-->
            </div>
        </div>
        <!--kccz-con end-->
            </div>
        </div>
        <!--kccz-con end-->
    </div>
    <!--rk-main end-->
    </div>
    <!--rk-main end-->
</div>
<!--l-container end-->
<script th:inline="javascript">
    //流程环节
    var inoutProgress = [[${inoutProgress}]];
    var progress = [[${progress}]];
    //流程环节
    var inoutProgress = [[${inoutProgress}]];
    var progress = [[${progress}]];
    var listDepot = [[${listDepot}]];
    //业务步骤
    var bizType = [[${bizType}]];
    var deptId = [[${deptId}]];
    //userId
    var userId = [[${loginUser.username}]];
    //出入库类型
    var type = [[${type}]];
    var companyId = [[${loginUser.companyId}]];
    var listDepot = [[${listDepot}]];
    //业务步骤
    var bizType = [[${bizType}]];
    var deptId = [[${deptId}]];
    //userId
    var userId = [[${loginUser.username}]];
    //出入库类型
    var type = [[${type}]];
    var companyId = [[${loginUser.companyId}]];
    //品种
    var listFoodVariety = [[${listFoodVariety}]];
    //品种
    var listFoodVariety = [[${listFoodVariety}]];
</script>
@@ -505,37 +576,39 @@
<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>
<!-- å¼¹å‡ºæ¡†çš„信息 -->
<div class="layui-tab-content" id="dialog-from-notify" style="display: none;">
    <table class="layui-table">
        <colgroup>
            <col width="100">
        </colgroup>
        <tbody>
        <tr>
            <td>返回信息</td>
            <td id="resultMsg" style="color: red;font-weight: bold;"></td>
        </tr>
        <tr>
            <td>承运人</td>
            <td id="resultUserName" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>车牌号</td>
            <td id="resultPlateNum" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>下一步</td>
            <td id="resultType" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>智慧卡号</td>
            <td id="resultIntelCard" style="font-weight: bold;"></td>
        </tr>
        </tbody>
    </table>
    <table class="layui-table">
        <colgroup>
            <col width="100">
        </colgroup>
        <tbody>
        <tr>
            <td>返回信息</td>
            <td id="resultMsg" style="color: red;font-weight: bold;"></td>
        </tr>
        <tr>
            <td>承运人</td>
            <td id="resultUserName" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>车牌号</td>
            <td id="resultPlateNum" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>下一步</td>
            <td id="resultType" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>智慧卡号</td>
            <td id="resultIntelCard" style="font-weight: bold;"></td>
        </tr>
        </tbody>
    </table>
</div>
</body>
igds-web/src/main/resources/templates/admin/inout/out-register.html
@@ -1,337 +1,349 @@
<!DOCTYPE html>
<html lang="zh-cn" xmlns:th=http://www.thymeleaf.org>
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="viewport"
          content="width=device-width, initial-scale=1, maximum-scale=1">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="renderer" content="webkit">
    <title>出入库管理-出库登记</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="viewport"
          content="width=device-width, initial-scale=1, maximum-scale=1">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="renderer" content="webkit">
    <title>出入库管理-出库登记</title>
    <link rel="stylesheet" type="text/css"
          th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
    <link rel="stylesheet" type="text/css"
          th:href="@{../../static/admin/inout/style.css}">
    <link rel="stylesheet" type="text/css"
          th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
    <link rel="stylesheet" type="text/css"
          th:href="@{../../static/admin/inout/style.css}">
    <style>
        .display-none {
            display: none;
        }
    <style>
        .display-none {
            display: none;
        }
        .kccz-r-con2 {
            /* height: 230px; */
            padding-right: 120px;
            position: relative;
            margin-top: 10px;
        }
        .kccz-r-con2 {
            /* height: 230px; */
            padding-right: 120px;
            position: relative;
            margin-top: 10px;
        }
        .kccz-r-vedio {
            width: 100%;
            height: 280px;
            /*     background: #dee6ec; */
            background: #000;
            color: #FFF;
            text-align: center;
        }
        .kccz-r-vedio {
            width: 100%;
            height: 280px;
            /*     background: #dee6ec; */
            background: #000;
            color: #FFF;
            text-align: center;
        }
        .kccz-r-btnbox {
            width: 100px;
            position: absolute;
            right: 0px;
            top: 0px;
            z-index: 99;
        }
        .kccz-r-btnbox {
            width: 100px;
            position: absolute;
            right: 0px;
            top: 0px;
            z-index: 99;
        }
        .layui-form-label {
            font-weight: bold;
        }
        .layui-form-label {
            font-weight: bold;
        }
        .ckdj-radiobox .layui-form-item {
            margin-bottom: 0px;
            margin-top: 10px;
        }
        .ckdj-radiobox .layui-form-item {
            margin-bottom: 0px;
            margin-top: 10px;
        }
        .rk-step-wrap {
            padding: 0px;
            border-bottom: 0px;
            text-align: center;
        }
        .rk-step-wrap {
            padding: 0px;
            border-bottom: 0px;
            text-align: center;
        }
        .qyzj-btnbox .rkbk-quick {
            margin-top: 15px !important;
        }
        .color-red {
            color: red !important;
        }
        .layui-form-item .layui-input-inline {
            width: unset;
        }
        .rkbk-search-input{
            background: #FFF !important;
        }
        .rkbk-search-input.bg-date {
            background: #FFF !important;
        }
    </style>
        .qyzj-btnbox .rkbk-quick {
            margin-top: 15px !important;
        }
        .color-red {
            color: red !important;
        }
        .layui-form-item .layui-input-inline {
            width: unset;
        }
        .rkbk-search-input {
            background: #FFF !important;
        }
        .rkbk-search-input.bg-date {
            background: #FFF !important;
        }
    </style>
</head>
<body>
<div class="l-container layui-clear">
    <div class="rk-main">
    <div class="rk-main">
        <div class="qyzj-btnbox layui-clear">
            <!-- æ“ä½œèœå•-->
            <div class="rkbk-quick fl">
                <button class="rkbk-quick-btn layui-btn btn-red"
                        onclick="resetForm()">
                    <i><img th:src="@{../../static/images/icon-clear.png}"/></i> æ¸…空数据
                </button>
                <button class="rkbk-quick-btn layui-btn btn-green"
                        onclick="submit()">
                    <i><img th:src="@{../../static/images/icon-ok.png}"/></i> å®Œæˆç™»è®°
                </button>
                <button class="rkbk-quick-btn layui-btn btn-violet"
                        onclick="resetPlateNum()">
                    <i><img th:src="@{../../static/images/icon-che.png}"/></i>重置车牌识别
                </button>
            </div>
        <div class="qyzj-btnbox layui-clear">
            <!-- æ“ä½œèœå•-->
            <div class="rkbk-quick fl">
                <button class="rkbk-quick-btn layui-btn btn-red"
                        onclick="resetForm()">
                    <i><img th:src="@{../../static/images/icon-clear.png}"/></i> æ¸…空数据
                </button>
                <button class="rkbk-quick-btn layui-btn btn-green"
                        onclick="submit()">
                    <i><img th:src="@{../../static/images/icon-ok.png}"/></i> å®Œæˆç™»è®°
                </button>
                <!--                <button class="rkbk-quick-btn layui-btn btn-violet"-->
                <!--                        onclick="resetPlateNum()">-->
                <!--                    <i><img th:src="@{../../static/images/icon-che.png}"/></i>重置车牌识别-->
                <!--                </button>-->
            </div>
            <!--流程引导-->
            <div class="rk-step-wrap fr">
                <ul class="rk-step">
                    <li id="progress-register" class="active rk-step-first">
            <!--流程引导-->
            <div class="rk-step-wrap fr">
                <ul class="rk-step">
                    <li id="progress-register" class="active rk-step-first">
                        <span class="rk-step-span">
                            <img th:src="@{../../static/images/icon-dengji.png}"/>
                        </span>
                        <p>出库登记</p>
                    </li>
                    <li id="progress-emptyWeight">
                        <p>出库登记</p>
                    </li>
                    <li id="progress-emptyWeight">
                        <span class="rk-step-span">
                            <img th:src="@{../../static/images/icon-chengzhong.png}"/>
                        </span>
                        <p>空车称重</p>
                    </li>
                    <li id="progress-hand">
                        <p>空车称重</p>
                    </li>
                    <li id="progress-hand">
                        <span class="rk-step-span">
                            <img th:src="@{../../static/images/icon-xiehuo.png}"/>
                        </span>
                        <p>出库值仓</p>
                    </li>
                    <li id="progress-fullWeight">
                        <p>出库值仓</p>
                    </li>
                    <li id="progress-fullWeight">
                        <span class="rk-step-span">
                            <img th:src="@{../../static/images/icon-chengzhong.png}"/>
                        </span>
                        <p>满车称重</p>
                    </li>
                    <li id="progress-cardBack">
                        <p>满车称重</p>
                    </li>
                    <li id="progress-cardBack">
                        <span class="rk-step-span">
                            <img th:src="@{../../static/images/icon-banli.png}"/>
                        </span>
                        <p>离库确认</p>
                    </li>
                </ul>
            </div>
            <!--流程引导结束-->
        </div>
                        <p>离库确认</p>
                    </li>
                </ul>
            </div>
            <!--流程引导结束-->
        </div>
        <form class="layui-form" action="" id="form-data"
              lay-filter="form-data">
        <form class="layui-form" action="" id="form-data"
              lay-filter="form-data">
            <div class="rkbk-con">
            <div class="rkbk-con">
                <div class="radius-6 rkbk-left-wrap fl">
                    <div class="rkbk-left">
                        <div class="rkbk-tit">
                            <i></i>
                            <h3>承运人信息</h3>
                        </div>
                        <div class="rkbk-left-form">
                <div class="radius-6 rkbk-left-wrap fl">
                    <div class="rkbk-left">
                        <div class="rkbk-tit">
                            <i></i>
                            <h3>承运人信息</h3>
                        </div>
                        <div class="rkbk-left-form">
                            <div class="rkbk-form-box1">
                            <div class="rkbk-form-box1">
                                <div class="layui-form-item display-none">
                                    <label class="layui-form-label">隐藏字段-类型</label>
                                        <input type="text" name="type" th:value="${type}" >
                                </div>
                                <div class="layui-form-item display-none">
                                    <label class="layui-form-label">隐藏字段-类型</label>
                                    <input type="text" name="type" th:value="${type}">
                                </div>
                                <div class="rkbk-form-left">
                                    <div class="layui-form-item">
                                        <label class="layui-form-label color-red">姓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;名:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userName" id="userName" required
                                                   lay-verify="required" placeholder="必填信息" autocomplete="off"
                                                   class="layui-input rkbk-search-input">
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label color-red">身份证号:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userId" id="userId" required
                                                   lay-verify="required" placeholder="必填信息" autocomplete="off"
                                                   class="layui-input rkbk-search-input">
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">联系方式:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userContact" id="userContact"
                                                   placeholder="请输入" autocomplete="off"
                                                   class="layui-input rkbk-search-input">
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">出生日期:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userBirthday" id="userBirthday"
                                                   placeholder="yyyy-MM-dd" autocomplete="off"
                                                   class="layui-input rkbk-search-input bg-date">
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">性&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;别:</label>
                                        <div class="layui-input-block rkbk-selBox">
                                            <input type="radio" name="userSex" id="userSex" value="男"
                                                   title="男" checked> <input type="radio"
                                                                             name="userSex" value="女" title="女">
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">民&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;族:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userNation" id="userNation"
                                                   required lay-verify="required" placeholder="请输入"
                                                   autocomplete="off" class="layui-input rkbk-search-input">
                                        </div>
                                    </div>
                                </div>
                                <!--rk-form-left end-->
                                <div class="rkbk-form-left">
                                    <div class="layui-form-item">
                                        <label class="layui-form-label color-red">姓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;名:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userName" id="userName" required
                                                   lay-verify="required" placeholder="必填信息" autocomplete="off"
                                                   class="layui-input rkbk-search-input">
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label color-red">身份证号:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userId" id="userId" required
                                                   lay-verify="required" placeholder="必填信息" autocomplete="off"
                                                   class="layui-input rkbk-search-input">
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">联系方式:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userContact" id="userContact"
                                                   placeholder="请输入" autocomplete="off"
                                                   class="layui-input rkbk-search-input">
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">出生日期:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userBirthday" id="userBirthday"
                                                   placeholder="yyyy-MM-dd" autocomplete="off"
                                                   class="layui-input rkbk-search-input bg-date">
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">性&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;别:</label>
                                        <div class="layui-input-block rkbk-selBox">
                                            <input type="radio" name="userSex" id="userSex" value="男"
                                                   title="男" checked> <input type="radio"
                                                                             name="userSex" value="女" title="女">
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label">民&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;族:</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="userNation" id="userNation"
                                                   required lay-verify="required" placeholder="请输入"
                                                   autocomplete="off" class="layui-input rkbk-search-input">
                                        </div>
                                    </div>
                                </div>
                                <!--rk-form-left end-->
                                <div class="rkbk-photo">
                                    <a href="#"><img id="id_img_pers"
                                                     th:src="@{../../static/images/rkbk-photo_03.png}"/></a>
                                </div>
                                <div class="rkbk-photo">
                                    <a href="#"><img id="id_img_pers"
                                                     th:src="@{../../static/images/rkbk-photo_03.png}"/></a>
                                </div>
                            </div>
                            <!--rkbk-form-box1 end-->
                            </div>
                            <!--rkbk-form-box1 end-->
                            <div class="rkbk-form-box2" style="padding-top: 20px;">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;址:</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="userAddress" id="userAddress"
                                               placeholder="请输入" autocomplete="off"
                                               class="layui-input rkbk-search-input">
                                    </div>
                                </div>
                            </div>
                            <!--rkbk-form-box2 end-->
                            <div class="rkbk-form-box2" style="padding-top: 20px;">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;址:</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="userAddress" id="userAddress"
                                               placeholder="请输入" autocomplete="off"
                                               class="layui-input rkbk-search-input">
                                    </div>
                                </div>
                            </div>
                            <!--rkbk-form-box2 end-->
                            <div class="rkbk-quick layui-text-center">
                                <button id="button_readID" type="button"
                                        onclick="flushIdCard()"
                                        class="rkbk-quick-btn layui-btn btn-blue">读取身份证
                                </button>
                            </div>
                            <div class="rkbk-quick layui-text-center">
                                <button id="button_readID" type="button"
                                        onclick="flushIdCard()"
                                        class="rkbk-quick-btn layui-btn btn-blue">读取身份证
                                </button>
                            </div>
                        </div>
                    </div>
                        </div>
                    </div>
                </div>
                <!--rkbk-left end-->
                </div>
                <!--rkbk-left end-->
                <div class="radius-6 rkbk-right-wrap fr" style="height: 512px;">
                    <div class="rkbk-left">
                        <div class="rkbk-tit">
                            <i></i>
                            <h3>运输信息</h3>
                        </div>
                <div class="radius-6 rkbk-right-wrap fr" style="height: 512px;">
                    <div class="rkbk-left">
                        <div class="rkbk-tit">
                            <i></i>
                            <h3>运输信息</h3>
                        </div>
                        <div class="rkbk-left-form rkbk-right-form">
                            <div class="layui-form-item">
                                <input type="button" value="读卡" class="rkbk-r-btn fr layui-btn" onclick="flushICCard()"/>
                                <label class="layui-form-label color-red">智慧卡号:</label>
                                <div class="layui-input-block">
                                    <input type="text" name="intelCard" id="intelCard" required
                                           lay-verify="required" placeholder="先放卡,然后点击读卡"
                                           autocomplete="off" class="layui-input rkbk-search-input">
                                </div>
                            </div>
                        <div class="rkbk-left-form rkbk-right-form">
                            <div class="layui-form-item">
                                <input type="button" value="读卡" class="rkbk-r-btn fr layui-btn"
                                       onclick="flushICCard()"/>
                                <label class="layui-form-label color-red">智慧卡号:</label>
                                <div class="layui-input-block">
                                    <input type="text" name="intelCard" id="intelCard" required
                                           lay-verify="required" placeholder="先放卡,然后点击读卡"
                                           autocomplete="off" class="layui-input rkbk-search-input">
                                </div>
                            </div>
                            <div class="layui-form-item">
                                <input type="button" value="读车牌"
                                       class="rkbk-r-btn fr layui-btn layui-btn-normal"
                                       onclick="flushPlateNum()"/>
                                <label class="layui-form-label color-red">运输车牌:</label>
                                <div class="layui-input-block">
                                    <input type="text" name="plateNum" id="plateNum" required  placeholder="无车牌车辆,填写 æ— è½¦ç‰Œ"
                                           lay-verify="required" autocomplete="off"
                                           class="layui-input rkbk-search-input">
                                </div>
                            </div>
                            <div class="layui-form-item">
                                <input type="button" value="读车牌"
                                       class="rkbk-r-btn fr layui-btn layui-btn-normal"
                                       onclick="flushPlateNum()"/>
                                <label class="layui-form-label color-red">运输车牌:</label>
                                <div class="layui-input-block">
                                    <input type="text" name="plateNum" id="plateNum" required placeholder="无车牌车辆,填写 æ— è½¦ç‰Œ"
                                           lay-verify="required" autocomplete="off"
                                           class="layui-input rkbk-search-input">
                                </div>
                            </div>
                            <div class="layui-form-item">
                                <div class="layui-inline">
                                    <label class="layui-form-label">运输方式:</label>
                                    <div class="layui-input-inline">
                                        <input type="radio" name="transType" value="1" title="汽车" checked>
                                        <input type="radio" name="transType" value="2" title="火车">
                                        <input type="radio" name="transType" value="3" title="轮船">
                                        <input type="radio" name="transType" value="9" title="其他">
                                    </div>
                                </div>
                            </div>
                        </div>
                            <div class="layui-form-item">
                                <div class="layui-inline">
                                    <label class="layui-form-label">运输方式:</label>
                                    <div class="layui-input-inline">
                                        <input type="radio" name="transType" value="1" title="汽车" checked>
                                        <input type="radio" name="transType" value="2" title="火车">
                                        <input type="radio" name="transType" value="3" title="轮船">
                                        <input type="radio" name="transType" value="9" title="其他">
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
                    </div>
                    <!-- è§†é¢‘ -->
                    <div class="rkbk-left">
                        <div class="rkbk-tit">
                            <i></i>
                            <h3>登记视频</h3>
                        </div>
                        <div class="kccz-r-con2">
                            <div class="kccz-r-vedio" id="kccz-r-video1">
                            </div>
                            <div class="kccz-r-btnbox">
                                <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active">
                                    <span class="kccz-r-pz"></span>
                                    <p>车牌识别</p>
                                </a>
                                <a href="javascript:;" class="kccz-r-btn mt-10">
                                    <span id="pz-img" class="kccz-r-img"></span>
                                    <p id="pz-text">自动抓拍</p>
                                </a>
                            </div>
                        </div>
                    </div>
                </div>
                <!--rkbk-right end-->
            </div>
            <!--rkbk-con end-->
        </form>
    </div>
    <!--rk-main end-->
                    <!-- è§†é¢‘ -->
                    <div class="rkbk-left">
                        <div class="rkbk-tit">
                            <i></i>
                            <h3>登记视频</h3>
                        </div>
                        <div class="kccz-r-con2">
                            <div class="kccz-r-vedio" id="kccz-r-video1"></div>
                            <div class="kccz-r-btnbox">
                                <div class="kccz-r-div" style="width: 110px">
                                    <span id="plateNum2">未识别</span>
                                    <p>车牌识别</p>
                                </div>
                                <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active mt-10">
                                    <span id="pz-img" class="kccz-r-pz"></span>
                                    <p id="pz-text">自动抓拍</p>
                                </a>
                                <!--                                <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active">-->
                                <!--                                    <span class="kccz-r-pz"></span>-->
                                <!--                                    <span id="plateNum2">未识别</span>-->
                                <!--                                    <p>车牌识别</p>-->
                                <!--                                </a>-->
                                <!--                                <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active mt-10">-->
                                <!--                                    <span id="pz-img" class="kccz-r-img"></span>-->
                                <!--                                    <p id="pz-text">自动抓拍</p>-->
                                <!--                                </a>-->
                            </div>
                        </div>
                    </div>
                </div>
                <!--rkbk-right end-->
            </div>
            <!--rkbk-con end-->
        </form>
    </div>
    <!--rk-main end-->
</div>
<!--l-container end-->
<script th:inline="javascript">
    //流程环节
    var inoutProgress = [[${inoutProgress}]];
    //当前节点
    var progress = [[${progress}]];
    //业务步骤
    var bizType = [[${bizType}]];
    var deptId = [[${deptId}]];
    //出入库类型
    var type = [[${type}]];
    var userId = [[${loginUser.username}]];
    var companyId = [[${loginUser.companyId}]];
    //车牌识别
    var lprDto = [[${lprDto}]];
    var ship = null; //是否船运页面标识
    //流程环节
    var inoutProgress = [[${inoutProgress}]];
    //当前节点
    var progress = [[${progress}]];
    //业务步骤
    var bizType = [[${bizType}]];
    var deptId = [[${deptId}]];
    //出入库类型
    var type = [[${type}]];
    var userId = [[${loginUser.username}]];
    var companyId = [[${loginUser.companyId}]];
    //车牌识别
    var lprDto = [[${lprDto}]];
    var ship = null; //是否船运页面标识
</script>
<script th:src="@{../../static/plugins/layui/layui.js}"></script>
@@ -339,37 +351,38 @@
<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>
<!-- å¼¹å‡ºæ¡†çš„信息 -->
<div class="layui-tab-content" id="dialog-from-notify" style="display: none;">
    <table class="layui-table">
        <colgroup>
            <col width="100">
        </colgroup>
        <tbody>
        <tr>
            <td>返回信息</td>
            <td id="resultMsg" style="color: red;font-weight: bold;"></td>
        </tr>
        <tr>
            <td>承运人</td>
            <td id="resultUserName" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>车牌号</td>
            <td id="resultPlateNum" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>下一步</td>
            <td id="resultType" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>智慧卡号</td>
            <td id="resultIntelCard" style="font-weight: bold;"></td>
        </tr>
        </tbody>
    </table>
    <table class="layui-table">
        <colgroup>
            <col width="100">
        </colgroup>
        <tbody>
        <tr>
            <td>返回信息</td>
            <td id="resultMsg" style="color: red;font-weight: bold;"></td>
        </tr>
        <tr>
            <td>承运人</td>
            <td id="resultUserName" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>车牌号</td>
            <td id="resultPlateNum" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>下一步</td>
            <td id="resultType" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>智慧卡号</td>
            <td id="resultIntelCard" style="font-weight: bold;"></td>
        </tr>
        </tbody>
    </table>
</div>
</body>
igds-web/src/main/resources/templates/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>