yusijie
2023-03-17 290ae5cf877a0989f268fa05e027ff2815a00cf8
Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
8个文件已修改
453 ■■■■ 已修改文件
WebTM/WebTM.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html 116 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Fast.html 110 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_Fast.html 109 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html 108 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>E:\智云mes\mes\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,10 +1,10 @@

function GetWEBURL() {
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    //var WEBURL = "http://localhost:8085/API/";   //zgq本地
    //var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
    var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
    //var WEBURL = "http://localhost/WEBAPI/";   //颜家台式机本地配置
    //var WEBURL = "http://localhost:8082/lubao";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨露本地配置
WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBill_Fast.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>调拨单</title>
    <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, maximum-scale=1">
@@ -21,7 +21,7 @@
            <div class="layui-card-body" style="padding: 5px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>调拨单</span>
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>直接调拨单</span>
                    </div>
                    <div class="layui-form-item" style="padding:15px;margin:0px">
                        <div class="layui-row">
@@ -33,6 +33,16 @@
                            </div>
                            <div class="layui-col-xs2">
                                <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">确定</button>
                            </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;">数量</label>
                                </div>
                                <div class="layui-col-xs8">
                                    <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
                                </div>
                            </div>
                        </div>
                    </div>
@@ -54,14 +64,12 @@
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">源单类型</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <select name=" HBillType" id="HBillType">
                                                <option value="-1">手工录入</option>
                                                <option value="3720">生产任务单-投料</option>
                                                <option value="1243">调拨申请单</option>
                                                <option value="1201">委外订单-投料</option>
                                            <select name="HBillType" id="HBillType">
                                                <option value="1402">发货通知单</option>
                    <!--<option value="1234">下架通知单</option>
                    <option value="1243">调拨申请单</option>-->
                                                <option value="1243">调拨申请单</option>
                                                <option value="3720">生产用料清单</option>
                                                <option value="1604">委外用料清单</option>
                                                <option value="-1">手工录入</option>
                                            </select>
                                            <!--<input type="text" name="cmbSourceType" id="cmbSourceType" lay-verify="cmbSourceType" autocomplete="off" class="layui-input">-->
                                        </div>
@@ -329,16 +337,6 @@
                            </div>
                            <!--明细信息-->
                            <div class="layui-tab-item">
                                <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;">数量</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
                                <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
                            </div>
                            <!--下架信息-->
@@ -474,7 +472,53 @@
                        // console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HBillType").val(d.data[0].HSourceBillType);
                        $("#HBillType").val(d.data[0].HSourceBillType == null ? "1402" : d.data[0].HSourceBillType);
                        //获取源单类型、源单单号
                        if (d.data[0].HSourceBillType == "1402") {
                            $("#HBillType").empty();
                            $("#HBillType").val("1402");
                            var optionHtml = '';
                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '发货通知单' + "</option>";
                            $("#HBillType").append(optionHtml);
                            layui.form.render('select');
                            $("#HBillType").attr("readonly", "readonly");
                        }
                        else if (d.data[0].HSourceBillType == "1243") {
                            $("#HBillType").empty();
                            $("#HBillType").val("1243");
                            var optionHtml = '';
                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '调拨申请单' + "</option>";
                            $("#HBillType").append(optionHtml);
                            layui.form.render('select');
                            $("#HBillType").attr("readonly", "readonly");
                        }
                        else if (d.data[0].HSourceBillType == "3720") {
                            $("#HBillType").empty();
                            $("#HBillType").val("3720");
                            var optionHtml = '';
                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '生产用料清单' + "</option>";
                            $("#HBillType").append(optionHtml);
                            layui.form.render('select');
                            $("#HBillType").attr("readonly", "readonly");
                        }
                        else if (d.data[0].HSourceBillType == "1604") {
                            $("#HBillType").empty();
                            $("#HBillType").val("1604");
                            var optionHtml = '';
                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '委外用料清单' + "</option>";
                            $("#HBillType").append(optionHtml);
                            layui.form.render('select');
                            $("#HBillType").attr("readonly", "readonly");
                        }
                        else {
                            $("#HBillType").empty();
                            $("#HBillType").val("-1");
                            var optionHtml = '';
                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '手工录入' + "</option>";
                            $("#HBillType").append(optionHtml);
                            layui.form.render('select');
                            $("#HBillType").attr("readonly", "readonly");
                        }
                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
                        $("#HSourceBillNo").attr("disabled","true");
                        //$("#HSourceBillNo").append.readonly = true;
@@ -1633,26 +1677,26 @@
            //    layer.msg("请先扫源单!", { icon: 5 });
            //    return false;
            //}
            if ($("#HDeptName").val() == '') {
                layer.msg("部门没有选择!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            if ($("#HSecManager").val() == '') {
                layer.msg("验收人没有选择!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            if ($("#HKeeper").val() == '') {
                layer.msg("保管人没有选择!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            //if ($("#HDeptName").val() == '') {
            //    layer.msg("部门没有选择!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //    return false;
            //}
            //if ($("#HSecManager").val() == '') {
            //    layer.msg("验收人没有选择!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //    return false;
            //}
            //if ($("#HKeeper").val() == '') {
            //    layer.msg("保管人没有选择!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //    return false;
            //}
            //if ($("#HSupName").val() == '') {
            //    layer.msg("供应商没有选择!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //    return false;
            //}
            if ($("#HWHNAME").val() == '') {
                layer.msg("调入仓库没有选择!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            //if ($("#HWHNAME").val() == '') {
            //    layer.msg("调入仓库没有选择!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //    return false;
            //}
            //if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) {
            //    layer.msg("调入仓库、仓位不能和调出仓库、仓位都相同!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //    return false;
WebTM/views/ÁìÁÏ·¢»õ/ÆäËû³ö¿â/Kf_OtherOutBill_Fast.html
@@ -129,6 +129,16 @@
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item">
                                    <div class="layui-row">
                                        <div class="layui-col-xs4">
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">日期</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input name="HDate" id="HDate" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <!--表头信息-->
                            <div class="layui-tab-item">
@@ -299,6 +309,7 @@
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , laydate = layui.laydate
                , element = layui.element;
            var HStockOrgID = sessionStorage["OrganizationID"]
            var HSourceFlag = sessionStorage["SourceFlag"];
@@ -323,11 +334,23 @@
            $("#HBillerID").val(sessionStorage["HBillerID"]);
            $("#HBillerID").hide();
            $("#HBillSubType").val(sessionStorage["HBillSubType"]);
            $("#HDate").val(formatDate(sessionStorage["HDate"]));
            //默认带入的仓库,如果启用仓位则仓位有效,如果没有启用则仓位灰度 new
            // ç¼–辑获取表头时时间格式矫正方式
            function formatDate(date) {
                var d = new Date(date),
                    month = '' + (d.getMonth() + 1),
                    day = '' + d.getDate(),
                    year = d.getFullYear();
                if (month.length < 2) month = '0' + month;
                if (day.length < 2) day = '0' + day;
                return [year, month, day].join('-');
            }
            //获取参数
@@ -345,6 +368,17 @@
            var linterid = params[params[0]]; //从参数中获取 å•据内码
            var lSourceBillType = params[params[2]];  //从单据获取 æºå•类型
            //初始化表单插件
            set_InitFrom();
            //初始化表单插件
            function set_InitFrom() {
                //常规用法
                laydate.render({
                    elem: '#HDate'
                });
            }
            function RoadBillMain(linterid)//加载表头
            {
                $.ajax({
@@ -355,8 +389,29 @@
                        // console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HBillType").val(d.data[0].HSourceBillType);
                        $("#HBillType").val(d.data[0].HSourceBillType == null ? "1242" : d.data[0].HSourceBillType);
                        //获取源单类型、源单单号
                        if (d.data[0].HSourceBillType == "1242") {
                            $("#HBillType").empty();
                            $("#HBillType").val("1242");
                            var optionHtml = '';
                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '出库申请单' + "</option>";
                            $("#HBillType").append(optionHtml);
                            layui.form.render('select');
                            $("#HBillType").attr("readonly", "readonly");
                        }
                        else {
                            $("#HBillType").empty();
                            $("#HBillType").val("-1");
                            var optionHtml = '';
                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '手工录入' + "</option>";
                            $("#HBillType").append(optionHtml);
                            layui.form.render('select');
                            $("#HBillType").attr("readonly", "readonly");
                        }
                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
                        $("#HSourceBillNo").attr("disabled", "true");
                        $("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
                        HSourceFlag = true;
                        //$("#HWHID").val(d.data[0].HWhID);
                        //$("#HKeeperID").val(d.data[0].HKeeperID);
@@ -434,6 +489,7 @@
                        //console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
                    }
                });
                //获取单据子类型
@@ -1113,16 +1169,46 @@
                                    element.tabChange('tab-Kf_OtherOutBill', '3');
                                }
                                else {
                                    if (HSourceFlag == "false") {
                                        $("#HBillType").find("option:contains('手工录入')").attr("selected", true);
                                        $("#HSourceBillNo").val("");
                                    //if (HSourceFlag == "false") {
                                    //    $("#HBillType").find("option:contains('手工录入')").attr("selected", true);
                                    //    $("#HSourceBillNo").val("");
                                        $("#HSourceBillNo").attr("readonly", "readonly");
                                        $("#HBillType").attr("disabled", "disabled");
                                        form.render('select');
                                    //    $("#HSourceBillNo").attr("readonly", "readonly");
                                    //    $("#HBillType").attr("disabled", "disabled");
                                    //    form.render('select');
                                    //}
                                    //HSourceFlag = true;
                                    //element.tabChange('tab-Kf_OtherOutBill', '3');
                                    if (HSourceFlag == true) {
                                        element.tabChange('tab-Kf_OtherOutBill', '3');
                                    }
                                    HSourceFlag = true;
                                    element.tabChange('tab-Kf_OtherOutBill', '3');
                                    else {
                                        HSourceFlag = true;
                                        $("#HSourceBillNo").val(result.data.hSourceBillNoField);
                                        $("#HBillType").val(result.data.hSourceBillTypeField == null ? "1242" : result.data.hSourceBillTypeField);
                                        //获取源单类型、源单单号
                                        if (result.data.hSourceBillTypeField == "1242") {
                                            $("#HBillType").empty();
                                            $("#HBillType").val("1242");
                                            var optionHtml = '';
                                            optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '出库申请单' + "</option>";
                                            $("#HBillType").append(optionHtml);
                                            layui.form.render('select');
                                            $("#HBillType").attr("readonly", "readonly");
                                        }
                                        else {
                                            //$("#HBillType").empty();
                                            $("#HBillType").val("-1");
                                            var optionHtml = '';
                                            optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '手工录入' + "</option>";
                                            $("#HBillType").append(optionHtml);
                                            layui.form.render('select');
                                            $("#HBillType").attr("readonly", "readonly");
                                        }
                                        $("#HSourceBillNo").attr("readonly", "readonly");
                                        element.tabChange('tab-Kf_OtherOutBill', '3');
                                    }
                                }
                                layer.load(3)
                                $.ajax({
WebTM/views/ÁìÁÏ·¢»õ/ίÍâ³ö¿â/Kf_EntrustOutBill_Fast.html
@@ -333,7 +333,7 @@
            //表头初始化赋值(根据登录用户获取 é»˜è®¤ä»“库、部门、验收、保管、金蝶用户) new
            $("#HWHID").val(sessionStorage["HWHID"]);
            $("#HWHNAME").val(sessionStorage["HWHName"]);
            $("#HSupID").val(sessionStorage["HSPID"]);
            $("#HStockPlaceID").val(sessionStorage["HSPID"]);
            $("#HStockPlaceName").val(sessionStorage["HSPName"]);
            //$("#HSupID").val(sessionStorage["HSupID"]);
            //$("#HSupName").val(sessionStorage["HSupName"]);
@@ -348,6 +348,7 @@
            $("#HMakerID").hide();
            $("#HBillerID").val(sessionStorage["HBillerID"]);
            $("#HBillerID").hide();
            var HSourceFlag = sessionStorage["SourceFlag"];
            //默认带入的仓库,如果启用仓位则仓位有效,如果没有启用则仓位灰度 new
@@ -412,7 +413,7 @@
                                $("#HSupName").val(result.data[0].HSupName);
                                $("#HDeptID").val(result.data[0].HDeptID);
                                $("#HDeptName").val(result.data[0].HDeptName);
                                sessionStorage["SourceFlag"] = true;
                                HSourceFlag = true;
                                element.tabChange('tab-EntrustOutBill', '2');
                                layer.load(3);
                            }
@@ -485,8 +486,7 @@
            //选择仓库
            form.on('submit(HWHID-BT)', function () {
            form.on('submit(HWHID-BT)', function () {//选择仓库
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
@@ -494,13 +494,28 @@
                    , 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=' + sessionStorage["OrganizationID"] + '', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                })
            });
            ////选择仓库
            //form.on('submit(HWHID-BT)', function () {
            //    layer.open({
            //        type: 2
            //        , area: ['100%', '100%']
            //        , title: '仓库列表'
            //        , shade: 0.6 //遮罩透明度
            //        , maxmin: true //允许全屏最小化
            //        , anim: 0 //0-6的动画形式,-1不开启
            //        , content: ['../../../views/Baseset/基础资料/Gy_WarehouseList.html?Type=HWHID', 'yes']
            //        , resize: false
            //        , cancel: function () {
            //            //$(".layui-btn").removeClass("layui-btn-disabled");
            //        }
            //    })
            //});
            //选择仓位
            form.on('submit(HSpID-BT)', function () {
@@ -637,7 +652,7 @@
            //退出按钮
            form.on('submit(Cancel)', function () {
                sessionStorage["SourceFlag"] = false;
                HSourceFlag = false;
                layer.confirm('您确定要退出吗?', { icon: 3, title: '提示' }, function (index) {
                    parent.location.href = "../../../views/index_Mobile.html";
                });
@@ -721,7 +736,7 @@
                if (event.keyCode == 13) {
                    //判断文本框是否有数据    new
                    $.ajax({
                        url: GetWEBURL() + "/Web/GetSpName_Json",
                        url: GetWEBURL() + "/LookingFor/getSpName_Json",
                        type: "GET",
                        data: { "HBarCode": HBarCode },
                        success: function (result) {
@@ -729,6 +744,7 @@
                                $("#HStockPlaceName").val(result.data[0].HName);
                                $("#HWHID").val(result.data[0].HWHID);
                                $("#HWHNAME").val(result.data[0].HWhName);
                                $("#HStockPlaceID").val(result.data[0].HItemID);
                                element.tabChange('tab-POStockInBill', '2');
                            }
                            else {
@@ -826,10 +842,10 @@
                var sBillNo = $("#HBillNo").val()
                var sQty = $("#HQty").val()
                var sWHID = $("#HWHID").val()
                var sSPID = $("#HSupID").val()
                var sSPID = $("#HStockPlaceID").val()
                var sHBillType = $("#HBillType").val()
                var sSourceBillNo = $("#HSourceBillNo").val()
                var Flag = sessionStorage["SourceFlag"];
                var Flag = HSourceFlag;
                var sMouldManagerCtl = "N";  //是否启用器具管理
                var sFIFOCtl = "N";          //是否启用先进先出管理
                var sQty = $("#HQty").val();
@@ -849,14 +865,79 @@
                    $('#HQty').val("");
                }
                $.ajax({
                    url: GetWEBURL() + "/MateOutBill/get_CheckTypeByBarCode_Json",
                    url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
                    type: "GET",
                    data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": '1211', "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sWHID, "SPID": sSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": Flag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
                    data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": '1211', "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sWHID, "HSPID": sSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": Flag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
                    //url: GetWEBURL() + "/MateOutBill/get_CheckTypeByBarCode_Json",
                    //type: "GET",
                    //data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": '1211', "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sWHID, "SPID": sSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": Flag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) {
                            if (result.data.HBarType == '仓库条码') {
                                $("#HWHNAME").val(result.data.HWhName);
                                $("#HWHID").val(result.data.HWhID);
                                $("#HStockPlaceName").val("");
                                $("#HNote").val(";一键扫码仓库条码");
                                element.tabChange('tab-EntrustOutBill', '2');  //跳转页签
                            }
                            else if (result.data.HBarType == '仓位条码') {
                                $("#HStockPlaceName").val(result.data.HSPName);
                                $("#HStockPlaceID").val(result.data.HSPID);
                                $("#HWHNAME").val(result.data.HWhName);
                                $("#HWHID").val(result.data.HWhID);
                                $("#HNote").val(";一键扫码仓位条码");
                                element.tabChange('tab-EntrustOutBill', '2');//跳转页签
                            }
                            else if (result.data.HBarType == '部门条码') {
                                $("#HDeptName").val(result.data.HDeptName);
                                $("#HDeptID").val(result.data.HDeptID);
                                $("#HNote").val(";一键扫码部门条码");
                                element.tabChange('tab-EntrustOutBill', '2');//跳转页签
                            }
                            else if (result.data.HBarType == '源单条码') {
                                $("#HSupName").val(result.data.HSupName);
                                $("#HSupID").val(result.data.HSupID);
                                $("#HDeptName").val(result.data.HDeptName);
                                $("#HDeptID").val(result.data.HDeptID);
                                $("#HSourceBillNo").val(result.data.HSourceBillNo);
                                HSourceFlag = true;
                                //获取源单类型、源单单号
                                $("#HBillType").val(result.data.hSourceBillTypeField == null ? "1604" : result.data.hSourceBillTypeField);
                                if (result.data.hSourceBillTypeField == "1604") {
                                    $("#HBillType").empty();
                                    $("#HBillType").val("1604");
                                    var optionHtml = '';
                                    optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '委外订单-投料' + "</option>";
                                    $("#HBillType").append(optionHtml);
                                    layui.form.render('select');
                                    $("#HBillType").attr("readonly", "readonly");
                                }
                                else {
                                    //$("#HBillType").empty();
                                    $("#HBillType").val("-1");
                                    var optionHtml = '';
                                    optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '手工录入' + "</option>";
                                    $("#HBillType").append(optionHtml);
                                    layui.form.render('select');
                                    $("#HBillType").attr("readonly", "readonly");
                                }
                                $("#HSourceBillNo").attr("readonly", "readonly");
                                $("#HNote").val(";一键扫码源单条码");
                                element.tabChange('tab-EntrustOutBill', '3');
                            }
                            else {
                                if (HSourceFlag == true) {
                                    element.tabChange('tab-EntrustOutBill', '3');
                                }
                                else {
                                    HSourceFlag = true;
                                    $("#HNote").val(";物料条码");
                                    element.tabChange('tab-EntrustOutBill', '3');  //跳转页签
                                }
                            }
                            playSound1();
                            $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "扫条码,成功\n");
                            element.tabChange('tab-EntrustOutBill', '3');  //跳转页签
                            //element.tabChange('tab-EntrustOutBill', '3');  //跳转页签
                            layer.load(3)
                            table.render({
                                elem: '#wl-table'
@@ -943,7 +1024,7 @@
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            playSound1();
                            $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "扫源单号,成功\n");
                            sessionStorage["SourceFlag"] = true;
                            HSourceFlag = true;
                            element.tabChange('tab-EntrustOutBill', '2');  //跳转页签
                            layer.load(3)
                            table.render({
WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_Fast.html
@@ -120,7 +120,7 @@
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">日期</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="date" name="HDate" id="HDate" autocomplete="off" class="layui-input">
                                            <input name="HDate" id="HDate" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBill_Fast.html
@@ -108,7 +108,7 @@
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">日期</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="date" name="HDate" id="HDate" autocomplete="off" class="layui-input">
                                            <input name="HDate" id="HDate" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
WebTM/views/ÑéÊÕÈë¿â/ÆäËûÈë¿â/Kf_OtherInBill_Fast.html
@@ -61,7 +61,7 @@
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">源单类型</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <select name=" HBillType" id="HBillType">
                                            <select name="HBillType" id="HBillType">
                                                <option value="1241">入库申请单</option>
                                                <option value="-1">手工录入</option>
                                            </select>
@@ -90,6 +90,16 @@
                                            <select name=" HBillSubType" id="HBillSubType">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">日期</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input name="HDate" id="HDate" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
@@ -245,6 +255,7 @@
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , laydate = layui.laydate
                , element = layui.element;
            //表头初始化赋值(根据登录用户获取 é»˜è®¤ä»“库、部门、验收、保管、金蝶用户) new
@@ -268,7 +279,23 @@
            $("#HOrgID").val(sessionStorage["OrganizationID"]);
            $("#HOrgID").hide();
            $("#HBillSubType").val(sessionStorage["HBillSubType"]);
            $("#HDate").val(formatDate(sessionStorage["HDate"]));
            var HSourceFlag = sessionStorage["SourceFlag"];
            //默认带入的仓库,如果启用仓位则仓位有效,如果没有启用则仓位灰度 new
            // ç¼–辑获取表头时时间格式矫正方式
            function formatDate(date) {
                var d = new Date(date),
                    month = '' + (d.getMonth() + 1),
                    day = '' + d.getDate(),
                    year = d.getFullYear();
                if (month.length < 2) month = '0' + month;
                if (day.length < 2) day = '0' + day;
                return [year, month, day].join('-');
            }
            //获取参数
@@ -286,6 +313,17 @@
            var linterid = params[params[0]]; //从参数中获取 å•据内码
            var lSourceBillType = params[params[2]];  //从单据获取 æºå•类型
            //初始化表单插件
            set_InitFrom();
            //初始化表单插件
            function set_InitFrom() {
                //常规用法
                laydate.render({
                    elem: '#HDate'
                });
            }
            function RoadBillMain(linterid)//加载表头
            {
                $.ajax({
@@ -296,14 +334,36 @@
                        // console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HBillType").val(d.data[0].HSourceBillType);
                        $("#HBillType").val(d.data[0].HSourceBillType == null ? "1241" : d.data[0].HSourceBillType);
                        //获取源单类型、源单单号
                        if (d.data[0].HSourceBillType == "1241") {
                            $("#HBillType").empty();
                            $("#HBillType").val("1241");
                            var optionHtml = '';
                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '入库申请单' + "</option>";
                            $("#HBillType").append(optionHtml);
                            layui.form.render('select');
                            $("#HBillType").attr("readonly", "readonly");
                        }
                        else {
                            $("#HBillType").empty();
                            $("#HBillType").val("-1");
                            var optionHtml = '';
                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '手工录入' + "</option>";
                            $("#HBillType").append(optionHtml);
                            layui.form.render('select');
                            $("#HBillType").attr("readonly", "readonly");
                        }
                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
                        $("#HSourceBillNo").attr("disabled", "true");
                        $("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
                        //$("#HWHID").val(d.data[0].HWhID);
                        //$("#HKeeperID").val(d.data[0].HKeeperID);
                        //$("#HSecManagerID").val(d.data[0].HSecManagerID);
                        //$("#HDeptID").val(d.data[0].HDeptID);
                        //$("#HBarCode").val(d.data[0].HBarCode);
                        //$("#HQty").val(d.data[0].HQty);
                        HSourceFlag = true;
                    }
                })
                //获取单据子类型
@@ -375,6 +435,7 @@
                        //console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
                    }
                });
                //获取单据子类型
@@ -1015,7 +1076,7 @@
                    //url: "http://localhost:12761/OtherInStockBill/get_InfoByBarCode_Source_Json", //方法所在页面和方法名
                    url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
                    type: "GET",
                    data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": HBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": sessionStorage["SourceFlag"], "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
                    data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": HBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
                    success: function (result) {
                        if (result.count == 1) {
                            if (result.data.HBarType == '仓库条码') {
@@ -1045,7 +1106,7 @@
                                $("#HDeptName").val(result.data.HDeptName);
                                $("#HDeptID").val(result.data.HDeptID);
                                $("#HSourceBillNo").val(result.data.HSourceBillNo);
                                sessionStorage["SourceFlag"] = true;
                                HSourceFlag = true;
                                //获取源单类型、源单单号
                                if (result.data.HSourceBillType == "1241") {
                                    $("#HBillType").val("1241");
@@ -1058,7 +1119,7 @@
                                element.tabChange('tab-Kf_OtherInBill', '3');
                            }
                            else {
                                if (sessionStorage["SourceFlag"] == "true") {
                                if (HSourceFlag == true) {
                                    element.tabChange('tab-Kf_OtherInBill', '3');
                                }
                                else {
@@ -1067,15 +1128,40 @@
                                    //$("#HDeptName").val(result.data.HDeptName);
                                    //$("#HDeptID").val(result.data.HDeptID);
                                    //$("#HSourceBillNo").val(result.data.HSourceBillNo);
                                    sessionStorage["SourceFlag"] = true;
                                    //sessionStorage["SourceFlag"] = true;
                                    //获取源单类型、源单单号
                                    if (result.data.HSourceBillType == "1241") {
                                        $("#HBillType").val("1241");
                                    //if (result.data.HSourceBillType == "1241") {
                                    //    $("#HBillType").val("1241");
                                    //}
                                    //else if (result.data.HSourceBillType == "1601") {
                                    //    $("#HBillType").val("1601");
                                    //}
                                    HSourceFlag = true;
                                    $("#HSourceBillNo").val(result.data.hSourceBillNoField);
                                    $("#HBillType").val(result.data.hSourceBillTypeField == null ? "1241" : result.data.hSourceBillTypeField);
                                    //获取源单类型、源单单号
                                    if (result.data.hSourceBillTypeField == "1241") {
                                        $("#HBillType").empty();
                                        $("#HBillType").val("1241");
                                        var optionHtml = '';
                                        optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '入库申请单' + "</option>";
                                        $("#HBillType").append(optionHtml);
                                        layui.form.render('select');
                                        $("#HBillType").attr("readonly", "readonly");
                                    }
                                    else if (result.data.HSourceBillType == "1601") {
                                        $("#HBillType").val("1601");
                                    else {
                                        //$("#HBillType").empty();
                                        $("#HBillType").val("-1");
                                        var optionHtml = '';
                                        optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '手工录入' + "</option>";
                                        $("#HBillType").append(optionHtml);
                                        layui.form.render('select');
                                        $("#HBillType").attr("readonly", "readonly");
                                    }
                                    $("#HSourceBillNo").attr("readonly", "readonly");
                                    $("#HNote").val(";物料条码");
                                    element.tabChange('tab-Kf_OtherInBill', '3');
                                }
@@ -1236,7 +1322,7 @@
                            element.tabChange('tab-Kf_OtherInBill', '2'); 
                            playSound1();
                            HSourceFlag = true;
                            sessionStorage["SourceFlag"] = true;
                            //sessionStorage["SourceFlag"] = true;
                            layer.load(3)
                            //table.render({
                            //    elem: '#wl-table'