1.采购:收料通知单,应付单 编辑时,如果3条子表数据删除某一条子表行后,进行时保存,保存校验报错 2.销售:2.1发货通知单 选源单后,子表 单...

zrg

2024-05-08 b8944b950c7bbfbbb5ae729ba9b83d107890d6c4

1.采购:收料通知单,应付单   编辑时,如果3条子表数据删除某一条子表行后,进行时保存,保存校验报错
2.销售:2.1发货通知单 选源单后,子表 单价 金额 进行赋值,子表 按F7时 增加 物料,计量单位,发货仓库双击返回     2.2应收单 子表按F7增加 物料 计量单位 双击返回
2.3 销售订单  修复 子表  计量单位  仓库 双击返回  2.4 销售出库单   子表F7   增加发货仓库  双击返回

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -8,8 +8,8 @@
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    /*var WEBURL = "http://localhost:8083/API/";  //陈雯静本地配置*/
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
   /* var WEBURL = "http://47.96.97.237/API/";   //智云服务器*/

 WebTM/views/²É¹º¹ÜÀí/Ó¦¸¶µ¥/Cg_PayableBill.html

@@ -1453,7 +1453,7 @@
                                , "HPrice": dealDoubleToFixed(dataArray[i].单价, 3)
                                , "HTaxPrice": dealDoubleToFixed(dataArray[i].含税单价, 3)
                                , 'HDiscountRate': dataArray[i].折扣率                                                       //
                                , 'HRelTaxPrice': dataArray[i].实际含税单价     
                                , 'HRelTaxPrice': dataArray[i].实际含税单价 
                                , "HTaxRate": dataArray[i].税率
                                , 'HTaxMoney': dataArray[i].税额                                                             //
                                , "HMoney": dealDoubleToFixed(dataArray[i].金额, 2)
@@ -1530,7 +1530,7 @@
                                , "计量单位": dataArray[i].计量单位
                                , "HQty": dealDoubleToFixed(dataArray[i].实收数量, 1)
                                , "HPrice": dealDoubleToFixed(dataArray[i].单价, 3)
                                , "HTaxPrice": dataArray[i].含税单价
                                , "HTaxPrice": dataArray[i].含税单价 
                                , 'HDiscountRate': dataArray[i].折扣率                                               //
                                , 'HRelTaxPrice': "0"
                                , "HTaxRate": dataArray[i].税率
