Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

jingh

2022-05-30 b7330097846d5cc68640cc055881e43904d4d42c

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBill_Check_New.html

@@ -89,7 +89,7 @@
                                            <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                            <button type="button" id="HSpID-BT" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button>
                                            <button type="button" id="HSpID-BT" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" >...</button>
                                        </div>
                                    </div>
                                </div>
@@ -117,7 +117,7 @@
                                            <input type="hidden" name="HOutStockPlaceID" id="HOutStockPlaceID" lay-verify="HOutStockPlaceID" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                            <button type="button" id="HOSpID-BT" lay-submit="" class="layui-btn" lay-filter="HOSpID-BT" style="display:none">...</button>
                                            <button type="button" id="HOSpID-BT" lay-submit="" class="layui-btn" lay-filter="HOSpID-BT" >...</button>
                                        </div>
                                    </div>
                                </div>
@@ -149,9 +149,10 @@
                                        </div>
                                    </div>
                                </div>
                                <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
                                
                            </div>
                            <div class="layui-tab-item">
                                <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
                                <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
                            </div>
                            <div class="layui-tab-item">
@@ -229,14 +230,30 @@
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            //console.log(JSON.stringify(result.data.hItemIDField))
                            //return;
                            //$("#HStockPlaceName").val(result.data.hSPNameField);
                            //$("#HWHID").val(result.data.hWhIDField);
                            //$("#HWHNAME").val(result.data.hWhNameField);
                            // $("#HStockPlaceName").val(result.data.hSPNameField);
                            //$("#HWHID").val(result.data.hWhIDField);
                            //$("#HWHNAME").val(result.data.hWhNameField);
                            //$('#HInterID').val(result.data.hInterIDField)
                            //$('#HBillNo').val(result.data.hBillNoField)


                            $("#HStockPlaceName").val(result.data.hSPNameField);
                            $("#HOutStockPlaceName").val(result.data.hSCSPNameField);
                            $("#HStockPlaceID").val(result.data.hSPIDField);
                            $("#HOutStockPlaceID").val(result.data.hSCSPIDField);
                            $("#HWHID").val(result.data.hWhIDField);
                            $("#HWHNAME").val(result.data.hWhNameField);
                             $("#HStockPlaceName").val(result.data.hSPNameField);
                            $("#HWHID").val(result.data.hWhIDField);
                            $("#HWHNAME").val(result.data.hWhNameField);
                            $("#HSCWHID").val(result.data.hSCWhIDField);
                            $("#HSCWHNAME").val(result.data.hSCWhNameField);
                            $('#HInterID').val(result.data.hInterIDField)
                            $('#HBillNo').val(result.data.hBillNoField)
                            $('#HStockOutOrgName').val(result.data.hStockOutOrgNameField)
                            $('#HStockOutOrgID').val(result.data.hStockOutOrgIDField)
                            $('#HStockInOrgName').val(result.data.hStockInOrgNameField)
                            $('#HStockInOrgID').val(result.data.hStockInOrgIDField)
                            var HBillID = $('#HInterID').val()
                            element.tabChange('tab-Kf_OtherInBill', '2');
                            table.render({
@@ -342,6 +359,7 @@
                pFocus.select();
            }


            //
            function Sub_ClearBill() {
                //表头初始化赋值（根据登录用户获取 é»˜è®¤ä»“库、部门、验收、保管、金蝶用户） new
@@ -394,7 +412,9 @@
            }
            //

            form.on('submit(HWHID-BT)', function () {//选择仓库
            //选择调入仓库
            form.on('submit(HWHID-BT)', function () {//选择调入仓库
                var HStockInOrgID = $("#HStockInOrgID").val();
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
@@ -402,14 +422,50 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_WarehouseList.html?Type=HWHID', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockInOrgID + '', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                })
            });
            form.on('submit(HSpID-BT)', function () {//选择仓位


            //选择调入组织
            form.on('submit(HStockInOrgID-BT)', function () {//选择调入组织
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '组织列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_OrganizationtList.html?Type=HStockInOrgID', 'yes']
                    , resize: false
                    , cancel: function () {
                    }
                })
            });

            //选择调出组织
            form.on('submit(HStockOutOrgID-BT)', function () {//选择调出组织

                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '组织列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_OrganizationtList.html?Type=HStockOutOrgID', 'yes']
                    , resize: false
                    , cancel: function () {
                    }
                })
            });

            //选择调入仓位
            form.on('submit(HSpID-BT)', function () {//选择调入仓位

                layer.open({
                    type: 2
                    , area: ['100%', '100%']
@@ -417,13 +473,48 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_StockPlaceListNew.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID&HOrgID=HStockInOrgID', 'yes']
                    , resize: false
                    , cancel: function () {
                    }
                })
            });

            //选择调出仓库
            form.on('submit(HSCWHID-BT)', function () {//选择调出仓库
                var HStockOutOrgID = $("#HStockOutOrgID").val();
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '仓库列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_WarehouseListNew.html?Type=HSCWHID&HOrgID=' + HStockOutOrgID + '', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                })
            });

            //选择调出仓位
            form.on('submit(HOSpID-BT)', function () {//选择调出仓位
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '仓位列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_StockPlaceListNew.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HOSpID&HOrgID=HStockOutOrgID', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                })
            });

            //form.on('submit(HSupID-BT)', function () {//选择供应商
            //    layer.open({
            //        type: 2
