出入库优化-称重页面

jiazx0107@163.com

2023-05-31 5eb90395313f5d7232aad2fb1a821a0028ca7764

出入库优化-称重页面

 igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java

@@ -679,9 +679,7 @@
     * @param data
     */
    private void setInoutCache(String deptId, InoutData data) {
        String key = this.buildInoutKey(deptId,
                InoutConstant.KEY_INOUT_LIST, data.getType(), data.getId());

        String key = this.buildInoutKey(deptId, InoutConstant.KEY_INOUT_LIST, data.getType(), data.getId());
        redisUtil.set(key, data, InoutConstant.KEY_INOUT_LIST_TIME);
    }


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

ÎļþÒÑɾ³ý

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

@@ -5,6 +5,7 @@
var recordData = null;// ä¸šåŠ¡æ•°æ®ä¿¡æ¯
var snapData;//系统抓拍对象信息
var timerWeight;
var textParam;//设备识别结果

$(function () {
    layui.use(['layer', 'laydate', 'form', 'table', 'util'], function () {
@@ -34,7 +35,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()
                    });
@@ -122,32 +123,6 @@
        resetForm();
    }
}

//控制流程环节显示
function showProgress() {
    if (!inoutProgress) {
        return;
    }
    if (inoutProgress.indexOf("REGISTER") == -1) {
        $("#progress-register").css("display", "none");
    }
    if (inoutProgress.indexOf("CHECK") == -1) {
        $("#progress-check").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 addDisabled() {
@@ -249,13 +224,7 @@

//新的读卡方式
function flushICCard() {
    if(cardDto && cardDto.protocol != "TCP_DEFAULT"){
        //协议获取
        flushICCard2();
    }else {
        //本地读取
        flushICCard1();
    }
    flushICCard1();
}

/**
@@ -299,7 +268,7 @@
 * æœ¬åœ°è¯»å–智慧卡
 */
function flushICCard1() {
    $("#intelCard").val(null);
    $("#text-param").val(null);
    $("#form-data")[0].reset();
    form.render();
    recordData = null;
@@ -312,18 +281,17 @@
        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']});
                alertError("请重新读卡！");
            } else {
                $("#intelCard").val(data);
                textParam = data;
                $("#text-param").text("识别卡号：" + textParam);
                flushData();
            }
        },
        error: function () {
            layer.alert("IC卡读取出错！", {offset: ['300px', '300px']});
            alertError("IC卡读取出错！");
        }
    });
}
@@ -661,7 +629,7 @@
            field: 'name',
            title: '通知单名称',
            width: '15%'
        },{
        }, {
            field: 'customerName',
            title: '送货单位'
        }, {
@@ -743,35 +711,36 @@
    });
}

