网页版： 采购订单 表头 增加 字段 项目编号 HProjectID （界面显示 项目编码，项目名称）， 以及 可选择 工程项目 为 基础资料； 表头...

yangle

2024-04-12 afa32a940c124d9b53af14c32c627b191c7bdb99

网页版： 采购订单 表头 增加 字段 项目编号 HProjectID （界面显示 项目编码，项目名称）， 以及 可选择 工程项目 为 基础资料； 表头和表体 增加字段 仓库 HWHID int ,以及 选择 表头仓库后， 表体仓库为空的 也自动填充。 网页版：收料通知单 表头 增加 字段 项目编号 HProjectID （界面显示 项目编码，项目名称）， 以及 可选择 工程项目 为 基础资料，并且 选择 源单 采购订单 时会带入 采购订单的项目编号；表头 增加 字段 发票编号 HInvoiceBillNo ； 以及 选择 表头仓库后， 表体 收料仓库为空的 也自动填充。 网页版：采购入库单 表头 增加字段 项目编号 HProjectID （界面显示 项目编码，项目名称）， 以及 可选择 工程项目 为 基础资料，并且 选择 源单 时会带入 源单 的项目编号；表头 增加 字段 发票编号 HInvoiceBillNo （可以源单带入）； 以及 选择 表头仓库后， 表体 收料仓库为空的 也自动填充。 表体 增加 HTaxRate税率HTaxPrice 含税单价HlineTotal 含税金额 含税单价和含税金额 根据 税率和单价 计算出来（如果不知道怎么处理，可以看下 销售订单的 几个字段 计算的公式）。 （新增，修改 功能 都测试下； 字段数据不要 缺失）

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Material.html

@@ -1100,7 +1100,7 @@
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                                //Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                                if (data[i].ID == HOrgID) {
                                    Organization = data[i].Name;
                                    break;

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Warehouse.html

@@ -138,6 +138,8 @@
            //#endregion

            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            var params = getUrlVars();
            var Type = params[params[0]];

            //初始化界面
            set_ClearBill();
@@ -242,10 +244,18 @@
            table.on('rowDouble(mainTable)', function (obj) {
                var data = [];
                data.push(obj.data);
                parent.GetHWHValue(data);
                switch (Type) {
                    case "Warehouse":
                        parent.GetGyWarehouse(data);
                        break;
                    default:
                        parent.GetHWHValue(data);
                        break;
                }
              
                var index = parent.layer.getFrameIndex(window.name);
                btnrowDouble(obj);
                //parent.layer.close(index);
                //btnrowDouble(obj);
                parent.layer.close(index);

            });
            //#endregion
@@ -255,7 +265,7 @@
                var index = parent.layer.getFrameIndex(window.name);
                var data = obj.data;
               //返回方法
                parent.GetGyWarehouse(data);
              
                parent.layer.close(index);
            }

@@ -800,6 +810,19 @@
            }
            //#endregion

            //#region èŽ·å–参数
            function getUrlVars() {
                var vars = [], hash;
                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
                for (var i = 0; i < hashes.length; i++) {
                    hash = hashes[i].split('=');
                    vars.push(hash[0]);
                    vars[hash[0]] = hash[1];
                }
                return vars;
            }
            //#endregion

            //#endregion

            //以上是layui模块

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/RetrospectiveQueryReport.html

