~admin/igds-v4.git

YYC

2023-07-07 a535bb743aef828314fcd74f8bee534dcddde1bb

出库称重

已修改5个文件

	igds-web/src/main/resources/static/admin/inout/out-handle.js	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-web/src/main/resources/static/admin/inout/out-weight.js	355 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-web/src/main/resources/static/admin/inout/weight.js	153 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-web/src/main/resources/templates/admin/inout/out-handle.html	75 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-web/src/main/resources/templates/admin/inout/out-weight.html	292 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

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

    showProgress();

    // 监听重量变化
    $(".weight").blur(function () {
        deAutoByHandle(this.name)
    });
    //调整字段不编辑
    $("#depotId").attr("disabled", true);
    $("#foodVariety").attr("disabled", true);
    $("#foodLevel").attr("disabled", true);
    // $("#foodLevel").attr("disabled", true);
});



 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();
    }
@@ -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("身份证读取失败，请手动录入！", {
@@ -415,7 +423,7 @@
                    printWeight(result.data);
                }
                // 刷新按钮
                flushBtn("btn-printBill");
                // flushBtn("btn-printBill");
            }
            layer.close(index);
        },
@@ -440,26 +448,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 +486,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 +499,8 @@
        },
        error: function () {
            layer.close(index);
            layer.alert("查询失败，请重新尝试！！");
            alertError("查询失败，请重新尝试");
            // layer.alert("查询失败，请重新尝试！！");
        }
    });
}
@@ -542,37 +552,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,27 +599,27 @@
        fileName: snapData.fileName3
    }];
    recordData.files = files;

    console.log("out-weight,submit")
    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);
        }
    });

@@ -635,95 +645,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/out-handle.html

@@ -297,16 +297,16 @@
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">净毛重</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="netWeight" autocomplete="off" placeholder="不可编辑"
                                               class="layui-input rkbk-search-input" disabled> <em
                                            class="kccz-data-dw">KG</em>
                                    </div>
                                </div>
                            </div>
                            <!--                            <div class="layui-col-xs4">-->
                            <!--                                <div class="layui-form-item">-->
                            <!--                                    <label class="layui-form-label">净&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">-->
@@ -341,8 +341,8 @@
                                <div class="layui-form-item">
                                    <label class="layui-form-label">粮食等级</label>
                                    <div class="layui-input-block">
                                        <select name="foodLevel" id="foodLevel">
                                            <option value="">不可编辑</option>
                                        <select name="foodLevel" id="foodLevel" lay-filter="select_foodLevel">
                                            <option value="">请选择</option>
                                            <option th:each="dic,dicSet:${listFoodLevel}"
                                                    th:value="${dic.code}" th:text="${dic.name}"></option>
                                        </select>
@@ -371,7 +371,7 @@
                                    <label class="layui-form-label">粮食品种</label>
                                    <div class="layui-input-block">
                                        <select name="foodVariety" id="foodVariety">
                                            <option value="">不可编辑</option>
                                            <option value="">请选择</option>
                                            <option th:each="dic,dicSet:${listFoodVariety}"
                                                    th:value="${dic.code}" th:text="${dic.name}"></option>
                                        </select>
@@ -383,13 +383,22 @@
                                <div class="layui-form-item">
                                    <label class="layui-form-label">其他扣重</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="deOther" autocomplete="off" placeholder="不可编辑"
                                               class="layui-input rkbk-search-input" disabled> <em
                                        <input type="text" name="deOther" autocomplete="off" placeholder="请输入"
                                               class="layui-input rkbk-search-input weight"> <em
                                            class="kccz-data-dw">KG</em>
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">现场扣重</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="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">
@@ -412,26 +421,19 @@
                            <!--        </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="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>-->
@@ -447,7 +449,7 @@
                                    <label class="layui-form-label">其他说明</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="deOtherInfo" placeholder="其他扣重说明"
                                               class="layui-input">
                                               autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                            </div>
@@ -456,7 +458,7 @@
                                    <label class="layui-form-label">备注说明</label>
                                    <div class="layui-input-block">
                                            <textarea name="remarks" placeholder="请输入内容"
                                                      class="layui-textarea"></textarea>
                                                      autocomplete="off" class="layui-textarea"></textarea>
                                    </div>
                                </div>
                            </div>
@@ -565,6 +567,7 @@
<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/weight.js}"></script>
<script th:src="@{../../static/admin/inout/out-handle.js}"></script>

