王 垚
2022-09-26 b3770cb16a7e55e46d7016eb20849a4365e86825
下架找货单 委外入库 产品入库 增加班组和职员
6个文件已修改
1个文件已添加
509 ■■■■ 已修改文件
WebTM/WebTM.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/基础资料/Gy_EmployeeList.html 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/基础资料/Gy_GroupList.html 107 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/仓库调拨/Cc_LookingForBill.html 105 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html 150 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/委外入库/Kf_EntrustInBill_Fast.html 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -299,6 +299,7 @@
    <Content Include="views\Baseset\SRM_OpenTmpList.html" />
    <Content Include="views\Baseset\基础资料\Gy_CustomerList.html" />
    <Content Include="views\Baseset\基础资料\Gy_DepartmentList.html" />
    <Content Include="views\Baseset\基础资料\Gy_GroupList.html" />
    <Content Include="views\Baseset\基础资料\Gy_EmployeeList.html" />
    <Content Include="views\Baseset\基础资料\Gy_GetProductionResourcesList.html" />
    <Content Include="views\Baseset\基础资料\Gy_WorkCenterList.html" />
WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,19 +1,11 @@
function GetWEBURL() {
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    var WEBURL = "http://124.70.129.242/WebAPI/";          //雅琪诺
    //var WEBURL = "http://124.70.129.242:9090/WebAPI/";          //雅琪诺测试
    //var WEBURL = "http://localhost:8084/WebAPI/";
    //61.130.49.162:9090
    //WEBURL = "";
    var WEBURL = "http://localhost:8082/yqnwmsAPI/";
    return WEBURL
}
function GetWEBURL1() {
    //var WEBURL = 'http://192.168.16.80:8011/';           //办公室服务器
    var WEBURL = 'http://124.70.129.242/WebAPI/';          //雅琪诺
    //var WEBURL = 'http://124.70.129.242:9090/WebAPI/';          //雅琪诺测试
    //var WEBURL = 'http://localhost:8084/WebAPI/';
    //61.130.49.162:9090
    //WEBURL = "";
    //var WEBURL = 'http://124.70.129.242/WebAPI/';          //雅琪诺
    var WEBURL = "http://localhost:8082/yqnwmsAPI/";
    return WEBURL
}
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_EmployeeList.html
@@ -59,8 +59,13 @@
            });
            form.on('submit(FH)', function () {//选择仓库
                //var sMainStr = JSON.stringify(table.cache['ck-table']);
                var index = parent.layer.getFrameIndex(window.name);
                var checkStatus = table.checkStatus('ck-table')
                 , data = checkStatus.data;
                if (data.length == 0) {
                    parent.layer.close(index);
                    return;
                }
                switch (Type) {
                    case "HKeeper":  //返回保管
                        parent.GetHKeeperValue(data);
@@ -71,8 +76,13 @@
                    case "HWorker":  //返回操作工
                        parent.GetHWorkerValue(data);
                        break;
                    case "HEmpID1":  //
                        parent.GetHEmpID1Value(data);
                        break;
                    case "HEmpID2":  //
                        parent.GetHEmpID2Value(data);
                        break;
                }
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });
            RoadQuery($('#Value').val(), 0);
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_GroupList.html
New file
@@ -0,0 +1,107 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>班组列表</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-card">
            <!--<div class="layui-card-header"></div>-->
            <div class="layui-card-body" style="padding: 15px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label">过滤列</label>
                            <div class="layui-input-inline">
                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="请输入过滤列" class="layui-input">
                            </div>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">快速查询</button>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
    <table class="layui-hide" id="ck-table"></table>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script>
        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
                , form = layui.form
                , layer = layui.layer;
            form.on('submit(HQuery)', function () {//选择仓库
                //var sMainStr = JSON.stringify(table.cache['ck-table']);
                RoadQuery($('#Value').val());
            });
            form.on('submit(FH)', function () {//选择仓库
                //var sMainStr = JSON.stringify(table.cache['ck-table']);
                var index = parent.layer.getFrameIndex(window.name);
                var checkStatus = table.checkStatus('ck-table')
                    , data = checkStatus.data;
                if (data.length == 0) {
                    parent.layer.close(index);
                    return;
                }
                parent.GetGroupValue(data);
                parent.layer.close(index);
            });
            RoadQuery($('#Value').val());
            table.render({
                elem: '#ck-table'
                // , url: '/demo/table/user/'
                , data: []
                , cellMinWidth: 80 //全局定义常规单元格的最小宽度,layui 2.2.1 æ–°å¢ž
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HItemID', width: 150, title: '班组ID', hide: true }
                    , { field: 'HNumber', width: 150, title: '班组代码' }
                    , { field: 'HName', width: 150, title: '班组名称', sort: true }
                ]]
                , page: true
            });
            ///加载显示数据
            function RoadQuery(Where) {
                var Value = Where;
                if (Value == null) {
                    Value = '';
                }
                $.ajax({
                    type: "get",
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetDepartmentList_Json",
                    url: GetWEBURL() + "/Web/GetProductionTeamList_Json",
                    async: true,
                    data: { "sWhere": Value },
                    //data: { "Value": Value },
                    success: function (result) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('ck-table', {
                            data: ajaxReturnData
                            , height: 'full-10'
                            , loading: false
                            , done: function (index, res) {
                            }
                        });
                    },
                    error: function (result) {
                        console.log(result);
                        //layer.msg('获取采购订单出现异常', { icon: 2, time: 2000 });
                    }
                });
            };
        });
    </script>
