1.调拨申请单 增加审核,反审核,关闭,反关闭,作废,反作废,修复编辑数据不能回显,无法编辑,保存失败功能
2.发货通知单 新增编辑 页面 初始化 主管 部门 业务员,修复多条数据 反写 销售订单 失败
3.销售订单列表 增加字段名,用于选单号 赋值表头信息
4.销售出库单 保存时增加 选着源单 发货通知单 后,查询源单是否存在
14个文件已修改
861 ■■■■■ 已修改文件
WebTM/views/仓存管理/仓库调拨/Add_Edit_Kf_MoveStockBill.html 99 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockRequestBillEdit.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockRequestBillList.html 381 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_StockPlace_List.html 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/应付单/Cg_PayableBill.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html 102 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillList.html 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/应收单/Xs_ReceivableBillList.html 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html 81 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Add_Edit_Kf_MoveStockBill.html
@@ -72,7 +72,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">日期</label>
                                            <label class="layui-form-label">日期<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                            </div>
@@ -102,7 +102,7 @@
                                        </div>
                                       
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">主管</label>
                                            <label class="layui-form-label">主管<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value=0 style="float:left;width:150px;">
@@ -113,7 +113,7 @@
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">调入仓库</label>
                                            <label class="layui-form-label">调入仓库<label style="color:red"> * </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;">
@@ -123,7 +123,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">调出仓库</label>
                                            <label class="layui-form-label">调出仓库<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HSCWHName" id="HSCWHName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HSCWHID" id="HSCWHID" class="layui-input" value=0 style="float:left;width:150px;">
@@ -136,7 +136,7 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">验收员</label>
                                            <label class="layui-form-label">验收员<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value=0 style="float:left;width:150px;">
@@ -146,7 +146,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">保管员</label>
                                            <label class="layui-form-label">保管员<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value=0 style="float:left;width:150px;">
@@ -156,7 +156,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">业务员</label>
                                            <label class="layui-form-label">业务员<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value=0 style="float:left;width:150px;">
@@ -172,7 +172,7 @@
                                            <label class="layui-form-label">源单类型</label>
                                            <div class="layui-input-inline">
                                                <select name="HSourceBillType" lay-filter="HSourceBillType" id="HSourceBillType">
                                                    <option value="调拨申请单" selected="selected">调拨申请单</option>
                                                    <option value="1243" selected="selected">调拨申请单</option>
                                                    <option value="手工录入">手工录入</option>
                                                </select>