function controlGate(targetStatus){
        if(gateDto){
            var data = {"companyId":companyId
                ,"deptId":deptId
                ,"bizType":type
                ,"confId":gateDto.id
                ,"targetStatus":targetStatus
                ,"sort":gateDto.sort
            };
            $.ajax({
                type: "POST",
                url: "../../basic/inout/gate-ctrl",
                dataType: "json",
                contentType: "application/json;charset=UTF-8",
                data: JSON.stringify(data),
                success: function (result) {
                    if (result.code != "0000") {
                        layer.msg("操作失败："+result.msg);
                    } else {
                        layer.msg("操作成功");
                    }
                },
                error: function () {
                    layer.alert("操作失败，请重新尝试！！");
function controlGate(targetStatus) {
    if (gateDto) {
        var data = {
            "companyId": companyId
            , "deptId": deptId
            , "bizType": type
            , "confId": gateDto.id
            , "targetStatus": targetStatus
            , "sort": gateDto.sort
        };
        $.ajax({
            type: "POST",
            url: "../../basic/inout/gate-ctrl",
            dataType: "json",
            contentType: "application/json;charset=UTF-8",
            data: JSON.stringify(data),
            success: function (result) {
                if (result.code != "0000") {
                    layer.msg("操作失败：" + result.msg);
                } else {
                    layer.msg("操作成功");
                }
            });
        }else{
            layer.msg("没有获取到设备！");
        }
            },
            error: function () {
                layer.alert("操作失败，请重新尝试！！");
            }
        });
    } else {
        layer.msg("没有获取到设备！");
    }
}

//-------------------------道闸操作--------------------------//

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,777 @@
//称重-包括空车和满车称重
var layer;
var form;
var table;
var recordData = null;// ä¸šåŠ¡æ•°æ®ä¿¡æ¯
var snapData;//系统抓拍对象信息
var timerWeight;

$(function () {
    layui.use(['layer', 'laydate', 'form', 'table', 'util'], function () {
        var util = layui.util;
        layer = layui.layer;
        form = layui.form;
        table = layui.table;
        layui.laydate.render({
            elem: '#test1',
            theme: '#7b8e9f'
        });

        // å³ä¸‹è§’添加固定信息
        util.fixbar({
            bar1: true,
            css: {
                right: 10,
                bottom: 20
            },
            bgcolor: '#53adce',
            click: function (type) {
                if (type === 'bar1') {
                    layer.closeAll();
                    layer.open({
                        type: 2,
                        title: false,
                        shadeClose: true,
                        shade: 0.3,
                        closeBtn: 2,
                        offset: ['50px','120px'],
                        area: ['1000px', '640px'],
                        content: '../../basic/inout/inout-progress?type=' + type + "&t=" + Math.random()
                    });
                }
            }
        });
    });

    //显示流程环节
    showProgress();

    // ç›‘听重量变化
    $(".weight").blur(function () {
        var name = this.name;
        deAutoByIn(name);
    });

    // åˆå§‹åŒ–WebSocket
    initInoutWS(companyId, bizType, progress, userId);
});

window.onload = function () {
    //自动连接地磅信息，2.5秒获取一次地磅重量信息
    clearInterval(timerWeight);
    timerWeight = setInterval(function () {
        flushWeight();
    }, 2500);

    // åŠ è½½è§†é¢‘
    initVideo(snapDto1, snapDto2, snapDto3);

    //设置地磅
    $("#scaleName").val(weightDto.sort);

    //监听地磅选择
    $("#scaleName").change(function () {
        layer.confirm('调整地磅需重新加载页面，确定调整？', {
            btn: ['确定', '取消']
        }, function () {
            updateWeight();
        });
    });

};

// socket信息返回處理
function socketOnMessage(packet) {
    //暂无
}

// æ ¹æ®å½“前操作的按钮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_FULL == 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() {
    if (!inoutProgress) {
        return;
    }
    if (inoutProgress.indexOf("REGISTER") == -1) {
        $("#progress-register").css("display", "none");
    }
    if (inoutProgress.indexOf("CHECK") == -1) {
        $("#progress-check").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 addDisabled() {
    //杂质
    $("#impurity").attr("disabled", true);
    $("#deImpurity").attr("disabled", true);
    //水分
    $("#wet").attr("disabled", true);
    $("#deWet").attr("disabled", true);
    //值仓
    $("#deHandle").attr("disabled", true);
    //其他
    $("#deOther").attr("disabled", true);
}

//恢复扣重信息框编辑状态
function delDisabled() {
    //杂质
    $("#impurity").attr("disabled", false);
    $("#deImpurity").attr("disabled", false);
    //水分
    $("#wet").attr("disabled", false);
    $("#deWet").attr("disabled", false);
    //值仓
    $("#deHandle").attr("disabled", false);
    //其他
    $("#deOther").attr("disabled", false);
}

// ç‚¹å‡»ç§°é‡
function weight() {
    // æ²¡æœ‰ä¸šåŠ¡æ•°æ®ä¸å¯æ‰§è¡Œ
    if (!recordData) {
        layer.alert("没有查询到业务数据，执行被拒绝！！");
        return;
    }

    // å¦‚果是空车称重
    if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
        form.val("form-data", {
            emptyWeight: weightDto.weight
        });
    }

    // å¦‚果是满车称重
    if (InoutProgress.WEIGHT_FULL == recordData.progress) {
        form.val("form-data", {
            fullWeight: weightDto.weight
        });
    }
    form.render();

    // ç‚¹å‡»ç§°é‡æ—¶å€™è‡ªåŠ¨æŠ“拍数据--增加通知信息
    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,

        sort: $("#scaleName").val(),
        weight: weightDto.weight
    };

    //当前AJAX服务为同步服务，返回数据包装照片信息
    var index = layer.load();
    $.ajax({
        sync: false,
        type: "POST",
        url: "../../inout/api/snap-img",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify(snapData),
        success: function (result) {
            layer.close(index);
            if (result.code != "0000") {
                layer.alert(result.msg);
            } else {
                snapData = result.data;
            }
        },
        error: function () {
            layer.close(index);
            layer.msg("后台调用截图失败，请重新尝试！！");
        }
    });

    //入库第二次称重时调用计算方法
    if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
        deAutoByIn("emptyWeight");
    }
    flushBtn("btn-weight");
}