@@ -1643,14 +1643,33 @@
                    layer.msg("日期不能为空!");
                    return false;
                }
                if ($("#HSupID").val() == "0") {
                    layer.msg("供应商未选择!");
                    return false;
                if ($("#HCurID").val() == 0) {
                    layer.msg("请选择币别！");
                    return;
                }

                if ($("#HCurID").val() == "0") {
                    layer.msg("币别未选择!");
                    return false;
                if ($("#HExRate").val() == 0) {
                    layer.msg("请输入汇率！");
                    return;
                }
                if ($("#HEmpID").val() == 0) {
                    layer.msg("请选择业务员员！");
                    return;
                }
                if ($("#HDeptID").val() == 0) {
                    layer.msg("请选择采购部门！");
                    return;
                }
                if ($("#HSupID").val() == 0) {
                    layer.msg("请选择供应商！");
                    return;
                }
                if ($("#HPSStyleID").val() == 0) {
                    layer.msg("请选择采购方式！");
                    return;
                }
                if ($("#HSSID").val() == 0) {
                    layer.msg("请选择结算方式！");
                    return;
                }

                temp = $("#HExRate").val() + "";
@@ -1665,6 +1684,9 @@

                //#region å­è¡¨ æ•°æ®æ£€éªŒ
                for (var i = 0; i < option.data.length; i++) {
                    if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
                        continue; // è·³è¿‡éžå¯¹è±¡é¡¹ï¼ˆå¦‚空数组）  
                    }
                    if (option.data[i]["HMaterID"] == "0") {
                        layer.msg("第" + (i+1) + "行：物料未选择！");
                        return false;
@@ -1729,12 +1751,6 @@
                        return false;
                    } else if (!ref.test(temp)) {
                        layer.msg("第" + (i + 1) + "行：价税合计请输入大于0的数字！");
                        return false;
                    }

                    //发货仓库非空验证
                    if (option.data[i]["HWHID"] == "0") {
                        layer.msg("第" + (i + 1) + "行：发货仓库未选择！");
                        return false;
                    }
                }
@@ -2242,6 +2258,7 @@
                            , "计量单位": dataArray[i].计量单位
                            , "HQty": dealDoubleToFixed(dataArray[i].实收数量-dataArray[i].关联数量, 1)
                            , "HPrice": dealDoubleToFixed(dataArray[i].单价, 3)
                            , "HTaxPrice": dealDoubleToFixed(dataArray[i].含税单价, 3)
                            , 'HDiscountRate': "0"                                                     //
                            , 'HRelTaxPrice': "0"
                            , "HTaxRate": dataArray[i].税率
@@ -2353,40 +2370,7 @@
            }
            //#endregion

            //#region ä¿å­˜æ–¹æ³•æ ¡éªŒ
            function AllowLoadData(data) {
                if ($("#HCurID").val() == 0) {
                    layer.msg("请选择币别！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HExRate").val() == 0) {
                    layer.msg("请输入汇率！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HEmpID").val() == 0) {
                    layer.msg("请选择业务员员！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HDeptID").val() == 0) {
                    layer.msg("请选择采购部门！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HSupID").val() == 0) {
                    layer.msg("请选择供应商！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HPSStyleID").val() == 0) {
                    layer.msg("请选择采购方式！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HSSID").val() == 0) {
                    layer.msg("请选择结算方式！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                return true;
            }

            //endregion
            

            //#endregion


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

@@ -1196,6 +1196,11 @@

                //#region å­è¡¨ æ•°æ®æ£€éªŒ
                for (var i = 0; i < option.data.length; i++) {

                    if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
                        continue; // è·³è¿‡éžå¯¹è±¡é¡¹ï¼ˆå¦‚空数组）  
                    }

                    if (option.data[i]["HMaterID"] == "0") {
                        layer.msg("第" + (i+1) + "行：物料未选择！");
                        return false;
@@ -1787,8 +1792,8 @@
                                    "HMaterID": checkStatus.data[j].HMaterID, "物料代码": checkStatus.data[j].物料代码, "物料名称": checkStatus.data[j].物料名称, "规格型号": checkStatus.data[j].规格型号,
                                    "HUnitID": checkStatus.data[j].HUnitID, "计量单位": checkStatus.data[j].计量单位,
                                    "HQty": checkStatus.data[j].数量-checkStatus.data[j].关联数量, "HPrice": checkStatus.data[j].单价,
                                    "HMoney": checkStatus.data[j].金额, "HTaxPrice": checkStatus.data[j].含税单价, "HTaxRate": checkStatus.data[j].税率, "HTaxMoney": checkStatus.data[j].税额, "HDiscountRate": checkStatus.data[j].折扣率, "HWHID": checkStatus.data[j].HWHID,
                                    "收料仓库": checkStatus.data[j].仓库名称,"HSPID": checkStatus.data[j].HSPID,"仓位名称": checkStatus.data[j].仓位名称,"HSecUnitID": checkStatus.data[j].HSecUnitID,"辅助单位": checkStatus.data[j].辅助单位,
                                    "HMoney": checkStatus.data[j].金额, "HTaxPrice": checkStatus.data[j].含税单价, "HTaxRate": checkStatus.data[j].税率, "HTaxMoney": checkStatus.data[j].税额, "HDiscountRate": checkStatus.data[j].折扣率,
                                    "HWHID": checkStatus.data[j].HWHIDSub,"收料仓库": checkStatus.data[j].仓库名称,"HSPID": checkStatus.data[j].HSPID,"仓位名称": checkStatus.data[j].仓位名称,"HSecUnitID": checkStatus.data[j].HSecUnitID,"辅助单位": checkStatus.data[j].辅助单位,
                                    "HSourceBillNo": checkStatus.data[j].单据号, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
                                })
                                j++;

 WebTM/views/ÏúÊÛ¹ÜÀí/·¢»õ֪ͨµ¥/Add_Edit_Xs_SeOutStockBillList.html

@@ -393,7 +393,7 @@

            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            get_LoginIs();
            window.OptionData = {};
            window.OptionData = [];
            //#region ã€åŠ¨æ€èŽ·å–模块名称】
            var HModuleType = "1402";
            //通过单据类型，从数据库动态获取单据模块命名,引用js文件 PageTitle.js
@@ -704,7 +704,8 @@
                                ,"HWHID": "0"
                                , "发货仓库": ""
                                , "HQty": checkStatus.data[i].数量,
                                "HPrice": "0", "HMoney": "0", "HRemark": ""
                                "HPrice": checkStatus.data[i].单价,
                                "HMoney": checkStatus.data[i].金额, "HRemark": ""
                            
                                , "HSourceBillNo": checkStatus.data[i].单据号
                                , "HSourceBillType": checkStatus.data[i].HBillType
@@ -814,8 +815,8 @@
                                , "HEmpName": data.业务员
                                , "HCusID": data.HCusID
                                , "HCusName": data.客户
                                , "HWHID": data.HWHID
                                , "HWHName": data.发货仓库
                                , "HWHID": data.主仓库ID
                                , "HWHName": data.主发货仓库
                                , "HAddress": data.交货地址
                                , "HDeptName": data.部门
                                , "HDeptID": data.HDeptID
@@ -1061,6 +1062,20 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (typeof (OptionData.HItemID) != "undefined") {
                                        //更新表格缓存的数据
                                        obj.update({
                                            "HMaterID": OptionData.HItemID
                                            , "物料代码": OptionData.物料代码
                                            , "物料名称": OptionData.物料名称
                                            , "规格型号": OptionData.规格型号
                                            , "HUnitID": OptionData.HUnitID
                                            , "计量单位": OptionData.计量单位名称
                                        })
                                        OptionData = [];
                                    }
                                }
                            })
                        }
                        //计量单位
