chenhaozhe
2025-10-11 d02de03ffe76ccb7ebfc777af85b40dd5372cf02
乔一 生产领料单 修改
3个文件已修改
78 ■■■■■ 已修改文件
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/领料出库/Kf_MateOutBillEdit_YangMao.html 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/领料出库/Kf_MateOutBillList.html 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html
@@ -104,7 +104,7 @@
                                            </select>
                                        </div>
                                    </div>
                                    <button class="layui-btn layuiadmin-btn-order" style="" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px;">重置</button>
WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBillEdit_YangMao.html
@@ -997,11 +997,11 @@
                        var HMaterRuleType = option.data[i].HMaterRuleType;
                        var HMaterRuleExternType = option.data[i].HMaterRuleExternType;
                        if (HMaterRuleExternType == "染料") {
                            option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
                            option.data[i].HQty = roundNumber(dealDoubleToFixed(option.data[i].HRate * HWeight), 3).toFixed(3);
                        } else if (HMaterRuleExternType == "助剂") {
                            option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
                            option.data[i].HQty = roundNumber(dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001), 3).toFixed(3);
                        } else if (HMaterRuleExternType == "助剂(按布算)") {
                            option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
                            option.data[i].HQty = roundNumber(dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001), 3).toFixed(3);
                        }
                        //if (HMaterRuleExternType == '羊毛') {
                        //     option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
@@ -1022,11 +1022,11 @@
                        var HMaterRuleType = option.data[i].HMaterRuleType;
                        var HMaterRuleExternType = option.data[i].HMaterRuleExternType;
                        if (HMaterRuleExternType == "染料") {
                            option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
                            option.data[i].HQty = roundNumber(dealDoubleToFixed(option.data[i].HRate * HWeight), 3).toFixed(3);
                        } else if (HMaterRuleExternType == "助剂") {
                            option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
                            option.data[i].HQty = roundNumber(dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001), 3).toFixed(3);
                        } else if (HMaterRuleExternType == "助剂(按布算)") {
                            option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
                            option.data[i].HQty = roundNumber(dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001), 3).toFixed(3);
                        }
                        //if (HMaterRuleExternType == '羊毛') {
                        //    option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
@@ -1233,11 +1233,11 @@
                        var HMaterRuleType = obj.data.HMaterRuleType;
                        var HMaterRuleExternType = obj.data.HMaterRuleExternType;
                        if (HMaterRuleExternType == "染料") {
                            HQty = dealDoubleToFixed(HRate * HWeight);
                            HQty = roundNumber(dealDoubleToFixed(HRate * HWeight), 3).toFixed(3);
                        } else if (HMaterRuleExternType == "助剂") {
                            HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001);
                            HQty = roundNumber(dealDoubleToFixed(HRate * HWaterQty * 0.001), 3).toFixed(3);
                        } else if (HMaterRuleExternType == "助剂(按布算)") {
                            HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
                            HQty = roundNumber(dealDoubleToFixed(HRate * HWeight * 0.001), 3).toFixed(3);
                        }
                        //if (HMaterRuleExternType == '羊毛') {
                        //    HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