//新的读卡方式
function flushICCard() {
    if(cardDto && cardDto.protocol != "TCP_DEFAULT"){
        //协议获取
        flushICCard2();
    }else {
        //本地读取
        flushICCard1();
    }
}

/**
 * åè®®è¯»å–智慧卡
 */
function flushICCard2() {
    var param = JSON.stringify(cardDto);
    var index = layer.load();
    $.ajax({
        type: "POST",
        url: "../../inout/api/ic-card-num",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: param,
        success: function (result) {
            if (result.code != "0000") {
                layer.alert(result.msg, {
                    offset: ['300px', '300px']
                });
            } else {
                if (result.data.errorMsg) {
                    layer.alert(result.data.errorMsg, {
                        offset: ['300px', '300px']
                    });
                } else {
                    $("#intelCard").val(result.data.icCardNo);
                }
            }
            layer.close(index);
        },
        error: function () {
            layer.close(index);
            layer.alert("IC卡读取失败！", {
                offset: ['300px', '300px']
            });
        }
    });
}

/**
 * æœ¬åœ°è¯»å–智慧卡
 */
function flushICCard1() {
    $("#intelCard").val(null);
    $("#form-data")[0].reset();
    form.render();
    recordData = null;
    $.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);
        }
    });
}

function flushWeight() {
    $.ajax({
        type: "GET",
        async: true,
        timeout: 2000,
        url: "http://127.0.0.1:9111/WEIGHT",
        data: {},
        dataType: "jsonp",
        jsonp: "callback",
        jsonpCallback: "jsonpCallback",
        success: function (json) {
            var data = json.content;
            if (!data) data = 0.0;
            weightDto.weight = data;
            $("#weightValue").text(data);
            $("#img_scale_statule").attr("src", "../../static/images/icon-gree.png");
        },
        error: function () {
            weightDto.weight = 0.0;
            $("#weightValue").text("0.0");
            $("#img_scale_statule").attr("src", "../../static/images/icon-red.png");
        }
    });
}


// ç‚¹å‡»æ‰“印，系统判断是否已经执行完成，如果已经完成，直接打印，如果未完成则先执行完成
function printBill() {
    if (!recordData) {
        layer.alert("没有获取到业务数据，不支持打印！");
        return;
    }
    // ä»ŽåŽå°èŽ·å–模版并打印
    var data = form.val("form-data");
    // åˆå¹¶æ›´æ–°ç•¶å‰ç¼–辑数据
    Object.assign(recordData, data);

    printBillStep2();
}

// ç‚¹å‡»æ‰“印，先执行系统默认执行完成卡回收
function printBillStep2() {
    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) {
            layer.close(index);
            if (result.code != "0000") {
                layer.msg(result.msg);
            } else {
                layer.msg("开始渲染打印单……");
                if (companyId && companyId == "5016") {
                    print5016Weight(result.data);
                    console.log("5016");
                } else {
                    printWeight(result.data);
                }
                // åˆ·æ–°æŒ‰é’®
                flushBtn("btn-printBill");
            }
        },
        error: function () {
            layer.close(index);
            layer.msg("获取打印模版失败，请联系管理员查看原因！！");
        }
    });
}

// è¡¨å•æ¸…空
function resetForm() {
    $("#form-data")[0].reset();
    form.render();
    recordData = null;
    weightDto.weight = 0.0;

    $("#weightValue").text("0.0");
    $("#img_scale_statule").attr("src", "../../static/images/icon-red.png");

    //称重可以复用
    $("#btn-weight").removeClass("layui-btn-disabled");
    $("#btn-weight").attr("disabled", false);

    //空车和满车被重置
    updateEditAndProgress();

    //扣重信息框恢复为可编辑
    delDisabled();
}

function flushPage() {
    layer.confirm('确定要刷新页面吗？', {icon: 3, title: '提示'}, function (index) {
        resetForm();
        layer.msg("页面重置完成，请重新操作……");
        layer.close(index);
    });
}

// --查询方法,获取身份证号、卡号、车牌号，进行查询
function flushData() {
    var index = layer.load();
    var userId2 = $("#userId").val();
    var intelCard = $("#intelCard").val();
    var plateNum = $("#plateNum").val();
    var param = {
        type: type,
        progress: progress,
        intelCard: intelCard,
        userId: userId2,
        plateNum: plateNum
    };

    $.ajax({
        type: "POST",
        url: "../../basic/inout/inout-query",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify(param),
        success: function (result) {
            if (result.code != "0000") {
                notify(result.msg, result.data);
            } else {
                recordData = result.data;
                // è¿”回的数据进行赋值
                form.val("form-data", recordData);
                form.render();
                updateEditAndProgress();
            }
            layer.close(index);
        },
        error: function () {
            layer.close(index);
            layer.alert("查询失败，请重新尝试！！");
        }
    });
}