@@ -1073,7 +1088,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_Unit.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -1089,6 +1104,16 @@
                                        , "HUnitID": checkStatus.data[0].HItemID
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (typeof (OptionData.HItemID) != "undefined") {
                                        //更新表格缓存的数据
                                        obj.update({
                                            "HUnitID": OptionData.HItemID
                                            , "计量单位": OptionData.计量单位名称
                                        })
                                        OptionData = [];
                                    }
                                }
                            })
                        }
@@ -1121,10 +1146,13 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    obj.update({
                                        "HWHID": OptionData.HItemID
                                        , "发货仓库": OptionData.仓库名称
                                    })
                                    if (typeof (OptionData.HItemID) != "undefined") {
                                        obj.update({
                                            "HWHID": OptionData.HItemID
                                            , "发货仓库": OptionData.仓库名称
                                        })
                                        OptionData = [];
                                    }
                                }
                            })
                        }
@@ -1160,7 +1188,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '业务员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HEmp', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1282,7 +1310,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '主管列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HManager', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1300,7 +1328,7 @@

            //项目代码
            function get_checkSearchHProNumber() {
                var HOrgID = $("#HOrgID").val();
                var HOrgID = sessionStorage["OrganizationID"];
                //打开工程项目小窗体
                layer.open({
                    type: 2
@@ -1373,29 +1401,29 @@
            //以上是layui模块
        });
        // åŸºç¡€èµ„料返回数据
        //function GetHEmpValue(obj)  //返回业务员
        //{
        //    $("#HEmpName").val(obj[0].HName);
        //    $("#HEmpID").val(obj[0].HItemID);
        //}
        function GetHEmpValue(obj)  //返回业务员
        {
            $("#HEmpName").val(obj[0].职员名称);
            $("#HEmpID").val(obj[0].HItemID);
        }

        //function GetHSupValue(obj)  //返回客户
        //{
        //    $("#HCusName").val(obj[0].HName);
        //    $("#HCusID").val(obj[0].HItemID);
        //}
        function GetHCusNameValue(obj)  //返回客户
        {
            $("#HCusName").val(obj[0].客户名称);
            $("#HCusID").val(obj[0].HItemID);
        }

        //function GetHManagerValue(obj)  //返回主管
        //{
        //    $("#HManagerName").val(obj[0].HName);
        //    $("#HManagerID").val(obj[0].HItemID);
        //}
        function GetHManagerValue(obj)  //返回主管
        {
            $("#HManagerName").val(obj[0].职员名称);
            $("#HManagerID").val(obj[0].HItemID);
        }

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

        //项目代码
        function GetProjectBillValue(obj) {
@@ -1407,11 +1435,6 @@
            } else {
                layer.msg("该项目已关闭，不可选择！");
            }
        }

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

        function GetHWHValue(obj)  //返回仓库