</body>
</html>
WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Cc_LookingForBill.html
@@ -43,13 +43,13 @@
                    </div>
                    <div class="layui-tab layui-col-xs12" lay-filter="tab-LookingForBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1" style="padding:1px;display:none">表头信息</li>
                            <li lay-id="1" style="padding:1px;">表头信息</li>
                            <li lay-id="2" style="padding:1px;" class="layui-this">明细信息</li>
                            <li lay-id="3" style="padding:1px;">已扫信息</li>
                        </ul>
                        <div class="layui-tab-content">
                            <!--表头信息-->
                            <div class="layui-tab-item" style="display:none">
                            <div class="layui-tab-item">
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
@@ -89,6 +89,35 @@
                                        </div>
                                        <div class="layui-col-xs3">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="ProductionTeam-BT">...</button>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width: 90px; padding-left: 0px;">职员1</label>
                                        </div>
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HEmpName1" id="HEmpName1" lay-verify="HEmpName1" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HEmpID1" id="HEmpID1" lay-verify="HEmpID1" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpID1-BT">...</button>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width: 90px; padding-left: 0px; ">职员2</label>
                                        </div>
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HEmpName2" id="HEmpName2" lay-verify="HEmpName2" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HEmpID2" id="HEmpID2" lay-verify="HEmpID2" value="0" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HJiaYe" id="HJiaYe" lay-verify="HJiaYe" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpID2-BT">...</button>
                                        </div>
                                    </div>
                                </div>
@@ -172,12 +201,18 @@
            $("#HWHName").val(sessionStorage["HWHName"]);
            $("#HSPID").val(sessionStorage["HSPID"]);
            $("#HSPName").val(sessionStorage["HSPName"]);
            $("#HGroupID").val(sessionStorage["HGroupID"]);
            $("#HGroup").val(sessionStorage["HGroup"]);
            $("#HSourceID").val(sessionStorage["HSourceID"]);
            $("#HSource").val(sessionStorage["HSource"]);
            $("#HMakerID").val(sessionStorage["Czybm"]);
            $("#HMaker").val(sessionStorage["HUserName"]);
            $("#HGroupID").val(sessionStorage["HGroupID"])
            $("#HGroup").val(sessionStorage["HGroup"] == 'undefined' ? '' : sessionStorage["HGroup"]);
            $("#HEmpID1").val(sessionStorage["HBillerID"])
            $("#HEmpName1").val(sessionStorage["HUserName"])
            $("#HJiaYe").val($("#HEmpID1").val() + ',' + $("#HEmpID2").val());
            //判断用户是否绑定班组和生产资源
@@ -385,8 +420,7 @@
                            //    layer.close(index);
                            //    layer.msg("该实物在" + sSubStr[i].HSource+"裁切中,不允许扫码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            //}
                            else
                            {
                            else {
                                sSubStr[i].HIsStatus = "是";
                                sSubStr[i].HSourceID = $("#HSourceID").val();
                                sSubStr[i].HSource = $("#HSource").val();
@@ -460,9 +494,44 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_GetProductionTeamList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_GroupList.html', 'yes']
                    , resize: false
                    , cancel: function (index, layero) {
                    }
                })
            });
            //选择职员1
            form.on('submit(HEmpID1-BT)', function () {
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '职员列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_EmployeeList.html?Type=HEmpID1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                })
            });
            //选择职员2
            form.on('submit(HEmpID2-BT)', function () {
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '职员列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_EmployeeList.html?Type=HEmpID2', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                })
            });