/**
 * è·Ÿæ–°æµç¨‹è¯´æ˜Žæå¿ƒä¿¡æ¯
 */
function updateEditAndProgress() {
    if (recordData) {
        if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
            $("#emptyWeight").removeClass("rkbk-search-input");
            $("#emptyWeight").attr("disabled", false);

            $("#progress-hand").addClass("active");
            $("#progress-emptyWeight").addClass("active");

            $("#fullWeight").addClass("rkbk-search-input");
            $("#fullWeight").attr("disabled", true);
        }
        if (InoutProgress.WEIGHT_FULL == recordData.progress) {
            $("#fullWeight").removeClass("rkbk-search-input");
            $("#fullWeight").attr("disabled", false);

            $("#progress-hand").removeClass("active");
            $("#progress-emptyWeight").removeClass("active");

            $("#emptyWeight").addClass("rkbk-search-input");
            $("#emptyWeight").attr("disabled", true);
        }
    } else {
        $("#fullWeight").addClass("rkbk-search-input");
        $("#fullWeight").attr("disabled", true);

        $("#emptyWeight").addClass("rkbk-search-input");
        $("#emptyWeight").attr("disabled", true);

        $("#progress-hand").removeClass("active");
        $("#progress-emptyWeight").removeClass("active");
    }
    //根据配置信息设置地磅是否可编辑
    if (weightEditTag && weightEditTag == 'N') {
        $("#fullWeight").addClass("rkbk-search-input");
        $("#fullWeight").attr("disabled", true);

        $("#emptyWeight").addClass("rkbk-search-input");
        $("#emptyWeight").attr("disabled", true);
    }
}

// å½“前完成
function submit() {
    if (null == recordData) {
        notify("没有数据可以提交", null);
        return;
    }
    var data = form.val("form-data");

    if (!data.depotId) {
        notify("装卸仓库必须填写", null);
        return;
    }
    // æ ¡éªŒ-入库满车称重
    if (InoutProgress.WEIGHT_FULL == recordData.progress) {
        if (data.fullWeight <= 0.0) {
            notify("满车称重信息必填！！", null);
            return;
        }
        if (!data.customerName) {
            notify("客户名称必填！！", null);
            return;
        }
    } else {
        if (data.emptyWeight <= 0.0) {
            notify("空车称重信息必填！！", null);
            return;
        }
        if (!data.foodVariety) {
            notify("粮食品种必填！！", null);
            return;
        }
        if (!data.settleWeight || data.settleWeight <= 0.0) {
            notify("结算重量合规，请核对！！", null);
            return;
        }
    }
    // åˆå¹¶æ›´æ–°ç•¶å‰ç¼–辑数据
    Object.assign(recordData, data);

    // èŽ·å–照片
    var files = [{
        fileName: snapData.fileName1
    }, {
        fileName: snapData.fileName2
    }, {
        fileName: snapData.fileName3
    }];
    recordData.files = files;

    var index = layer.load();
    $.ajax({
        type: "POST",
        url: "../../basic/inout/inout-next-step",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify(recordData),
        success: function (result) {
            if (result.code != "0000") {
                notify(result.msg, result.data);
            } else {
                notify("数据提交成功", result.data);
                // æ›´æ–°æŒ‰é’®æ˜¾ç¤º
                flushBtn("btn-submit");
            }
            layer.close(index);
        },
        error: function () {
            layer.close(index);
            notify("提交失败，请重新尝试", null);
        }
    });

    //以下逻辑为增加一个语音通知的调用方法，不考虑返回结果--后台调用
    var curWeight = recordData.fullWeight;
    if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
        curWeight = recordData.emptyWeight;
    }
    var param = {
        sort: $("#scaleName").val(),
        weight: curWeight,
        inoutProgress: recordData.progress,
        deptId: recordData.deptId,
        companyId: recordData.companyId,
        plateNum: recordData.plateNum
    };
    $.ajax({
        type: "POST",
        url: "../../inout/api/notice-weight-done",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify(param)
    });
}