@@ -861,23 +861,31 @@
            //#region ä¿å­˜æ–¹æ³•
            function set_SaveBill(data) {
                if ($("#HDeptName").val() == 0) {
                    layer.msg("请选择部门!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                if ($("#HWHID").val() == 0) {
                    layer.msg("请选择调入仓库!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HWHName").val() == 0) {
                    layer.msg("请选择仓库!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                if ($("#HSCWHID").val() == 0) {
                    layer.msg("请选择调出仓库!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HKeeperID").val() == 0) {
                    layer.msg("请选择保管员!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                if ($("#HManagerID").val() == 0) {
                    layer.msg("请选择负责人!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HSecManagerID").val() == 0) {
                    layer.msg("请选择验收员!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    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 ($("#HKeeperID ").val() == 0) {
                    layer.msg("请选择保管员!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                var num = [];
@@ -1160,6 +1168,7 @@
                })
            }
            //#endregion
            //#endregion
            //行内快捷键筛选
@@ -1495,13 +1504,7 @@
            function getSupType() {
                var type = $("#HSourceBillType").val();
                switch (type) {
                    case '1102':
                        return { url: "../../采购管理/采购订单/Cg_POOrderBillList.html", name: "采购订单" };
                        break;
                    case '1103':
                        return { url: "../../采购管理/收料通知单/Cg_POInStockBillList.html", name: "收料通知单" };
                        break;
                    case '调拨申请单':
                    case '1243':
                        return { url: "../../仓存管理/仓库调拨/Kf_MoveStockRequestBillList.html", name: "调拨申请单" };
                        break;
                }
@@ -1510,7 +1513,7 @@
            //表头信息选择单据弹窗
            form.on('submit(XDHList)', function () {
                if ($("#HSourceBillType").val() == "调拨申请单") {
                if ($("#HSourceBillType").val() == "1243") {
                    var url = getSupType().url;
                    url = encodeURI(url);
@@ -1568,49 +1571,31 @@
                        for (var i = 0; i < checkStatus.data.length; i++) {
                            ProcessNumber.push(checkStatus.data[i]);
                        }
                        $("#HEmpID").val(checkStatus.data[0]["HEmpID"]);
                        $("#HEmpName").val(checkStatus.data[0]["业务员"]);
                        $("#HSecManagerID").val(checkStatus.data[0]["HSecManagerID"]);
                        $("#HSecManagerName").val(checkStatus.data[0]["验收员"]);
                        $("#HKeeperID").val(checkStatus.data[0]["HKeeperID"]);
                        $("#HKeeperName").val(checkStatus.data[0]["保管员"]);
                        $("#HManagerID").val(checkStatus.data[0]["HMangerID"]);
                        $("#HMangerName").val(checkStatus.data[0]["主管"]);
                        $("#HWHID").val(checkStatus.data[0]["HWHID"]);
                        $("#HWHName").val(checkStatus.data[0]["调入仓库"]);
                        $("#HSCWHID").val(checkStatus.data[0]["HSCWHID"]);
                        $("#HSCWHName").val(checkStatus.data[0]["调出仓库"]);
                        //获取当前位置所在行数
                        var NowNum = 0;
                        NowNum = option.data.length;
                        if (getSupType().name == "采购订单") {
                            var j = 0;
                            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].计量单位,
                                    "HQty": 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,
                                })
                                j++;
                            }
                            table.render(option);
                            layer.close(index);
                        }
                        else if (getSupType().name == "收料通知单") {
                            var j = 0;
                            for (var i = 0; i < ProcessNumber.length; i++) {
                                option.data.push({
                                    "HMaterID": checkStatus.data[j].HMaterID, "物料代码": checkStatus.data[j].物料代码, "物料名称": checkStatus.data[j].物料名称, "规格型号": checkStatus.data[j].规格型号,
                                    "   ": 0, "物料辅助属性": "", "HUnitID": checkStatus.data[j].HUnitID, "计量单位": checkStatus.data[j].计量单位, "HQtyMust": "", "HQty": checkStatus.data[j].数量, "HRemark": "",
                                    "HPrice": checkStatus.data[j].单价, "HMoney": checkStatus.data[j].金额,   "HWHID": checkStatus.data[j].HWHID, "收料仓库": checkStatus.data[j].收料仓库,
                                    "HSPID": checkStatus.data[j].HSPID, "仓位名称": checkStatus.data[j].仓位名称, "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
                                    "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
                                    "HSourceBillNo": checkStatus.data[j].单据号, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
                                })
                                j++;
                            }
                            table.render(option);
                            layer.close(index);//关闭弹窗
                        }
                        else if (getSupType().name == "调拨申请单") {
                        if ($("#HSourceBillType").val() == "1243") {
                            var j = 0;
                            for (var i = 0; i < ProcessNumber.length; i++) {
                                option.data.push({
                                    "HMaterID": checkStatus.data[j].HMaterID, "物料代码": checkStatus.data[j].物料代码, "物料名称": checkStatus.data[j].物料名称, "规格型号": checkStatus.data[j].规格型号,
                                    "HPropertyID": checkStatus.data[j].HPropertyID, "辅助属性": checkStatus.data[j].辅助属性, "HUnitID": checkStatus.data[j].HUnitID, "计量单位": checkStatus.data[j].计量单位, "HQtyMust": checkStatus.data[j].应收数量, "HQty": checkStatus.data[j].实收数量, "HRemark": checkStatus.data[j].表体备注,
                                    "HPrice": checkStatus.data[j].单价, "HMoney": checkStatus.data[j].金额, "HWHID": checkStatus.data[j].HWHID, "调入仓库": checkStatus.data[j].调入仓库, "HSCWHID": checkStatus.data[j].HSCWHID, "调出仓库": checkStatus.data[j].调出仓库,
                                    "HSPID":"0", "仓位名称":"",
                                    "HPOOrderInterID": checkStatus.data[j].HPOOrderInterID, "HPOOrderEntryID": checkStatus.data[j].HPOOrderEntryID, "HPOOrderBillNo": checkStatus.data[j].采购订单号,
                                    "HSeOrderInterID": checkStatus.data[j].HSeOrderInterID, "HSeOrderEntryID": checkStatus.data[j].HSeOrderEntryID, "HSeOrderBillNo": checkStatus.data[j].销售订单号,
                                    "HSourceBillNo": checkStatus.data[j].单据号, "HSourceBillType": checkStatus.data[j].HBillSubType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
@@ -1808,7 +1793,7 @@
         } 
         //双击返回仓位
         function GetStockPlaceValue(data) {
        function GetGyStockPlace(data) {
             OptionData = data
         }
        //双击返回调入仓库
WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockRequestBillEdit.html
@@ -385,7 +385,7 @@
                    "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "", "HSecUnitRate": "0",
                    "HSecUnitID": "0", "辅助计量单位": "", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0",
                    "HOutPrice": "0", "HOutMoney": "0", "HWHID": "0", "调入仓库": "", "HSCWHID": "0", "调出仓库": "",
                    "HBASEUNITID": "0", "基本计量单位": "", "HEXTAUXUNITID": "", "辅单位": "", "HRemark": ""
                    "HBASEUNITID": "0", "基本计量单位": "", "HEXTAUXUNITID": "0", "辅单位": "", "HRemark": ""
                };
                switch (obj.event) {
                    case 'btn-AddLine':
WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockRequestBillList.html
@@ -117,12 +117,16 @@
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-audit" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Faudit" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Audit" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-DeAudit" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Close" lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-DeClose" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Drop" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-DeDrop" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>反作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Exit" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
@@ -183,6 +187,33 @@
                    //删除
                    case 'btn-Delete': set_DeleteBill();
                        break;
                    //刷新
                    case 'get_Refresh': get_Refresh();
                        break;
                    //审核按钮
                    case 'btn-Audit':
                        set_CheckBill(1);
                        break;
                    //反审核按钮
                    case 'btn-DeAudit':
                        set_CheckBill(2);
                        break;
                    //关闭按钮        ï¼ˆ1:关闭、2:反关闭)
                    case 'btn-Close':
                        set_CloseBill(1);
                        break;
                    //反关闭按钮
                    case 'btn-DeClose':
                        set_CloseBill(2);
                        break;
                    //作废按钮        ï¼ˆ1:作废、2:反作废)
                    case 'btn-Drop':
                        set_DropBill(1);
                        break;
                    //反作废按钮
                    case 'btn-DeDrop':
                        set_DropBill(2);
                        break;
                    //关闭
                    case 'set_CloseBill': set_CloseBill();
                        break;
@@ -222,6 +253,12 @@
            //#endregion
            //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
            //#region åˆ·æ–°
            function get_Refresh() {
                $("#btnSearch").trigger('click');
            }
            //#endregion
            // åˆå§‹åŒ–界面
            function set_ClearBill() {
@@ -405,37 +442,239 @@
                    var InterID = data[0].hmainid.toString();
                    //逻辑删除方法
                    layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "/Kf_MoveStockRequestBill/DeltetKf_MoveStockRequestBill", //方法所在页面和方法名
                            data: { "HInterID": InterID },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame
                                        layer.close(index);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                    });
                        if (data[0].状态 == "创建") {
                            var wait = layer.load();
                            $.ajax({
                                type: "GET",
                                url: GetWEBURL() + "/Kf_MoveStockRequestBill/DeltetKf_MoveStockRequestBill", //方法所在页面和方法名
                                data: { "HInterID": InterID },
                                success: function (result) {
                                    if (result.count == 1) {
                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                            // å¾—到frame索引
                                            var index = layer.getFrameIndex(window.name);
                                            //关闭当前frame
                                            layer.close(index);
                                            //修改为功后刷新界面
                                            window.location.reload();
                                        });
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    } else {
                                        layer.alert(result.code + result.Message, { icon: 5 });
                                    }
                                    layer.close(wait);
                                }, error: function () {
                                    layer.close(wait);
                                    layer.alert("接口请求失败!", { icon: 5 });
                                }
                                layer.close(wait);
                            }, error: function () {
                                layer.close(wait);
                                layer.alert("接口请求失败!", { icon: 5 });
                            }
                        });
                            });
                        } else {
                            layer.msg('此数据不是创建状态,不能删除!');
                        }
                    })
                }
                else {
                    layer.msg('请选择一行数据删除!');
                }
            }
            // å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
                var HDate = $("#HBeginDate").val();//开始日期
                var HDate1 = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
                var HDeptID = $("#HDeptID").val();//部门
                var MaterialCode = $("#MaterialCode").val();//物料代码
                var MaterialName = $("#MaterialName").val();//物料名称
                var SpecificationModel = $("#SpecificationModel").val();//规格型号
                var HSourceBillNo = $("#HSourceBillNo").val();//源单单号
                var Warehouse = $("#Warehouse").val();//仓库
                var Hmaker = $("#Hmaker").val();//制单人
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
                }
                if (HBillNo) {
                    sWhere += " and å•据号 like '%" + HBillNo + "%'";
                }
                if (HDeptID) {
                    sWhere += " and éƒ¨é—¨ like '%" + HDeptID + "%'";
                }
                if (MaterialCode) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + MaterialCode + "%'";
                }
                if (MaterialName) {
                    sWhere += " and ç‰©æ–™åç§° like '%" + MaterialName + "%'";
                }
                if (SpecificationModel) {
                    sWhere += " and è§„格型号 like '%" + SpecificationModel + "%'";
                }
                if (HSourceBillNo) {
                    sWhere += " and æºå•单号 like '%" + HSourceBillNo + "%'";
                }
                if (Warehouse) {
                    sWhere += " and ä»“库名称 like '%" + Warehouse + "%'";
                }
                if (Hmaker) {
                    sWhere += " and åˆ¶å•人 like '%" + Hmaker + "%'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
            // é‡ç½®è¿‡æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");//单据号
                $("#HDeptID").val();//部门
                $("#MaterialCode").val();//物料代码
                $("#MaterialName").val();//物料名称
                $("#SpecificationModel").val();//规格型号
                $("#HSourceBillNo").val();//源单单号
                $("#Warehouse").val();//仓库
                $("#Hmaker").val();//制单人
                sWhere = "";
                get_Display(sWhere);
            }
            //重新同步按钮
            function set_ResCnz() {
                var HBillno2 = $('#HBillno2').val();
                $.ajax({
                    url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
                    type: "GET",
                    data: { "HBillNo": HBillno2, "HBillType": 1243 },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
                                //关闭当前frame
                                layer.close(index);
                                //修改为功后刷新界面
                                window.location.reload();
                            });
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#region åå®¡æ ¸/审核数据
            function set_CheckBill(num) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Kf_MoveStockRequestBill/AuditKf_MoveStockRequestBill", //方法所在页面和方法名
                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    layer.close(index);
                                    //修改为功后刷新界面
                                    $("#btnSearch").trigger('click');
                                });
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                }
                else {
                    layer.msg('请选择一行数据审核!');
                }
            }
            //#endregion
            //#region åå…³é—­/关闭数据
            function set_CloseBill(num) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Kf_MoveStockRequestBill/CloseKf_MoveStockRequestBill", //方法所在页面和方法名
                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    layer.close(index);
                                    //修改为功后刷新界面
                                    $("#btnSearch").trigger('click');
                                });
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                }
                else {
                    layer.msg('请选择一行数据审核!');
                }
            }
            //#endregion
            //#region åä½œåºŸ/作废数据
            function set_DropBill(num) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Kf_MoveStockRequestBill/DropKf_MoveStockRequestBill", //方法所在页面和方法名
                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    layer.close(index);
                                    //修改为功后刷新界面
                                    $("#btnSearch").trigger('click');
                                });
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                }
                else {
                    layer.msg('请选择一行数据审核!');
                }
            }
            //#endregion
            //隐藏列设置
            function get_HideColumn() {
@@ -553,94 +792,6 @@
                })
            }
            // å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
                var HDate = $("#HBeginDate").val();//开始日期
                var HDate1 = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
                var HDeptID = $("#HDeptID").val();//部门
                var MaterialCode = $("#MaterialCode").val();//物料代码
                var MaterialName = $("#MaterialName").val();//物料名称
                var SpecificationModel = $("#SpecificationModel").val();//规格型号
                var HSourceBillNo = $("#HSourceBillNo").val();//源单单号
                var Warehouse = $("#Warehouse").val();//仓库
                var Hmaker = $("#Hmaker").val();//制单人
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
                }
                if (HBillNo) {
                    sWhere += " and å•据号 like '%" + HBillNo + "%'";
                }
                if (HDeptID) {
                    sWhere += " and éƒ¨é—¨ like '%" + HDeptID + "%'";
                }
                if (MaterialCode) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + MaterialCode + "%'";
                }
                if (MaterialName) {
                    sWhere += " and ç‰©æ–™åç§° like '%" + MaterialName + "%'";
                }
                if (SpecificationModel) {
                    sWhere += " and è§„格型号 like '%" + SpecificationModel + "%'";
                }
                if (HSourceBillNo) {
                    sWhere += " and æºå•单号 like '%" + HSourceBillNo + "%'";
                }
                if (Warehouse) {
                    sWhere += " and ä»“库名称 like '%" + Warehouse + "%'";
                }
                if (Hmaker) {
                    sWhere += " and åˆ¶å•人 like '%" + Hmaker + "%'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
            // é‡ç½®è¿‡æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");//单据号
                $("#HDeptID").val();//部门
                $("#MaterialCode").val();//物料代码
                $("#MaterialName").val();//物料名称
                $("#SpecificationModel").val();//规格型号
                $("#HSourceBillNo").val();//源单单号
                $("#Warehouse").val();//仓库
                $("#Hmaker").val();//制单人
                sWhere = "";
                get_Display(sWhere);
            }
            //重新同步按钮
            function set_ResCnz() {
                var HBillno2 = $('#HBillno2').val();
                $.ajax({
                    url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
                    type: "GET",
                    data: { "HBillNo": HBillno2, "HBillType": 1243 },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
                                //关闭当前frame
                                layer.close(index);
                                //修改为功后刷新界面
                                window.location.reload();
                            });
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //以上是layui模块
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_StockPlace_List.html
@@ -167,15 +167,15 @@
         //#endregion
         //#region åŒå‡»è¿”回数据
         table.on('rowDouble(mainTable)', function (obj) {
             var data = [];
             data.push(obj.data);
             parent.GetStockPlaceValue(data);
             var index = parent.layer.getFrameIndex(window.name);
             parent.layer.close(index);
         });
         //#endregion
         ////#region åŒå‡»è¿”回数据
         //table.on('rowDouble(mainTable)', function (obj) {
         //    var data = [];
         //    data.push(obj.data);
         //    parent.GetStockPlaceValue(data);
         //    var index = parent.layer.getFrameIndex(window.name);
         //    parent.layer.close(index);
         //});
         ////#endregion
         //#region é‡ç½®è¿‡æ»¤æ¡ä»¶
            function set_ClearQuery() {
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_MouldFile.html
@@ -1521,7 +1521,7 @@
            $("#HWHID").val(obj[0].HItemID);
        }
        function GetStockPlaceValue(obj) {   //仓位
        function GetGyStockPlace(obj) {   //仓位
            $("#HSPName").val(obj[0].仓位名称);
            $("#HSPID").val(obj[0].HMainID);
        }
WebTM/views/²É¹º¹ÜÀí/Ó¦¸¶µ¥/Cg_PayableBill.html
@@ -1782,7 +1782,7 @@
                                }
                               , end: function () {
                                obj.update({
                                   "HMaterID" :OptionData.HMaterID
                                    "HMaterID": OptionData.HItemID
                                        ,"物料代码" : OptionData.物料代码
                                       , "物料名称" :OptionData.物料名称
                                        ,"规格型号" : OptionData.规格型号
WebTM/views/ÏúÊÛ¹ÜÀí/·¢»õ֪ͨµ¥/Add_Edit_Xs_SeOutStockBillList.html
@@ -69,13 +69,13 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">日期</label>
                                            <label class="layui-form-label">日期<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">业务员</label>
                                            <label class="layui-form-label">业务员<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -88,7 +88,7 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">客户</label>
                                            <label class="layui-form-label">客户<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -98,7 +98,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">仓库</label>
                                            <label class="layui-form-label">仓库<label style="color:red"> * </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;">
@@ -116,7 +116,7 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">部门</label>
                                            <label class="layui-form-label">部门<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -126,7 +126,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">币别</label>
                                            <label class="layui-form-label">币别<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -136,7 +136,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">汇率</label>
                                            <label class="layui-form-label">汇率<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0">
                                            </div>
@@ -152,7 +152,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">主管</label>
                                            <label class="layui-form-label">主管<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -304,7 +304,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">制单日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
                                                <input model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
@@ -413,6 +413,8 @@
            //判断操作类型
            if (OperationType == 1) {//无源单新增
                $("#HItemID").val(0);
                //页面初始化加载 ä¸šåŠ¡å‘˜ ä¸»ç®¡   éƒ¨é—¨
                get_DeptHManage();
            }
            else if (OperationType == 3) {//编辑
                $("#HItemID").val(linterid);//修改时主表ID
@@ -701,7 +703,8 @@
                                , "计量单位": checkStatus.data[i].计量单位
                                ,"HWHID": "0"
                                , "发货仓库": ""
                                , "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": ""
                                , "HQty": checkStatus.data[i].数量,
                                "HPrice": "0", "HMoney": "0", "HRemark": ""
                            
                                , "HSourceBillNo": checkStatus.data[i].单据号
                                , "HSourceBillType": checkStatus.data[i].HBillType
@@ -709,9 +712,24 @@
                                , "HSourceEntryID": checkStatus.data[i].hsubid
                            })
                        }
                        $("#HProjectID").val(checkStatus.data[0].HProjectID);
                        $("#HProjectID").val(checkStatus.data[0].HProjectID ? checkStatus.data[0].HProjectID : 0);
                        $("#HProjectNumber").val(checkStatus.data[0].项目编码);
                        $("#HProjectName").val(checkStatus.data[0].项目名称);
                        $("#HCusID").val(checkStatus.data[0].HCusID);
                        $("#HCusName").val(checkStatus.data[0].客户);
                        $("#HDeptID").val(checkStatus.data[0].HDeptID);
                        $("#HDeptName").val(checkStatus.data[0].部门);
                        $("#HManagerID").val(checkStatus.data[0].HManagerID);
                        $("#HManagerName").val(checkStatus.data[0].主管);
                        $("#HEmpID").val(checkStatus.data[0].HEmpID);
                        $("#HEmpName").val(checkStatus.data[0].业务员);
                        $("#HCurID").val(checkStatus.data[0].HCurID);
                        $("#HCurName").val(checkStatus.data[0].币别);
                        $("#HExRate").val(checkStatus.data[0].汇率);
                        $("#HWHID").val(checkStatus.data[0].主仓库id);
                        $("#HWHName").val(checkStatus.data[0].主仓库);
                        table.render(option);
                        layer.close(index);//关闭弹窗
                    }
@@ -881,8 +899,12 @@
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(shijian);
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HMakeDate").val(shijian);
                        $("#HMaker").val(sessionStorage["HUserName"]);
                    }
                });
                //页面初始化加载 ä¸šåŠ¡å‘˜ ä¸»ç®¡   éƒ¨é—¨
                get_DeptHManage();
            }
            else {//如果修改则走下面 new
                $("#HInterID").val(linterid);
@@ -905,6 +927,36 @@
            //#region ä¿å­˜æ–¹æ³•
            function set_SaveBill(data) {
                if ($("#HWHID").val() == 0) {
                    layer.msg("请选择仓库!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HManagerID").val() == 0) {
                    layer.msg("请选择主管!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HCusID").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 ($("#HCurID ").val() == 0) {
                    layer.msg("请选择币别!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HExRate").val() == 0) {
                    layer.msg("汇率不能为0!", { 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;
                }
                var num = [];
                for (var i = 0; i < table.cache["mainTable"].length; i++) {
@@ -945,6 +997,33 @@
                });
            }
            //#endregion
            //页面初始化加载 ä¸šåŠ¡å‘˜ ä¸»ç®¡   éƒ¨é—¨
            function get_DeptHManage() {
                //页面初始化加载 ä¸šåŠ¡å‘˜ ä¸»ç®¡   éƒ¨é—¨
                $("#HDeptID").val(sessionStorage["HDeptID"]);
                $("#HDeptName").val(sessionStorage["HDept"]);
                $("#HEmpName").val(sessionStorage["HUserName"]);
                $("#HEmpID").val(sessionStorage["HEmpID"]);
                //根据当前登录用户的部门 èŽ·å– ä¸»ç®¡
                if ($("#HDeptID").val() != 0) {
                    $.ajax({
                        url: GetWEBURL() + "Gy_Department/list",
                        async: false,
                        type: "GET",
                        data: {
                            "sWhere": "and HItemID = '" + $("#HDeptID").val() + "'", "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"]
                        },
                        success: function (result) {
                            $("#HManagerID").val(result.data[0].HEmpID);
                            $("#HManagerName").val(result.data[0].负责人);
                        }, error: function () {
                            layer.alert("发生错误!", { icon: 5 });
                        }
                    });
                }
            }
            //行内快捷键筛选
            function set_GridCellCheck(obj) {
@@ -1279,7 +1358,6 @@
                })
            }
            //#endregion
            //#region ä¿å­˜åŽæµè§ˆæ–¹æ³•
            function ReRoadBillMain() {
WebTM/views/ÏúÊÛ¹ÜÀí/·¢»õ֪ͨµ¥/Xs_SeOutStockBillList.html
@@ -264,6 +264,8 @@
                       ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                        , { field: '日期', title: '日期', width: 125, sort: true }
                        , { field: '单据号', title: '单据号', width: 125, sort: true }
                        , { field: '状态', title: '状态', width: 125, sort: true }
                        , { field: '行状态', title: '行状态', width: 125, sort: true }
                        , { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
                        , { field: 'HCusID', title: 'HCusID', hide: true, sort: true }
                        , { field: '客户代码', title: '客户代码', width: 125, sort: true }
@@ -302,6 +304,7 @@
                        , { field: '计量单位代码', title: '计量单位代码', sort: true }
                        , { field: '计量单位', title: '计量单位', width: 125, sort: true }
                        , { field: '数量', title: '数量', sort: true }
                        , { field: '已关联数量', title: '已关联数量', sort: true }
                        , { field: '单价', title: '单价', sort: true }
                        , { field: '金额', title: '金额', sort: true }
                        , { field: 'HWHID', title: 'HWHID', hide: true, sort: true }
@@ -422,28 +425,33 @@
                            var HSourceEntryID = data[0].源单子内码;
                            //逻辑删除方法
                            layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                                $.ajax({
                                    type: "GET",
                                    url: GetWEBURL() + "Xs_SeOutStockBill/DeltetSeOutStockBill", //方法所在页面和方法名
                                    data: { "HInterID": InterID, "HsupId": HsupId, "HQty": HQty, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "user": sessionStorage["HUserName"]},
                                    success: function (result) {
                                        if (result.count == 1) {
                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                                // å¾—到frame索引
                                                var index = layer.getFrameIndex(window.name);
                                                //关闭当前frame
                                                layer.close(index);
                                                //修改为功后刷新界面
                                                window.location.reload();
                                            });
                                if (data[0].状态=="创建") {
                                    $.ajax({
                                        type: "GET",
                                        url: GetWEBURL() + "Xs_SeOutStockBill/DeltetSeOutStockBill", //方法所在页面和方法名
                                        data: { "HInterID": InterID, "HsupId": HsupId, "HQty": HQty, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "user": sessionStorage["HUserName"] },
                                        success: function (result) {
                                            if (result.count == 1) {
                                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                                    // å¾—到frame索引
                                                    var index = layer.getFrameIndex(window.name);
                                                    //关闭当前frame
                                                    layer.close(index);
                                                    //修改为功后刷新界面
                                                    window.location.reload();
                                                });
                                        } else {
                                            layer.alert(result.code + result.Message, { icon: 5 });
                                            } else {
                                                layer.alert(result.code + result.Message, { icon: 5 });
                                            }
                                        }, error: function () {
                                            layer.alert("接口请求失败!", { icon: 5 });
                                        }
                                    }, error: function () {
                                        layer.alert("接口请求失败!", { icon: 5 });
                                    }
                                });
                                    });
                                } else {
                                    layer.msg('此条数据不是创建状态,无法删除!');
                                }
                            })
                        }
                        else {
WebTM/views/ÏúÊÛ¹ÜÀí/Ó¦ÊÕµ¥/Xs_ReceivableBill.html
@@ -103,7 +103,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="background-color:#efefef4d;" readonly>
                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="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>
@@ -1309,7 +1309,7 @@
                                , "HDeleteDate": data.作废日期 == null ? "" : Format(new Date(data.作废日期), "yyyy-MM-dd")
                            });
                            HOrgIDBar = 0;
                            HOrgIDBar = sessionStorage["OrganizationID"];
                            //子表  èµ‹å€¼
                            var rowdata = [];