@@ -240,7 +240,7 @@

        // è¿›å‡ºç«™æŸ¥è¯¢
        function get_Display2(sWhere) {

         
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/EntryAndExitRecords',
@@ -708,6 +708,10 @@

            sWhere += com;

            if (HBardCode!="") {
                sWhere += " order by å‡ºç«™æ—¶é—´";
            }

            get_Display2(sWhere);
            get_Display5(sWhere);
            if (HBardCode != "") {

 WebTM/views/²É¹º¹ÜÀí/ÊÕÁÏ֪ͨµ¥/Add_Edit_Cg_POInStockBillList.html

@@ -183,6 +183,30 @@
                                                <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">发票编号</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HInvoiceBillNo" id="HInvoiceBillNo" autocomplete="off">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">项目编码</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HProjectNumber" id="HProjectNumber" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
                                                <input type="hidden" name="HProjectID" id="HProjectID" class="layui-input" value="0" style="float: left; width: 150px; background-color: #efefef4d;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHProjectID" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">项目名称</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HProjectName" id="HProjectName" style="background-color:#efefef4d;" readonly autocomplete="off">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs7 layui-inline">
@@ -514,13 +538,18 @@
            form.on('submit(HSupList)', function () {
                get_checkSup();
            });
            //选择部门按钮
            //选择仓库按钮
            form.on('submit(HWHList)', function () {
                get_checkWH();
            });
            //选择币别按钮
            form.on('submit(HCurList)', function () {
                get_checkCur();
            });

            //选择工程项目
            form.on('submit(btnHProjectID)', function () {
                get_btnHProjectID();
            });

            //选择部门按钮
@@ -783,6 +812,10 @@
                                , "HSourceBillType": data.源单类型
                                , "HAddress": data.交货地点
                                , "HExRate": data.汇率
                                , "HProjectID": data.HProjectID
                                , "HProjectNumber": data.项目代码
                                , "HProjectName": data.项目名称
                                , "HInvoiceBillNo": data.发票编号
                                , "Box2": ""
                                , "HRemark": data.表头备注
                                , "HMaker": data.制单人
@@ -886,22 +919,24 @@
                    
                    if ($("#HSourceBillType").val() == "1102") {
                        for (var i = 0; i < option.data.length; i++) {
                            var HSourceBillData = "";
                            var HSourceBillData = getPushSource_POOrderBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID);            //获取源单数据
                            if (HSourceBillData != "none") {
                                if (HSourceBillData == null) {
                                    layer.alert("保存失败!第" + (i + 1) + "行：未查询到源单单据!", { icon: 5 });
                                    return;
                                } else if (HSourceBillData.状态 != "已审核") {
                                    var err = "保存失败!原因：第" + (i + 1) + "行-源单单据状态为“" + HSourceBillData.状态 + "”，不允许保存！";
                                    layer.alert(err, { icon: 5 });
                                    return;
                                } else if (HSourceBillData.行状态 == "已关闭") {
                                    layer.alert("保存失败!第" + (i + 1) + "行：该行记录行状态为'已关闭'状态!", { icon: 5 });
                            if (option.data[i] != []) {
                                var HSourceBillData = "";
                                var HSourceBillData = getPushSource_POOrderBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID);            //获取源单数据
                                if (HSourceBillData != "none") {
                                    if (HSourceBillData == null) {
                                        layer.alert("保存失败!第" + (i + 1) + "行：未查询到源单单据!", { icon: 5 });
                                        return;
                                    } else if (HSourceBillData.状态 != "已审核") {
                                        var err = "保存失败!原因：第" + (i + 1) + "行-源单单据状态为“" + HSourceBillData.状态 + "”，不允许保存！";
                                        layer.alert(err, { icon: 5 });
                                        return;
                                    } else if (HSourceBillData.行状态 == "已关闭") {
                                        layer.alert("保存失败!第" + (i + 1) + "行：该行记录行状态为'已关闭'状态!", { icon: 5 });
                                        return;
                                    }
                                } else {
                                    return;
                                }
                            } else {
                                return;
                            }
                        }
                    }
@@ -1288,6 +1323,17 @@
                        }
                        $("#HWHName").val(checkStatus.data[0].仓库名称);
                        $("#HWHID").val(checkStatus.data[0].HItemID);


                        if (option.data.length > 0) {
                            for (var i = 0; i < option.data.length; i++) {
                                if (option.data[i]["HWHID"] == 0) {
                                    option.data[i]["HWHID"] = checkStatus.data[0].HItemID;
                                    option.data[i]["收料仓库"] = checkStatus.data[0].仓库名称;
                                }
                            }
                        }
                        table.render(option);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
@@ -1311,6 +1357,31 @@
                        $("#HCurName").val(checkStatus.data[0].货币名称);
                        $("#HCurID").val(checkStatus.data[0].HItemID);
                        $("#HExRate").val(checkStatus.data[0].汇率);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }

            //工程项目
            function get_btnHProjectID() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '项目列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../项目管理/工程项目/PM_ProjectBillList.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HProjectName").val(checkStatus.data[0].项目名称);
                        $("#HProjectNumber").val(checkStatus.data[0].项目代码);
                        $("#HProjectID").val(checkStatus.data[0].HInterID);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