@@ -1428,6 +1451,24 @@
            }
            layui.table.render(option);
        }

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

        function GetGyMaterial(obj)           //物料名称
        {
            OptionData = obj;
        }

        function GetAuxiliaryUnitValue(obj)           //计量单位
        {
            OptionData = obj[0];
        }


        
    </script>
</body>
</html>

 WebTM/views/ÏúÊÛ¹ÜÀí/Ó¦ÊÕµ¥/Xs_ReceivableBill.html

@@ -169,7 +169,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">结算方式<label style="color:red"> * </label></label>
                                            <label class="layui-form-label">结算方式</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -346,7 +346,7 @@

            var allVal;
            var HModName = "Xs_ReceivableBill";

            window.OptionData = [];
            //记录组织的值
            var HOrgIDBar = 0;

@@ -1758,7 +1758,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../Baseset/基础资料/Gy_MaterialList.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Material.html', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -1772,13 +1772,27 @@
                                    //更新表格缓存的数据
                                    obj.update({
                                        "HMaterID": checkStatus.data[0].HItemID
                                        , "物料代码": checkStatus.data[0].HNumber
                                        , "物料名称": checkStatus.data[0].HName
                                        , "规格型号": checkStatus.data[0].HModel
                                        , "物料代码": checkStatus.data[0].物料代码
                                        , "物料名称": checkStatus.data[0].物料名称
                                        , "规格型号": checkStatus.data[0].规格型号
                                        , "HUnitID": checkStatus.data[0].HUnitID
                                        , "计量单位": checkStatus.data[0].HUnitName
                                        , "计量单位": checkStatus.data[0].计量单位名称
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (typeof (OptionData.HItemID) != "undefined") {
                                        //更新表格缓存的数据
                                        obj.update({
                                            "HMaterID": OptionData.HItemID
                                            , "物料代码": OptionData.物料代码
                                            , "物料名称": OptionData.物料名称
                                            , "规格型号": OptionData.规格型号
                                            , "HUnitID": OptionData.HUnitID
                                            , "计量单位": OptionData.计量单位名称
                                        })
                                        OptionData = [];
                                    }
                                }
                            })
                        }
@@ -1792,7 +1806,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../Baseset/基础资料/Gy_UnitList.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -1804,10 +1818,20 @@
                                    }
                                    //更新表格缓存的数据
                                    obj.update({
                                        "计量单位": checkStatus.data[0].HName
                                        "计量单位": checkStatus.data[0].计量单位名称
                                        , "HUnitID": checkStatus.data[0].HItemID
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (typeof (OptionData.HItemID) != "undefined") {
                                        //更新表格缓存的数据
                                        obj.update({
                                            "HUnitID": OptionData.HItemID
                                            , "计量单位": OptionData.计量单位名称
                                        })
                                        OptionData = [];
                                    }
                                }
                            })
                        }
@@ -2425,6 +2449,15 @@
            $("#HSSName").val(obj[0].HName);
            $("#HSSID").val(obj[0].HItemID);
        }
        function GetGyMaterial(obj)           //物料名称
        {
            OptionData = obj;
        }

        function GetAuxiliaryUnitValue(obj)           //计量单位
        {
            OptionData = obj[0];
        }

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

 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛ¶©µ¥/Add_Edit_Xs_SeOrderBillList.html