// ---------------------------通知单-开始 -------------------//
// å¼¹å‡ºå¾€æ¥å•ä½ä¸‹æ‹‰æ¡†
function showNotice() {
    var index = layer.load();
    var param = {
        type: type
    };
    // æ¸²æŸ“往来单位列表
    table.render({
        elem: '#tableNotice',
        url: '../../basic/inout/list-notice—in',
        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: 'foodVarietyName',
            title: '粮食品种',
            width: '10%'
        }, {
            field: 'year',
            title: '年份',
            width: '8%'
        }, {
            field: 'unitName',
            title: '收货单位'
        }, {
            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
        });
        // å…³é—­
        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
    });
}

// ---------------------------通知单 -结束 -------------------//
//-------------------------道闸操作--------------------------//

function gateCtrl() {
    layer.open({
        type: 1,
        title: '设备操作-' + domSelectDevice.attr("name"),
        area: ['450px', '210px'],
        shade: 0,
        content: $('#control-gate'),
        btn: 0,
        closeBtn: 2
    });
}

function controlGate(targetStatus){
        if(gateDto){
            var data = {"companyId":companyId
                ,"deptId":deptId
                ,"bizType":type
                ,"confId":gateDto.id
                ,"targetStatus":targetStatus
                ,"sort":gateDto.sort
            };
            $.ajax({
                type: "POST",
                url: "../../basic/inout/gate-ctrl",
                dataType: "json",
                contentType: "application/json;charset=UTF-8",
                data: JSON.stringify(data),
                success: function (result) {
                    if (result.code != "0000") {
                        layer.msg("操作失败："+result.msg);
                    } else {
                        layer.msg("操作成功");
                    }
                },
                error: function () {
                    layer.alert("操作失败，请重新尝试！！");
                }
            });
        }else{
            layer.msg("没有获取到设备！");
        }
}

//-------------------------道闸操作--------------------------//

 igds-web/src/main/resources/static/admin/inout/style.css

@@ -936,10 +936,17 @@
    font-weight: bold;
}








.line-container {
    display: flex;
    align-items: center;
    justify-content: center;
}
.line {
    flex: 1;
    height: 1px;
    background-color: #2ab5ad;
}
.line-text {
    padding: 0 10px;
    color: #2ab5ad;
}

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

@@ -274,7 +274,7 @@
                                <div class="layui-form-item">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">运输工具：</label>
                                        <div class="layui-input-inline">
                                        <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"
@@ -283,6 +283,7 @@
                                        </div>
                                    </div>
                                </div>

                            </div>
                        </div>


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

