zrg
2024-04-25 8f0257ed4e0f6692226685c5a66a849c96f11c31
直接调拨单,调拨申请单(未审核 已关闭的单子 不允许下推)
4个文件已修改
278 ■■■■ 已修改文件
WebTM/layuiadmin/Scripts/webConfig.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/仓库调拨/Add_Edit_Kf_MoveStockBill.html 140 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockRequestBillList.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/分步式调入单/Fb_StepFoldinBillEdit.html 129 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,12 +3,12 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:8083/API/";  //陈雯静本地配置
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
   /* var WEBURL = "http://47.96.97.237/API/";   //智云服务器*/
WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Add_Edit_Kf_MoveStockBill.html
@@ -1198,15 +1198,19 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                              , end: function () {
                                    obj.update({
                                     "HMaterID" :OptionData.HMaterID
                                        ,"物料代码" : OptionData.物料代码
                                       , "物料名称" :OptionData.物料名称
                                        ,"规格型号" : OptionData.规格型号
                                        ,"HUnitID" :OptionData.HUnitID
                                        ,"计量单位" : OptionData.计量单位名称
                                })
                                , end: function () {
                                    if (OptionData.length>0) {
                                        obj.update({
                                            "HMaterID": OptionData.HMaterID
                                            , "物料代码": OptionData.物料代码
                                            , "物料名称": OptionData.物料名称
                                            , "规格型号": OptionData.规格型号
                                            , "HUnitID": OptionData.HUnitID
                                            , "计量单位": OptionData.计量单位名称
                                        })
                                        OptionData = [];
                                    }
                                }
                            });
                        }
@@ -1232,17 +1236,20 @@
                                    }
                                    //更新表格缓存的数据
                                    obj.update({
                                        "HPropertyID": checkStatus.data[0].HItemID,
                                        "辅助属性": checkStatus.data[0].辅助属性名称
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                              , end: function () {
                                obj.update({
                                    "HPropertyID": OptionData.HItemID
                                    , "辅助属性": OptionData.辅助属性名称
                                })
                                , end: function () {
                                    if (OptionData.length > 0) {
                                        obj.update({
                                            "HPropertyID": OptionData.HItemID
                                            , "辅助属性": OptionData.辅助属性名称
                                        })
                                        OptionData = [];
                                    }
                            }
                            })
                        }
@@ -1277,10 +1284,14 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                obj.update({
                                    "HUnitID": OptionData.HItemID
                                    , "计量单位": OptionData.计量单位名称
                                })
                                    if (OptionData.length > 0) {
                                        obj.update({
                                            "HUnitID": OptionData.HItemID
                                            , "计量单位": OptionData.计量单位名称
                                        })
                                        OptionData = [];
                                    }
                            }
                            })
                        }
@@ -1312,11 +1323,15 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                obj.update({
                                    "HWHID": OptionData.HItemID
                                    , "调入仓库": OptionData.仓库名称
                                })
                                , end: function () {
                                    if (OptionData.length > 0) {
                                        obj.update({
                                            "HWHID": OptionData.HItemID
                                            , "调入仓库": OptionData.仓库名称
                                        })
                                        OptionData = [];
                                    }
                            }
                            })
                            
@@ -1350,10 +1365,14 @@
                                        layer.close(index);//关闭弹窗
                                    }
                                    , end: function () {
                                        obj.update({
                                            "HSCWHID": OptionData.HItemID
                                            , "调出仓库": OptionData.仓库名称
                                        })
                                        if (OptionData.length > 0) {
                                            obj.update({
                                                "HSCWHID": OptionData.HItemID
                                                , "调出仓库": OptionData.仓库名称
                                            })
                                            OptionData = [];
                                        }
                                    }
                                })
                            }
