1.销售出库单 增加 反写源单 销售订单和发货通知单   超出 关联数量  关闭源单
2.应收单 增加 反写源单 销售出库单 和 销售订单 超出关联数量 关闭源单
3.动态获取源单增加参数 Num 0蓝单 1红单 2全部
4.销售流程的测试并完善功能; 销售订单-》发货通知单-》销售出库单-》应收单 (注意: 源单类型的下拉框 需要 根据数据库 表动态加载, 关联数量 要准确 , 审核 且 未关闭 未行关闭的行 才能下推 ,关联数量超额后,要 反写 关闭 源单 )
14个文件已修改
253 ■■■■■ 已修改文件
WebTM/views/仓存管理/仓库调拨/Add_Edit_Kf_MoveStockBill.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/分步式调入单/Fb_StepFoldinBillEdit.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产退库单/Sc_ProductionReturnEdit.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/退料通知单/Add_Edit_Cg_POInStockBackBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/退货通知单/Xs_SeOutStockBackBill.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/其他出库/Add_Edit_Kf_OtherOutBill.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html 187 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/产品入库/Kf_ProductInBillEdit.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/其他入库/Add_Edit_Kf_OtherInBill.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/外购入库/Kf_POStockInBackBill_Add_Up.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Add_Edit_Kf_MoveStockBill.html
@@ -1637,7 +1637,7 @@
                $.ajax({
                    type: "get",
                    async: false,
                    data: { "HName": HName },
                    data: { "HName": HName, "Num": 2 },       //0蓝单 1红单 2不分红蓝单
                    url: GetWEBURL() + "/Web/GetHSourceBillType",
                    success: function (result) {
                        var HSourceBillTypes = "";
WebTM/views/²Ö´æ¹ÜÀí/·Ö²½Ê½µ÷Èëµ¥/Fb_StepFoldinBillEdit.html
@@ -1254,7 +1254,7 @@
                $.ajax({
                    type: "get",
                    async: false,
                    data: { "HName": HName },
                    data: { "HName": HName, "Num": 2 },       //0蓝单 1红单 2不分红蓝单
                    url: GetWEBURL() + "/Web/GetHSourceBillType",
                    success: function (result) {
                        var HSourceBillTypes = "";
WebTM/views/Éú²ú¹ÜÀí/Éú²úÍ˿ⵥ/Sc_ProductionReturnEdit.html
@@ -1715,7 +1715,7 @@
                $.ajax({
                    type: "get",
                    async: false,
                    data: { "HName": HName },
                    data: { "HName": HName, "Num": 2 },       //0蓝单 1红单 2不分红蓝单
                    url: GetWEBURL() + "/Web/GetHSourceBillType",
                    success: function (result) {
                        var HSourceBillTypes = "";
WebTM/views/²É¹º¹ÜÀí/ÊÕÁÏ֪ͨµ¥/Add_Edit_Cg_POInStockBillList.html
@@ -1864,7 +1864,7 @@
                $.ajax({
                    type: "get",
                    async: false,
                    data: { "HName": HName },
                    data: { "HName": HName, "Num": 2 },       //0蓝单 1红单 2不分红蓝单
                    url: GetWEBURL() + "/Web/GetHSourceBillType",
                    success: function (result) {
                        var HSourceBillTypes = "";
WebTM/views/²É¹º¹ÜÀí/ÍËÁÏ֪ͨµ¥/Add_Edit_Cg_POInStockBackBillList.html
@@ -1619,7 +1619,7 @@
                $.ajax({
                    type: "get",
                    async: false,
                    data: { "HName": HName },
                    data: { "HName": HName, "Num": 2 },       //0蓝单 1红单 2不分红蓝单
                    url: GetWEBURL() + "/Web/GetHSourceBillType",
                    success: function (result) {
                        var HSourceBillTypes = "";
WebTM/views/ÏúÊÛ¹ÜÀí/·¢»õ֪ͨµ¥/Add_Edit_Xs_SeOutStockBillList.html
@@ -637,6 +637,7 @@
            function getSupType() {
                var type = $("#HSourceBillType").val();
                var data = [];
                var HOrgID = sessionStorage["OrganizationID"];
                //获取编码对应单据名称
                $.ajax({
                    type: "get",
@@ -649,7 +650,8 @@
                })
                switch (type) {
                    case '1401':
                        return { url: "../../销售管理/销售订单/Xs_SeOrderBillList.html", name: data[0]["HName"] };
                        return {
                            url: "../../销售管理/销售订单/Xs_SeOrderBillList.html?openType=2&HOrgID=" + HOrgID, name: data[0]["HName"] };
                        break;
                }
@@ -684,7 +686,6 @@
                        if (checkStatus.data.length == 0) {
                            return layer.msg("请至少选择一条数据!");
                        }
                        //layer.alert("你已选择" + checkStatus.data.length + "条数据");
                        //获取销售订单代码
                        var ProcessNumber = [];
                        for (var i = 0; i < checkStatus.data.length; i++) {
@@ -1262,7 +1263,7 @@
                $.ajax({
                    type: "get",
                    async: false,
                    data: { "HName": HName },
                    data: { "HName": HName, "Num":2 },       //0蓝单 1红单 2不分红蓝单
                    url: GetWEBURL() + "/Web/GetHSourceBillType",
                    success: function (result) {
                        var HSourceBillTypes = "";
WebTM/views/ÏúÊÛ¹ÜÀí/Ó¦ÊÕµ¥/Xs_ReceivableBill.html
@@ -77,10 +77,13 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">源单类型</label>
                                            <div class="layui-input-inline">
                                                <select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
                                                <select name="BillType" id="BillType" lay-verify="BillType" style="width: 180px; ">
                                                    <!--动态渲染源单类型-->
                                                </select>
                                                <!--<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
                                                    <option style="color:blue;" selected="selected" value="1401">销售订单</option>
                                                    <option style="color:blue;" value="1205">销售出库单</option>
                                                </select>
                                                </select>-->
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -414,6 +417,9 @@
            //初始化组织
            Organ();
            //获取源单类型
            HBillType();
            //#endregion
@@ -1103,6 +1109,8 @@
                })
            }
            //#endregion
            //#region é€‰æ‹©æºå•
            function get_checkMainSource() {
@@ -2063,6 +2071,31 @@
            }
            //#endregion
            //#region èŽ·å–æºå•ç±»åž‹
            function HBillType() {
                var HName = '应收单';
                //获取登录页组织列
                $.ajax({
                    type: "get",
                    async: false,
                    data: { "HName": HName, "Num": 2 },       //0蓝单 1红单 2不分红蓝单
                    url: GetWEBURL() + "/Web/GetHSourceBillType",
                    success: function (result) {
                        var HSourceBillTypes = "";
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HSourceBillTypes += '<option  style="color:blue;" value="' + data[i].HSourceBillType + '">' + data[i].HSourceBillTypeName + '</option>';
                            }
                            $("#BillType").append(HSourceBillTypes);
                            form.render('select');
                        }
                    }
                })
            }
            //#endregion
            //#region é€‰æ‹©æºå•-销售订单
            function setInitBySeOrderBill(checkStatus) {
                var dataArray = [];
WebTM/views/ÏúÊÛ¹ÜÀí/ÍË»õ֪ͨµ¥/Xs_SeOutStockBackBill.html
@@ -1258,7 +1258,7 @@
                $.ajax({
                    type: "get",
                    async: false,
                    data: { "HName": HName },
                    data: { "HName": HName, "Num": 2 },       //0蓝单 1红单 2不分红蓝单
                    url: GetWEBURL() + "/Web/GetHSourceBillType",
                    success: function (result) {
                        var HSourceBillTypes = "";
WebTM/views/ÁìÁÏ·¢»õ/ÆäËû³ö¿â/Add_Edit_Kf_OtherOutBill.html
@@ -1444,7 +1444,7 @@
                $.ajax({
                    type: "get",
                    async: false,
                    data: { "HName": HName },
                    data: { "HName": HName, "Num": 2 },       //0蓝单 1红单 2不分红蓝单
                    url: GetWEBURL() + "/Web/GetHSourceBillType",
                    success: function (result) {
                        var HSourceBillTypes = "";
WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill.html
@@ -78,8 +78,12 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">源单类型</label>
                                            <div class="layui-input-inline">
                                                <!--<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">-->
                                                    <!--动态获取源单-->
                                                <!--</select>-->
                                                <select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
                                                    <option style="color:blue;" selected="selected" value="1401">销售订单</option>
                                                    <option style="color:blue;"  value="1402">发货通知单</option>
                                                </select>
                                            </div>
                                        </div>
@@ -555,6 +559,9 @@
            //初始化组织
            Organ();
            //动态获取源单
            //HBillType
            //#region é¡µé¢åˆå§‹åŒ–后,根据客户获取客户余额
            getCustomerBalance($("#HSupID").val());
@@ -1490,13 +1497,39 @@
            }
            //#endregion
            //#region èŽ·å–æºå•ç±»åž‹
            function HBillType() {
                var HName = '销售出库单';
                //获取登录页组织列
                $.ajax({
                    type: "get",
                    async: false,
                    data: { "HName": HName, "Num":0},       //0蓝单 1红单 2不分红蓝单
                    url: GetWEBURL() + "/Web/GetHSourceBillType",
                    success: function (result) {
                        var HSourceBillTypes = "";
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HSourceBillTypes += '<option  style="color:blue;" value="' + data[i].HSourceBillType + '">' + data[i].HSourceBillTypeName + '</option>';
                            }
                            $("#BillType").append(HSourceBillTypes);
                            form.render('select');
                        }
                    }
                })
            }
            //#endregion
            //#region é€‰æ‹©æºå•
            function get_checkMainSource() {
                var HOrgID = $("#HOrgID").val();
                var url = "";
                if ($("#BillType").val() == "1401") {
                    url = "../../销售管理/销售订单/Xs_SeOrderBillList.html?openType=2&HOrgID=" + HOrgID;
                } else {
                } else if ($("#BillType").val() == "1402") {
                    url = "../../销售管理/发货通知单/Xs_SeOutStockBillList.html?openType=2&HOrgID=" + HOrgID;
                }else {
                    return layer.msg('当前不支持改源单选择!!');
                }
@@ -1514,9 +1547,11 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        if ($("#BillType").val() == "1401") {
                            setInitBySeOrderBill(checkStatus);
                        } else if ($("#BillType").val() == "1402") {
                            setInitBySeOutStockBill(checkStatus)
                        }
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
@@ -2713,6 +2748,127 @@
            }
            //#endregion
            //#region é€‰æ‹©æºå•-发货通知单
            function setInitBySeOutStockBill(checkStatus) {
                var dataArray = [];
                for (var i = 0; i < checkStatus.data.length; i++) {
                    var temp = getPushSeOutStockBillInit(checkStatus.data[i].hmainid, checkStatus.data[i].hsubid);
                    if (temp != "none") {
                        dataArray.push(temp);
                        if (temp.审核人 != "") {
                            layer.msg("下推失败!单据号【" + temp.单据号 + "】单据状态不为已审核状态!");
                            return;
                        }
                        if (temp.关闭人 != "") {
                            layer.msg("下推失败!单据号【" + temp.单据号 + "】下选中的记录中存在已关闭状态的记录!");
                            return;
                        }
                    } else {
                        return;
                    }
                }
                form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                    "HDeptID": dataArray[0].HDeptID
                    , "HDeptName": dataArray[0].部门
                    , "HEmpID": dataArray[0].HEmpID
                    , "HEmpName": dataArray[0].业务员
                    , "HManagerID": dataArray[0].HManagerID
                    , "HManagerName": dataArray[0].主管
                    , "HMainSourceInterID": "0"
                    , "HMainSourceEntryID": "0"
                    , "HMainSourceBillNo": ""
                    , "HMainSourceBillType": $("#BillType").val()
                    , "HSupID": dataArray[0].HCusID
                    , "HSupName": dataArray[0].客户
                    , "HLinkMan": dataArray[0].联系人
                    , "HLinkPhone": dataArray[0].联系电话
                    , "HSellSID": "0"
                    , "HSellSName": dataArray[0].销售方式
                    , "HCurID": dataArray[0].HCurID
                    , "HCurName": dataArray[0].币别
                    , "HExRate": dataArray[0].汇率
                    , "HProjectID": dataArray[0].HProjectID
                    , "HProjectNumber": dataArray[0].项目编码
                    , "HProjectName": dataArray[0].项目名称
                });
                //子表  èµ‹å€¼
                var rowdata = [];
                for (var i = 0; i < dataArray.length; i++) {
                    rowdata.push(
                        {
                            "HMaterID": dataArray[i].HMaterID
                            , "物料代码": dataArray[i].物料代码
                            , "物料名称": dataArray[i].物料名称
                            , "规格型号": dataArray[i].规格型号
                            , "HUnitID": dataArray[i].HUnitID
                            , "计量单位": dataArray[i].计量单位
                            , "HQtyMust": dealDoubleToFixed(dataArray[i].数量, 1)
                            , "HQty": dealDoubleToFixed(dataArray[i].数量, 1)
                            , "HPieceQty": "0"
                            , "HPrice": dealDoubleToFixed(dataArray[i].单价, 3)
                            , "HTaxPrice": "0"
                            , "HTaxRate": dataArray[i].税率
                            , "HMoney": dealDoubleToFixed(dataArray[i].金额, 2)
                            , "HTaxMoney": "0"
                            , "HWHID": $("#HWHID").val()
                            , "发货仓库": $("#HWHName").val()
                            , "HRemark": ""
                            , "HQty_Full": "0"
                            , "HQty_Empty": "0"
                            , "HQty_Back": "0"
                            , "HCostPrice": "0"
                            , "HCostMoney": "0"
                            , "HSalePrice": "0"
                            , "HSeOrderInterID": dataArray[i].hmainid
                            , "HSeOrderEntryID": dataArray[i].hsubid
                            , "HSeOrderBillNo": dataArray[i].单据号
                            , "HSourceInterID": dataArray[i].hmainid
                            , "HSourceEntryID": dataArray[i].hsubid
                            , "HSourceBillNo": dataArray[i].单据号
                            , "HSourceBillType": dataArray[i].HBillType
                            , "HRelationQty": "0"
                            , "HRelationMoney": "0"
                            , 'HSPID': "0"
                            , 'HSPName': ""
                            , 'HSPGroupID': "0"
                            , "HSPGroupName": ""
                            , 'HSCWHID': "0"
                            , 'HSCWHName': ""
                            , 'HSCSPID': "0"
                            , 'HSCSPName': ""
                            , 'HBatchNo': ""
                            , 'HPOOrderInterID': "0"
                            , 'HPOOrderEntryID': "0"
                            , 'HPOOrderBillNo': ""
                            , 'HPropertyID': "0"
                            , 'HPropertyName': ""
                            , 'HSecUnitID': "0"
                            , 'HSecUnitName': ""
                            , 'HSecUnitRate': "0"
                            , 'HEngineNum': ""
                            , 'HUnderPanNum': ""
                            , 'HLeaveFactCard': ""
                        }
                    );
                }
                option.data = rowdata;
                table.render(option);
            }
            //#endregion
            //#region åå®¡æ ¸/审核数据
            function set_CheckBill(num) {
                var InterID = $("#HInterID").val();
@@ -2814,6 +2970,33 @@
            }
            //#endregion
            //#region æ ¹æ®ä¸»å†…码与子内码获取源单发货通知单数据
            function getPushSeOutStockBillInit(HSourceInterID, HSourceEntryID) {
                var res = "none";
                $.ajax({
                    url: GetWEBURL() + "/Kf_SellOutBill/loadXs_SeOutStockBill_Push",
                    async: false,
                    type: "GET",
                    data: {
                        "HInterID": HSourceInterID
                        , "HSubID": HSourceEntryID
                    },
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            res = result.data[0];
                        } else {
                            res = result.data;
                            //layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }
                    }, error: function () {
                        res = "none";
                        layer.alert("发生错误!", { icon: 5 });
                    }
                });
                return res;
            }
            //#endregion
            //#region èŽ·å–é”€å”®å‡ºåº“å•å•æ®çŠ¶æ€
            function getSourceBillStatus_SellOutBill() {
                var HSourceBillData = "none";
WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBillEdit.html
@@ -1715,7 +1715,7 @@
                $.ajax({
                    type: "get",
                    async: false,
                    data: { "HName": HName },
                    data: { "HName": HName, "Num": 2 },       //0蓝单 1红单 2不分红蓝单
                    url: GetWEBURL() + "/Web/GetHSourceBillType",
                    success: function (result) {
                        var HSourceBillTypes = "";
WebTM/views/ÑéÊÕÈë¿â/ÆäËûÈë¿â/Add_Edit_Kf_OtherInBill.html
@@ -1408,7 +1408,7 @@
                $.ajax({
                    type: "get",
                    async: false,
                    data: { "HName": HName },
                    data: { "HName": HName, "Num": 2 },       //0蓝单 1红单 2不分红蓝单
                    url: GetWEBURL() + "/Web/GetHSourceBillType",
                    success: function (result) {
                        var HSourceBillTypes = "";
WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Add_Edit_Kf_POStockInBillList.html
@@ -1928,7 +1928,7 @@
                $.ajax({
                    type: "get",
                    async: false,
                    data: { "HName": HName },
                    data: { "HName": HName, "Num": 2 },       //0蓝单 1红单 2不分红蓝单
                    url: GetWEBURL() + "/Web/GetHSourceBillType",
                    success: function (result) {
                        var HSourceBillTypes = "";
WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBackBill_Add_Up.html
@@ -1649,7 +1649,7 @@
                $.ajax({
                    type: "get",
                    async: false,
                    data: { "HName": HName },
                    data: { "HName": HName, "Num": 2 },       //0蓝单 1红单 2不分红蓝单
                    url: GetWEBURL() + "/Web/GetHSourceBillType",
                    success: function (result) {
                        var HSourceBillTypes = "";