@@ -519,7 +588,7 @@
                        url: GetWEBURL() + "/LookingFor/set_SaveLookingForBill_Json",
                        //url:"http://localhost:12761/LookingFor/set_SaveLookingForBill_Json",
                        async: true,
                        data: { "oMain": sSubStr },
                            data: { "oMain": sSubStr, "HJiaYe": $("#HJiaYe").val() },
                        dataType: "json",
                        success: function (result) {
                            if (result.count == 1) {
@@ -534,7 +603,7 @@
                            }
                            else {
                                layer.close(index);
                                layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                    layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        },
                        error: function (err) {
@@ -625,18 +694,25 @@
                $("#HSPID").val(obj[0].HItemID);
            }
        }
        //返回班组
        function GetProductionTeamValue(obj) {   //返回班组
        function GetGroupValue(obj) {
            if (obj.length == 0) {
                layer.msg("请先选择班组", { index: 0 });
            } else {
                $("#HGroupName").val(obj[0].班组);
                $("#HGroup").val(obj[0].HName);
                $("#HGroupID").val(obj[0].HItemID);
                layer.closeAll();
            }
        }
        function GetHEmpID1Value(obj) {
            $("#HEmpName1").val(obj[0].HName);
            $("#HEmpID1").val(obj[0].HItemID);
            $("#HJiaYe").val($("#HEmpID1").val() + ',' + $("#HEmpID2").val());
        }
        function GetHEmpID2Value(obj) {
            $("#HEmpName2").val(obj[0].HName);
            $("#HEmpID2").val(obj[0].HItemID);
            $("#HJiaYe").val($("#HEmpID1").val() + ',' + $("#HEmpID2").val());
        }
        //返回生产资源
        function GetProductionResourcesValue(obj) {  //返回生产资源
            if (obj.length == 0) {
@@ -649,6 +725,7 @@
        }
        function AllowLoadData(sSubStr, bnt) {  //非空验证
            return true;
            if ($("#HSourceBillNo").val() == '') {
                layer.msg("请先扫源单!", { icon: 5 });
                return false;
WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBill_Fast.html
@@ -159,6 +159,49 @@
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">班组</label>
                                        </div>
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HGroupName" id="HGroupName" lay-verify="HGroupName" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HGroupID" id="HGroupID" lay-verify="HGroupID" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupID-BT">...</button>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">职员1</label>
                                        </div>
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HEmpName1" id="HEmpName1" lay-verify="HEmpName1" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HEmpID1" id="HEmpID1" lay-verify="HEmpID1" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpID1-BT">...</button>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width: 40px; padding-left: 0px; ">职员2</label>
                                        </div>
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HEmpName2" id="HEmpName2" lay-verify="HEmpName2" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HEmpID2" id="HEmpID2" lay-verify="HEmpID2" value="0" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HJiaYe" id="HJiaYe" lay-verify="HJiaYe" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpID2-BT">...</button>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:45px;padding-left:0px;">单据号</label>
                                        </div>
                                        <div class="layui-col-xs6">
@@ -263,6 +306,15 @@
            $("#HMakerID").hide();
            $("#HBillerID").val(sessionStorage["HBillerID"]);
            $("#HBillerID").hide();
            $("#HGroupID").val(sessionStorage["HGroupID"])
            $("#HGroupName").val(sessionStorage["HGroup"] == 'undefined' ? '' : sessionStorage["HGroup"]);
            $("#HEmpID1").val(sessionStorage["HBillerID"])
            $("#HEmpName1").val(sessionStorage["HUserName"])
            $("#HJiaYe").val($("#HEmpID1").val() + ',' + $("#HEmpID2").val());
            var HSourceFlag = sessionStorage["SourceFlag"];
            //默认带入的仓库,如果启用仓位则仓位有效,如果没有启用则仓位灰度 new
@@ -312,8 +364,6 @@
                    }
                })
            }
            function RoadBillSub(linterid)//加载表体
            {
                table.render({
@@ -340,15 +390,7 @@
                    , height: 500
                })
            }
            //动态加载源单类型列表 new
            //判断是否新增
            if (linterid == null || linterid == 0) {
                //获取最大单据号 new
@@ -439,7 +481,6 @@
                }
            })
        });
        //选择验收
        form.on('submit(HSecManagerID-BT)', function (data) {//选择验收
            var sMainStr = JSON.stringify(data.field);
@@ -457,7 +498,6 @@
                }
            })
        });
        //选择部门
        form.on('submit(HDeptID-BT)', function () {//选择部门
            layer.open({
@@ -468,6 +508,54 @@
                , maxmin: true //允许全屏最小化
                , anim: 0 //0-6的动画形式,-1不开启
                , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                })
            });
            //选择职员1
            form.on('submit(HEmpID1-BT)', function () {
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '职员列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_EmployeeList.html?Type=HEmpID1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                })
            });
            //选择职员2
            form.on('submit(HEmpID2-BT)', function () {
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '职员列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_EmployeeList.html?Type=HEmpID2', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                })
            });
            //选择班组
            form.on('submit(HGroupID-BT)', function () {
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '职员列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_GroupList.html', 'yes']
                , resize: false
                , cancel: function () {
                    //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -568,8 +656,7 @@
                    layer.msg("请扫MES库位码!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                else
                {
                    else {
                    $("#HExplanation").val($("#HWHNAME").val());
                }
            }
@@ -611,7 +698,6 @@
                return false;
            } 
        });
        //监听提交
        form.verify({
            numberOrEmpty: function (value, item) {
@@ -622,7 +708,6 @@
                //}
            }
        });
        //扫条码
        $('#HBarCode').on('keydown', function (event) {  //扫条码
            var sSubStr = table.cache['wl-table'];
@@ -651,10 +736,8 @@
                if (sQty != "") {
                    $('#HQty').val("");
                }
                if (sHWHID == "184154")
                {
                    if (sHSPID == "0")
                    {
                    if (sHWHID == "184154") {
                        if (sHSPID == "0") {
                        layer.msg("仓位为空,请选择仓位!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return false;
                    }
@@ -779,7 +862,6 @@
            //layer.closeAll("loading");
            //}
        });
        //扫源单
        $('#HSourceBillNo').on('keydown', function (event) {   //扫源单
            var HSourceBillNo = $('#HSourceBillNo').val()
@@ -837,7 +919,6 @@
                });
            }
        });
        //扫仓位
        $('#HStockPlaceName').on('keydown', function (event) {      //扫仓位
            var HBarCode = $('#HStockPlaceName').val()
@@ -865,7 +946,6 @@
                });
            }
        });
        //扫MES仓位
        $('#HMESSPName').on('keydown', function (event) {      //扫仓位
            var HBarCode = $('#HMESSPName').val();
@@ -906,7 +986,6 @@
                });
            }
        });
        //刷新明细页签
        table.render({
            elem: '#mx-table'
@@ -944,13 +1023,26 @@
        $("#HDeptName").val(obj[0].HName);
        $("#HDeptID").val(obj[0].HItemID);
    }
        function GetHEmpID1Value(obj) {
            $("#HEmpName1").val(obj[0].HName);
            $("#HEmpID1").val(obj[0].HItemID);
            $("#HJiaYe").val($("#HEmpID1").val() + ',' + $("#HEmpID2").val());
        }
        function GetHEmpID2Value(obj) {
            $("#HEmpName2").val(obj[0].HName);
            $("#HEmpID2").val(obj[0].HItemID);
            $("#HJiaYe").val($("#HEmpID1").val() + ',' + $("#HEmpID2").val());
        }
        function GetGroupValue(obj) {
            $("#HGroupName").val(obj[0].HName);
            $("#HGroupID").val(obj[0].HItemID);
        }
    function AllowLoadData(sSubStr) {  //非空验证
        //if ($("#HSourceBillNo").val() == '') {
        //    layer.msg("请先扫源单!", { icon: 5 });
        //    return false;
        //}
        if($("#HDeptName").val()=='')
        {
            if ($("#HDeptName").val() == '') {
            layer.msg("部门没有选择", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            return false;
        }
@@ -974,8 +1066,7 @@
            layer.msg("错误的内码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            return false;
        }
        if (typeof (sSubStr) == "undefined")
        {
            if (typeof (sSubStr) == "undefined") {
            layer.msg("没有物料明细记录", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            return false;
        }
@@ -999,8 +1090,7 @@
                return false;
            }
        }
        else
        {
            else {
            return true;
        }
    }
WebTM/views/ÑéÊÕÈë¿â/ίÍâÈë¿â/Kf_EntrustInBill_Fast.html
@@ -173,6 +173,49 @@
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">班组</label>
                                        </div>
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HGroupName" id="HGroupName" lay-verify="HGroupName" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HGroupID" id="HGroupID" lay-verify="HGroupID" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupID-BT">...</button>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">职员1</label>
                                        </div>
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HEmpName1" id="HEmpName1" lay-verify="HEmpName1" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HEmpID1" id="HEmpID1" lay-verify="HEmpID1" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpID1-BT">...</button>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width: 40px; padding-left: 0px; ">职员2</label>
                                        </div>
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HEmpName2" id="HEmpName2" lay-verify="HEmpName2" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HEmpID2" id="HEmpID2" lay-verify="HEmpID2" value="0" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HJiaYe" id="HJiaYe" lay-verify="HJiaYe" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpID2-BT">...</button>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:45px;padding-left:0px;">单据号</label>
                                        </div>
                                        <div class="layui-col-xs6">
@@ -281,10 +324,15 @@
            $("#HBillerID").val(sessionStorage["HBillerID"]);
            $("#HBillerID").hide();
            $("#HGroupID").val(sessionStorage["HGroupID"])
            $("#HGroupName").val(sessionStorage["HGroup"] == 'undefined' ? '' : sessionStorage["HGroup"] );
            $("#HEmpID1").val(sessionStorage["HBillerID"])
            $("#HEmpName1").val(sessionStorage["HUserName"])
            $("#HJiaYe").val($("#HEmpID1").val() + ',' + $("#HEmpID2").val());
            //sessionStorage["HGroupID"]
            //默认带入的仓库,如果启用仓位则仓位有效,如果没有启用则仓位灰度 new
            //获取参数
            function getUrlVars() {
                var vars = [], hash;
@@ -465,6 +513,58 @@
                })
            });
            //选择职员1
            form.on('submit(HEmpID1-BT)', function () {
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '职员列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_EmployeeList.html?Type=HEmpID1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                })
            });
            //选择职员2
            form.on('submit(HEmpID2-BT)', function () {
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '职员列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_EmployeeList.html?Type=HEmpID2', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                })
            });
            //选择班组
            form.on('submit(HGroupID-BT)', function () {
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '职员列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_GroupList.html', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                })
            });
            //选择部门
            form.on('submit(HDeptID-BT)', function () {
                layer.open({
@@ -517,6 +617,7 @@
                        return;
                    }
                }
                //$("#HJiaYe").val($("#HEmpID1").val() + ',' + $("#HEmpID2").val());
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = table.cache['wl-table'];
                var sSourceType = $("#HBillType").val();
@@ -930,6 +1031,7 @@
            $("#HKeeper").val(obj[0].HName);
            $("#HKeeperID").val(obj[0].HItemID);
        }
        function GetHSecManagerValue(obj) {  //返回验收
            $("#HSecManager").val(obj[0].HName);
            $("#HSecManagerID").val(obj[0].HItemID);
@@ -938,6 +1040,20 @@
            $("#HDeptName").val(obj[0].HName);
            $("#HDeptID").val(obj[0].HItemID);
        }
        function GetHEmpID1Value(obj) {
            $("#HEmpName1").val(obj[0].HName);
            $("#HEmpID1").val(obj[0].HItemID);
            $("#HJiaYe").val($("#HEmpID1").val() + ',' + $("#HEmpID2").val());
        }
        function GetHEmpID2Value(obj) {
            $("#HEmpName2").val(obj[0].HName);
            $("#HEmpID2").val(obj[0].HItemID);
            $("#HJiaYe").val($("#HEmpID1").val() + ',' + $("#HEmpID2").val());
        }
        function GetGroupValue(obj) {
            $("#HGroupName").val(obj[0].HName);
            $("#HGroupID").val(obj[0].HItemID);
        }
        //function Get_CheckWhAndSP(sInterID, sHBillType, sBarCode, sHWHID, sHSPID) {   //返回部门
        //    $.ajax({
        //        url: "http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/Get_CheckWhAndSP_Josn",