@@ -1416,7 +1487,7 @@
                                    //if (checkStatus.data.length != 1) {
                                    //    return layer.msg("请选择一条数据");
                                    //}

                                    OptionData = checkStatus.data[0];
                                    var rowIndex = $(obj.tr).attr("data-index") * 1;
                                    for (var i = 0; i < checkStatus.data.length; i++) {
                                        if (rowIndex + i >= option.data.length) {
@@ -1463,7 +1534,7 @@
                                },
                                end: function () {
                                    obj.update({
                                     "HMaterID" :OptionData.HMaterID
                                     "HMaterID" :OptionData.HItemID
                                        ,"物料代码" : OptionData.物料代码
                                       , "物料名称" :OptionData.物料名称
                                        ,"规格型号" : OptionData.规格型号
@@ -1519,7 +1590,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?type=Warehouse', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -1682,6 +1753,10 @@
                        NowNum = option.data.length;

                        if ($("#HSourceBillType").val() == "1102") {
                            $("#HProjectName").val(checkStatus.data[0].项目名称);
                            $("#HProjectNumber").val(checkStatus.data[0].项目代码);
                            $("#HProjectID").val(checkStatus.data[0].HProjectID);

                            var j = 0;
                            for (var i = 0; i < ProcessNumber.length; i++) {
                                option.data.push({
@@ -1854,7 +1929,17 @@
        {
            $("#HWHName").val(obj[0].仓库名称);
            $("#HWHID").val(obj[0].HItemID);
        } 
            if (option.data.length > 0) {
                for (var i = 0; i < option.data.length; i++) {
                    if (option.data[i]["HWHID"] == 0 || option.data[i]["收料仓库"] == undefined) {
                        option.data[i]["HWHID"] = obj[0].HItemID;
                        option.data[i]["收料仓库"] = obj[0].仓库名称;
                    }
                }
            }
            layui.table.render(option);
        }


        function GetHDeptNameValue(obj)  //返回部门
        {
@@ -1880,14 +1965,21 @@

           //双击返回收料仓库
         function GetGyWarehouse(data) {
             OptionData = data
             OptionData = data[0];
         } 


        //双击返回收料仓位
         function GetGyStockPlace(data) {
             OptionData = data
         } 
        }

        //项目
        function GetProjectBillValue(data) {
            $("#HProjectName").val(data[0].项目名称);
            $("#HProjectNumber").val(data[0].项目代码);
            $("#HProjectID").val(data[0].HInterID);
        }

        //#region å¤„理小数显示位数（data：需要处理的数据；num：数据的类型(如1:数量；2:金额；3:单价)）
        function dealDoubleToFixed(data, num) {

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillEdit.html

@@ -191,6 +191,36 @@
                                                <input class="layui-input" name="HSSDate" id="HSSDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">项目编码</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HProjectNumber" id="HProjectNumber" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
                                                <input type="hidden" name="HProjectID" id="HProjectID" class="layui-input" value="0" style="float: left; width: 150px; background-color: #efefef4d;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHProjectID" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">项目名称</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HProjectName" id="HProjectName" style="background-color:#efefef4d;" readonly autocomplete="off">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:10px;">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">仓库</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float: left; width: 150px; background-color: #efefef4d;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHWHID" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:10px;">
                                        <div class="layui-col-xs7 layui-inline">
                                            <label class="layui-form-label">备注</label>
                                            <div class="layui-input-block">
@@ -412,7 +442,7 @@
            //#endregion

            var rowdata = [{
                "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "", "数量": "", "HRemark": ""
                "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "", "HWHID": 0,"HWHName":"", "数量": "", "HRemark": ""
                , "HPrice": "", "HTaxPrice": "", "HMoney": "", "HDiscountRate": "", "HRelTaxPrice": "", "HTaxRate": "", "HTaxMoney": "", "HlineTotal": "", "HlineTotalBB": "","HDate":"2022-12-05"
            }];

@@ -425,7 +455,7 @@
                    , data = checkStatus.data;
                //新增行表格数据
                var NewRow = {
                    "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "", "数量": "", "HRemark": ""
                    "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "", "HWHID": 0, "HWHName": "", "数量": "", "HRemark": ""
                , "HPrice": "", "HTaxPrice": "", "HMoney": "", "HDiscountRate": "", "HRelTaxPrice": "", "HTaxRate": "", "HTaxMoney": "", "HlineTotal": "", "HlineTotalBB": "","HDate":"2022-12-05"
                     };
                switch (obj.event) {
@@ -485,6 +515,17 @@
            form.on('submit(HSSList)', function () {
                get_checkSS();
            });

            //选择工程项目
            form.on('submit(btnHProjectID)', function () {
                get_btnHProjectID();
            });

            //选择仓库
            form.on('submit(btnHWHID)', function () {
                get_btnHWHID();
            });
            
            //选择币别按钮
            form.on('submit(HCurList)', function () {
                get_checkCur();
@@ -783,6 +824,8 @@
                        , { field: '规格型号', title: '规格型号', width: 100, style: 'background-color:#efefef4d;' }
                        , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
                        , { field: '计量单位', title: '计量单位', width: 100, edit: 'text', event: "HUnitID" }//f7
                        , { field: 'HWHID', title: 'HWHID', width: 100, hide: true }
                        , { field: 'HWHName', title: '仓库名称', width: 100, edit: 'text', event: "HWHID" }//f7
                        , { field: 'HQty', title: '数量', width: 100, edit: 'text', totalRow: true}
                        , { field: 'HPrice', title: '单价', width: 100, edit: 'text'}
                        , { field: 'HTaxPrice', title: '含税单价', width: 100, edit: 'text'}
@@ -841,6 +884,12 @@
                                , "HLinkMan": data.联系人
                                , "HLinkPhone": data.联系电话
                                , "HInnerBillNo": data.辅助字段
                                , "HProjectID": data.HProjectID
                                , "HProjectNumber": data.项目代码
                                , "HProjectName": data.项目名称
                                , "HWHID": data.HWHID
                                , "HOrgID": data.HOrgID
                                , "HWHName": data.仓库
                                , "HRemark": data.表头备注
                                , "HMaker": data.制单人
                                , "HChecker": data.审核人
@@ -862,7 +911,7 @@
                                    {
                                        "HMaterID": data.HMaterID, "物料代码": data.物料代码, "物料名称": data.物料名称
                                        , "规格型号": data.规格型号, "HUnitID": data.HUnitID
                                        , "计量单位": data.计量单位, "HQty": data.数量, "HRemark": data.表体备注
                                        , "计量单位": data.计量单位, "HWHID": data.HWHID, "HWHName": data.仓库名称, "HQty": data.数量, "HRemark": data.表体备注
                                        , "HPrice": data.单价, "HMoney": data.金额, "HTaxRate": data.税率
                                        , "HTaxMoney": data.金额 * data.税率, "HlineTotal": data.金额 + data.税额, "HlineTotalBB": (data.金额 + data.税额) * data.汇率
                                        , "HTaxPrice": data.含税单价, "HDiscountRate": data.折扣率, "HRelTaxPrice": data.实际含税单价
@@ -988,7 +1037,7 @@
                                    for (var i = 0; i < checkStatus.data.length; i++) {
                                        if (rowIndex + i >= option.data.length) {
                                            var NewRow = {
                                                "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "", "数量": "", "HRemark": ""
                                                "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "", "HWHID": 0, "HWHName": "", "数量": "", "HRemark": ""
                                                , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0", "HDate": "2022-12-05"
                                            };
                                             
@@ -1020,7 +1069,7 @@
                                },
                                end: function () {
                                    obj.update({
                                     "HMaterID" :OptionData.HMaterID
                                        "HMaterID": OptionData.HItemID
                                        ,"物料代码" : OptionData.物料代码
                                       , "物料名称" :OptionData.物料名称
                                        ,"规格型号" : OptionData.规格型号
@@ -1065,7 +1114,44 @@
                                })
                            }
                        })
                    }
                        }

                        //仓库
                        if (obj.event == "HWHID") {
                            layer.open({
                                type: 2
                                , skin: "layui-layer-rim" //加上边框
                                , title: "计量单位列表"  //标题
                                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?type=Warehouse', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
                                    var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                                    if (checkStatus.data.length != 1) {
                                        return layer.msg("请选择一条数据");
                                    }
                                    OptionData = checkStatus.data[0];
                                    //更新表格缓存的数据
                                    obj.update({
                                        "HWHID": checkStatus.data[0].HItemID
                                        , "HWHName": checkStatus.data[0].仓库名称
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    obj.update({
                                        "HWHID": OptionData.HItemID
                                        , "HWHName": OptionData.仓库名称
                                    })
                                }
                            })
                        }
                    obj.event = "";
                    return false;
                }
@@ -1254,6 +1340,67 @@
                })
            }

            //工程项目
            function get_btnHProjectID() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '项目列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../项目管理/工程项目/PM_ProjectBillList.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HProjectName").val(checkStatus.data[0].项目名称);
                        $("#HProjectNumber").val(checkStatus.data[0].项目代码);
                        $("#HProjectID").val(checkStatus.data[0].HInterID);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }

            //仓库
            function get_btnHWHID() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '结算方式列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HWHName").val(checkStatus.data[0].仓库名称);
                        $("#HWHID").val(checkStatus.data[0].HItemID);

                        if (option.data.length > 0) {
                            for (var i = 0; i < option.data.length; i++) {
                                if (option.data[i]["HWHID"] == 0) {
                                    option.data[i]["HWHID"] = checkStatus.data[0].HItemID;
                                    option.data[i]["HWHName"] = checkStatus.data[0].仓库名称;
                                }
                            }
                        }
                        table.render(option);
                      
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            

            //#region æ ¹æ®ç‰©æ–™ID获取物料详细信息
            function getMaterialByMaterID(HMaterID) {
                var resultData = {};
@@ -1339,8 +1486,31 @@
            //双击返回物料
         function GetGyMaterial(data) {
             OptionData = data
         }
        }
        //项目
        function GetProjectBillValue(data) {
            $("#HProjectName").val(data[0].项目名称);
            $("#HProjectNumber").val(data[0].项目代码);
            $("#HProjectID").val(data[0].HInterID);
        }
        //双击返回仓库
        function GetHWHValue(data) {
            $("#HWHName").val(data[0].仓库名称);
            $("#HWHID").val(data[0].HItemID);

            if (option.data.length > 0) {
                for (var i = 0; i < option.data.length; i++) {
                    if (option.data[i]["HWHID"] == 0) {
                        option.data[i]["HWHID"] = data[0].HItemID;
                        option.data[i]["HWHName"] = data[0].仓库名称;
                    }
                }
            }
            layui.table.render(option);
        }
        function GetGyWarehouse(data) {
            OptionData = data[0]
        }
    </script>
</body>
</html>     

 WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Add_Edit_Kf_POStockInBillList.html

@@ -173,9 +173,9 @@
                                                </button>
                                            </div>
                                            <!--<label class="layui-form-label">选单号</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
                                            </div>-->
            <div class="layui-input-inline">
                <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
            </div>-->
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">负责人</label>
@@ -190,15 +190,39 @@


                                    </div>
                                    <!--<div class="layui-row">

                                        <div class="layui-col-xs7 layui-inline">
                                            <label class="layui-form-label">摘要</label>
                                            <div class="layui-input-block">
                                                <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">发票编号</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HInvoiceBillNo" id="HInvoiceBillNo" autocomplete="off">
                                            </div>
                                        </div>
                                    </div>-->
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">项目编码</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HProjectNumber" id="HProjectNumber" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
                                                <input type="hidden" name="HProjectID" id="HProjectID" class="layui-input" value="0" style="float: left; width: 150px; background-color: #efefef4d;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHProjectID" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">项目名称</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HProjectName" id="HProjectName" style="background-color:#efefef4d;" readonly autocomplete="off">
                                            </div>
                                        </div>
                                    </div>
                                    <!--<div class="layui-row">

        <div class="layui-col-xs7 layui-inline">
            <label class="layui-form-label">摘要</label>
            <div class="layui-input-block">
                <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
            </div>
        </div>
    </div>-->
                                    <div class="layui-row">
                                        <div class="layui-col-xs7 layui-inline">
                                            <label class="layui-form-label">备注</label>
@@ -419,11 +443,12 @@
            //#endregion

            var rowdata = [{
                "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "", "HQtyMust": "", "HQty": "", "HRemark": "",
                "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "", "HQtyMust": "0", "HQty": "", "HRemark": "",
                "HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "收料仓库": "",
                "HSPID": 0, "仓位名称": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
                "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
                "HTaxRate": 0, "HTaxPrice": 0, "HlineTotal": 0
            }];
          
            //头工具栏事件
@@ -437,6 +462,7 @@
                    "HSPID": 0, "仓位名称": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
                    "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
                    "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
                    "HTaxRate": 0, "HTaxPrice": 0, "HlineTotal": 0
                };
                switch (obj.event) {
                    case 'btn-AddLine':
@@ -492,6 +518,11 @@
            form.on('submit(HSupList)', function () {
                get_checkSup();
            });
            //选择工程项目
            form.on('submit(btnHProjectID)', function () {
                get_btnHProjectID();
            });

            //选择部门按钮
            form.on('submit(HWHList)', function () {
                get_checkWH();
@@ -573,14 +604,27 @@
                        var HQty = value * 1;                           //数量
                        var HPrice = obj.data.HPrice * 1;               //单价
                        var HMoney = HQty * HPrice;                     //金额=数量*单价
                        var HTaxRate = obj.data.HTaxRate * 0.01;           //税率
                        var HTaxPrice = HPrice * (1 + HTaxRate);        //含税单价=单价*(1+税率)
                        var HTaxMoney = HMoney * HTaxRate;              //税额=金额*税率
                        var HlineTotal = HMoney + HTaxMoney;            //价税合计=金额+税额


                        HQty = dealDoubleToFixed(HQty, 1);
                        HPrice = dealDoubleToFixed(HPrice, 3);
                        HTaxRate = HTaxRate;
                        HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
                        HMoney = dealDoubleToFixed(HMoney, 2);
                        HlineTotal = dealDoubleToFixed(HlineTotal, 2);

                        //同步更新表格和缓存对应的值
                        obj.update({
                            HQty: HQty
                            , HPrice: HPrice
                            , HMoney: HMoney
                            , HTaxRate: HTaxRate * 100
                            , HTaxPrice: HTaxPrice
                            , HMoney: HMoney
                            , HlineTotal: HlineTotal
                        });
                        /* table.render(option);*/
                        break;
@@ -602,13 +646,27 @@
                        var HQty = obj.data.HQty * 1;                   //数量
                        var HPrice = value * 1;
                        var HMoney = HQty * HPrice;                     //金额=数量*单价
                        var HTaxRate = obj.data.HTaxRate * 0.01;        //税率
                        var HTaxPrice = HPrice * (1 + HTaxRate);        //含税单价=单价*(1+税率)
                        var HTaxMoney = HMoney * HTaxRate;              //税额=金额*税率
                        var HlineTotal = HMoney + HTaxMoney;            //价税合计=金额+税额

                        //设置数据小数位数
                        HQty = dealDoubleToFixed(HQty, 1);
                        HPrice = dealDoubleToFixed(HPrice, 3);
                        HTaxRate = HTaxRate;
                        HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
                        HMoney = dealDoubleToFixed(HMoney, 2);
                        HlineTotal = dealDoubleToFixed(HlineTotal, 2);

                        //同步更新表格和缓存对应的值
                        obj.update({
                            HQty: HQty
                            , HPrice: HPrice
                            , HMoney: HMoney
                            , HTaxRate: HTaxRate * 100
                            , HTaxPrice: HTaxPrice
                            , HlineTotal: HlineTotal
                        });
                        break;
                    case "HMoney":                                         //金额
@@ -629,16 +687,76 @@
                        var HQty = obj.data.HQty * 1;                   //数量
                        var HMoney = value * 1;
                        var HPrice = (HMoney / HQty).toFixed(2);       //单价=金额/数量
                        var HTaxRate = value * 0.01;                       //税率
                        var HTaxPrice = HPrice * (1 + HTaxRate);        //含税单价=单价*(1+税率)
                        var HTaxMoney = HMoney * HTaxRate;              //税额=金额*税率
                        var HlineTotal = HMoney + HTaxMoney;            //价税合计=金额+税额

                        HQty = dealDoubleToFixed(HQty, 1);
                        HPrice = dealDoubleToFixed(HPrice, 3);
                        HTaxRate = HTaxRate;
                        HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
                        HMoney = dealDoubleToFixed(HMoney, 2);
                        HlineTotal = dealDoubleToFixed(HlineTotal, 2);


                        //同步更新表格和缓存对应的值
                        obj.update({
                            HQty: HQty
                            , HPrice: HPrice
                            , HTaxRate: HTaxRate * 100
                            , HTaxPrice: HTaxPrice
                            , HMoney: HMoney
                            , HlineTotal: HlineTotal
                        });
                        break;
                        table.render(option);
                    case "HTaxRate":                                                       //数量
                        //数据格式校验
                        temp = value + "";
                        if (!ref.test(temp)) {
                            //恢复数据到编辑前
                            obj.update({
                                HTaxRate: oldText
                            });
                            table.render(option);

                            layer.msg("税率请输入不小于0的数字!");
                            return;
                        }


                        //数据校验合格，重算记录
                        var HQty = obj.data.HQty * 1;                   //数量
                        var HPrice = obj.data.HPrice * 1;               //单价
                        var HTaxRate = value * 0.01;                       //税率
                        /*var HDiscountRate = obj.data.HDiscountRate * 1; //折扣率*/
                        var HTaxPrice = HPrice * (1 + HTaxRate);        //含税单价=单价*(1+税率)
                        /*var HRelTaxPrice = HTaxPrice * HDiscountRate;   //实际含税单价=含税单价*折扣率*/
                        //折扣额 = å«ç¨Žå•ä»· * (1 - æŠ˜æ‰£çŽ‡) * æ•°é‡
                        var HMoney = HQty * HPrice;                     //金额=数量*单价
                        var HTaxMoney = HMoney * HTaxRate;              //税额=金额*税率
                        var HlineTotal = HMoney + HTaxMoney;            //价税合计=金额+税额

                        //设置数据小数位数
                        HQty = dealDoubleToFixed(HQty, 1);
                        HPrice = dealDoubleToFixed(HPrice, 3);
                        HTaxRate = HTaxRate;
                        HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
                        HMoney = dealDoubleToFixed(HMoney, 2);
                        HlineTotal = dealDoubleToFixed(HlineTotal, 2);

                        //同步更新表格和缓存对应的值
                        obj.update({
                            HQty: HQty
                            , HPrice: HPrice
                            , HTaxRate: HTaxRate * 100
                            , HTaxPrice: HTaxPrice
                            , HMoney: HMoney
                            , HlineTotal: HlineTotal
                        });
                        //table.render(option);
                        break;
                    default:
                }
            });
@@ -729,6 +847,9 @@
                        , { field: '收料仓库', title: '收料仓库', width: 100, edit: 'text', event: "HWHID" }//f7
                        , { field: 'HSPID', title: 'HSPID', width: 100, hide: true }
                        , { field: '仓位名称', title: '仓位名称', width: 100, edit: 'text', event: "HSPID" }//f7
                        , { field: 'HTaxRate', title: '税率', width: 100, edit: 'text' }
                        , { field: 'HTaxPrice', title: '含税单价', width: 100, edit: 'text' }
                        , { field: 'HlineTotal', title: '含税金额', width: 100, style: 'background-color:#efefef4d;' }
                        , { field: 'HBatchNo', title: '批次', width: 150, edit: 'text' }
                        , { field: 'HRemark', title: '备注', width: 100, edit: 'text' }
                        , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 70 }
@@ -773,6 +894,10 @@
                                , "HManagerID": data.HManagerID
                                , "HManagerName": data.负责人
                                , "HExRate": data.汇率
                                , "HProjectID": data.HProjectID
                                , "HProjectNumber": data.项目代码
                                , "HProjectName": data.项目名称
                                , "HInvoiceBillNo": data.发票编号
                                , "HExplanation ":data.摘要
                                //, "Box2": ""
                                , "HRemark": data.表头备注
@@ -798,7 +923,8 @@
                                        "HSourceBillNo": subdata[i].源单单号,    //源单号
                                        "HSourceBillType": subdata[i].源单类型,   //源单类型
                                        "HSourceInterID": subdata[i].源单主内码,   //源单主内码
                                        "HSourceEntryID": subdata[i].源单子内码     //源单子内码
                                        "HSourceEntryID": subdata[i].源单子内码,     //源单子内码
                                        "HTaxRate": subdata[i].税率, "HTaxPrice": subdata[i].含税单价, "HlineTotal": subdata[i].含税金额
                                    }
                                )
                            }
