王 垚
2021-10-14 aacae8dd0e0655f00249543a7457b8be3c11662a
调拨单 增加 组织 部门根据组织过滤
3个文件已修改
177 ■■■■ 已修改文件
WebTM/views/Baseset/基础资料/Gy_WarehouseList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBill.html 167 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBillList.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_WarehouseList.html
@@ -47,6 +47,7 @@
        }
        var params = getUrlVars();
        var Type = params[params[0]];
        var HOtherOrgID = params[params[1]];
        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
@@ -93,6 +94,9 @@
                if (Value == null) {
                    Value = '';
                }
                if (HOtherOrgID > 0) {
                    Value = HOtherOrgID;
                }
                $.ajax({
                    type: "get",
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetWarehouseList_Json",
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldMoveStockStepInBill.html
@@ -113,58 +113,66 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-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="text" name="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">源单类型</label>
                                                <label class="layui-form-label">调拨类型</label>
                                                <div class="layui-input-inline">
                                                    <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
                                                        <option value="生产任务单">生产任务单</option>
                                                        <option value="手工录入">手工录入</option>
                                                    <select name="HStockStyle" lay-filter="aihao" id="HStockStyle">
                                                        <option value="同组织调拨">同组织调拨</option>
                                                        <option value="跨组织调拨">跨组织调拨</option>
                                                    </select>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">选单号</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
                                            <div class="layui-form-item">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">源单类型</label>
                                                    <div class="layui-input-inline">
                                                        <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
                                                            <option value="生产任务单">生产任务单</option>
                                                            <option value="手工录入">手工录入</option>
                                                        </select>
                                                    </div>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">摘要</label>
                                                <div class="layui-input-inline">
                                                    <textarea placeholder="请输入摘要" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">选单号</label>
                                                    <div class="layui-input-inline">
                                                        <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
                                                    </div>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">备注</label>
                                                <div class="layui-input-inline">
                                                    <textarea placeholder="请输入维备注" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">摘要</label>
                                                    <div class="layui-input-inline">
                                                        <textarea placeholder="请输入摘要" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">备注</label>
                                                    <div class="layui-input-inline">
                                                        <textarea placeholder="请输入维备注" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
                                                    </div>
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>增加一行</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>复制一行</button>
                            </div>
                        </script>
                        <script type="text/html" id="xuhao">
                            {{d.LAY_TABLE_INDEX+1}}
                        </script>
                            <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                            <script type="text/html" id="toolbarDemo">
                                <div class="layui-btn-container">
                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>增加一行</button>
                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>复制一行</button>
                                </div>
                            </script>
                            <script type="text/html" id="xuhao">
                                {{d.LAY_TABLE_INDEX+1}}
                            </script>
                    </form>
                </div>
            </div>
@@ -174,7 +182,6 @@
        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>-->
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
    </script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -222,6 +229,7 @@
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                , height: 500
                , limit: 500 //每页默认显示的数量
                //,url: '/demo/table/user/' //数据接口
                , page: true //开启分页
                , cols: [[ //表头
@@ -239,9 +247,13 @@
                    , { field: 'HQty', title: '实发数量', edit: 'text', width: 100 }
                    , { field: 'HPrice', title: '单价', edit: 'text', width: 100 }
                    , { field: 'HMoney', title: '金额', edit: 'text', width: 100 }
                    , { field: 'HStockOrgID', title: 'HStockOrgID', width: 100, hide: true }
                    , { field: 'HOtherOrgID', title: 'HOtherOrgID', width: 100, hide: true }
                    , { field: 'HOtherOrgCode', title: '调出组织代码', edit: 'text', event: 'HOtherOrgCode', width: 120 }
                    , { field: 'HOtherOrgName', title: '调出组织', width: 100 }
                    , { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true }
                    , { field: 'HWHCode', title: '调入仓库代码', edit: 'text', event: 'HWHCode', width: 120 }
                    , { field: 'HWHName', title: '调入仓库', edit: 'text', width: 100 }
                    , { field: 'HWHName', title: '调入仓库', width: 100 }
                    , { field: 'HSPID', title: 'HSPID', edit: 'text', width: 100, hide: true }
                    , { field: 'HSPCode', title: '调入仓位代码', edit: 'text', event: 'HSPCode', width: 120 }
                    , { field: 'HSPName', title: '调入仓位', edit: 'text', width: 100 }
@@ -254,12 +266,11 @@
                    , { field: 'HRemark', title: '表体备注', edit: 'text', width: 100 }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                ]]
                , limit: 500 //每页默认显示的数量
            };
            //判断是否新增
            if (OperationType == 1) {
                //初始加载表格{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" }];
                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HStockOrgID": sessionStorage["OrganizationID"], "HOtherOrgID": 0, "HOtherOrgCode": "", "HOtherOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" }];
                table.render(option);
            }
            else {
@@ -292,13 +303,14 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;;
                var AddRow = table.cache['mainTable'];
                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" };
                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HStockOrgID": sessionStorage["OrganizationID"], "HOtherOrgID": 0, "HOtherOrgCode": "", "HOtherOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" };
                switch (obj.event) {
                    case 'btn-AddLine':
                        //table.cache["mainTable"].push(AddRow[rows]);
                        table.cache["mainTable"].push(NewRow);
                        option.data = table.cache["mainTable"];
                        table.render(option);
                        rows++;
                        //layer.msg('增加一行按钮!')
                        break;
@@ -316,7 +328,7 @@
                            table.cache["mainTable"].push(JSON.parse(copyrow));//将复制的行强转成json追加到表格上
                            option.data = table.cache["mainTable"];//将数据绑定到data上
                            table.render(option);//将数据渲染到表格上
                            //layer.alert(copyrow);
                        }
                        break;
                }
@@ -388,6 +400,59 @@
                            });
                        }
                        if (obj.event === 'HOtherOrgCode')  //调入仓库代码
                        {
                            //页面层-自定义
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', //加上边框
                                title: '组织列表',
                                closeBtn: 1,
                                shift: 2,
                                area: ['80%', '80%'],
                                maxmin: true,
                                content: ['../../PublicPage/Organizations.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {
                                    //按钮【按钮一】的回调
                                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('请选择数据');
                                    }
                                    var HStockStyle = $("#HStockStyle").val();
                                    if (HStockStyle == "跨组织调拨") //false åŒç»„织 true è·¨ç»„织                                    {
                                    {
                                        if (sessionStorage["OrganizationID"] == checkStatus.data[0].HItemID) {
                                            layer.close(layer.index);
                                            return layer.msg('调拨类型为跨组织调拨,当前组织:' + sessionStorage["Organization"] + '请选择其他组织');
                                        }
                                    }
                                    else {
                                        if (sessionStorage["OrganizationID"] != checkStatus.data[0].HItemID) {
                                            layer.close(layer.index);
                                            return layer.msg('调拨类型为同组织调拨,请选择当前组织:' + sessionStorage["Organization"]);
                                        }
                                    }
                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HOtherOrgID: checkStatus.data[0].HItemID,
                                        HOtherOrgCode: checkStatus.data[0].HNumber,
                                        HOtherOrgName: checkStatus.data[0].HName,
                                    });
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                                }
                                , btn2: function (index, layero) {
                                    //按钮【按钮二】的回调
                                    //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                                },
                                end: function () {
                                }
                            });
                        }
                        if (obj.event === 'HWHCode')  //调入仓库代码
                        {
                            //页面层-自定义
@@ -399,7 +464,7 @@
                                shift: 2,
                                area: ['80%', '80%'],
                                maxmin: true,
                                content: ['../../../views/Baseset/基础资料/Gy_WarehouseList.html?Type=HWHID', 'yes'],
                                content: ['../../../views/Baseset/基础资料/Gy_WarehouseList.html?Type=HWHID&HOrgID=' + sessionStorage["OrganizationID"], 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {
@@ -470,6 +535,10 @@
                        }
                        if (obj.event === 'HSCWHCode')  //调出仓库代码
                        {
                            var HOtherOrgID = obj.data.HOtherOrgID;
                            if (HOtherOrgID == 0 || HOtherOrgID == "") {
                                return layer.msg('请选择调出组织');
                            }
                            //页面层-自定义
                            layer.open({
                                type: 2,
@@ -479,7 +548,7 @@
                                shift: 2,
                                area: ['80%', '80%'],
                                maxmin: true,
                                content: ['../../../views/Baseset/基础资料/Gy_WarehouseList.html?Type=HWHID', 'yes'],
                                content: ['../../../views/Baseset/基础资料/Gy_WarehouseList.html?Type=HWHID&HOrgID=' + HOtherOrgID, 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {
@@ -674,7 +743,7 @@
                                , "HDate": formatDate(data.日期)
                                , "HInnerBillNo": data.内部单据号
                                , "HWHID": data.HWHID1                    //仓库ID
                                , "HWHName": data.仓库                   //仓库名称
                                , "HWHName": data.器具仓库                   //仓库名称
                                , "HSecManagerID": data.hsecmanagerid    //验收员ID
                                , "HSecManagerName": data.领料人         //验收员名称
                                , "HKeeperID": data.hkeeperid            //保管员ID
@@ -685,6 +754,7 @@
                                , "XDH": ""                               //选单号
                                , "HExplanation": data.摘要              //摘要
                                , "HRemark": data.表头备注                    //备注
                                , "HStockStyle": data.调拨类型
                            });
                        } else {
@@ -955,6 +1025,8 @@
                    //}
                }
            });
        });
        //定义全局变量
        var HReasonName, ReasonID, EmpName, SQProcName,