@@ -7,16 +7,28 @@
    <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}">

    <!--使用打印插件 éšè—å½“前插件 -->
    <script th:src="@{../../static/plugins/lodop/LodopFuncs.js}"></script>

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

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

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

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

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

        .color-red {
@@ -127,7 +139,7 @@

            <div class="rkbk-quick fl">
                <button class="rkbk-quick-btn layui-btn" onclick="showCheck()">
                    <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>化验单
                    <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>质检信息
                </button>
                <button id="btn-weight" class="rkbk-quick-btn layui-btn btn-blue"
                        onclick="weight()">
@@ -241,29 +253,24 @@
                <!--kccz-left-box1 end-->

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

                    <div class="rkbk-tit">
                        <i></i>
                        <h3>业务数据</h3>
                        <h3>业务数据<span id="text-param"></span></h3>
                        <div>
                            <input type="button" value="读智慧卡"
                                   class="rkbk-search-btn layui-btn r-240"
                                   onclick="flushICCard()">

                            <input type="button" value="读身份证"
                                   class="rkbk-search-btn layui-btn r-120"
                                   onclick="flushIdCard()">

                            <input type="button" value="手动查询"
                                   class="rkbk-search-btn layui-btn" onclick="flushData()">

                        </div>
                    </div>

                    <div class="kccz-data-form layui-row">
                        <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>
                                <input type="text" name="id">
@@ -292,19 +299,19 @@

                            <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>
@@ -312,19 +319,9 @@

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">身份证号</label>
                                    <label class="layui-form-label color-red">承运人</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="userId" id="userId"
                                               placeholder="承运人身份证号" autocomplete="off" class="layui-input">
                                    </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="userName" placeholder="不可编辑" class="layui-input"
                                        <input type="text" name="userName" placeholder="自动带入，不可编辑" class="layui-input"
                                               disabled>
                                    </div>
                                </div>
@@ -336,7 +333,7 @@
                                    <label class="layui-form-label color-red">毛重(满车)</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="fullWeight" id="fullWeight" autocomplete="off"
                                               placeholder="请输入" class="layui-input weight rkbk-search-input" disabled>
                                               placeholder="地磅自动带入" class="layui-input weight rkbk-search-input" disabled>
                                        <em
                                                class="kccz-data-dw">KG</em>
                                    </div>
@@ -348,23 +345,13 @@
                                    <label class="layui-form-label color-red">皮重(空车)</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="emptyWeight" id="emptyWeight" autocomplete="off"
                                               placeholder="请输入" class="layui-input weight rkbk-search-input" disabled>
                                               placeholder="地磅自动带入" class="layui-input weight 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="customerName" placeholder="请选择，不可手动录入"
                                               autocomplete="off" class="layui-input" disabled="disabled"> <em
                                            class="kccz-data-dw cursor" onclick="showNotice()">…</em>
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
@@ -377,21 +364,13 @@
                                </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 rkbk-search-input" disabled> <em
                                            class="kccz-data-dw">%</em>
                                    </div>
                                <div class="layui-form-item">
                                    <label class="layui-form-label color-red">客户信息</label>
                                    <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>
                                        <input type="text" name="customerName" placeholder="请选择"
                                               autocomplete="off" class="layui-input" disabled="disabled"> <em
                                            class="kccz-data-dw cursor" onclick="showNotice()">…</em>
                                    </div>
                                </div>
                            </div>
@@ -410,6 +389,38 @@
                            </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">
                                        <button class="rkbk-quick-btn layui-btn" onclick="showCheck()">
                                            <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>详细
                                        </button>
                                    </div>
                                    <div class="layui-input-block">
                                        <div class="posi-r">
                                            <input id="deCheck" type="text" name="deCheck" placeholder="请输入"
                                                   autocomplete="off" class="layui-input"> <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">
                                        <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">
@@ -422,30 +433,28 @@

                            <div class="layui-col-xs4">
                                <div class="layui-form-item kccz-data-group-md">
                                    <label class="layui-form-label">水分扣重</label>
                                    <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 rkbk-search-input" disabled> <em
                                            class="kccz-data-dw">%</em>
                                        <button class="rkbk-quick-btn layui-btn" onclick="showCheck()">
                                            <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>详细
                                        </button>
                                    </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
                                            <input id="addCheck" type="text" name="addCheck" placeholder="请输入"
                                                   autocomplete="off" class="layui-input"> <em
                                                class="kccz-data-dw">KG</em>
                                        </div>
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">粮食品种</label>
                                    <label class="layui-form-label color-red">粮食产地</label>
                                    <div class="layui-input-block">
                                        <select name="foodVariety" id="foodVariety">
                                            <option value=""></option>
                                            <option th:each="dic,dicSet:${listFoodVariety}"
                                                    th:value="${dic.code}" th:text="${dic.name}"></option>
                                        </select>
                                        <input type="text" name="foodLocation" placeholder="请选择"
                                               autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                            </div>
@@ -463,41 +472,10 @@

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">总&nbsp;扣&nbsp;重</label>
                                    <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">规&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">
                                    </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>
                                        <input type="text" name="deOtherInfo" autocomplete="off"
                                               placeholder="其他扣重说明" class="layui-input">
                                    </div>
                                </div>
                            </div>
@@ -511,30 +489,10 @@
                                    </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="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-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>
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label color-red">入库重量</label>
                                    <label class="layui-form-label">入库重量</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="recordWeight" placeholder="自动计算"
                                               autocomplete="off" class="layui-input rkbk-search-input"
@@ -542,6 +500,99 @@
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs8">
                                    <span style="padding-left: 50px;color: #2ab5ad;">
                                        è¯´æ˜Žï¼šå‡€é‡=毛重-皮重；质检增扣重根据质检详细填写；入库重量=净重-扣重；结算重量=入库重量+质检增重<br>
                                    </span>
                            </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-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="jjlx" value="0" title="称重入库" checked>
                                        <input type="radio" name="jjlx" value="1" title="标准包入库">
                                    </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"> <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="dbz" 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="bzbjs" autocomplete="off"
                                               placeholder="请输入" class="layui-input weight"> <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="price" placeholder="请输入"
                                               class="layui-input"> <em class="kccz-data-dw">元/公斤</em>
                                    </div>
                                </div>
                            </div>


                        </form>
                    </div>
                </div>
@@ -558,8 +609,6 @@
                        </div>
                        <div class="kccz-r-con">
                            <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">
@@ -684,6 +733,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/in-weight.js}"></script>