@@ -634,7 +725,7 @@
                    $.ajax(
                        {
                            type: "POST",
                            url: GetWEBURL() + "/MateOutBill_Check_New/set_SaveMateOutBill_Check_New_Json",
                            url: GetWEBURL() + "/MoveStockBill_Check_New/set_SaveMoveStockBill_Check_Json",
                            async: true,
                            data: { "oMain": sMain },
                            dataType: "json",
@@ -697,12 +788,19 @@
                                //console.log(JSON.stringify(result.data.hItemIDField))
                                //return;
                                $("#HStockPlaceName").val(result.data.hSPNameField);
                                $("#HOutStockPlaceName").val(result.data.hSCSPNameField);
                                $("#HStockPlaceID").val(result.data.hSPIDField);
                                $("#HOutStockPlaceID").val(result.data.hSCSPIDField);
                                $("#HWHID").val(result.data.hWhIDField);
                                $("#HWHNAME").val(result.data.hWhNameField);
                                $("#HSCWHID").val(result.data.hSCWhIDField);
                                $("#HSCWHNAME").val(result.data.hSCWhNameField);
                                $('#HInterID').val(result.data.hInterIDField)
                                $('#HBillNo').val(result.data.hBillNoField)
                                $('#HStockOutOrgName').val(result.data.hStockOutOrgNameField)
                                $('#HStockOutOrgID').val(result.data.hStockOutOrgIDField)
                                $('#HStockInOrgName').val(result.data.hStockInOrgNameField)
                                $('#HStockInOrgID').val(result.data.hStockInOrgIDField)
                                var HBillID = $('#HInterID').val()
                                element.tabChange('tab-Kf_OtherInBill', '2');
                                table.render({
@@ -793,7 +891,7 @@
                var sHWHID = $("#HWHID").val()
                var sHSPID = $("#HStockPlaceID").val()
                var sHSCWHID = $("#HSCWHID").val()
                var sHSCSPID = $("#HSCStockPlaceID").val()
                var sHSCSPID = $("#HOutStockPlaceID").val()
                var HOrgID = $("#HOrgID").val();//组织
                //判断条码是否为空  new
                if (sBarCode == '') {
@@ -809,7 +907,7 @@
                }
                $.ajax({
                    //url: "http://localhost:12761/OtherInStockBill/get_InfoByBarCode_Source_Json", //方法所在页面和方法名
                    url: GetWEBURL() + "/OtherOutBill_Check_New/get_InfoByBarCode_Source_Json",
                    url: GetWEBURL() + "/MoveStockBill_Check_New/get_InfoByBarCode_Source_Json1",
                    type: "GET",
                    data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sHBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "SCWhID": sHSCWHID, "SCSPID": sHSCSPID, "sQty": sQty, "HOWNERID": sessionStorage["OrganizationID"] },
                    success: function (result) {
@@ -934,15 +1032,36 @@
            }
        });
        //以上为 Layui模块
        function GetHWHValue(obj)  //返回仓库
        function GetHWHValue(obj)  //返回调入仓库
        {
            $("#HWHNAME").val(obj[0].HName);
            //sessionStorage["HWHID"] = obj[0].HItemID;
            $("#HWHID").val(obj[0].HItemID);
        }
        function GetHOrgNameValue(obj)  //返回调入组织
        {
            $("#HStockInOrgName").val(obj[0].HName);
            $("#HStockInOrgID").val(obj[0].HItemID);

        }
        function GetHOutOrgNameValue(obj)  //返回调出组织
        {
            $("#HStockOutOrgName").val(obj[0].HName);
            $("#HStockOutOrgID").val(obj[0].HItemID);

        }
        function GetHSpValue(obj) {  //返回调入仓位
            $("#HStockPlaceName").val(obj[0].HName);
            $("#HStockPlaceID").val(obj[0].HItemID);
        }
        function GetHSCWHNAMEValue(obj)  //返回调出仓库
        {
            $("#HSCWHNAME").val(obj[0].HName);
            $("#HSCWHID").val(obj[0].HItemID);
        }
        function GetHOutStockPlaceIDValue(obj) {  //返回调出仓位
            $("#HOutStockPlaceName").val(obj[0].HName);
            $("#HOutStockPlaceID").val(obj[0].HItemID);
        }
        //function GetHSupValue(obj) {  //返回供应商
        //    $("#HSupName").val(obj[0].HName);
@@ -998,28 +1117,28 @@
                layer.msg("没有物料明细记录!", { icon: 5 });
                return false;
            }
            if (sSubStr != '') {
                for (var i = 0; i <= sSubStr.length - 1; i++) {  //判断扫码数量不能大于应收数量
                    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
                        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
                            layer.msg("数量不能大于应收数量！", { icon: 5 });
                            return false;
                        }
                    }
                }
                for (var i = 0; i <= sSubStr.length - 1; i++) {   //判断扫码数量不能为0
                    if (parseFloat(sSubStr[i].HQty) > 0) {
                        s = 1;
                    }
                }
                if (s == 0) {
                    layer.msg("其他入库记录未扫码！", { icon: 5 });
                    return false;
                }
            }
            else {
                return true;
            }
            //if (sSubStr != '') {
            //    for (var i = 0; i <= sSubStr.length - 1; i++) {  //判断扫码数量不能大于应收数量
            //        if (parseFloat(sSubStr[i].HQtyMust) > 0) {
            //            if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
            //                layer.msg("数量不能大于应收数量！", { icon: 5 });
            //                return false;
            //            }
            //        }
            //    }
            //    for (var i = 0; i <= sSubStr.length - 1; i++) {   //判断扫码数量不能为0
            //        if (parseFloat(sSubStr[i].HQty) > 0) {
            //            s = 1;
            //        }
            //    }
            //    if (s == 0) {
            //        layer.msg("其他入库记录未扫码！", { icon: 5 });
            //        return false;
            //    }
            //}
            //else {
            //    return true;
            //}
        }
    </script>