采购管理：采购订单，收料通知单，采购入库单，应付单，付款单；销售管理：销售订单，发货通知单，销售出库单，应收单；修改

wtt

2024-11-05 3eb10e612d09c4d3d3519544b5e2e0229881c108

采购管理：采购订单，收料通知单，采购入库单，应付单，付款单；销售管理：销售订单，发货通知单，销售出库单，应收单；修改

 WebTM/views/²É¹º¹ÜÀí/¸¶¿îµ¥/YF_PayMentBill.html

@@ -42,7 +42,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">单据编号<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
                                            </div>
                                        </div>
@@ -720,6 +720,7 @@
                        , { field: 'HQty', title: '数量', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
                        , { field: 'HPrice', title: '单价', width: 100, style: 'background-color:#efefef4d;' }
                        , { field: 'HMoney', title: '结算金额', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
                        , { field: 'HInvoiceBillNo_Sub', title: '发票号码', width: 100,style: 'background-color:#efefef4d;' }
                        , { field: 'HReceiveBillInterID', title: '接收源单内码', width: 100, hide: true, style: 'background-color:#efefef4d;' }
                        , { field: 'HReceiveBillEntryID', title: '接收源单子内码', width: 100, hide: true, style: 'background-color:#efefef4d;' }
                        , { field: 'HReceiveBillNo', title: '接收源单号', width: 100, hide: true, style: 'background-color:#efefef4d;' }
@@ -1069,6 +1070,7 @@
                            , "HQty": dealDoubleToFixed(dataArray[i].数量, 1)
                            , "HPrice": dealDoubleToFixed(dataArray[i].单价, 3)                                                   //
                            , "HMoney": dealDoubleToFixed(dataArray[i].金额, 2)
                            , "HInvoiceBillNo_Sub": dataArray[i].发票编号
                            , "HReceiveBillInterID": dataArray[i].hmainid
                            , "HReceiveBillEntryID": dataArray[i].hsubid
                            , "HReceiveBillNo": dataArray[i].单据号
@@ -1385,6 +1387,7 @@
                                            , "HQty": dealDoubleToFixed(result.data[i].数量, 1)
                                            , "HPrice": dealDoubleToFixed(result.data[i].单价, 3)                                                   //
                                            , "HMoney": dealDoubleToFixed(result.data[i].结算金额, 2)
                                            , "HInvoiceBillNo_Sub": result.data[i].发票号码
                                            , "HReceiveBillInterID": result.data[i].源单主内码
                                            , "HReceiveBillEntryID": result.data[i].源单子内码
                                            , "HReceiveBillNo": result.data[i].源单单号

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

@@ -66,7 +66,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">单据编号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
                                            </div>
                                        </div>

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

@@ -65,7 +65,7 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">单据号<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value="0">
                                            </div>

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

@@ -66,7 +66,7 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">单据号<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value="0">
                                            </div>

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

@@ -67,7 +67,7 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">单据号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value="0">
                                            </div>

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

@@ -65,7 +65,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">单据编号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
                                            </div>
                                        </div>
@@ -2368,11 +2368,18 @@
                                    if (typeof (OptionData.HItemID) != "undefined") {
                                        //通过供应商id获取税率
                                        var HSupID = $("#HCusID").val();
                                        var Dec = getDecByMaterID(obj.data.HMaterID) //获取精度
                                        var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"];  //数量精度
                                        var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"];  //单价精度
                                        var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"];  //金额精度
                                        var HPrice = 0;
                                        if ($("#HPriceType").val() == "成本价") {
                                            HPrice = OptionData.含税成本价 * 1;//单价
                                        } else {
                                            HPrice = OptionData.结算价 * 1;//单价
                                        }
                                        var HTaxRate = obj.data.HTaxRate*0.01;
                                        if (HSupID != 0) {
                                            var Dec = getDecByMaterID(obj.data.HMaterID) //获取精度
                                            var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"];  //数量精度
                                            var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"];  //单价精度
                                            var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"];  //金额精度
                                            $.ajax({
                                                url: GetWEBURL() + "/Gy_Customer/xg",
                                                //url: "http://localhost:12761/Gy_Supplier/xg",
@@ -2381,63 +2388,51 @@
                                                    "HInterID": HSupID
                                                },
                                                success: function (d) {
                                                    var HTaxRate = parseInt(d.data[0].增值税率) * 0.01;
                                                    var HExRate = $("#HExRate").val();                      //汇率
                                                    //数据校验合格，重算记录
                                                    var HQty = obj.data.HQty * 1;                           //数量
                                                    var HPrice = obj.data.HPrice * 1;               //单价
                                                    var HMoney = HQty * HPrice;                     //金额=数量*单价
                                                    var HTaxMoney = Number((HMoney * HTaxRate));         //税额=金额*税率
                                                    var HlineTotal = HMoney + HTaxMoney;            //价税合计=金额+税额
                                                    var HTaxPrice = Number((HPrice * (1 + HTaxRate)));        //含税单价=单价*(1+税率)
                                                    var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));     //本位币价税合计=(税额+金额)*汇率
                                                    var HDiscountRate = obj.data.HDiscountRate * 1;   //折扣率
                                                    var HRelTaxPrice = Number((HTaxPrice * HDiscountRate));   //实际含税单价=含税单价*折扣率
                                                    var HExRate = $("#HExRate").val();                      //汇率
                                                    var HMoneyBB = HMoney * HExRate;
                                                    ///数字精度
                                                    HQty = Number(HQty.toFixed(HQtyDec));
                                                    HPrice = Number(HPrice.toFixed(HPriceDec));
                                                    HMoney = Number(HMoney.toFixed(HMoneyDec));
                                                    HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
                                                    HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
                                                    HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
                                                    HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
                                                    HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
                                                    HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));

                                                    obj.update({ //更新表格数据
                                                        "HMaterID": OptionData.HItemID             //设置HItemID的值为“HBillNo”字段的值HItemID`的值
                                                        , "物料代码": OptionData.物料代码
                                                        , "物料名称": OptionData.物料名称
                                                        , "规格型号": OptionData.规格型号
                                                        , "HUnitID": OptionData.HUnitID
                                                        , "计量单位": OptionData.计量单位名称
                                                        , "HTaxRate": HTaxRate * 100
                                                        , HQty: HQty                          //更新HQty字段，HQty
                                                        , HPrice: HPrice                     //更新HPrice字段，HPrice
                                                        , HMoney: HMoney                      //更新HMoney字段，HMoney
                                                        , HTaxMoney: HTaxMoney                  //更新HTaxMoney字段，HTaxMoney
                                                        , HlineTotal: HlineTotal             //更新HlineTotal字段，HlineTotal
                                                        , HTaxPrice, HTaxPrice                   //更新HTaxPrice字段，HTaxPrice
                                                        , HRelTaxPrice: HRelTaxPrice            //更新HRelTaxPrice字段，其值来自变量HRelTaxPrice
                                                        , HlineTotalBB: HlineTotalBB              //更新HlineTotalBB字段，其值来自变量HlineTotalBB
                                                        , HMoneyBB: HMoneyBB
                                                    })
                                                    OptionData = [];
                                                   HTaxRate = parseInt(d.data[0].增值税率) * 0.01;
                                                }
                                            });
                                        } else {
                                            obj.update({ //更新表格数据
                                                "HMaterID": OptionData.HItemID             //设置HItemID的值为“HBillNo”字段的值HItemID`的值
                                                , "物料代码": OptionData.物料代码
                                                , "物料名称": OptionData.物料名称
                                                , "规格型号": OptionData.规格型号
                                                , "HUnitID": OptionData.HUnitID
                                                , "计量单位": OptionData.计量单位名称
                                            })
                                            OptionData = [];
                                        }
                                        var HExRate = $("#HExRate").val();                      //汇率
                                        //数据校验合格，重算记录
                                        var HQty = obj.data.HQty * 1;                           //数量
                                        var HMoney = HQty * HPrice;                     //金额=数量*单价
                                        var HTaxMoney = Number((HMoney * HTaxRate));         //税额=金额*税率
                                        var HlineTotal = HMoney + HTaxMoney;            //价税合计=金额+税额
                                        var HTaxPrice = Number((HPrice * (1 + HTaxRate)));        //含税单价=单价*(1+税率)
                                        var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));     //本位币价税合计=(税额+金额)*汇率
                                        var HDiscountRate = obj.data.HDiscountRate * 1;   //折扣率
                                        var HRelTaxPrice = Number((HTaxPrice * HDiscountRate));   //实际含税单价=含税单价*折扣率
                                        var HMoneyBB = HMoney * HExRate;
                                        ///数字精度
                                        HQty = Number(HQty.toFixed(HQtyDec));
                                        HPrice = Number(HPrice.toFixed(HPriceDec));
                                        HMoney = Number(HMoney.toFixed(HMoneyDec));
                                        HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
                                        HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
                                        HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
                                        HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
                                        HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
                                        HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));

                                        obj.update({ //更新表格数据
                                            "HMaterID": OptionData.HItemID             //设置HItemID的值为“HBillNo”字段的值HItemID`的值
                                            , "物料代码": OptionData.物料代码
                                            , "物料名称": OptionData.物料名称
                                            , "规格型号": OptionData.规格型号
                                            , "HUnitID": OptionData.HUnitID
                                            , "计量单位": OptionData.计量单位名称
                                            , "HTaxRate": HTaxRate * 100
                                            , HQty: HQty                          //更新HQty字段，HQty
                                            , HPrice: HPrice                     //更新HPrice字段，HPrice
                                            , HMoney: HMoney                      //更新HMoney字段，HMoney
                                            , HTaxMoney: HTaxMoney                  //更新HTaxMoney字段，HTaxMoney
                                            , HlineTotal: HlineTotal             //更新HlineTotal字段，HlineTotal
                                            , HTaxPrice, HTaxPrice                   //更新HTaxPrice字段，HTaxPrice
                                            , HRelTaxPrice: HRelTaxPrice            //更新HRelTaxPrice字段，其值来自变量HRelTaxPrice
                                            , HlineTotalBB: HlineTotalBB              //更新HlineTotalBB字段，其值来自变量HlineTotalBB
                                            , HMoneyBB: HMoneyBB
                                        })
                                        OptionData = [];
                                    }
                                }
                            })