@@ -1256,11 +1256,11 @@
                        var HQty = 0;
                        var HMaterRuleType = value;
                        if (HMaterRuleType == "染料") {
                            HQty = dealDoubleToFixed(HRate * HWeight);
                            HQty = roundNumber(dealDoubleToFixed(HRate * HWeight), 3).toFixed(3);
                        } else if (HMaterRuleType == "助剂") {
                            HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001);
                            HQty = roundNumber(dealDoubleToFixed(HRate * HWaterQty * 0.001), 3).toFixed(3);
                        } else if (HMaterRuleType == "助剂(按布算)") {
                            HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
                            HQty = roundNumber(dealDoubleToFixed(HRate * HWeight * 0.001), 3).toFixed(3);
                        }
                        //同步更新表格和缓存对应的值
                        obj.update({
@@ -1438,7 +1438,7 @@
                    , { field: 'HUnitName', title: '计量单位', width: 100 }
                    , { field: 'HQtyMust', title: '应发数量', width: 100, hide: true }
                    , { field: 'HRate', title: '用量‰', edit: 'text', width: 100 }
                    , { field: 'HQty', title: '重量', edit: 'text', width: 100 }
                    , { field: 'HQty', title: '重量', edit: 'text', width: 100, }
                    , { field: 'HWeight', title: '实际称重', width: 100 }
                    , { field: 'HPrice', title: '单价', width: 100, hide: true }
                    , { field: 'HMoney', title: '金额', width: 100, hide: true }
@@ -1627,6 +1627,7 @@
                            option.data = result.list[0];
                            for (var i = 0; i < option.data.length; i++) {
                                option.data[i]["HRate"] = (option.data[i]["HRate"] * 1).toFixed(6);
                                option.data[i]["HQty"] = roundNumber((option.data[i]["HQty"] * 1), 3).toFixed(3);
                            }
                            table.render(option);
                            //option1.data = result.list[1];
@@ -1838,11 +1839,11 @@
                                        var HWeight = $("#HWeight").val();
                                        var HWaterQty = $("#HWaterQty").val();
                                        if (option.data[rowIndex + i].HMaterRuleExternType == "染料") {
                                            option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight);
                                            option.data[rowIndex + i].HQty = roundNumber(dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight), 3).toFixed(3);
                                        } else if (option.data[rowIndex + i].HMaterRuleExternType == "助剂") {
                                            option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWaterQty * 0.001);
                                            option.data[rowIndex + i].HQty = roundNumber(dealDoubleToFixed(option.data[rowIndex + i].HRate * HWaterQty * 0.001), 3).toFixed(3);
                                        } else if (option.data[rowIndex + i].HMaterRuleExternType == "助剂(按布算)") {
                                            option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
                                            option.data[rowIndex + i].HQty = roundNumber(dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001), 3).toFixed(3);
                                        }
                                        //if (option.data[rowIndex + i].HMaterRuleExternType == "羊毛") {
                                        //    option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
@@ -2283,22 +2284,28 @@
                //#region å­è¡¨å…³é”®å­—段重复检验
                var num = [];
                for (var i = 0; i < option.data.length; i++) {
                    temp = option.data[i]["HMaterID"];
                    if ($.inArray(temp, num) != -1) {
                        layer.msg("第" + (i + 1) + "行:物料重复,请重新选择!");
                        console.log(option);
                        return Result = false;
                    }
                    num.push(temp);
                }
                // var num = [];
                // for (var i = 0; i < option.data.length; i++) {
                //     temp = option.data[i]["HMaterID"];
                //     if ($.inArray(temp, num) != -1) {
                //         layer.msg("第" + (i + 1) + "行:物料重复,请重新选择!");
                //         console.log(option);
                //         return Result = false;
                //     }
                //     num.push(temp);
                // }
                //#endregion
                return Result;
            }
            //#endregion
            // å››èˆäº”入方法
            function roundNumber(num, decimalPlaces) {
                var factor = Math.pow(10, decimalPlaces);
                return Math.round((num + Math.pow(2, -52)) * factor) / factor;
            }
            //#region æ ¹æ®å·¥è‰ºå•号获取表头信息
            function getMainInfoByHProcExchBillNo() {
                var HProcExchBillNo = $("#HProcExchBillNo").val();
WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBillList.html
@@ -909,7 +909,7 @@
                            DisPlay_HideColumn()
                            ins = table.render(option);
                            if($("#ColName option").length < 1){
                            if ($("#ColName option").length < 1) {
                                ColFilter()
                            }
@@ -1311,15 +1311,26 @@
                });
                var linterid = obj.data["hmainid"];
                var title = '编辑生产领料单'
                var content = '../领料出库/Kf_MateOutBillLEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
                if (subType) {
                    if (subType == '羊毛染色') {
                        content = '../领料出库/Kf_MateOutBillEdit_YangMao.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
                    } else if (subType == '毛尖') {
                        content = '../领料出库/Kf_MateOutBillEdit_MaoJian.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
                    }
                }
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '编辑生产领料单'
                    , title: title
                    , closeBtn: 1
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: '../领料出库/Kf_MateOutBillLEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
                    , content: content
                    , resize: false,
                    end: function () {
                        //get_FastQuery(table, option);