@@ -838,43 +964,47 @@
                    
                    if ($("#HSourceBillType").val() == "1102") {
                        for (var i = 0; i < option.data.length; i++) {
                            var HSourceBillData = "";
                            var HSourceBillData = getPushSource_POOrderBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID);            //获取源单数据
                            if (HSourceBillData != "none") {
                                if (HSourceBillData == null) {
                                    layer.alert("保存失败!第" + (i + 1) + "行：未查询到源单单据!", { icon: 5 });
                                    return;
                                } else if (HSourceBillData.状态 != "已审核") {
                                    var err = "保存失败!原因：第" + (i + 1) + "行-源单单据状态为“" + HSourceBillData.状态 + "”，不允许保存！";
                                    layer.alert(err, { icon: 5 });
                                    return;
                                } else if (HSourceBillData.行状态 == "已关闭") {
                                    layer.alert("保存失败!第" + (i + 1) + "行：该行记录行状态为'已关闭'状态!", { icon: 5 });
                            if (option.data[i] != []) {
                                var HSourceBillData = "";
                                var HSourceBillData = getPushSource_POOrderBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID);            //获取源单数据
                                if (HSourceBillData != "none") {
                                    if (HSourceBillData == null) {
                                        layer.alert("保存失败!第" + (i + 1) + "行：未查询到源单单据!", { icon: 5 });
                                        return;
                                    } else if (HSourceBillData.状态 != "已审核") {
                                        var err = "保存失败!原因：第" + (i + 1) + "行-源单单据状态为“" + HSourceBillData.状态 + "”，不允许保存！";
                                        layer.alert(err, { icon: 5 });
                                        return;
                                    } else if (HSourceBillData.行状态 == "已关闭") {
                                        layer.alert("保存失败!第" + (i + 1) + "行：该行记录行状态为'已关闭'状态!", { icon: 5 });
                                        return;
                                    }
                                } else {
                                    return;
                                }
                            } else {
                                return;
                            }
                        }
                    }
                    else if ($("#HSourceBillType").val() == "1103") {
                        for (var i = 0; i < option.data.length; i++) {
                            var HSourceBillData = "";
                            var HSourceBillData = getPushSource_POInStockBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID);            //获取源单数据
                            if (HSourceBillData != "none") {
                                if (HSourceBillData == null) {
                                    layer.alert("保存失败!第" + (i + 1) + "行：未查询到源单单据!", { icon: 5 });
                                    return;
                                } else if (HSourceBillData.状态 != "已审核") {
                                    var err = "保存失败!原因：第" + (i + 1) + "行-源单单据状态为“" + HSourceBillData.状态 + "”，不允许保存！";
                                    layer.alert(err, { icon: 5 });
                                    return;
                                } else if (HSourceBillData.行状态 == "已关闭") {
                                    layer.alert("保存失败!第" + (i + 1) + "行：该行记录行状态为'已关闭'状态!", { icon: 5 });
                            if (option.data[i] != []) {
                                var HSourceBillData = "";
                                var HSourceBillData = getPushSource_POInStockBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID);            //获取源单数据
                                if (HSourceBillData != "none") {
                                    if (HSourceBillData == null) {
                                        layer.alert("保存失败!第" + (i + 1) + "行：未查询到源单单据!", { icon: 5 });
                                        return;
                                    } else if (HSourceBillData.状态 != "已审核") {
                                        var err = "保存失败!原因：第" + (i + 1) + "行-源单单据状态为“" + HSourceBillData.状态 + "”，不允许保存！";
                                        layer.alert(err, { icon: 5 });
                                        return;
                                    } else if (HSourceBillData.行状态 == "已关闭") {
                                        layer.alert("保存失败!第" + (i + 1) + "行：该行记录行状态为'已关闭'状态!", { icon: 5 });
                                        return;
                                    }
                                } else {
                                    return;
                                }
                            } else {
                                return;
                            }
                        }
                    }