@@ -91,7 +91,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">销售员</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HEmpName" id="HEmpName" " class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -245,7 +245,7 @@
                                            <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;">
                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value=0 style="float:left;width:150px;">
                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
@@ -1243,7 +1243,7 @@
                        , { field: '物料名称', title: '物料名称', width: 150, style: 'background-color:#efefef4d;' }
                        , { field: '规格型号', title: '规格型号', width: 100, style: 'background-color:#efefef4d;' }
                        , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
                        , { field: '计量单位', title: '计量单位', width: 100, style: 'background-color:#efefef4d;' }//f7
                        , { field: '计量单位', title: '计量单位', width: 100, style: 'background-color:#efefef4d;', edit: 'text', event:"HUnitID" }//f7
                        , { field: 'HRemark_TL', title: '投料', width: 100, edit: 'text' }
                        , { field: 'HRemark_SJG', title: '深加工', width: 100, edit: 'text' }
                        , { field: 'HWHID ', title: 'HWHID ', width: 100, hide: true }
@@ -1943,6 +1943,7 @@
                //#region å­è¡¨ æ•°æ®æ£€éªŒ
                var RowCount = 0;
                for (var i = 0; i < option.data.length; i++) {

                    if (option.data[i]["HMaterID"] == "0") {
                        continue;
                    }
@@ -2552,10 +2553,6 @@
                                    var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                                    //if (checkStatus.data.length != 1) {
                                    //    return layer.msg("请选择一条数据");
                                    //}

                                    var rowIndex = $(obj.tr).attr("data-index") * 1;
                                    for (var i = 0; i < checkStatus.data.length; i++) {
                                        if (rowIndex + i >= option.data.length) {
@@ -2650,7 +2647,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_Unit.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -2708,10 +2705,14 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    obj.update({
                                        "HWHID": OptionData.HItemID
                                        , "仓库": OptionData.仓库名称
                                    })
                                    if (typeof (HDataEmp.HItemID) != "undefined") {
                                        //更新表格缓存的数据
                                        obj.update({
                                            "HWHID": HDataEmp.HItemID
                                            , "仓库": HDataEmp.仓库名称
                                        })
                                        HDataEmp = {};
                                    }
                                }
                            })

@@ -3471,7 +3472,7 @@

        function GetHManagerValue(obj)  //返回主管
        {
            $("#HManagerName").val(obj[0].HName);
            $("#HManagerName").val(obj[0].职员名称);
            $("#HManagerID").val(obj[0].HItemID);
        }

@@ -3493,12 +3494,12 @@
            $("#HSellSID").val(obj[0].HItemID);
        }

        function GetMaterValue(obj)           //物料名称
        function GetGyMaterial(obj)           //物料名称
        {
            HDataEmp = obj[0];
            HDataEmp = obj;
        }

        function GetUnitValue(obj)           //计量单位
        function GetAuxiliaryUnitValue(obj)           //计量单位
        {
            HDataEmp = obj[0];
        }
