Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

ch

2022-11-07 a3aca1c1bfef24e3db60fa16b2618986e8b62fbe

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú½ÐÁÏƽ̨/JIT_ComplementGoodPT.html

@@ -35,6 +35,11 @@
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ptjl" id="ptjl">配套叫料</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">隐藏列设置</button>
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" style="margin-left: 0px;" lay-filter="btnReSearch" id="btnReSearch">重置</button>
                        <div class="layui-inline">
                            <div style="padding-left: 10px;">
                                <input type="checkbox" name="checkZXBZ" id="checkZXBZ" lay-skin="primary" lay-filter="checkZXBZ" title="最小包装">
                            </div>
                        </div>
                    </div>
                    <div class="layui-collapse">
                        <div class="layui-colla-item">
@@ -194,6 +199,46 @@
            get_HideColumn();
        })

        //最小包装
        form.on('checkbox(checkZXBZ)', function (data) {
            var checkZXBZ = $("input[name='checkZXBZ']").prop("checked");//复选框

            if (checkZXBZ) {
                for (var i = 0; i < option.cols[0].length; i++) {
                    if (option.cols[0][i]["field"] == "包数") {
                        option.cols[0][i]["edit"] = "text";
                    }
                    if (option.cols[0][i]["field"] == "配套数量") {
                        option.cols[0][i]["edit"] = "";
                    }
                }
            } else {
                for (var i = 0; i < option.cols[0].length; i++) {
                    if (option.cols[0][i]["field"] == "包数") {
                        option.cols[0][i]["edit"] = "";
                    }
                    if (option.cols[0][i]["field"] == "配套数量") {
                        option.cols[0][i]["edit"] = "text";
                    }
                }
            }
            table.render(option);
        })

        //行内鼠标离开事件
        table.on('edit(mainTable)', function (obj) {
            var HQty = 0.0;

            if (obj.field == "包数") {
                HQty = parseFloat(obj.data["包数"]) * parseFloat(obj.data["最小包装"])
                //修改数据
                obj.update({
                    "配套数量": HQty
                });
            }
        })


        //#endregion

        //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法
@@ -231,7 +276,9 @@
                    , { field: '调出仓库id', title: '调出仓库id', width: 120, hide: true }
                    , { field: '调入仓库', title: '调入仓库', width: 120, edit: 'text', event: 'InWarehouse' }
                    , { field: '调入仓库id', title: '调入仓库id', width: 120, hide: true }
                    , { field: '配套数量', title: '配套数量', width: 120 }
                    , { field: '最小包装', title: '最小包装', width: 160 }
                    , { field: '包数', title: '包数', width: 160 }
                    , { field: '配套数量', title: '配套数量', width: 120, edit: 'text' }
                    , { field: '调出仓库可用库存数量', title: '调出仓库可用库存数量', width: 120 }
                    , { field: '调出仓库库存数量', title: '调出仓库库存数量', width: 120 }
                    , { field: '已叫料数量', title: '已叫料数量', width: 160}
@@ -556,6 +603,7 @@
        }

        //配套数量 ä¿®æ”¹è¡¨æ ¼
        //最小包装数量  ä¿®æ”¹è¡¨æ ¼
        function PTTable() {
            if ($('#PTCount').val() % 1 != 0) {
                return layer.msg("请输入整数数量!");
@@ -563,10 +611,20 @@
            if ($('#PTCount').val() <= 0) {
                return layer.msg("请输入数量大于0!");
            }
            var checkZXBZ = $("input[name='checkZXBZ']").prop("checked");//复选框

            for (var i = 0; i < option.data.length; i++) {
                var num = $('#PTCount').val() * option.data[i]["单位用量"];
                option.data[i]["配套数量"] = num;
            if (checkZXBZ) {
                for (var i = 0; i < option.data.length; i++) {
                    var num = $('#PTCount').val() * option.data[i]["最小包装"];
                    option.data[i]["配套数量"] = num;
                    option.data[i]["包数"] = $('#PTCount').val();
                }
            }
            else {
                for (var i = 0; i < option.data.length; i++) {
                    var num = $('#PTCount').val() * option.data[i]["单位用量"];
                    option.data[i]["配套数量"] = num;
                }
            }
            table.render(option);
        }
@@ -575,8 +633,9 @@
        function set_ptjl() {
            for (var item in table.cache["mainTable"]) {
                if (table.cache["mainTable"][item]["配套数量"] > table.cache["mainTable"][item]["调出仓库可用库存数量"] || table.cache["mainTable"][item]["配套数量"] == 0) {
                    return layer.msg("第" + (parseInt(item)  + 1) + "行的配套数量大于调出仓库可用库存数量!");
                    return layer.msg("第" + (parseInt(item)  + 1) + "行的配套数量大于调出仓库可用库存数量!或者配套数量为0!");
                }

            }

            var sMainStr = JSON.stringify(table.cache['mainTable']) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];