@@ -1385,11 +1404,15 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                            , end: function () {
                                obj.update({
                                    "HSPID": OptionData.HItemID
                                    , "仓位名称": OptionData.仓位名称
                                })
                                , end: function () {
                                    if (OptionData.length > 0) {
                                        obj.update({
                                            "HSPID": OptionData.HItemID
                                            , "仓位名称": OptionData.仓位名称
                                        })
                                        OptionData = [];
                                    }
                            }
                            })
                        }
@@ -1517,7 +1540,29 @@
                        if (checkStatus.data.length == 0) {
                            return layer.msg("请至少选择一条数据!");
                        }
                        layer.alert("你已选择" + checkStatus.data.length + "条数据");
                        //layer.alert("你已选择" + checkStatus.data.length + "条数据");
                        //未审核 å·²å…³é—­çš„单子不允许下推
                        for (var i = 0; i < checkStatus.data.length; i++) {
                            var temp = getPushSource_MoveStockRequestInBillInit(checkStatus.data[i].hmainid, checkStatus.data[i].hsubid);
                            if (temp != "none") {
                                if (temp.状态 != "已审核") {
                                    layer.msg("下推失败!单据号【" + temp.单据号 + "】单据状态不为已审核状态!");
                                    layer.close(index);//关闭弹窗
                                    return;
                                }
                                if (temp.行状态 != "") {
                                    layer.msg("下推失败!单据号【" + temp.单据号 + "】下选中的记录中存在已关闭状态的记录!");
                                    layer.close(index);//关闭弹窗
                                    return;
                                }
                            } else {
                                return;
                            }
                        }
                        //获取收料通知单代码
                        var ProcessNumber = [];
                        for (var i = 0; i < checkStatus.data.length; i++) {
@@ -1654,6 +1699,33 @@
            }
            //#endregion
            //#region æ ¹æ®ä¸»å†…码与子内码获取源单调拨申请单数据
            function getPushSource_MoveStockRequestInBillInit(HSourceInterID, HSourceEntryID) {
                var res = "none";
                $.ajax({
                    url: GetWEBURL() + "/Kf_MoveStockBill/loadKf_MoveStockBillMain_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
            //#endregion
WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockRequestBillList.html
@@ -254,6 +254,8 @@
                        , { field: 'HBillSubType', title: '单据类型', hide: true, sort: true }
                        , { field: '日期', title: '日期', width: 160, sort: true }
                        , { field: '单据号', title: '单据号', width: 160, sort: true }
                        , { field: '状态', title: '状态', width: 160, sort: true }
                        , { field: '行状态', title: '行状态', width: 160, sort: true }
                        , { field: 'HEmpID', title: 'HEmpID', width: 160, hide: true, sort: true }
                        , { field: '业务员代码', title: '业务员代码', width: 200, sort: true }
                        , { field: '业务员', title: '业务员', width: 200, sort: true }
@@ -281,6 +283,7 @@
                        , { field: '计量单位', title: '计量单位', width: 200, sort: true }
                        , { field: '应收数量', title: '应收数量', width: 115, sort: true, totalRow: 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 }
                        , { field: '金额', title: '金额', width: 200, sort: true, totalRow: true }
                        , { field: 'HWHID', title: 'HWHID', width: 115, hide: true, sort: true }
WebTM/views/²Ö´æ¹ÜÀí/·Ö²½Ê½µ÷Èëµ¥/Fb_StepFoldinBillEdit.html
@@ -758,15 +758,19 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                              , end: function () {
                                    obj.update({
                                     "HMaterID" :OptionData.HMaterID
                                        ,"物料代码" : OptionData.物料代码
                                       , "物料名称" :OptionData.物料名称
                                        ,"规格型号" : OptionData.规格型号
                                        ,"HUnitID" :OptionData.HUnitID
                                        ,"计量单位" : OptionData.计量单位名称
                                })
                                , end: function () {
                                    if (OptionData.length>0) {
                                        obj.update({
                                            "HMaterID": OptionData.HMaterID
                                            , "物料代码": OptionData.物料代码
                                            , "物料名称": OptionData.物料名称
                                            , "规格型号": OptionData.规格型号
                                            , "HUnitID": OptionData.HUnitID
                                            , "计量单位": OptionData.计量单位名称
                                        })
                                        OptionData = [];
                                    }
                                }
                            })
                        }
@@ -797,11 +801,15 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                obj.update({
                                    "HUnitID": OptionData.HItemID
                                    , "计量单位": OptionData.计量单位名称
                                })
                                , end: function () {
                                    if (OptionData.length > 0) {
                                        obj.update({
                                            "HUnitID": OptionData.HItemID
                                            , "计量单位": OptionData.计量单位名称
                                        })
                                        OptionData = [];
                                    }
                            }
                            })
                        }
