Merge remote-tracking branch 'origin/master'

sgj

2026-02-13 72a67eb9ba942e632c11906093c5cd14e364eed7

 fzzy-igdss-web/src/main/resources/static/inout/inout-weight2.js

@@ -42,6 +42,11 @@
            }
        });

        //监听仓库选择,选择后自动调用仓库的粮食品种信息
        form.on('select(select_depotId)', function (obj) {
            updateFoodVarietyByDepot(obj.value);
        })

        // 初始化表单数据
        renderTable();
    });
@@ -89,6 +94,24 @@
        "background": "#eff4f6"
    });
    layer.close(index);
}

//根据选择的仓库信息,更新粮食品种
function updateFoodVarietyByDepot(selectId) {
    var selectDepot;
    $.each(listDepot, function (index, data) {
        if (data.id === selectId) {
            selectDepot = data;
            return false;
        }
    });

    if (selectDepot) {
        form.val("form-data", {
            foodVariety: selectDepot.foodVariety
        });
        form.render();
    }
}

// 渲染表单数据
@@ -250,6 +273,8 @@
        area: ['1283px', '815px'],
        cancel: function (index, layero) {
            $("#weightDetail").css("display", "none");
            // 初始化表单数据
            renderTable();
        },
        shade: 0,
        scrollbar: 0,
@@ -281,6 +306,8 @@
        area: ['1283px', '815px'],
        cancel: function (index, layero) {
            $("#weightDetail").css("display", "none");
            // 初始化表单数据
            renderTable();
        },
        shade: 0,
        scrollbar: 0,
@@ -486,13 +513,18 @@
        id3: snapDto3.id,
        sort: $("#scaleName").val()
    };
    if (!gatewaySer) {
        layer.msg("未获取到库区网关信息，抓图失败！");
        return;
    }
    var url = "http://" + gatewaySer.ip + ":" + gatewaySer.apiPort + gatewaySer.snapUrl;

    //当前AJAX服务为同步服务，返回数据包装照片信息
    var index = layer.load();
    $.ajax({
        sync: false,
        type: "POST",
        url: "/inout/api/snap-img",
        url: url,
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify(snapData),
@@ -601,6 +633,7 @@
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify(recordData),
        success: function (result) {
            layer.close(index);
            if (result.code != "0000") {
                alertError(result.msg);
            } else {
@@ -609,11 +642,13 @@
                notify("数据提交成功", result.data);
                //第一次称重后，刷新页面
                if (recordData.recordWeight <= 0.0) {
                    layer.closeAll();
                    // 初始化表单数据
                    renderTable();
                    $("#form-data")[0].reset();
                    form.render();
                }
            }
            layer.close(index);
        },
        error: function () {
            layer.close(index);
@@ -671,11 +706,16 @@
 * 读取车牌号
 */
function flushPlateNum() {
    if (!gatewaySer) {
        layer.msg("未获取到库区网关信息，车牌读取失败！");
        return;
    }
    var url = "http://" + gatewaySer.ip + ":" + gatewaySer.apiPort + gatewaySer.plateNumUrl;
    var param = JSON.stringify(snapDto1);
    var index = layer.load();
    $.ajax({
        type: "POST",
        url: "/inout/api/get-plateNum",
        url: url,
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: param,