@@ -3507,6 +3508,39 @@
        {
            HDataEmp = obj[0];
        }

        //项目代码
        function GetProjectBillValue(obj) {
            if (obj[0].关闭人 == null || obj[0].关闭人 == "") {
                $("#HProjectID").val(obj[0].HInterID);
                $("#HProjectNumber").val(obj[0].项目代码);//工程项目代码
                $("#HProjectName").val(obj[0].项目名称);//工程项目代码

            } else {
                layer.msg("该项目已关闭，不可选择！");
            }
        }

        //双击返回仓库
        function GetHWHSubValue(data) {
            HDataEmp = data[0]
        }

        function GetHWHValue(obj)  //返回仓库
        {
            $("#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);
        }


        //#region æ ¹æ®å®¢æˆ·èŽ·å–币别、汇率、结算方式、客户信用额度、联系人、联系电话
        function getCustomerByCusID(HCusID) {
@@ -3626,38 +3660,7 @@
        }
        //#endregion

        //项目代码
        function GetProjectBillValue(obj) {
            if (obj[0].关闭人 == null || obj[0].关闭人 == "") {
                $("#HProjectID").val(obj[0].HInterID);
                $("#HProjectNumber").val(obj[0].项目代码);//工程项目代码
                $("#HProjectName").val(obj[0].项目名称);//工程项目代码

            } else {
                layer.msg("该项目已关闭，不可选择！");
            }
        }

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

        function GetHWHValue(obj)  //返回仓库
        {
            $("#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);
        }

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

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill.html

@@ -517,6 +517,9 @@
            //初始化子表
            set_InitGrid();

            //动态获取源单
            HBillType();

            //#region åˆ¤æ–­æ“ä½œç±»åž‹å¹¶åˆå§‹åŒ–界面
            if (OperationType == 1) {                                                   //无源单新增
               /* $("#HItemID").val(0);*/
@@ -558,9 +561,6 @@

            //初始化组织
            Organ();

            //动态获取源单
            HBillType();

            //#region é¡µé¢åˆå§‹åŒ–后，根据客户获取客户余额
            getCustomerBalance($("#HSupID").val());
@@ -1817,7 +1817,7 @@
                            });

                            HOrgIDBar = data.HSTOCKORGID == null ? 0 : data.HSTOCKORGID;

                            $("#BillType").val(data.HMainSourceBillType);
                            //子表  èµ‹å€¼
                            var rowdata = [];
                            for (let i = 0; i < result.data.length; i++) {
@@ -2119,6 +2119,11 @@

                //#region å­è¡¨ æ•°æ®æ£€éªŒ
                for (var i = 0; i < option.data.length; i++) {

                    if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
                        continue; // è·³è¿‡éžå¯¹è±¡é¡¹ï¼ˆå¦‚空数组）  
                    }

                    if (option.data[i]["HMaterID"] == "0") {
                        layer.msg("第" + (i+1) + "行：物料未选择！");
                        return false;
@@ -2327,10 +2332,13 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    obj.update({
                                        "HWHID": OptionData.HItemID
                                        , "发货仓库": OptionData.仓库名称
                                    })
                                    if (typeof (HDataTemp.HItemID) != "undefined") {
                                        obj.update({
                                            "HWHID": HDataTemp.HItemID
                                            , "发货仓库": HDataTemp.仓库名称
                                        })
                                        HDataTemp = {};
                                    }
                                }
                            })
                        }
@@ -3183,17 +3191,17 @@
            layui.table.render(option);
        }

        function GetMaterValue(obj)           //物料名称
        function GetGyMaterial(obj)           //物料名称
        {
            HDataTemp = obj[0];
            HDataTemp = obj;
        }

        function GetUnitValue(obj)           //计量单位
        {
            HDataTemp = obj[0];
        }

        function GetHSubWHValue(obj)  //子表发货仓库
        
        function GetHWHSubValue(obj)  //子表发货仓库
        {
            HDataTemp = obj[0];
        }

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBillList.html

@@ -405,7 +405,7 @@
                        , { field: '业务员', title: '业务员', width: 200, sort: true }
                        , { field: '件数', title: '件数', totalRow: true, width: 200, sort: true }
                        , { field: '数量', title: '数量', totalRow: true, width: 200, sort: true }
                        //, { field: '已关联数量', title: '已关联数量', totalRow: true, width: 200, sort: true }
                        , { field: '已关联数量', title: '已关联数量', totalRow: true, width: 200, sort: true }
                        , { field: '单价', title: '单价', width: 200, sort: true, totalRow: true}
                        , { field: '税率', title: '税率', width: 200, sort: true, totalRow: true }
                        , { field: '含税单价', title: '含税单价', width: 200, sort: true, totalRow: true }

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

@@ -880,7 +880,7 @@
                                , "HSupName": data.供应商
                                , "HEmpID": data.HEmpID
                                , "HEmpName": data.业务员
                                , "HWHID": data.HWHID
                                , "HWHID": data.主表仓库ID
                                , "HWHName": data.主表仓库
                                , "HSecManagerID": data.HSecManagerID
                                , "HSecManagerName": data.验收员
