yangle
2022-11-03 868fe08263e3a2729aabfb4a63efe0f16935edd9
叫料功能维护
5个文件已修改
202 ■■■■■ 已修改文件
WebTM/views/生产管理/拣料配送单/JIT_ComplementGoodsBill.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产叫料平台/JIT_ComplementGoodBillMain.html 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产叫料平台/JIT_ComplementGoodBillMain_ZXBZ.html 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产叫料平台/JIT_ComplementGoodPT.html 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/报表分析/ProductionPlanReportList.html 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Éú²ú¹ÜÀí/¼ðÁÏÅäË͵¥/JIT_ComplementGoodsBill.html
@@ -344,7 +344,9 @@
            else {
                layer.confirm("确定要配送生成调拨单", {
                    btn: ['确定', '取消']
                    , btn1: function () {
                    , btn1: function (index) {
                        $('#Ckfl').addClass("layui-btn-disabled").attr("disabled", true); //仓库发料按钮禁止
                        layer.close(index);
                        var sMainStr = JSON.stringify(table.cache['mainTable1']) + ";" + sessionStorage["HUserName"] + ";" + $("#HInterID").val() + ";" + $("#HRemark").val();//sessionStorage["HUserName"]
@@ -357,9 +359,7 @@
                                dataType: "json",
                                success: function (data) {
                                    if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                        //$('#Ckfl').removeClass("layui-btn-disabled").attr("disabled", true); //按钮禁用
                                        layer.msg(data.Message, { icon: 1 });
                                        Pub_Close(1);
                                    }
                                    else {
                                        layer.alert(data.Message, { icon: 5 });
WebTM/views/Éú²ú¹ÜÀí/Éú²ú½ÐÁÏÆ½Ì¨/JIT_ComplementGoodBillMain.html
@@ -137,6 +137,11 @@
                                            <input type="text" class="layui-input" name="HSeOrderBillNo" lay-verify="HSeOrderBillNo" id="HSeOrderBillNo">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <div style="padding-left: 50px;">
                                            <input type="checkbox" name="checkZXBZ" id="checkZXBZ" lay-skin="primary" lay-filter="checkZXBZ" title="最小包装">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
@@ -286,6 +291,45 @@
            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 æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
@@ -358,6 +402,8 @@
                    , { field: '子项单位', title: '子项单位', width: 160 }
                    , { field: '单位用量', title: '单位用量', width: 160}
                    , { field: '计划发料数量', title: '计划发料数量', width: 160 }
                    , { field: '最小包装', title: '最小包装', width: 160}
                    , { field: '包数', title: '包数', width: 160}
                    , { field: '叫料数量', title: '叫料数量', width: 160, edit: 'text'}
                    , { field: '退料数量', title: '退料数量', width: 160, edit: 'text'}
                    , { field: '退料原因', title: '退料原因', width: 160, edit: 'text'}
@@ -797,7 +843,9 @@
            else {
                layer.confirm('确定要生成拣料单?', {
                    btn: ['确定', '取消'] //按钮
                    , btn1: function () {
                    , btn1: function (index) {
                        layer.close(index);
                        var sMainStr = JSON.stringify(table.cache['mainTable']) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]
                        $.ajax(
@@ -838,7 +886,9 @@
            else {
                layer.confirm('确定要生成退料单?', {
                    btn: ['确定', '取消'] //按钮
                    , btn1: function () {
                    , btn1: function (index) {
                        layer.close(index);
                        var sMainStr = JSON.stringify(table.cache['mainTable']) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]
                        $.ajax(
WebTM/views/Éú²ú¹ÜÀí/Éú²ú½ÐÁÏÆ½Ì¨/JIT_ComplementGoodBillMain_ZXBZ.html
@@ -28,8 +28,8 @@
                    <div style="padding: 10px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cx" id="Cx">查询</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Jl" id="Jl">叫料</button>
                        <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Scjld" id="Scjld">生成拣料单</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Blptl" id="Blptl">不良品退料申请单</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Scjld" id="Scjld">生成拣料单</button>
                        <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Blptl" id="Blptl">不良品退料申请单</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Yltl" id="Yltl">余量退料申请单</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Bftl" id="Bftl">报废退料申请单</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Sctld" id="Sctld">生成退料单</button>-->
@@ -165,7 +165,24 @@
        form.on('submit(Jl)', function () {
            set_AddNew_Jl();
        })
        //新增拣料单
        form.on('submit(Scjld)', function () {
            set_AddNew_Scjld();
        })
        //行内鼠标离开事件
        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 æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
@@ -236,7 +253,8 @@
                    , { field: '调出仓库可用库存数量', title: '调出仓库可用库存数量', width: 120 }
                    , { field: '库存数量', title: '库存数量', width: 120 }
                    , { field: '可用库存', title: '可用库存', width: 120 }
                    , { field: '叫料数量', title: '叫料数量', width: 120, edit: 'text' }
                    , { field: '包数', title: '包数', width: 120, edit: 'text'  }
                    , { field: '叫料数量', title: '叫料数量', width: 120}
                    , { field: '可发数量', title: '可发数量', width: 120 }
                    , { field: '可发包数', title: '可发包数', width: 120 }
                    , { field: '用料清单总量', title: '用料清单总量', width: 120 }
@@ -469,6 +487,49 @@
            }
        }
        //新增拣料单
        function set_AddNew_Scjld() {
            if (table.cache['mainTable'].length == 0) {
                return layer.msg("无数据,无法拣料!");
            }
            else {
                layer.confirm('确定要生成拣料单?', {
                    btn: ['确定', '取消'] //按钮
                    , btn1: function (index) {
                        layer.close(index);
                        var sMainStr = JSON.stringify(table.cache['mainTable']) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]
                        $.ajax(
                            {
                                type: "POST",
                                url: GetWEBURL() + "/Sc_ComplementGoodBill/Insert_JL_ICStockTuiBill", //方法所在页面和方法名
                                async: true,
                                data: { "msg": sMainStr },
                                dataType: "json",
                                success: function (data) {
                                    if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                        layer.msg(data.Message, { icon: 1 });
                                        //刷新页面
                                        get_FastQuery();
                                    }
                                    else {
                                        layer.alert(data.Message, { icon: 5 });
                                        //console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
                                    }
                                    layer.closeAll("loading");
                                },
                                error: function (err) {
                                    layer.alert("错误:" + err, { icon: 5 });
                                    //console.log("Reason" + sMainStr);
                                }
                            });
                    }
                })
            }
        }
        //隐藏列设置
        function get_HideColumn() {
            var colName = "";
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,6 +276,8 @@
                    , { 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: 160 }
                    , { field: '包数', title: '包数', width: 160 }
                    , { field: '配套数量', title: '配套数量', width: 120, edit: 'text' }
                    , { field: '调出仓库可用库存数量', title: '调出仓库可用库存数量', width: 120 }
                    , { field: '调出仓库库存数量', title: '调出仓库库存数量', width: 120 }
@@ -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);
        }
WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/ProductionPlanReportList.html
@@ -258,6 +258,7 @@
                        , { field: '物料代码', title: '物料代码', width: 160 }
                        , { field: '开工日期', title: '下达日期', width: 160, templet: "<div>{{d.开工日期 ==null ?'':layui.util.toDateString(d.开工日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '要求完工', title: '要求完工', width: 160, templet: "<div>{{d.要求完工 ==null ?'':layui.util.toDateString(d.要求完工, 'yyyy-MM-dd')}}</div>" }
                        , { field: '包装标识', title: '包装标识', width: 200 }
                        , { field: '整批', title: '整批', width: 160 }
                        , { field: '报废数量', title: '报废', width: 160 }
                        , { field: '汇报单数量', title: '汇报单数量', width: 160 }
@@ -335,15 +336,17 @@
            }
            //重置过滤条件
            function set_ClearQuery() {
                $("#HBeginDate").val("");
                $("#HEndDate").val("");
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//开始日期
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//结束日期
                $("#HICMOBillNo").val("");
                $("#HProcExchBillNo").val("");
                $("#HName").val("");
                $("#HBillNo").val("");
                $("#F_BSV_WYID").val("");
                $("#HState").val("0")
                $("input[name='checkWRuku']").prop("checked", false);
                form.render()
                sWhere = "";
                get_Display(sWhere);
            }
            //物料