WebTM/views/ÏúÊÛ¹ÜÀí/Ó¦ÊÕµ¥/Xs_ReceivableBillList.html
@@ -506,31 +506,36 @@
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid.toString();
                    layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        //逻辑删除方法
                        $.ajax({
                            url: GetWEBURL() + '/Xs_ReceivableBill/delete',
                            type: "GET",
                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame
                        if (data[0].单据状态=="创建") {
                            var wait = layer.load();
                            //逻辑删除方法
                            $.ajax({
                                url: GetWEBURL() + '/Xs_ReceivableBill/delete',
                                type: "GET",
                                data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
                                success: function (result) {
                                    if (result.count == 1) {
                                        layer.msg(result.Message, { icon: 1 }, function () {
                                            // å¾—到frame索引
                                            var index = layer.getFrameIndex(window.name);
                                            //关闭当前frame
                                            layer.close(wait);
                                            //修改为功后刷新界面
                                            $("#btnSearch").trigger('click');
                                        });
                                    } else {
                                        layer.alert(result.code + result.Message, { icon: 5 });
                                        layer.close(wait);
                                        //修改为功后刷新界面
                                        $("#btnSearch").trigger('click');
                                    });
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    }
                                }, error: function () {
                                    layer.alert("接口请求失败!", { icon: 5 });
                                    layer.close(wait);
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                                layer.close(wait);
                            }
                        });
                            });
                        } else {
                            layer.msg('此数据不是创建状态,无法删除!');
                        }
                    })
                }
                else {
WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛ¶©µ¥/Xs_SeOrderBillList.html
@@ -544,17 +544,19 @@
                        //, { field: '结算方式代码', title: '结算方式代码', width: 125, sort: true }
                        //, { field: '结算方式', title: '结算方式', width: 125, sort: true }
                        //, { field: '结算日期', title: '结算日期', width: 170, sort: true }
                        //, { field: 'HCurID', title: 'HCurID', hide: true, sort: true }
                        , { field: 'HCurID', title: 'HCurID', hide: true, sort: true }
                        //, { field: '币别代码', title: '币别代码', sort: true }
                        //, { field: '币别', title: '币别', sort: true }
                        //, { field: '汇率', title: '汇率', sort: true }
                        //, { field: 'HDeptID', title: 'HDeptID', hide: true, sort: true }
                        , { field: '币别', title: '币别', hide: true, sort: true }
                        , { field: '汇率', title: '汇率', hide: true, sort: true }
                        , { field: 'HDeptID', title: 'HDeptID', hide: true, sort: true }
                        //, { field: '部门代码', title: '部门代码', width: 125, sort: true }
                        //, { field: '部门', title: '部门', width: 125, sort: true }
                        , { field: '部门', title: '部门', width: 125, hide: true,sort: true }
                        //, { field: '销售方式', title: '销售方式', sort: true }
                        //, { field: 'HManagerID', title: 'HManagerID', hide: true, sort: true }
                        , { field: 'HManagerID', title: 'HManagerID', hide: true, sort: true }
                        //, { field: '主管代码', title: '主管代码', sort: true }
                        //, { field: '主管', title: '主管', sort: true }
                        , { field: '主管', title: '主管', hide: true, sort: true }
                        , { field: '主仓库id', title: '主仓库id', hide: true, sort: true }
                        , { field: '主仓库', title: '主仓库', hide: true, sort: true }
                        //, { field: '摘要', title: '摘要', sort: true }
                        //, { field: '批号', title: '批号', sort: true }
                        //, { field: '税额', title: '税额', sort: true }
WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill.html
@@ -78,13 +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>
                                                <!--<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
                                                    <option style="color:blue;" selected="selected" value="1401">销售订单</option>
                                                </select>-->
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -561,7 +560,7 @@
            Organ();
            //动态获取源单
            //HBillType
            HBillType();
            //#region é¡µé¢åˆå§‹åŒ–后,根据客户获取客户余额
            getCustomerBalance($("#HSupID").val());
@@ -596,27 +595,53 @@
            //#region ä¿å­˜æŒ‰é’®
            form.on('submit(Saver)', function (data) {
                if (OperationType == 1 || OperationType == 4) {
                    //#region åˆ¤æ–­æºå•状态
                    for (var i = 0; i < option.data.length; i++) {
                        var HSourceBillData = "";
                        var HSourceBillData = getPushSourceBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID);            //获取源单数据
                        if (HSourceBillData != "none") {
                            if (HSourceBillData == null) {
                                layer.alert("保存失败!第" + (i+1) + "行:未查询到源单单据!", { icon: 5 });
                                return;
                            } else if (HSourceBillData.状态 != "已审核") {
                                var err = "保存失败!原因:第" + (i + 1) + "行-源单单据状态为“" + HSourceBillData.状态 + "”,不允许保存!";
                                layer.alert(err, { icon: 5 });
                                return;
                            } else if (HSourceBillData.行状态 == "已关闭") {
                                layer.alert("保存失败!第" + (i + 1) + "行:该行记录行状态为'已关闭'状态!", { icon: 5 });
                    if ($("#BillType").val() == "1401") {
                        //#region åˆ¤æ–­æºå•状态  é”€å”®è®¢å•
                        for (var i = 0; i < option.data.length; i++) {
                            var HSourceBillData = "";
                            var HSourceBillData = getPushSourceBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID);            //获取源单数据
                            if (HSourceBillData != "none") {
                                if (HSourceBillData == null) {
                                    layer.alert("保存失败!第" + (i + 1) + "行:未查询到源单单据!", { icon: 5 });
                                    return;
                                } else if (HSourceBillData.状态 != "已审核") {
                                    var err = "保存失败!原因:第" + (i + 1) + "行-源单单据状态为“" + HSourceBillData.状态 + "”,不允许保存!";
                                    layer.alert(err, { icon: 5 });
                                    return;
                                } else if (HSourceBillData.行状态 == "已关闭") {
                                    layer.alert("保存失败!第" + (i + 1) + "行:该行记录行状态为'已关闭'状态!", { icon: 5 });
                                    return;
                                }
                            } else {
                                return;
                            }
                        } else {
                            return;
                        }
                        //#endregion
                    }
                    else if ($("#BillType").val() == "1402") {
                        //#region åˆ¤æ–­æºå•状态  å‘货通知单
                        for (var i = 0; i < option.data.length; i++) {
                            var HSourceBillData = "";
                            var HSourceBillData = getPushSeOutStockBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID);            //获取源单数据
                            if (HSourceBillData != "none") {
                                if (HSourceBillData == null) {
                                    layer.alert("保存失败!第" + (i + 1) + "行:未查询到源单单据!", { icon: 5 });
                                    return;
                                } else if (HSourceBillData.状态 != "已审核") {
                                    var err = "保存失败!原因:第" + (i + 1) + "行-源单单据状态为“" + HSourceBillData.状态 + "”,不允许保存!";
                                    layer.alert(err, { icon: 5 });
                                    return;
                                } else if (HSourceBillData.行状态 == "已关闭") {
                                    layer.alert("保存失败!第" + (i + 1) + "行:该行记录行状态为'已关闭'状态!", { icon: 5 });
                                    return;
                                }
                            } else {
                                return;
                            }
                        }
                    //#endregion
                    }
                }
@@ -877,7 +902,7 @@
                        //数据校验合格,重算记录
                        var HQty = value * 1;                           //数量
                        var HPrice = obj.data.HPrice * 1;               //单价
                        var HTaxRate = obj.data.HTaxRate * 0.01;           //税率
                        var HTaxRate = obj.data.HTaxRate !== undefined ? obj.data.HTaxRate * 0.01 : 0           //税率
                        /*var HDiscountRate = obj.data.HDiscountRate * 1; //折扣率*/
                        var HTaxPrice = HPrice * (1 + HTaxRate);        //含税单价=单价*(1+税率)
                        /*var HRelTaxPrice = HTaxPrice * HDiscountRate;   //实际含税单价=含税单价*折扣率*/
@@ -922,7 +947,7 @@
                        //数据校验合格,重算记录
                        var HQty = obj.data.HQty * 1;                   //数量
                        var HPrice = value * 1;                         //单价
                        var HTaxRate = obj.data.HTaxRate * 0.01;           //税率
                        var HTaxRate = obj.data.HTaxRate !== undefined ? obj.data.HTaxRate * 0.01 : 0;      //税率
                        /*var HDiscountRate = obj.data.HDiscountRate * 1; //折扣率*/
                        var HTaxPrice = HPrice * (1 + HTaxRate);        //含税单价=单价*(1+税率)
                        /*var HRelTaxPrice = HTaxPrice * HDiscountRate;   //实际含税单价=含税单价*折扣率*/
@@ -1162,6 +1187,7 @@
                });
            }
            //#endregion
            //#region å¼¹çª—选择方法
            //#region é€‰æ‹©é”€å”®éƒ¨é—¨
            function get_checkDept() {
@@ -2756,11 +2782,14 @@
                    var temp = getPushSeOutStockBillInit(checkStatus.data[i].hmainid, checkStatus.data[i].hsubid);
                    if (temp != "none") {
                        dataArray.push(temp);
                        if (temp.审核人 != "") {
                        if (temp.状态 != "已审核") {
                            layer.msg("下推失败!单据号【" + temp.单据号 + "】单据状态不为已审核状态!");
                            return;
                        }
                        if (temp.行状态 == "已关闭") {
                            layer.msg("下推失败!单据号【" + temp.单据号 + "】下选中的记录中存在已关闭状态的记录!");
                            return;
                        }
                        if (temp.关闭人 != "") {
                            layer.msg("下推失败!单据号【" + temp.单据号 + "】下选中的记录中存在已关闭状态的记录!");
                            return;
WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBillList.html
@@ -405,6 +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: '单价', width: 200, sort: true, totalRow: true}
                        , { field: '税率', title: '税率', width: 200, sort: true, totalRow: true }
                        , { field: '含税单价', title: '含税单价', width: 200, sort: true, totalRow: true }
@@ -840,28 +841,33 @@
                    var InterID = data[0].hmainid.toString();
                    //逻辑删除方法
                    layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "Kf_SellOutBill/DeltetSellOutBill", //方法所在页面和方法名
                            data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame
                                        layer.close(index);
                                        //修改为功后刷新界面
                                        $("#btnSearch").trigger('click');
                                    });
                        if (data[0].状态=="创建") {
                            $.ajax({
                                type: "GET",
                                url: GetWEBURL() + "Kf_SellOutBill/DeltetSellOutBill", //方法所在页面和方法名
                                data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                                success: function (result) {
                                    if (result.count == 1) {
                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                            // å¾—到frame索引
                                            var index = layer.getFrameIndex(window.name);
                                            //关闭当前frame
                                            layer.close(index);
                                            //修改为功后刷新界面
                                            $("#btnSearch").trigger('click');
                                        });
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    } else {
                                        layer.alert(result.code + result.Message, { icon: 5 });
                                    }
                                }, error: function () {
                                    layer.alert("接口请求失败!", { icon: 5 });
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                            }
                        });
                            });
                        } else {
                            layer.msg('此条数据不是创建状态,无法删除!');
                        }
                    })
                }
                else {
WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Add_Edit_Kf_POStockInBillList.html
@@ -1816,8 +1816,15 @@
                        $("#HDeptID").val(checkStatus.data[0].HDeptID);
                        $("#HDeptName").val(checkStatus.data[0].部门);
                        $("#HWHID").val(checkStatus.data[0].主表仓库ID);
                        $("#HWHName").val(checkStatus.data[0].主表仓库);
                        //两边显示的字段不一样所以用判断去赋值
                        if ($("#HSourceBillType").val() == "1102") {  //采购订单
                            $("#HWHID").val(checkStatus.data[0].HWHID);
                            $("#HWHName").val(checkStatus.data[0].仓库);
                        } else if ($("#HSourceBillType").val() == "1103") {  //收货通知单
                            $("#HWHID").val(checkStatus.data[0].主表仓库ID);
                            $("#HWHName").val(checkStatus.data[0].主表仓库);
                        }
                        $("#HSupID").val(checkStatus.data[0].HSupID);
                        $("#HSupName").val(checkStatus.data[0].供应商);
                        $("#HEmpID").val(checkStatus.data[0].HEmpID);