@@ -739,11 +789,11 @@
    <div class="layui-btn-container m10">
        <button class="rkbk-quick-btn layui-btn btn-violet"
                onClick="controlGate('OPEN')">
            <i><img th:src="@{../../static/images/icon-sm-fc.png}" /></i>开道闸
            <i><img th:src="@{../../static/images/icon-sm-fc.png}"/></i>开道闸
        </button>
        <button class="rkbk-quick-btn layui-btn btn-red"
                onClick="controlGate('CLOSE')">
            <i><img th:src="@{../../static/images/icon-sm-fc.png}" /></i>关道闸
            <i><img th:src="@{../../static/images/icon-sm-fc.png}"/></i>关道闸
        </button>
    </div>


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

ÎļþÃû´Ó igds-web/src/main/resources/templates/admin/inout/in-weight-bak20221110.html ÐÞ¸Ä
@@ -6,7 +6,7 @@
          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>
    <title>出入库管理-入库称重</title>

    <link rel="stylesheet" type="text/css"
          th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
@@ -20,6 +20,7 @@
        .display-none {
            display: none;
        }

        .cursor {
            cursor: pointer;
        }
@@ -32,7 +33,7 @@
        }

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

        .color-red {
@@ -89,28 +90,31 @@
        .rkbk-search-btn {
            width: 100px;
            height: 30px;
            line-height: 30px;
            font-size: 16px;
        }
        .r-240{
            right: 240px;
        }
        .r-120{
            right: 120px;
        }
        
        .rkbk-search-input{
            background: #FFF !important;
        }
        .rkbk-search-input.bg-date {
             background: #FFF !important;
            line-height: 30px;
            font-size: 16px;
        }

        #scaleName{
        .r-240 {
            right: 240px;
        }

        .r-120 {
            right: 120px;
        }

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

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

        #scaleName {
            width: 130px;
            height: 28px;
        }
        

    </style>

</head>
@@ -138,6 +142,9 @@
                        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>打印过磅单
                </button>
                <button class="rkbk-quick-btn layui-btn" onclick="gateCtrl()">
                    <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>道闸操作
                </button>
                <button class="rkbk-quick-btn layui-btn btn-violet"
                        onclick="flushPage()">
@@ -224,7 +231,7 @@

                    <div class="kccz-czxx-wrap">
                        <div class="kccz-czxx-num">
                            <span id="weightValue">0.00<em>KG</em></span>
                            <span id="weightValue">0.00</span><em>KG</em>
                        </div>

                    </div>
@@ -259,42 +266,29 @@

                            <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>
                                <input type="text" name="id">
                            </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>
                                <input type="text" name="progress">
                            </div>

                            <div class="layui-form-item display-none">
                                <label class="layui-form-label">隐藏字段-客户ID</label>
                                <div class="layui-input-block">
                                    <input type="text" name="customerId" 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>
                                <input type="text" name="type">
                            </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>
                                <label class="layui-form-label">隐藏字段-客户编码Id</label>
                                <input type="text" name="customerId">
                            </div>
                            <div class="layui-form-item display-none">
                                <label class="layui-form-label">隐藏字段-通知单ID</label>
                                <input type="text" name="noticeId">
                            </div>
                            <div class="layui-form-item display-none">
                                <label class="layui-form-label">隐藏字段-粮食性质</label>
                                <input type="text" name="foodType">
                            </div>


                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
@@ -305,7 +299,6 @@
                                    </div>
                                </div>
                            </div>


                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
@@ -331,7 +324,8 @@
                                <div class="layui-form-item">
                                    <label class="layui-form-label">承运人</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="userName" placeholder="不可编辑" class="layui-input" disabled>
                                        <input type="text" name="userName" placeholder="不可编辑" class="layui-input"
                                               disabled>
                                    </div>
                                </div>
                            </div>
@@ -363,11 +357,11 @@

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label color-red">往来单位</label>
                                    <label class="layui-form-label color-red">客户名称</label>
                                    <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="showCustomer()">…</em>
                                            class="kccz-data-dw cursor" onclick="showNotice()">…</em>
                                    </div>
                                </div>
                            </div>
@@ -401,6 +395,7 @@
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">装卸仓库</label>
@@ -468,7 +463,7 @@

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">总 æ‰£ é‡</label>
                                    <label class="layui-form-label">总&nbsp;扣&nbsp;重</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="deSum" placeholder="自动计算"
                                               autocomplete="off" class="layui-input rkbk-search-input"
@@ -476,7 +471,18 @@
                                    </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>
@@ -486,43 +492,17 @@
                                    </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">-->
<!--                                            <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">
                                    <label class="layui-form-label color-red">结算重量</label>
                                    <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>
                                        <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 color-red">结算重量</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-xs12">
                            <div class="layui-col-xs8">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">备注说明</label>
                                    <div class="layui-input-block">