@@ -1006,6 +1136,9 @@
                                , "HSeOrderInterID": dataArray[i].hmainid
                                , "HSeOrderEntryID": dataArray[i].hsubid
                                , "HSeOrderBillNo": dataArray[i].单据号
                                , "HTaxRate": 0
                                , "HTaxPrice": 0
                                , "HlineTotal": 0
                            }
                        );
                    }
@@ -1239,6 +1372,30 @@
                    , btn2: function (index, layero) { }
                })
            }
            //工程项目
            function get_btnHProjectID() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '项目列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../项目管理/工程项目/PM_ProjectBillList.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HProjectName").val(checkStatus.data[0].项目名称);
                        $("#HProjectNumber").val(checkStatus.data[0].项目代码);
                        $("#HProjectID").val(checkStatus.data[0].HInterID);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            function get_checkWH() {
                layer.open({
                    type: 2//弹窗类型
@@ -1256,6 +1413,17 @@
                        }
                        $("#HWHName").val(checkStatus.data[0].仓库名称);
                        $("#HWHID").val(checkStatus.data[0].HItemID);

                        if (option.data.length > 0) {
                            for (var i = 0; i < option.data.length; i++) {
                                if (option.data[i]["HWHID"] == 0) {
                                    option.data[i]["HWHID"] = checkStatus.data[0].HItemID;
                                    option.data[i]["收料仓库"] = checkStatus.data[0].仓库名称;
                                }
                            }
                        }
                        table.render(option);

                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
@@ -1404,16 +1572,17 @@
                                    //    return layer.msg("请选择一条数据");
                                    //}


                                    OptionData = checkStatus.data[0];
                                    var rowIndex = $(obj.tr).attr("data-index") * 1;
                                    for (var i = 0; i < checkStatus.data.length; i++) {
                                        if (rowIndex + i >= option.data.length) {
                                            var NewRow = {
                                                "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "","HUnitID": 0, "计量单位": "", "HQtyMust": "", "HQty": "", "HRemark": "",
                                                "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "","HUnitID": 0, "计量单位": "", "HQtyMust": "0", "HQty": "", "HRemark": "",
                                                "HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "收料仓库": "",
                                                "HSPID": 0, "仓位名称": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
                                                "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
                                                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
                                                "HTaxRate": 0, "HTaxPrice": 0, "HlineTotal": 0
                                            };

                                            table.cache["mainTable"].push(NewRow);
@@ -1453,7 +1622,7 @@
                                },
                                end: function () {
                                    obj.update({
                                     "HMaterID" :OptionData.HMaterID
                                        "HMaterID": OptionData.HItemID
                                        ,"物料代码" : OptionData.物料代码
                                       , "物料名称" :OptionData.物料名称
                                        ,"规格型号" : OptionData.规格型号
@@ -1508,7 +1677,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?type=Warehouse', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -1518,6 +1687,7 @@
                                    if (checkStatus.data.length != 1) {
                                        return layer.msg("请选择一条数据");
                                    }
                                    OptionData = checkStatus.data[0];
                                    //更新表格缓存的数据
                                    obj.update({
                                        "收料仓库": checkStatus.data[0].仓库名称
@@ -1634,7 +1804,12 @@
                        var NowNum = 0;
                        NowNum = option.data.length;

                        $("#HProjectName").val(checkStatus.data[0].项目名称);
                        $("#HProjectNumber").val(checkStatus.data[0].项目代码);
                        $("#HProjectID").val(checkStatus.data[0].HProjectID);

                        if (getSupType().name == "采购订单") {
                           
                            var j = 0;
                            for (var i = 0; i < checkStatus.data.length; i++) {
                                option.data.push({
@@ -1644,21 +1819,24 @@
                                    "HQty": checkStatus.data[j].数量-checkStatus.data[j].关联数量, "HPrice": checkStatus.data[j].单价,
                                    "HMoney": checkStatus.data[j].金额,
                                    "HSourceBillNo": checkStatus.data[j].单据号, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
                                    "HTaxRate": checkStatus.data[j].税率, "HTaxPrice": checkStatus.data[j].含税单价, "HlineTotal": checkStatus.data[j].价税合计
                                })
                                j++;
                            }
                            table.render(option);
                            layer.close(index);
                        } else if (getSupType().name =="收料通知单") {
                        } else if (getSupType().name == "收料通知单") {
                         
                            var j = 0;
                            for (var i = 0; i < ProcessNumber.length; i++) {
                                option.data.push({
                                    "HMaterID": checkStatus.data[j].HMaterID, "物料代码": checkStatus.data[j].物料代码, "物料名称": checkStatus.data[j].物料名称, "规格型号": checkStatus.data[j].规格型号,
                                     "HUnitID": checkStatus.data[j].HUnitID, "计量单位": checkStatus.data[j].计量单位, "HQtyMust": "", "HQty": checkStatus.data[j].数量-checkStatus.data[j].关联数量, "HRemark": "",
                                    "HUnitID": checkStatus.data[j].HUnitID, "计量单位": checkStatus.data[j].计量单位, "HQtyMust": checkStatus.data[j].数量, "HQty": checkStatus.data[j].数量-checkStatus.data[j].关联数量, "HRemark": "",
                                    "HPrice": checkStatus.data[j].单价, "HMoney": checkStatus.data[j].金额, "HOrderPrice": "0", "HWHID": checkStatus.data[j].HWHID, "收料仓库": checkStatus.data[j].收料仓库,
                                    "HSPID": checkStatus.data[j].HSPID, "仓位名称": checkStatus.data[j].仓位名称, "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
                                    "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
                                    "HSourceBillNo": checkStatus.data[j].单据号, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
                                    "HTaxRate": checkStatus.data[j].税率, "HTaxPrice": checkStatus.data[j].含税单价, "HlineTotal": (checkStatus.data[j].金额 + (checkStatus.data[j].金额 * checkStatus.data[j].税率))
                                })
                                j++;
                            }
@@ -1844,12 +2022,29 @@
        {
            $("#HWHName").val(obj[0].仓库名称);
            $("#HWHID").val(obj[0].HItemID);

            if (option.data.length > 0) {
                for (var i = 0; i < option.data.length; i++) {
                    if (option.data[i]["HWHID"] == 0 || option.data[i]["收料仓库"] == undefined) {
                        option.data[i]["HWHID"] = obj[0].HItemID;
                        option.data[i]["收料仓库"] = obj[0].仓库名称;
                    }
                }
            }
            layui.table.render(option);
        }

        function GetHDeptNameValue(obj)  //返回部门
        {
            $("#HDeptName").val(obj[0].部门名称);
            $("#HDeptID").val(obj[0].HItemID);
        }

        //项目
        function GetProjectBillValue(data) {
            $("#HProjectName").val(data[0].项目名称);
            $("#HProjectNumber").val(data[0].项目代码);
            $("#HProjectID").val(data[0].HInterID);
        }

        function GetHSecManagerValue(obj)  //返回验收员
@@ -1881,7 +2076,7 @@

           //双击返回收料仓库
         function GetGyWarehouse(data) {
             OptionData = data
             OptionData = data[0]
         }