@@ -2510,9 +2505,19 @@
                        }
                        , end: function () {
                            if (typeof (OptionData.HItemID) != "undefined") {
                                
                                //通过供应商id获取税率
                                var HSupID = $("#HCusID").val();
                                var Dec = getDecByMaterID(obj.data.HMaterID) //获取精度
                                var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"];  //数量精度
                                var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"];  //单价精度
                                var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"];  //金额精度
                                var HPrice = 0;
                                if ($("#HPriceType").val() == "成本价") {
                                    HPrice = OptionData.含税成本价 * 1;//单价
                                } else {
                                    HPrice = OptionData.结算价 * 1;//单价
                                }
                                var HTaxRate = obj.data.HTaxRate*0.01;
                                if (HSupID != 0) {
                                    $.ajax({
                                        url: GetWEBURL() + "/Gy_Customer/xg",
@@ -2522,46 +2527,52 @@
                                            "HInterID": HSupID
                                        },
                                        success: function (d) {
                                            var HTaxRate = parseInt(d.data[0].增值税率) * 0.01;
                                            var HExRate = $("#HExRate").val();                      //汇率
                                            //数据校验合格，重算记录
                                            var HQty = obj.data.HQty * 1;                           //数量
                                            var HPrice = obj.data.HPrice * 1;               //单价
                                            var HMoney = HQty * HPrice;                     //金额=数量*单价
                                            var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4));         //税额=金额*税率
                                            var HlineTotal = HMoney + HTaxMoney;            //价税合计=金额+税额
                                            var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4));        //含税单价=单价*(1+税率)
                                            var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4));     //本位币价税合计=(税额+金额)*汇率
                                            obj.update({ //更新表格数据
                                                "HMaterID": OptionData.HItemID             //设置HItemID的值为“HBillNo”字段的值HItemID`的值
                                                , "物料代码": OptionData.物料代码
                                                , "物料名称": OptionData.物料名称
                                                , "规格型号": OptionData.规格型号
                                                , "HUnitID": OptionData.HUnitID
                                                , "计量单位": OptionData.计量单位名称
                                                , "HTaxRate": HTaxRate * 100
                                                , HQty: HQty                               //更新HQty字段，HQty
                                                , HPrice: HPrice                         //更新HPrice字段，HPrice
                                                , HMoney: HMoney                      //更新HMoney字段，HMoney
                                                , HTaxMoney: HTaxMoney                  //更新HTaxMoney字段，HTaxMoney
                                                , HlineTotal: HlineTotal             //更新HlineTotal字段，HlineTotal
                                                , HTaxPrice, HTaxPrice                   //更新HTaxPrice字段，HTaxPrice
                                                , HlineTotalBB: HlineTotalBB              //更新HlineTotalBB字段，其值来自变量HlineTotalBB
                                            })
                                            OptionData = [];
                                            HTaxRate = parseInt(d.data[0].增值税率) * 0.01;
                                        }
                                    });
                                } else {
                                    obj.update({ //更新表格数据
                                        "HMaterID": OptionData.HItemID             //设置HItemID的值为“HBillNo”字段的值HItemID`的值
                                        , "物料代码": OptionData.物料代码
                                        , "物料名称": OptionData.物料名称
                                        , "规格型号": OptionData.规格型号
                                        , "HUnitID": OptionData.HUnitID
                                        , "计量单位": OptionData.计量单位名称
                                    })
                                    OptionData = [];
                                }
                                var HExRate = $("#HExRate").val();                      //汇率
                                //数据校验合格，重算记录
                                var HQty = obj.data.HQty * 1;                           //数量
                                var HMoney = HQty * HPrice;                     //金额=数量*单价
                                var HTaxMoney = Number((HMoney * HTaxRate));         //税额=金额*税率
                                var HlineTotal = HMoney + HTaxMoney;            //价税合计=金额+税额
                                var HTaxPrice = Number((HPrice * (1 + HTaxRate)));        //含税单价=单价*(1+税率)
                                var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));     //本位币价税合计=(税额+金额)*汇率
                                var HDiscountRate = obj.data.HDiscountRate * 1;   //折扣率
                                var HRelTaxPrice = Number((HTaxPrice * HDiscountRate));   //实际含税单价=含税单价*折扣率
                                var HExRate = $("#HExRate").val();                      //汇率
                                var HMoneyBB = HMoney * HExRate;
                                ///数字精度
                                HQty = Number(HQty.toFixed(HQtyDec));
                                HPrice = Number(HPrice.toFixed(HPriceDec));
                                HMoney = Number(HMoney.toFixed(HMoneyDec));
                                HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
                                HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
                                HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
                                HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
                                HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
                                HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));

                                obj.update({ //更新表格数据
                                    "HMaterID": OptionData.HItemID             //设置HItemID的值为“HBillNo”字段的值HItemID`的值
                                    , "物料代码": OptionData.物料代码
                                    , "物料名称": OptionData.物料名称
                                    , "规格型号": OptionData.规格型号
                                    , "HUnitID": OptionData.HUnitID
                                    , "计量单位": OptionData.计量单位名称
                                    , "HTaxRate": HTaxRate * 100
                                    , HQty: HQty                          //更新HQty字段，HQty
                                    , HPrice: HPrice                     //更新HPrice字段，HPrice
                                    , HMoney: HMoney                      //更新HMoney字段，HMoney
                                    , HTaxMoney: HTaxMoney                  //更新HTaxMoney字段，HTaxMoney
                                    , HlineTotal: HlineTotal             //更新HlineTotal字段，HlineTotal
                                    , HTaxPrice, HTaxPrice                   //更新HTaxPrice字段，HTaxPrice
                                    , HRelTaxPrice: HRelTaxPrice            //更新HRelTaxPrice字段，其值来自变量HRelTaxPrice
                                    , HlineTotalBB: HlineTotalBB              //更新HlineTotalBB字段，其值来自变量HlineTotalBB
                                    , HMoneyBB: HMoneyBB
                                })
                                OptionData = [];
                            }
                        }
                    })

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

@@ -77,7 +77,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">单据编号<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
                                            </div>

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

@@ -70,7 +70,7 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">单据号<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value=0>
                                            </div>