@@ -531,17 +511,36 @@
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs12">
                            <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="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-xs8">
                                    <span style="padding-left: 50px;color: blue;">
                                        æ³¨æ„ï¼š1、净重 = æ¯›é‡ - çš®é‡ ï¼› æ€»æ‰£é‡ = æ‰£æ°´æ‚ + çŽ°åœºæ‰£é‡ + å…¶ä»–扣重 <br>
                                        æ³¨æ„ï¼š1、水杂增扣重根据化验结果自动计算，正数=扣重，负数=增重 <br>
                                    </span>
                                    <span style="padding-left: 93px;color: blue;">
                                        2、水分扣重根据化验水分信息自动计算，正数=扣重，负数=增重<br>
                                <span style="padding-left: 93px;color: blue;">
                                        2、净重 = æ¯›é‡ - çš®é‡ ï¼›æ€»æ‰£é‡ = æ‰£æ°´æ‚（大于0） + çŽ°åœºæ‰£é‡ + å…¶ä»–扣重<br>
                                    </span>
                                  <span style="padding-left: 93px;color: blue;">
                                        3、结算重量 = å‡€é‡ - æ€»æ‰£é‡ ï¼ˆå«æ°´æ‚增重）； å…¥åº“重量 = å‡€é‡ - æ€»æ‰£é‡ ï¼ˆä¸å«æ°´æ‚增重）
                                <span style="padding-left: 93px;color: blue;">
                                        3、结算重量 = å‡€é‡ - æ€»æ‰£é‡ + æ°´æ‚增重；入库重量 = å‡€é‡ - æ€»æ‰£é‡
                                    </span>
                            </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="recordWeight" placeholder="自动计算"
                                               autocomplete="off" class="layui-input rkbk-search-input"
                                               disabled> <em class="kccz-data-dw">KG</em>
                                    </div>
                                </div>
                            </div>
                        </form>
                    </div>
@@ -671,7 +670,10 @@
    //过程摄像头
    var snapDto1 = [[${snapDto1}]];
    var snapDto2 = [[${snapDto2}]];
    var snapDto3 = [[${snapDto2}]];
    var snapDto3 = [[${snapDto3}]];
    var gateDto = [[${gateDto}]];
    //智慧卡
    var cardDto = [[${cardDto}]];

    var ship = null; //是否船运页面标识
</script>
@@ -680,30 +682,18 @@
<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/plugins/video/EasyPlayer-element.min.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/weight.js}"></script>
<script th:src="@{../../static/admin/inout/in-weight.js}"></script>

</body>

<!-- å¼¹å‡ºå¾€æ¥å•ä½åˆ—表 -->
<div class="layui-tab-content" id="listCustomer" style="display: none;">
    <table class="layui-table" lay-skin="nob" id="tableCustomer"
           lay-filter="tableCustomer" style="margin: 0px;"></table>
<!-- å¼¹å‡ºé€šçŸ¥å• -->
<div class="layui-tab-content" id="listNotice" style="display: none;">
    <table class="layui-table" lay-skin="nob" id="tableNotice"
           lay-filter="tableNotice" style="margin: 0px;"></table>
</div>

<script type="text/html" id="toolbarCustomer">
    <div class="">
        <div class="layui-col-xs6">
            <input type="text" id="key" placeholder="输入编码或者名称……" class="layui-input">
        </div>
        <div class="layui-col-xs6" style="padding-left: 10px;">
            <button class="layui-btn layui-btn-sm" onclick="flushCustomer()">查询</button>
        </div>
    </div>
</script>


<!-- å¼¹å‡ºç²®é£Ÿäº§åœ° -->
<div class="layui-tab-content" id="listFoodLocation"
@@ -743,6 +733,21 @@
        </tbody>
    </table>
</div>
<!-- å¼¹å‡ºæ¡†-道闸操作-->
<div class="layui-tab-content areation-center" id="control-gate"
     style="display: none;">
    <div class="layui-btn-container m10">
        <button class="rkbk-quick-btn layui-btn btn-violet"
                onClick="controlGate('OPEN')">
            <i><img th:src="@{../../static/images/icon-sm-fc.png}" /></i>开道闸
        </button>
        <button class="rkbk-quick-btn layui-btn btn-red"
                onClick="controlGate('CLOSE')">
            <i><img th:src="@{../../static/images/icon-sm-fc.png}" /></i>关道闸
        </button>
    </div>

</div>

<script type="text/html" id="toolbarFoodLocaton">
    <div class="">