<!-- 弹出框的信息 -->

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

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

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

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

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

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

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

        .border-no {
            border: 0px;
        }

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

        .qyzj-btnbox {
@@ -124,21 +138,19 @@
            <div class="rkbk-quick fl">
                <button id="btn-weight" class="rkbk-quick-btn layui-btn btn-blue"
                        onclick="weight()">
                    <i><img th:src="@{../../static/images/icon-chengzhong.png}"/></i>称重
                    <i><img th:src="@{../../static/images/icon-chengzhong.png}"/></i>步骤一：称重确认
                </button>
                <button id="btn-submit"
                        class="rkbk-quick-btn layui-btn btn-green layui-btn-disabled"
                        disabled=true onclick="submit()">
                    <i><img th:src="@{../../static/images/icon-ok.png}"/></i>完成称重
                        class="rkbk-quick-btn layui-btn btn-green" onclick="submit()">
                    <i><img th:src="@{../../static/images/icon-ok.png}"/></i>步骤二：完成称重
                </button>
                <button id="btn-printBill"
                        class="rkbk-quick-btn layui-btn btn-blue layui-btn-disabled"
                        disabled=true onclick="printBill()">
                    <i><img th:src="@{../../static/images/icon-dayin.png}"/></i>打印过磅单
                        class="rkbk-quick-btn layui-btn btn-blue" onclick="printBill()">
                    <i><img th:src="@{../../static/images/icon-dayin.png}"/></i>步骤三：打印过磅单
                </button>
                <button class="rkbk-quick-btn layui-btn btn-violet"
                        onclick="flushPage()">
                    <i><img th:src="@{../../static/images/icon-shuaxin2.png}"/></i>重新称重
                    <i><img th:src="@{../../static/images/icon-shuaxin2.png}"/></i>刷新页面
                </button>
            </div>

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

                    <div class="rkbk-tit">
                        <i></i>
                        <h3>业务数据</h3>
                        <h3>业务数据<span id="text-param"></span></h3>
                        <div>
                            <input type="button" value="读智慧卡"
                                   class="rkbk-search-btn layui-btn r-240"
@@ -276,37 +288,37 @@

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">智慧卡号</label>
                                    <label class="layui-form-label color-red">智慧卡号</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="intelCard" id="intelCard"
                                               placeholder="智慧卡号" autocomplete="off" class="layui-input">
                                               placeholder="刷卡/手动录入" autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">车牌号</label>
                                    <label class="layui-form-label color-red">车牌号</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="plateNum" id="plateNum" placeholder="车牌号"
                                        <input type="text" name="plateNum" id="plateNum" placeholder="自动录入/手动录入"
                                               autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">身份证号</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="userId" id="userId"
                                               placeholder="承运人身份证号" autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                            </div>
                            <!--<div class="layui-col-xs4">-->
                            <!--    <div class="layui-form-item">-->
                            <!--        <label class="layui-form-label">身份证号</label>-->
                            <!--        <div class="layui-input-block">-->
                            <!--            <input type="text" name="userId" id="userId"-->
                            <!--                   placeholder="承运人身份证号" autocomplete="off" class="layui-input">-->
                            <!--        </div>-->
                            <!--    </div>-->
                            <!--</div>-->

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">承运人</label>
                                    <label class="layui-form-label color-red">承运人</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="userName" placeholder="不可编辑" class="layui-input"
                                               disabled>
@@ -344,7 +356,7 @@
                                    <div class="layui-input-block">
                                        <input type="text" name="customerName" placeholder="请选择，不可手动录入"
                                               autocomplete="off" class="layui-input" disabled="disabled"> <em
                                            class="kccz-data-dw cursor" onclick="showNotice()">…</em>
                                            class="kccz-data-dw cursor" onclick="showNotice()">……</em>
                                    </div>
                                </div>
                            </div>
@@ -361,23 +373,23 @@
                            </div>


                            <div class="layui-col-xs4">
                                <div class="layui-form-item kccz-data-group-md">
                                    <label class="layui-form-label">杂质扣重</label>
                                    <div class="posi-r kccz-data-bfb fr">
                                        <input id="impurity" type="text" name="impurity" placeholder="请输入"
                                               autocomplete="off" class="layui-input weight"> <em
                                            class="kccz-data-dw">%</em>
                                    </div>
                                    <div class="layui-input-block">
                                        <div class="posi-r">
                                            <input id="deImpurity" type="text" name="deImpurity" placeholder="请输入"
                                                   autocomplete="off" class="layui-input weight"> <em
                                                class="kccz-data-dw">KG</em>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <!--<div class="layui-col-xs4">-->
                            <!--    <div class="layui-form-item kccz-data-group-md">-->
                            <!--        <label class="layui-form-label">杂质扣重</label>-->
                            <!--        <div class="posi-r kccz-data-bfb fr">-->
                            <!--            <input id="impurity" type="text" name="impurity" placeholder="请输入"-->
                            <!--                   autocomplete="off" class="layui-input weight"> <em-->
                            <!--                class="kccz-data-dw">%</em>-->
                            <!--        </div>-->
                            <!--        <div class="layui-input-block">-->
                            <!--            <div class="posi-r">-->
                            <!--                <input id="deImpurity" type="text" name="deImpurity" placeholder="请输入"-->
                            <!--                       autocomplete="off" class="layui-input weight"> <em-->
                            <!--                    class="kccz-data-dw">KG</em>-->
                            <!--            </div>-->
                            <!--        </div>-->
                            <!--    </div>-->
                            <!--</div>-->
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label" id="label4">装卸仓库</label>
@@ -390,7 +402,6 @@
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">现场扣重</label>
@@ -402,23 +413,23 @@
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item kccz-data-group-md">
                                    <label class="layui-form-label">水分增重</label>
                                    <div class="posi-r kccz-data-bfb fr">
                                        <input id="wet" type="text" name="wet" placeholder="请输入"
                                               autocomplete="off" class="layui-input weight"> <em
                                            class="kccz-data-dw">%</em>
                                    </div>
                                    <div class="layui-input-block">
                                        <div class="posi-r">
                                            <input id="deWet" type="text" name="deWet" placeholder="请输入"
                                                   autocomplete="off" class="layui-input weight"> <em
                                                class="kccz-data-dw">KG</em>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <!--<div class="layui-col-xs4">-->
                            <!--    <div class="layui-form-item kccz-data-group-md">-->
                            <!--        <label class="layui-form-label">水分增重</label>-->
                            <!--        <div class="posi-r kccz-data-bfb fr">-->
                            <!--            <input id="wet" type="text" name="wet" placeholder="请输入"-->
                            <!--                   autocomplete="off" class="layui-input weight"> <em-->
                            <!--                class="kccz-data-dw">%</em>-->
                            <!--        </div>-->
                            <!--        <div class="layui-input-block">-->
                            <!--            <div class="posi-r">-->
                            <!--                <input id="deWet" type="text" name="deWet" placeholder="请输入"-->
                            <!--                       autocomplete="off" class="layui-input weight"> <em-->
                            <!--                    class="kccz-data-dw">KG</em>-->
                            <!--            </div>-->
                            <!--        </div>-->
                            <!--    </div>-->
                            <!--</div>-->
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">粮食品种</label>
@@ -442,6 +453,15 @@
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">其他说明</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="deOtherInfo" autocomplete="off"
                                               placeholder="其他扣重说明" class="layui-input">
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
@@ -453,51 +473,29 @@
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格</label>
                                    <div class="layui-input-block">
                                        <select name="specType" id="specType">
                                            <option value="散粮">散粮</option>
                                            <option value="25kg">25kg</option>
                                            <option value="50kg">50kg</option>
                                        </select>
                                    </div>
                                </div>
                            </div>
                            <!--<div class="layui-col-xs4">-->
                            <!--    <div class="layui-form-item">-->
                            <!--        <label class="layui-form-label">规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格</label>-->
                            <!--        <div class="layui-input-block">-->
                            <!--            <select name="specType" id="specType">-->
                            <!--                <option value="散粮">散粮</option>-->
                            <!--                <option value="25kg">25kg</option>-->
                            <!--                <option value="50kg">50kg</option>-->
                            <!--            </select>-->
                            <!--        </div>-->
                            <!--    </div>-->
                            <!--</div>-->
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">粮食产地</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="foodLocation" placeholder="请选择"
                                               autocomplete="off" class="layui-input"> <em
                                            class="kccz-data-dw cursor" onclick="showFoodLocation()">…</em>
                                            class="kccz-data-dw cursor" onclick="showFoodLocation()">……</em>
                                    </div>
                                </div>
                            </div>


                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">单价</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="price" placeholder="请输入单价"
                                               class="layui-input"> <em class="kccz-data-dw">元/公斤</em>
                                    </div>
                                </div>
                            </div>



                            <div class="layui-col-xs8">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">备注说明</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="remarks" placeholder="请输入内容"
                                               class="layui-input">
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label color-red">结算重量</label>
@@ -508,17 +506,28 @@
                                    </div>
                                </div>
                            </div>
                            <!--<div class="layui-col-xs4">-->
                            <!--    <div class="layui-form-item">-->
                            <!--        <label class="layui-form-label">单价</label>-->
                            <!--        <div class="layui-input-block">-->
                            <!--            <input type="text" name="price" placeholder="请输入单价"-->
                            <!--                   class="layui-input"> <em class="kccz-data-dw">元/公斤</em>-->
                            <!--        </div>-->
                            <!--    </div>-->
                            <!--</div>-->


                            <div class="layui-col-xs8">
                                    <span style="padding-left: 50px;color: blue;">
                                        注意：1、水分增重，正数=增加 <br>
                                    </span>
                                <span style="padding-left: 93px;color: blue;">
                                        2、净重 = 毛重 - 皮重 ；总扣重 = 扣水杂（大于0） + 现场扣重 + 其他扣重<br>
                                    </span>
                                <span style="padding-left: 93px;color: blue;">
                                        3、结算重量 = 净重 - 总扣重 + 水杂增重；出库重量 = 净重 - 总扣重
                                    </span>
                                <div class="layui-form-item">
                                    <label class="layui-form-label">备注说明</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="remarks" placeholder="请输入内容"
                                               autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                            </div>


                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label color-red">出库重量</label>
@@ -529,6 +538,80 @@
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs8">
                                <span style="padding-left: 93px;color: blue;">
                                       说明： 1、净重 = 毛重 - 皮重 ；总扣重 =  现场扣重 + 其他扣重<br>
                                    </span>
                                <span style="padding-left: 93px;color: blue;">
                                        2、结算重量 = 净重 - 总扣重 ；出库重量 = 净重 - 总扣重
                                    </span>
                            </div>

                            <div class="layui-col-xs12">
                                <div class="line-container">
                                    <div class="line"></div>
                                    <div class="line-text">以下根据库区称重作业要求填写</div>
                                    <div class="line"></div>
                                </div>
                            </div>

                            <!-- 补充字段默认隐藏 -->
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">包装物</label>
                                    <div class="layui-input-block">
                                        <input type="radio" name="bzw" value="1" title="麻袋">
                                        <input type="radio" name="bzw"
                                               value="2" title="编织袋">
                                        <input type="radio" name="bzw"
                                               value="3" title="散装" checked>
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">包装扣重</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="dePackage" autocomplete="off"
                                               placeholder="请输入" class="layui-input weight"> <em
                                            class="kccz-data-dw">KG</em>
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">单价</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="price" placeholder="请输入"
                                               class="layui-input"> <em class="kccz-data-dw">元/公斤</em>
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">标准包重</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="dbz" autocomplete="off"
                                               placeholder="请输入" class="layui-input"> <em
                                            class="kccz-data-dw">KG</em>
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">包件总数</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="bzbjs" autocomplete="off"
                                               placeholder="请输入" class="layui-input"> <em
                                            class="kccz-data-dw">件</em>
                                    </div>
                                </div>
                            </div>

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

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

			showProgress();

			// 监听重量变化
			$(".weight").blur(function () {
			deAutoByHandle(this.name)
			});
			//调整字段不编辑
			$("#depotId").attr("disabled", true);
			$("#foodVariety").attr("disabled", true);
			$("#foodLevel").attr("disabled", true);
			// $("#foodLevel").attr("disabled", true);
			});

			@@ -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();
			}
			@@ -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("身份证读取失败，请手动录入！", {
			@@ -415,7 +423,7 @@
			printWeight(result.data);
			}
			// 刷新按钮
			flushBtn("btn-printBill");
			// flushBtn("btn-printBill");
			}
			layer.close(index);
			},
			@@ -440,26 +448,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 +486,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 +499,8 @@
			},
			error: function () {
			layer.close(index);
			layer.alert("查询失败，请重新尝试！！");
			alertError("查询失败，请重新尝试");
			// layer.alert("查询失败，请重新尝试！！");
			}
			});
			}
			@@ -542,37 +552,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,27 +599,27 @@
			fileName: snapData.fileName3
			}];
			recordData.files = files;

			console.log("out-weight,submit")
			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);
			}
			});

			@@ -635,95 +645,96 @@
			// });
			}


			// ---------------------------通知单-开始 -------------------//
			// 弹出往来单位下拉框
			function showNotice() {
			var index = layer.load();
			var param = {
			type: type
			};
			// 渲染往来单位列表
			table.render({
			elem: '#tableNotice',
			url: '../../basic/inout/list-notice—out',
			page: false,
			// skin : "nob",
			// size : 'sm',
			even: true,
			method: 'POST',
			contentType: "application/json;charset=UTF-8",
			cols: [[{
			field: 'name',
			title: '通知单名称',
			width: '15%'
			}, {
			field: 'customerName',
			title: '收货单位'
			}, {
			field: 'depotName',
			title: '仓库名称',
			width: '15%'
			}, {
			field: 'foodVarietyName',
			title: '粮食品种',
			width: '10%'
			}, {
			field: 'year',
			title: '年份',
			width: '8%'
			}, {
			field: 'contractName',
			title: '所属合同'
			}]],
			where: param,
			parseData: function (res) {
			if ("0000" == res.code) {
			return {
			"code": "0",
			"msg": res.msg,
			"data": res.data
			}
			} else {
			return {
			"code": "1",
			"msg": res.msg
			}
			}
			},
			done: function (res) {
			layer.close(index);
			}
			});

			//双击显示选中数据
			table.on('rowDouble(tableNotice)', function (obj) {
			var data = obj.data;
			form.val("form-data", {
			customerId: data.customerId,
			customerName: data.customerName,
			noticeId: data.id,
			foodType: data.foodType,
			foodLevel: data.foodLevel
			});
			// 关闭
			layer.closeAll();
			});

			// 弹出对话框
			layer.open({
			type: 1,
			offset: ['100px', '250px'],
			title: "出库通知单",
			area: ['900px', '600px'],
			shade: 0,
			content: $('#listNotice'),
			btn: 0,
			btn: ['取消'],
			yes: function () {
			layer.closeAll();
			},
			closeBtn: 0
			});
			}
			// ---------------------------通知单 -结束 -------------------//
			//-----------------------转移至weight.js中----------------------//
			// // ---------------------------通知单-开始 -------------------//
			// // 弹出往来单位下拉框
			// function showNotice() {
			// var index = layer.load();
			// var param = {
			// type: type
			// };
			// // 渲染往来单位列表
			// table.render({
			// elem: '#tableNotice',
			// url: '../../basic/inout/list-notice-out',
			// page: false,
			// // skin : "nob",
			// // size : 'sm',
			// even: true,
			// method: 'POST',
			// contentType: "application/json;charset=UTF-8",
			// cols: [[{
			// field: 'name',
			// title: '通知单名称',
			// width: '15%'
			// }, {
			// field: 'customerName',
			// title: '收货单位'
			// }, {
			// field: 'depotName',
			// title: '仓库名称',
			// width: '15%'
			// }, {
			// field: 'foodVarietyName',
			// title: '粮食品种',
			// width: '10%'
			// }, {
			// field: 'year',
			// title: '年份',
			// width: '8%'
			// }, {
			// field: 'contractName',
			// title: '所属合同'
			// }]],
			// where: param,
			// parseData: function (res) {
			// if ("0000" == res.code) {
			// return {
			// "code": "0",
			// "msg": res.msg,
			// "data": res.data
			// }
			// } else {
			// return {
			// "code": "1",
			// "msg": res.msg
			// }
			// }
			// },
			// done: function (res) {
			// layer.close(index);
			// }
			// });
			//
			// //双击显示选中数据
			// table.on('rowDouble(tableNotice)', function (obj) {
			// var data = obj.data;
			// form.val("form-data", {
			// customerId: data.customerId,
			// customerName: data.customerName,
			// noticeId: data.id,
			// foodType: data.foodType,
			// foodLevel: data.foodLevel
			// });
			// // 关闭
			// layer.closeAll();
			// });
			//
			// // 弹出对话框
			// layer.open({
			// type: 1,
			// offset: ['100px', '250px'],
			// title: "出库通知单",
			// area: ['900px', '600px'],
			// shade: 0,
			// content: $('#listNotice'),
			// btn: 0,
			// btn: ['取消'],
			// yes: function () {
			// layer.closeAll();
			// },
			// closeBtn: 0
			// });
			// }
			//
			// // ---------------------------通知单 -结束 -------------------//

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

			if (curData.fullWeight == 0 \|\| curData.emptyWeight == 0) {
			return;
			}
			//汇总结果
			var deSum = 0, addSum = 0, settleWeight = 0, recordWeight = 0;
			// 净重
			var netWeight = curData.fullWeight - curData.emptyWeight;
			//扣水杂
			var deWet = curData.deWet, deImpurity = curData.deImpurity;

			if (netWeight <= 0) {
			layer.alert("净重小于0，当前称重存在逻辑问题");
			alertError("净重<=0，当前环节存在逻辑错误，请核对");
			return;
			}
			//其他信息
			var deHandle = curData.deHandle, dePackage = curData.dePackage, deOther = curData.deOther, settleWeight = 0,
			recordWeight = 0, deSum = 0;
			recordWeight = Number(netWeight) - Number(deHandle) - Number(dePackage) - Number(deOther);
			settleWeight = Number(recordWeight);
			deSum = Number(deOther) + Number(deHandle)

			var deBase = 0, multiple = 0;
			//水分杂质，更改比例并且水分扣重还没计算情况下
			if ("fullWeight" == name \|\| null == deWet) {
			var checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C01, CHECK_ST.C020101);
			if (checkItem) {
			deBase = Number(curData.wet) - Number(checkItem.upperLimit);
			if (deBase == 0) return;
			multiple = parseInt(deBase / checkItem.ruleNum);//倍数
			deWet = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
			}
			}
			//杂质
			if ("fullWeight" == name \|\| null == deImpurity) {
			checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C02, CHECK_ST.C01010301);
			if (checkItem) {
			deBase = Number(curData.impurity) - Number(checkItem.upperLimit);
			if (deBase == 0) return;
			multiple = parseInt(deBase / checkItem.ruleNum);
			deImpurity = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
			}
			}

			/** 总扣重，不含增重*/
			deSum = Number(curData.deOther) + Number(curData.deHandle);


			if (Number(deWet) > 0) {//增重
			addSum = addSum + Number(deWet);
			} else {
			deSum = deSum + Number(deWet);
			}

			if (Number(deImpurity) > 0) {//扣重
			deSum = deSum + Number(deImpurity);
			} else {
			addSum = addSum + Number(deImpurity);
			}

			netWeight = netWeight.toFixed(0);
			recordWeight = recordWeight.toFixed(0);
			settleWeight = settleWeight.toFixed(0);
			deSum = deSum.toFixed(0);
			/** 增重转正数，便于计算 */
			addSum = Math.abs(addSum).toFixed(0);
			/** 入库重量 = 净重 - 总扣重 */
			recordWeight = Number(netWeight) - Number(deSum);
			/** 结算重量 = 净重 - 总扣重 + 增重 */
			settleWeight = Number(netWeight) - Number(deSum) + Number(addSum);

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

			// function deAutoByOut(name) {
			// var curData = form.val("form-data");
			//
			// if (curData.fullWeight == 0 \|\| curData.emptyWeight == 0) {
			// return;
			// }
			// //汇总结果
			// var deSum = 0, addSum = 0, settleWeight = 0, recordWeight = 0;
			// // 净重
			// var netWeight = curData.fullWeight - curData.emptyWeight;
			// //扣水杂
			// var deWet = curData.deWet, deImpurity = curData.deImpurity;
			//
			// if (netWeight <= 0) {
			// layer.alert("净重小于0，当前称重存在逻辑问题");
			// return;
			// }
			//
			// var deBase = 0, multiple = 0;
			// //水分杂质，更改比例并且水分扣重还没计算情况下
			// if ("fullWeight" == name \|\| null == deWet) {
			// var checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C01, CHECK_ST.C020101);
			// if (checkItem) {
			// deBase = Number(curData.wet) - Number(checkItem.upperLimit);
			// if (deBase == 0) return;
			// multiple = parseInt(deBase / checkItem.ruleNum);//倍数
			// deWet = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
			// }
			// }
			// //杂质
			// if ("fullWeight" == name \|\| null == deImpurity) {
			// checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C02, CHECK_ST.C01010301);
			// if (checkItem) {
			// deBase = Number(curData.impurity) - Number(checkItem.upperLimit);
			// if (deBase == 0) return;
			// multiple = parseInt(deBase / checkItem.ruleNum);
			// deImpurity = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
			// }
			// }
			//
			// /** 总扣重，不含增重*/
			// deSum = Number(curData.deOther) + Number(curData.deHandle);
			//
			//
			// if (Number(deWet) > 0) {//增重
			// addSum = addSum + Number(deWet);
			// } else {
			// deSum = deSum + Number(deWet);
			// }
			//
			// if (Number(deImpurity) > 0) {//扣重
			// deSum = deSum + Number(deImpurity);
			// } else {
			// addSum = addSum + Number(deImpurity);
			// }
			//
			// deSum = deSum.toFixed(0);
			// /** 增重转正数，便于计算 */
			// addSum = Math.abs(addSum).toFixed(0);
			// /** 入库重量 = 净重 - 总扣重 */
			// recordWeight = Number(netWeight) - Number(deSum);
			// /** 结算重量 = 净重 - 总扣重 + 增重 */
			// settleWeight = Number(netWeight) - Number(deSum) + Number(addSum);
			//
			// form.val("form-data", {
			// netWeight: netWeight,
			// deImpurity: deImpurity,
			// deWet: deWet,
			// deSum: deSum,
			// settleWeight: settleWeight,
			// recordWeight: recordWeight
			// });
			// form.render();
			// }
			function deAutoByHandle(name) {
			var curData = form.val("form-data");
			var deOther = curData.deOther, deHandle = curData.deHandle;
			deSum = Number(deOther) + Number(deHandle);
			deSum = deSum.toFixed(0);
			form.val("form-data", {
			deSum: deSum,
			});
			form.render();

			}

			/**
			* 根据化验项和传递过来的参数获取当前参数的配置信息
			* @param checkItems

			@@ -297,16 +297,16 @@
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">净毛重</label>
			<div class="layui-input-block">
			<input type="text" name="netWeight" autocomplete="off" placeholder="不可编辑"
			class="layui-input rkbk-search-input" disabled> <em
			class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>
			<!-- <div class="layui-col-xs4">-->
			<!-- <div class="layui-form-item">-->
			<!-- <label class="layui-form-label">净    重</label>-->
			<!-- <div class="layui-input-block">-->
			<!-- <input type="text" name="netWeight" autocomplete="off" placeholder="不可编辑"-->
			<!-- class="layui-input rkbk-search-input" disabled> <em-->
			<!-- class="kccz-data-dw">KG</em>-->
			<!-- </div>-->
			<!-- </div>-->
			<!-- </div>-->


			<!-- <div class="layui-col-xs4">-->
			@@ -341,8 +341,8 @@
			<div class="layui-form-item">
			<label class="layui-form-label">粮食等级</label>
			<div class="layui-input-block">
			<select name="foodLevel" id="foodLevel">
			<option value="">不可编辑</option>
			<select name="foodLevel" id="foodLevel" lay-filter="select_foodLevel">
			<option value="">请选择</option>
			<option th:each="dic,dicSet:${listFoodLevel}"
			th:value="${dic.code}" th:text="${dic.name}"></option>
			</select>
			@@ -371,7 +371,7 @@
			<label class="layui-form-label">粮食品种</label>
			<div class="layui-input-block">
			<select name="foodVariety" id="foodVariety">
			<option value="">不可编辑</option>
			<option value="">请选择</option>
			<option th:each="dic,dicSet:${listFoodVariety}"
			th:value="${dic.code}" th:text="${dic.name}"></option>
			</select>
			@@ -383,13 +383,22 @@
			<div class="layui-form-item">
			<label class="layui-form-label">其他扣重</label>
			<div class="layui-input-block">
			<input type="text" name="deOther" autocomplete="off" placeholder="不可编辑"
			class="layui-input rkbk-search-input" disabled> <em
			<input type="text" name="deOther" autocomplete="off" placeholder="请输入"
			class="layui-input rkbk-search-input weight"> <em
			class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">现场扣重</label>
			<div class="layui-input-block">
			<input type="text" name="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">
			@@ -412,26 +421,19 @@
			<!-- </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="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>-->
			@@ -447,7 +449,7 @@
			<label class="layui-form-label">其他说明</label>
			<div class="layui-input-block">
			<input type="text" name="deOtherInfo" placeholder="其他扣重说明"
			class="layui-input">
			autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>
			@@ -456,7 +458,7 @@
			<label class="layui-form-label">备注说明</label>
			<div class="layui-input-block">
			<textarea name="remarks" placeholder="请输入内容"
			class="layui-textarea"></textarea>
			autocomplete="off" class="layui-textarea"></textarea>
			</div>
			</div>
			</div>
			@@ -565,6 +567,7 @@
			<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/weight.js}"></script>
			<script th:src="@{../../static/admin/inout/out-handle.js}"></script>

			<!-- 弹出框的信息 -->

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

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

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

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

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

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

			.border-no {
			border: 0px;
			}

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

			.qyzj-btnbox {
			@@ -124,21 +138,19 @@
			<div class="rkbk-quick fl">
			<button id="btn-weight" class="rkbk-quick-btn layui-btn btn-blue"
			onclick="weight()">
			<i><img th:src="@{../../static/images/icon-chengzhong.png}"/></i>称重
			<i><img th:src="@{../../static/images/icon-chengzhong.png}"/></i>步骤一：称重确认
			</button>
			<button id="btn-submit"
			class="rkbk-quick-btn layui-btn btn-green layui-btn-disabled"
			disabled=true onclick="submit()">
			<i><img th:src="@{../../static/images/icon-ok.png}"/></i>完成称重
			class="rkbk-quick-btn layui-btn btn-green" onclick="submit()">
			<i><img th:src="@{../../static/images/icon-ok.png}"/></i>步骤二：完成称重
			</button>
			<button id="btn-printBill"
			class="rkbk-quick-btn layui-btn btn-blue layui-btn-disabled"
			disabled=true onclick="printBill()">
			<i><img th:src="@{../../static/images/icon-dayin.png}"/></i>打印过磅单
			class="rkbk-quick-btn layui-btn btn-blue" onclick="printBill()">
			<i><img th:src="@{../../static/images/icon-dayin.png}"/></i>步骤三：打印过磅单
			</button>
			<button class="rkbk-quick-btn layui-btn btn-violet"
			onclick="flushPage()">
			<i><img th:src="@{../../static/images/icon-shuaxin2.png}"/></i>重新称重
			<i><img th:src="@{../../static/images/icon-shuaxin2.png}"/></i>刷新页面
			</button>
			</div>

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

			<div class="rkbk-tit">
			<i></i>
			<h3>业务数据</h3>
			<h3>业务数据<span id="text-param"></span></h3>
			<div>
			<input type="button" value="读智慧卡"
			class="rkbk-search-btn layui-btn r-240"
			@@ -276,37 +288,37 @@

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">智慧卡号</label>
			<label class="layui-form-label color-red">智慧卡号</label>
			<div class="layui-input-block">
			<input type="text" name="intelCard" id="intelCard"
			placeholder="智慧卡号" autocomplete="off" class="layui-input">
			placeholder="刷卡/手动录入" autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">车牌号</label>
			<label class="layui-form-label color-red">车牌号</label>
			<div class="layui-input-block">
			<input type="text" name="plateNum" id="plateNum" placeholder="车牌号"
			<input type="text" name="plateNum" id="plateNum" placeholder="自动录入/手动录入"
			autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">身份证号</label>
			<div class="layui-input-block">
			<input type="text" name="userId" id="userId"
			placeholder="承运人身份证号" autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>
			<!--<div class="layui-col-xs4">-->
			<!-- <div class="layui-form-item">-->
			<!-- <label class="layui-form-label">身份证号</label>-->
			<!-- <div class="layui-input-block">-->
			<!-- <input type="text" name="userId" id="userId"-->
			<!-- placeholder="承运人身份证号" autocomplete="off" class="layui-input">-->
			<!-- </div>-->
			<!-- </div>-->
			<!--</div>-->

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">承运人</label>
			<label class="layui-form-label color-red">承运人</label>
			<div class="layui-input-block">
			<input type="text" name="userName" placeholder="不可编辑" class="layui-input"
			disabled>
			@@ -344,7 +356,7 @@
			<div class="layui-input-block">
			<input type="text" name="customerName" placeholder="请选择，不可手动录入"
			autocomplete="off" class="layui-input" disabled="disabled"> <em
			class="kccz-data-dw cursor" onclick="showNotice()">…</em>
			class="kccz-data-dw cursor" onclick="showNotice()">……</em>
			</div>
			</div>
			</div>
			@@ -361,23 +373,23 @@
			</div>


			<div class="layui-col-xs4">
			<div class="layui-form-item kccz-data-group-md">
			<label class="layui-form-label">杂质扣重</label>
			<div class="posi-r kccz-data-bfb fr">
			<input id="impurity" type="text" name="impurity" placeholder="请输入"
			autocomplete="off" class="layui-input weight"> <em
			class="kccz-data-dw">%</em>
			</div>
			<div class="layui-input-block">
			<div class="posi-r">
			<input id="deImpurity" type="text" name="deImpurity" placeholder="请输入"
			autocomplete="off" class="layui-input weight"> <em
			class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>
			</div>
			<!--<div class="layui-col-xs4">-->
			<!-- <div class="layui-form-item kccz-data-group-md">-->
			<!-- <label class="layui-form-label">杂质扣重</label>-->
			<!-- <div class="posi-r kccz-data-bfb fr">-->
			<!-- <input id="impurity" type="text" name="impurity" placeholder="请输入"-->
			<!-- autocomplete="off" class="layui-input weight"> <em-->
			<!-- class="kccz-data-dw">%</em>-->
			<!-- </div>-->
			<!-- <div class="layui-input-block">-->
			<!-- <div class="posi-r">-->
			<!-- <input id="deImpurity" type="text" name="deImpurity" placeholder="请输入"-->
			<!-- autocomplete="off" class="layui-input weight"> <em-->
			<!-- class="kccz-data-dw">KG</em>-->
			<!-- </div>-->
			<!-- </div>-->
			<!-- </div>-->
			<!--</div>-->
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label" id="label4">装卸仓库</label>
			@@ -390,7 +402,6 @@
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">现场扣重</label>
			@@ -402,23 +413,23 @@
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item kccz-data-group-md">
			<label class="layui-form-label">水分增重</label>
			<div class="posi-r kccz-data-bfb fr">
			<input id="wet" type="text" name="wet" placeholder="请输入"
			autocomplete="off" class="layui-input weight"> <em
			class="kccz-data-dw">%</em>
			</div>
			<div class="layui-input-block">
			<div class="posi-r">
			<input id="deWet" type="text" name="deWet" placeholder="请输入"
			autocomplete="off" class="layui-input weight"> <em
			class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>
			</div>
			<!--<div class="layui-col-xs4">-->
			<!-- <div class="layui-form-item kccz-data-group-md">-->
			<!-- <label class="layui-form-label">水分增重</label>-->
			<!-- <div class="posi-r kccz-data-bfb fr">-->
			<!-- <input id="wet" type="text" name="wet" placeholder="请输入"-->
			<!-- autocomplete="off" class="layui-input weight"> <em-->
			<!-- class="kccz-data-dw">%</em>-->
			<!-- </div>-->
			<!-- <div class="layui-input-block">-->
			<!-- <div class="posi-r">-->
			<!-- <input id="deWet" type="text" name="deWet" placeholder="请输入"-->
			<!-- autocomplete="off" class="layui-input weight"> <em-->
			<!-- class="kccz-data-dw">KG</em>-->
			<!-- </div>-->
			<!-- </div>-->
			<!-- </div>-->
			<!--</div>-->
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">粮食品种</label>
			@@ -442,6 +453,15 @@
			</div>
			</div>
			</div>
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">其他说明</label>
			<div class="layui-input-block">
			<input type="text" name="deOtherInfo" autocomplete="off"
			placeholder="其他扣重说明" class="layui-input">
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			@@ -453,51 +473,29 @@
			</div>
			</div>
			</div>
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">规      格</label>
			<div class="layui-input-block">
			<select name="specType" id="specType">
			<option value="散粮">散粮</option>
			<option value="25kg">25kg</option>
			<option value="50kg">50kg</option>
			</select>
			</div>
			</div>
			</div>
			<!--<div class="layui-col-xs4">-->
			<!-- <div class="layui-form-item">-->
			<!-- <label class="layui-form-label">规      格</label>-->
			<!-- <div class="layui-input-block">-->
			<!-- <select name="specType" id="specType">-->
			<!-- <option value="散粮">散粮</option>-->
			<!-- <option value="25kg">25kg</option>-->
			<!-- <option value="50kg">50kg</option>-->
			<!-- </select>-->
			<!-- </div>-->
			<!-- </div>-->
			<!--</div>-->
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">粮食产地</label>
			<div class="layui-input-block">
			<input type="text" name="foodLocation" placeholder="请选择"
			autocomplete="off" class="layui-input"> <em
			class="kccz-data-dw cursor" onclick="showFoodLocation()">…</em>
			class="kccz-data-dw cursor" onclick="showFoodLocation()">……</em>
			</div>
			</div>
			</div>


			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">单价</label>
			<div class="layui-input-block">
			<input type="text" name="price" placeholder="请输入单价"
			class="layui-input"> <em class="kccz-data-dw">元/公斤</em>
			</div>
			</div>
			</div>



			<div class="layui-col-xs8">
			<div class="layui-form-item">
			<label class="layui-form-label">备注说明</label>
			<div class="layui-input-block">
			<input type="text" name="remarks" placeholder="请输入内容"
			class="layui-input">
			</div>
			</div>
			</div>
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label color-red">结算重量</label>
			@@ -508,17 +506,28 @@
			</div>
			</div>
			</div>
			<!--<div class="layui-col-xs4">-->
			<!-- <div class="layui-form-item">-->
			<!-- <label class="layui-form-label">单价</label>-->
			<!-- <div class="layui-input-block">-->
			<!-- <input type="text" name="price" placeholder="请输入单价"-->
			<!-- class="layui-input"> <em class="kccz-data-dw">元/公斤</em>-->
			<!-- </div>-->
			<!-- </div>-->
			<!--</div>-->


			<div class="layui-col-xs8">
			<span style="padding-left: 50px;color: blue;">
			注意：1、水分增重，正数=增加 <br>
			</span>
			<span style="padding-left: 93px;color: blue;">
			2、净重 = 毛重 - 皮重；总扣重 = 扣水杂（大于0） + 现场扣重 + 其他扣重<br>
			</span>
			<span style="padding-left: 93px;color: blue;">
			3、结算重量 = 净重 - 总扣重 + 水杂增重；出库重量 = 净重 - 总扣重
			</span>
			<div class="layui-form-item">
			<label class="layui-form-label">备注说明</label>
			<div class="layui-input-block">
			<input type="text" name="remarks" placeholder="请输入内容"
			autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>


			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label color-red">出库重量</label>
			@@ -529,6 +538,80 @@
			</div>
			</div>
			</div>
			<div class="layui-col-xs8">
			<span style="padding-left: 93px;color: blue;">
			说明： 1、净重 = 毛重 - 皮重；总扣重 = 现场扣重 + 其他扣重<br>
			</span>
			<span style="padding-left: 93px;color: blue;">
			2、结算重量 = 净重 - 总扣重；出库重量 = 净重 - 总扣重
			</span>
			</div>

			<div class="layui-col-xs12">
			<div class="line-container">
			<div class="line"></div>
			<div class="line-text">以下根据库区称重作业要求填写</div>
			<div class="line"></div>
			</div>
			</div>

			<!-- 补充字段默认隐藏 -->
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">包装物</label>
			<div class="layui-input-block">
			<input type="radio" name="bzw" value="1" title="麻袋">
			<input type="radio" name="bzw"
			value="2" title="编织袋">
			<input type="radio" name="bzw"
			value="3" title="散装" checked>
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">包装扣重</label>
			<div class="layui-input-block">
			<input type="text" name="dePackage" autocomplete="off"
			placeholder="请输入" class="layui-input weight"> <em
			class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">单价</label>
			<div class="layui-input-block">
			<input type="text" name="price" placeholder="请输入"
			class="layui-input"> <em class="kccz-data-dw">元/公斤</em>
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">标准包重</label>
			<div class="layui-input-block">
			<input type="text" name="dbz" autocomplete="off"
			placeholder="请输入" class="layui-input"> <em
			class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">包件总数</label>
			<div class="layui-input-block">
			<input type="text" name="bzbjs" autocomplete="off"
			placeholder="请输入" class="layui-input"> <em
			class="kccz-data-dw">件</em>
			</div>
			</div>
			</div>

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