@@ -1839,10 +1839,9 @@
                            for (var i = 0; i < checkStatus.data.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].计量单位,"HWHID": checkStatus.data[j].HWHID, "收料仓库": checkStatus.data[j].收料仓库,
                                    "HSPID": checkStatus.data[j].HSPID, "仓位名称": checkStatus.data[j].仓位名称,
                                    "HQty": checkStatus.data[j].数量-checkStatus.data[j].关联数量, "HPrice": checkStatus.data[j].单价,
                                    "HMoney": checkStatus.data[j].金额,
                                    "HUnitID": checkStatus.data[j].HUnitID, "计量单位": checkStatus.data[j].计量单位, "HWHID": checkStatus.data[j].HWHIDSub, "收料仓库": checkStatus.data[j].仓库名称,
                                    "HSPID": checkStatus.data[j].HSPID, "仓位名称": checkStatus.data[j].仓位名称, "HQtyMust": checkStatus.data[j].数量,
                                    "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].价税合计
                                })
@@ -2028,6 +2027,10 @@

            //#region ä¿å­˜æ–¹æ³•æ ¡éªŒ
            function AllowLoadData(data) {

                var ref = /^\d+(\.\d+)?$/;          //非负数正则表达式
                var temp = "";

                if ($("#HWHID").val() == 0) {
                    layer.msg("请选择仓库！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
@@ -2064,6 +2067,76 @@
                    layer.msg("请选择结算方式！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                //#region å­è¡¨ æ•°æ®æ£€éªŒ
                for (var i = 0; i < option.data.length; i++) {

                    if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
                        continue; // è·³è¿‡éžå¯¹è±¡é¡¹ï¼ˆå¦‚空数组）  
                    }

                    if (option.data[i]["HMaterID"] == "0") {
                        layer.msg("第" + (i + 1) + "行：物料未选择！");
                        return false;
                    }

                    if (option.data[i]["HUnitID"] == "0") {
                        layer.msg("第" + (i + 1) + "行：计量单位未选择！");
                        return false;
                    }

                    //实发数量格式校验
                    temp = option.data[i]["HQty"] + "";
                    if (temp == "0") {
                        layer.msg("第" + (i + 1) + "行：数量不能为0！");
                        return false;
                    } else if (!ref.test(temp)) {
                        layer.msg("第" + (i + 1) + "行：数量请输入大于0的数字！");
                        return false;
                    }

                    //单价格式校验
                    temp = option.data[i]["HPrice"] + "";
                    if (temp == "0") {
                        layer.msg("第" + (i + 1) + "行：单价不能为0！");
                        return false;
                    } else if (!ref.test(temp)) {
                        layer.msg("第" + (i + 1) + "行：单价请输入大于0的数字！");
                        return false;
                    }

                    //含税单价格式校验
                    temp = option.data[i]["HTaxPrice"] + "";
                    if (temp == "0") {
                        layer.msg("第" + (i + 1) + "行：含税单价不能为0！");
                        return false;
                    } else if (!ref.test(temp)) {
                        layer.msg("第" + (i + 1) + "行：含税单价请输入大于0的数字！");
                        return false;
                    }

                    //税率格式校验
                    temp = option.data[i]["HTaxRate"] + "";
                    if (!ref.test(temp)) {
                        layer.msg("第" + (i + 1) + "行：税率请输入不小于0的数字！");
                        return false;
                    }

                    //金额格式校验
                    temp = option.data[i]["HMoney"] + "";
                    if (temp == "0") {
                        layer.msg("第" + (i + 1) + "行：金额不能为0！");
                        return false;
                    } else if (!ref.test(temp)) {
                        layer.msg("第" + (i + 1) + "行：金额请输入大于0的数字！");
                        return false;
                    }
                    //收料仓库非空验证
                    if (option.data[i]["HWHID"] == "0") {
                        layer.msg("第" + (i + 1) + "行：收料仓库未选择！");
                        return false;
                    }
                }
                //#endregion
                return true;
            }