@@ -1000,6 +1072,7 @@
        }
        //非空验证
        function AllowLoadData(sSubStr) {
            var HStockStyle = $("#HStockStyle").val();
            var Result = true;
            if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
                layer.msg("器具仓库不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
@@ -1016,7 +1089,7 @@
            if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
                layer.msg("部门不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            }
            if (typeof (sSubStr) == "undefined" || sSubStr == "") {
                layer.msg("没有物料明细记录", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
@@ -1036,6 +1109,14 @@
                        layer.msg("明细记录第" + (i + 1) + "行,调出仓库为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return Result = false;
                    }
                    if (HStockStyle == "跨组织调拨" && sSubStr[i].HStockOrgID == sSubStr[i].HOtherOrgID) {
                        layer.msg("调拨类型为跨组织调拨,明细记录第" + (i + 1) + "行,调出组织和当前组织一致 !", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return Result = false;
                    }
                    if (HStockStyle == "同组织调拨" && sSubStr[i].HStockOrgID != sSubStr[i].HOtherOrgID) {
                        layer.msg("调拨类型为同组织调拨,明细记录第" + (i + 1) + "行,调出组织和当前组织不一致 !", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return Result = false;
                    }
                }
            }
            else {
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldMoveStockStepInBillList.html
@@ -152,9 +152,8 @@
                        , { field: '日期', title: '日期', width: 125, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '单据号', title: '单据号', width: 195 }
                        , { field: '单据类型', title: '单据类型', width: 110 }
                        //, { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
                        //, { field: '仓库代码', title: '仓库代码', width: 125 }
                        //, { field: '仓库', title: '仓库', width: 125 }
                        , { field: '器具仓库代码', title: '器具仓库代码', width: 125 }
                        , { field: '器具仓库', title: '器具仓库', width: 125 }
                        , { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true }
                        , { field: '领料人代码', title: '领料人代码', width: 180 }
                        , { field: '领料人', title: '领料人', width: 125 }
@@ -175,6 +174,7 @@
                        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
                        //, { field: '计量单位代码', title: '计量单位代码', width: 125 }
                        //, { field: '计量单位', title: '计量单位', width: 125 }
                        , { field: '调拨类型', title: '调拨类型', width: 100, hide: true }
                        , { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
                        , { field: '调入仓库代码', title: '调入仓库代码', width: 125 }
                        , { field: '调入仓库', title: '调入仓库', width: 125 }