@@ -832,11 +840,15 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                 , end: function () {
                                obj.update({
                                    "HSecUnitID": OptionData.HItemID
                                    , "辅助计量单位": OptionData.辅助属性名称
                                })
                                , end: function () {
                                    if (OptionData.length > 0) {
                                        obj.update({
                                            "HSecUnitID": OptionData.HItemID
                                            , "辅助计量单位": OptionData.辅助属性名称
                                        })
                                        OptionData = [];
                                    }
                            }
                            })
                        }
@@ -867,11 +879,15 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                obj.update({
                                    "HWHID": OptionData.HItemID
                                    , "调入仓库": OptionData.仓库名称
                                })
                                , end: function () {
                                    if (OptionData.length > 0) {
                                        obj.update({
                                            "HWHID": OptionData.HItemID
                                            , "调入仓库": OptionData.仓库名称
                                        })
                                        OptionData = [];
                                    }
                            }
                            })
                        }
@@ -902,11 +918,15 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                obj.update({
                                    "HSCWHID": OptionData.HItemID
                                    , "调出仓库": OptionData.仓库名称
                                })
                                , end: function () {
                                    if (OptionData.length > 0) {
                                        obj.update({
                                            "HSCWHID": OptionData.HItemID
                                            , "调出仓库": OptionData.仓库名称
                                        })
                                        OptionData = [];
                                    }
                            }
                            })
                        }
@@ -956,7 +976,29 @@
                        if (checkStatus.data.length == 0) {
                            return layer.msg("请至少选择一条数据!");
                        }
                        layer.alert("你已选择" + checkStatus.data.length + "条数据");
                        //layer.alert("你已选择" + checkStatus.data.length + "条数据");
                        //未审核 å·²å…³é—­çš„单子不允许下推
                        for (var i = 0; i < checkStatus.data.length; i++) {
                            var temp = getPushSource_ICStockInBillInit(checkStatus.data[i].hmainid, checkStatus.data[i].hsubid);
                            if (temp != "none") {
                                if (temp.状态 != "已审核") {
                                    layer.msg("下推失败!单据号【" + temp.单据号 + "】单据状态不为已审核状态!");
                                    layer.close(index);//关闭弹窗
                                    return;
                                }
                                if (temp.行状态 != "") {
                                    layer.msg("下推失败!单据号【" + temp.单据号 + "】下选中的记录中存在已关闭状态的记录!");
                                    layer.close(index);//关闭弹窗
                                    return;
                                }
                            } else {
                                return;
                            }
                        }
                        //获取分步式调入单通知单代码
                        var ProcessNumber = [];
                        for (var i = 0; i < checkStatus.data.length; i++) {
@@ -1271,6 +1313,33 @@
            }
            //#endregion
            //#region æ ¹æ®ä¸»å†…码与子内码获取源单采购入库单数据
            function getPushSource_ICStockInBillInit(HSourceInterID, HSourceEntryID) {
                var res = "none";
                $.ajax({
                    url: GetWEBURL() + "/Kf_StepFoldInBill/loadKf_ICStockBillMain_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
            //#endregion