1
duhe
2023-11-20 bdc4e1bddd257f1fb04854e8654149b7d9f4975d
1
11个文件已修改
1个文件已添加
861 ■■■■ 已修改文件
WebTM/WebTM.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBillList_QiaoYi_PDA.html 473 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_QiaoYi_PDA.html 79 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index_Mobile.html 48 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/公共页面/Kf_ChaoBaoEditDlg.html 74 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/单品过站/Cj_CollectionOfSingleProductDefects.html 66 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/单品过站/Cj_ProcessItemBGA.html 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/单品过站/Cj_ProcessItemBGA_PJGH.html 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/单品过站/Cj_ProcessItemStationPlatform.html 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -220,6 +220,7 @@
    <Content Include="views\WMS扫码模块\生产管理\生产组托单\Sc_PackUnionBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\调拨换托\Kf_MoveStockBill_HuanTuo_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\调拨换托\Kf_MoveStockBillList_HuanTuo_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBillList_QiaoYi_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBill_QiaoYi_PDA.html" />
    <Content Include="views\人事管理\异常反馈单\OA_ErrMsgBackBillList_PDA.html" />
    <Content Include="views\人事管理\异常反馈单\OA_ErrMsgBackBill_PDA.html" />
WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,9 +3,9 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
/*    var WEBURL = "http://localhost/API/";             //颜晓军本地配置*/
    var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:81/API/";  //陈雯静本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)
WebTM/views/WMSɨÂëÄ£¿é/ÏúÊÛ³ö¿â/Kf_SellOutBillList_QiaoYi_PDA.html
New file
@@ -0,0 +1,473 @@
<!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, maximum-scale=1">
    <!--引用layui样式文件-->
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <!--引用layui js文件-->
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-card" style="padding: 1px">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div class="layui-tab" lay-filter="tab-Kf_SellOutBillList_QiaoYi_PDA">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1" style="padding:1px;">缓存列表</li>
                            <li lay-id="2" style="padding:1px;">已上传列表</li>
                        </ul>
                        <div class="layui-tab-content">
                            <!--缓存列表-->
                            <div class="layui-tab-item">
                                <div class="layui-row">
                                    <div class="layui-col-xs12">
                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
                                    </div>
                                </div>
                            </div>
                            <!--已上传列表-->
                            <div class="layui-tab-item">
                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs2">
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">单据号</label>
                                        </div>
                                        <div class="layui-col-xs10">
                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs2">
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">源单单号</label>
                                        </div>
                                        <div class="layui-col-xs10">
                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
                                        <div class="layui-col-xs6">
                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">查询</button>
                                        </div>
                                        <div class="layui-col-xs4">
                                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">撤销</button>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs12">
                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
                                            <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
                        <div class="layui-row">
                            <div class="layui-col-xs2">
                                <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">编辑</button>
                            </div>
                            <div class="layui-col-xs2">
                                <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">删除</button>
                            </div>
                            <div class="layui-col-xs2">
                                <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">刷新</button>
                            </div>
                            <div class="layui-col-xs2">
                                <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">退出</button>
                            </div>
                        </div>
                    </div>
                    <!--失败提示音-->
                    <div id="" style="display:none;">
                        <audio id="cs" hidden controls>
                            <source src="../../video/jingbao.wav" type="audio/ogg">
                        </audio>
                    </div>
                    <!--成功提示音-->
                    <div id="" style="display:none;">
                        <audio id="cs2" hidden controls>
                            <source src="../../video/success.wav" type="audio/ogg">
                        </audio>
                    </div>
                </form>
            </div>
        </div>
    </div>
    <script>
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index' //主入口模块
    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
        var $ = layui.$
        , admin = layui.admin
        , layer = layui.layer
        , table = layui.table
        , form = layui.form
        , element = layui.element;
        var HBillType = '1205'
        var HMaker = sessionStorage["HUserName"]
        var HStockOrgID = sessionStorage["OrganizationID"]  //组织ID
        var HBillNo = $('#HBillNo').val()
        var HSourceBillNo = $('#HSourceBillNo').val()
        var listOption = [];    //缓存列表
        var Uploadedoption = [];   //已上传列表
        var columns = "";
        var Uploadedcolumns = "";
        var HModName = "Kf_SellOutBillList_QiaoYi_PDA";
        var titleData = [];     //不需要显示的字段
        var UploadedtitleData = [];     //不需要显示的字段
        //判断是否登录 æœªç™»å½•则跳到登录页
        if (sessionStorage.login != "login") {
            layer.confirm("登录失效,请重新登录!", {
                icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
            }, function () { window.location.href = "../../user/login.html"; });
        }
        //失败提示音
        function playSound() {
            console.log("playSound");
            var audio = document.getElementById("cs");
            audio.play();
        }
        //成功提示音
        function playSound_OK() {
            console.log("playSound_OK");
            var audio = document.getElementById("cs2");
            audio.play();
        }
        //#region åˆå§‹åŒ–界面
        set_ClearBill();
        function set_ClearBill() {
            //默认显示页面
            element.tabChange('tab-Kf_SellOutBillList_QiaoYi_PDA', '1');
            set_InitGrid();     //初始化表格
            //显示缓存列表信息
            DisTempEntryList();
            //显示已上传列表信息
            DisUploadedList();
        }
        //初始化表格
        function set_InitGrid() {
            //缓存列表
            listOption = {
                elem: '#dj-table'
                //, toolbar: '#toolbarDemo'
                //, totalRow: true
                , height: 'full-50'
                , cellMinWidth: 90
                , limit: 50
            };
            //已上传列表
            Uploadedoption = {
                elem: '#Uploaded-table'
                //, toolbar: '#toolbarDemo'
                //, totalRow: true
                , height: 'full-50'
                , cellMinWidth: 90
                , limit: 50
            };
        }
        //#endregion
        //#region ç¼–辑功能控件
        form.on('submit(cmdModify)', function () {
            var checkStatus = table.checkStatus('dj-table')
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
                    async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                    data: { "HInterID": data[0].HInterID, "HBillNo": data[0].单据号, "HBillType": HBillType },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.open({
                                type: 2
                                , area: ['100%', '100%']
                                , title: '销售出库单'
                                , shade: 0.6 //遮罩透明度
                                , maxmin: false //允许全屏最小化
                                , anim: 0 //0-6的动画形式,-1不开启
                                , content: ['../../WMS扫码模块/销售出库/Kf_SellOutBill_QiaoYi_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
                                , resize: false
                                , cancel: function () {
                                    $(".layui-btn").removeClass("layui-btn-disabled");
                                }
                            })
                        }
                        else {
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    },
                    error: function (err) {
                        layer.msg("错误" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
            }
            else {
                layer.msg('请先选中一行数据!');
            }
        });
        //#endregion
        //#region åˆ é™¤åŠŸèƒ½æŽ§ä»¶
        form.on('submit(cmdDelete)', function () {
            var checkStatus = table.checkStatus('dj-table')
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                layer.confirm("确认要删除选中行所有扫码记录?删除后将不可恢复!", { title: "删除确认" }, function (index) {
                    layer.load(3)
                    $.ajax(
                        {
                            type: "Get",
                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
                            async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                            data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) {
                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        //显示缓存列表信息
                                        DisTempEntryList();
                                    });
                                }
                                else {
                                    playSound();
                                    layer.msg(data.Message, { icon: 2, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                }
                            },
                            error: function (err) {
                                layer.msg('错误' + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        });
                    layer.closeAll("loading");
                })
            }
            else {
                layer.msg('请选择一行数据删除!');
            }
        });
        //#endregion
        //#region åˆ·æ–°åŠŸèƒ½æŽ§ä»¶
        form.on('submit(cmdRefresh)', function () {
            //显示缓存列表信息
            DisTempEntryList();
        });
        //显示缓存列表信息
        function DisTempEntryList() {
            layer.load(3)
            $.ajax({
                type: "GET",
                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
                async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = [];
                        var col = [];
                        //给空的数组赋值
                        for (var key in result.list) {
                            //动态获取列表所有列名
                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
                            //获取不需要显示的列(H开头的列不显示)
                            var patrn = new RegExp(/^h/i);
                            if (patrn.test(result.list[key].ColmCols)) {
                                titleData[key] = result.list[key].ColmCols;
                            }
                        }
                        //在列表左边添加勾选框
                        col.push({ type: 'radio', fixed: 'left' });
                        for (var i = 0; i < data.length; i++) {
                            if ($.inArray(data[i].name, titleData) > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                            }
                            else {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 150 });
                                        break;
                                    default:
                                    if (data[i].name == '单据号' || data[i].name == '组织' || data[i].name == '源单单号' || data[i].name == '单据内码') {
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
                                    } else {
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center' });
                                    }
                                }
                            }
                        }
                        columns = col;
                        listOption.cols = [columns];
                        listOption.data = result.data;
                        //listOption.totalRow = true;
                        table.render(listOption);
                    }
                    else {
                        //layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                }
            });
            layer.closeAll("loading");
        }
        //#endregion
        //#region é€€å‡ºåŠŸèƒ½æŽ§ä»¶
        form.on('submit(cmdCancel)', function () {
            layer.confirm('您确定要退出吗?', { icon: 3, title: '提示' }, function (index) {
                parent.location.href = "../../../views/index_Mobile.html";
            });
        })
        //#endregion
        //#region æŸ¥è¯¢åŠŸèƒ½æŽ§ä»¶
        form.on('submit(cmdQuery)', function () {
            HBillNo = $("#HBillNo").val();
            HSourceBillNo = $("#HSourceBillNo").val();
            //显示已上传列表信息
            DisUploadedList();
        });
        //显示已上传列表信息
        function DisUploadedList() {
            $.ajax({
                type: "GET",
                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
                async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
                success: function (result) {
                    if (result.count == 1) {
                        var data = [];
                        var col = [];
                        //给空的数组赋值
                        for (var key in result.list) {
                            //动态获取列表所有列名
                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
                            //获取不需要显示的列(H开头的列不显示)
                            var patrn = new RegExp(/^h/i);
                            if (patrn.test(result.list[key].ColmCols)) {
                                UploadedtitleData[key] = result.list[key].ColmCols;
                            }
                        }
                        //在列表左边添加勾选框
                        col.push({ type: 'radio', fixed: 'left' });
                        for (var i = 0; i < data.length; i++) {
                            if ($.inArray(data[i].name, UploadedtitleData) > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                            }
                            else {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                        break;
                                    default:
                                        if (data[i].name == '数量') {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
                                        } else {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
                                        }
                                }
                            }
                        }
                        Uploadedcolumns = col;
                        Uploadedoption.cols = [Uploadedcolumns];
                        Uploadedoption.data = result.data;
                        //Uploadedoption.totalRow = true;
                        table.render(Uploadedoption);
                    }
                    else {
                        //layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                }
            });
        }
        //#endregion
        //#region æ’¤æ¶ˆåŠŸèƒ½æŽ§ä»¶
        form.on('submit(cmdRescind)', function () {
            var checkStatus = table.checkStatus('Uploaded-table')
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                layer.load(3)
                $.ajax(
                    {
                        type: "Get",
                        url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
                        async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                        data: { "HInterID": data[0].HInterID, "HBillNo": data[0].单据号, "HBillType": HBillType },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) {
                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    element.tabChange('tab-Kf_SellOutBillList_QiaoYi_PDA', '1');
                                    //显示缓存列表信息
                                    DisTempEntryList();
                                    //显示已上传列表信息
                                    DisUploadedList();
                                });
                            }
                            else {
                                playSound();
                                layer.msg(data.Message, { icon: 2, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        },
                        error: function (err) {
                            layer.msg('错误' + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    });
                layer.closeAll("loading");
            }
            else {
                layer.msg('请选择一行记录,进行撤销!');
            }
        });
        //#endregion
    });
    </script>
</body>
</html>
WebTM/views/WMSɨÂëÄ£¿é/ÏúÊÛ³ö¿â/Kf_SellOutBill_QiaoYi_PDA.html
@@ -122,7 +122,8 @@
                                            </div>
                                            <div class="layui-col-xs10">
                                                <div class="layui-col-xs12">
                                                    <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                                    <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" readonly>
                                                    <!--<input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">-->
                                                    <input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" value="0" autocomplete="off" class="layui-input">
                                                </div>
                                                <!--<div class="layui-col-xs1">
@@ -233,7 +234,6 @@
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
@@ -377,7 +377,7 @@
                    , limit: 3000
                    , totalRow: true
                    , cols: [[
                        { field: 'HBarCode', title: '条码编号', width: 220, totalRow: true }
                        { field: 'HBarCode', title: '条码编号', width: 220 }
                        , { field: 'HQty', title: '数量', width: 80, totalRow: true }
                        , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                        , { field: 'HMaterName', title: '物料名称', width: 150 }
@@ -459,6 +459,8 @@
                    success: function (d) {
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        HInterID = $('#HInterID').val()
                        HBillNo = $('#HBillNo').val()
                        $("#HMainSourceBillType").val(d.data[0].HSourceBillType == null ? "1402" : d.data[0].HSourceBillType);
                        //获取源单类型
                        if (d.data[0].HSourceBillType == "1402") {
@@ -844,7 +846,12 @@
                                    layer.confirm(data.Message, {
                                        icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['新增','关闭'],
                                        btn2: function () {
                                            parent.location.href = "../../../views/index_Mobile.html";
                                            if (OperationType == 2) {
                                                parent.location.href = "../../WMS扫码模块/销售出库/Kf_SellOutBillList_QiaoYi_PDA.html";
                                            }
                                            else {
                                                parent.location.href = "../../../views/index_Mobile.html";
                                            }
                                        }//关闭
                                    }
                                        , function () {
@@ -935,7 +942,6 @@
                                    layer.msg('错误' + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                }
                            });
                        layer.close(index)
                        layer.closeAll("loading");
                    })
                }
@@ -950,7 +956,13 @@
            form.on('submit(cmdCancel)', function () {
                layer.confirm('您确定要退出吗?', { icon: 3, title: '提示' }, function (index) {
                    parent.location.href = "../../../views/index_Mobile.html";
                    if (OperationType == 2) {
                        var index = parent.layer.getFrameIndex(window.name);
                        parent.layer.close(index);
                    }
                    else {
                        parent.location.href = "../../../views/index_Mobile.html";
                    }
                });
            })
@@ -1013,24 +1025,20 @@
            //扫描源单条码
            $('#HSourceBillNo').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    layer.load(3)
                    GetMeesageBySourceBillNo();
                    layer.closeAll("loading");
                }
            });
            //源单按钮
            form.on('submit(HSourceBillNo-BT)', function (data) {
                layer.load(3)
                GetMeesageBySourceBillNo();
                layer.closeAll("loading");
            });
            //扫描源单条码
            function GetMeesageBySourceBillNo(obj) {
                var HSourceBillNo = $('#HSourceBillNo').val()
                var HSourceBillType = $("#HMainSourceBillType").val()
                layer.load(3)
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/WEBSController/Get_SourceBarCode_SellOut_Json",
@@ -1065,6 +1073,7 @@
                        }
                    }
                });
                layer.closeAll("loading");
            }
            //#endregion
@@ -1075,19 +1084,15 @@
            //扫描条码
            $('#HBarCode').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    layer.load(3)
                    GetMeesageByBarCode();
                    $("#HBarCode").focus();     //获取光标
                    layer.closeAll("loading");
                }
            });
            //条码按钮
            form.on('submit(HBarCode-BT)', function (data) {
                layer.load(3)
                GetMeesageByBarCode();
                $("#HBarCode").focus();     //获取光标
                layer.closeAll("loading");
            });
            //扫条码
@@ -1101,6 +1106,7 @@
                var sSourceBillNo = $("#HSourceBillNo").val()
                var sSourceBillType = $("#HMainSourceBillType").val()
                layer.load(3)
                if (HDeleteFlag == "*") {
                    if (sBarCode == "") {
                        layer.msg("请扫描要删除的条码", { icon: 0, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
@@ -1253,6 +1259,7 @@
                        }
                    });
                }
                layer.closeAll("loading");
            }
            //#endregion
@@ -1282,7 +1289,7 @@
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                            col.push({ type: 'radio', fixed: 'left', totalRowText: '合计' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
@@ -1307,17 +1314,6 @@
                                }
                            }
                            columns = col;
                            //设置赋值列宽
                            var colWidth = getColumnsWidth();
                            if (colWidth == "" || colWidth == []) {
                            }
                            else {
                                $.each(columns, function (x, m) {
                                    m["width"] = colWidth[x];
                                });
                            }
                            listOption.cols = [columns];
                            listOption.data = result.data.Materlist;
                            listOption.totalRow = true;
@@ -1332,35 +1328,6 @@
                    }
                });
            }
            //#region èŽ·å–åˆ—å®½
            function getColumnsWidth() {
                var result = [];
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                //获取列宽
                $.ajax({
                    type: "Get",
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
                    async: false,
                    dataType: "json",
                    data: { "colNum": colNum, "Name": HModName },
                    success: function (data1) {
                        if (data1.code == 1) {
                            result = data1.data;
                        }
                        else if (data1.code == -1) {
                        }
                        else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                return result;
            }
            //#endregion
            //#endregion
WebTM/views/index_Mobile.html
@@ -690,6 +690,12 @@
                          </a>
                      </dd>
                      <dd>
                          <a lay-href="WMS扫码模块/销售出库/Kf_SellOutBillList_QiaoYi_PDA.html" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              é”€å”®å‡ºåº“缓存列表—乔一
                          </a>
                      </dd>
                      <dd>
                          <a lay-href="领料发货/销售出库/Kf_SellOutBill_CheckList_New.html" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              é”€å”®å‡ºåº“校验缓存列表
@@ -755,48 +761,6 @@
                              æ¢æ‰˜è°ƒæ‹¨å•缓存列表
                          </a>
                      </dd>
                      <!--<dd>
                <a lay-href="" style="color: aqua;">
                    <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                    åˆ†æ­¥å¼è°ƒå‡ºç¼“存列表null
                </a>
            </dd>
            <dd>
                <a lay-href="" style="color: aqua;">
                    <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                    åˆ†æ­¥å¼è°ƒå…¥ç¼“存列表null
                </a>
            </dd>
            <dd>
                <a lay-href="" style="color: aqua;">
                    <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                    é‡‡è´­é€€æ–™ç¼“存列表null
                </a>
            </dd>
            <dd>
                <a lay-href="" style="color: aqua;">
                    <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                    ç”Ÿäº§é€€åº“缓存列表null
                </a>
            </dd>
            <dd>
                <a lay-href="" style="color: aqua;">
                    <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                    ç”Ÿäº§é€€æ–™ç¼“存列表null
                </a>
            </dd>
            <dd>
                <a lay-href="" style="color: aqua;">
                    <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                    é”€å”®é€€è´§ç¼“存列表null
                </a>
            </dd>
            <dd>
                <a lay-href="" style="color: aqua;">
                    <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                    åˆ°è´§ç‚¹æ•°ç¼“存列表null
                </a>
            </dd>-->
                  </dl>
              </li>
              <!-- ç³»ç»Ÿç®¡ç† -->
WebTM/views/¹«¹²Ò³Ãæ/Kf_ChaoBaoEditDlg.html
@@ -167,7 +167,7 @@
                set_InitGrid();     //初始化表格
                //光标默认在条码位置上
                var pFocus = $("#HBarCode");
                var pFocus = $("#HQty");
                pFocus.focus();     //获取光标
                pFocus.select();
            }
@@ -185,7 +185,7 @@
                };
            }
            //#region   ä»Žç¼“存列表中返回信息
            //#region   ä»Žæ‰«ç æ¨¡å—跳转返回信息
            function getUrlVars() {
                var vars = [], hash;
                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -209,10 +209,19 @@
            //#endregion
            //判断是否新增,获取最大单据号
            if (HInterID != 0) {
                $("#HBarCode").select();
                $("#HBarCode").focus();     //获取光标
                //返回物料信息
                $("#HBarCode").val(HMaterID);
                var sBarCode = $('#HBarCode').val()
                if (sBarCode == 0) {
                    $('#HBarCode').val("");
                    $("#HBarCode").select();
                    $("#HBarCode").focus();     //获取光标
                }
                else {
                    GetBarCode();
                    $("#HQty").focus();     //获取光标
                }
                //显示表体明细
                DisBillEntryList();
            }
@@ -222,9 +231,7 @@
                return;
            }
            //#endregion
            //#region åŠŸèƒ½æŽ§ä»¶
@@ -262,7 +269,6 @@
                                    layer.msg('错误' + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                }
                            });
                        layer.close(index)
                        layer.closeAll("loading");
                    })
                }
@@ -289,19 +295,15 @@
            //扫描条码
            $('#HBarCode').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    layer.load(3)
                    GetBarCode();
                    $("#HQty").focus();     //获取光标
                    layer.closeAll("loading");
                }
            });
            //条码按钮
            form.on('submit(HBarCode-BT)', function (data) {
                layer.load(3)
                GetBarCode();
                $("#HQty").focus();     //获取光标
                layer.closeAll("loading");
            });
            //扫条码
@@ -312,6 +314,7 @@
                    layer.msg("条码为空,请扫描条码!", { icon: 0, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                layer.load(3)
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/WEBSController/GetBarCode_Json",
@@ -337,6 +340,7 @@
                        layer.msg("错误!" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
                layer.closeAll("loading");
            }
            //#endregion
@@ -345,9 +349,7 @@
            //添加按钮
            form.on('submit(cmdAdd)', function (data) {
                layer.load(3)
                GetMeesageByBarCode();
                layer.closeAll("loading");
            });
            //将条码信息写入条码临时表
@@ -364,6 +366,7 @@
                    layer.msg("数量不允许小于0,请输入数量!", { icon: 0, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                layer.load(3)
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
@@ -387,6 +390,7 @@
                        layer.msg("错误!" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
                layer.closeAll("loading");
            }
            //#endregion
@@ -416,7 +420,7 @@
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                            col.push({ type: 'radio', fixed: 'left', totalRowText: '合计' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
@@ -439,17 +443,6 @@
                                }
                            }
                            columns = col;
                            ////设置赋值列宽
                            //var colWidth = getColumnsWidth();
                            //if (colWidth == "" || colWidth == []) {
                            //}
                            //else {
                            //    $.each(columns, function (x, m) {
                            //        m["width"] = colWidth[x];
                            //    });
                            //}
                            listOption.cols = [columns];
                            listOption.data = result.data;
                            listOption.totalRow = true;
@@ -466,35 +459,6 @@
                    }
                });
            }
            //#region èŽ·å–åˆ—å®½
            function getColumnsWidth() {
                var result = [];
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                //获取列宽
                $.ajax({
                    type: "Get",
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
                    async: false,
                    dataType: "json",
                    data: { "colNum": colNum, "Name": HModName },
                    success: function (data1) {
                        if (data1.code == 1) {
                            result = data1.data;
                        }
                        else if (data1.code == -1) {
                        }
                        else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                return result;
            }
            //#endregion
            //#endregion
WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html
@@ -693,9 +693,9 @@
                if (!isNaN(HDeptID) && HDeptName == 0) {
                    HDeptName = HDeptID;
                }
                if (!isNaN(HDeptID)) {
                    HStatus = "开工";
                }
                //if (!isNaN(HDeptID)) {
                //    HStatus = "开工";
                //}
                if (HSF) {//判断打印状态
                    if (HSF == "全部") {
WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/JIT_DayPlanPlatForm.html
@@ -751,7 +751,7 @@
            columns.push({ field: '订单交货期', title: '订单交货期', width: 150, templet: "<div>{{d.订单交货期 =='1900-01-01' ?'':layui.util.toDateString(d.订单交货期, 'yyyy-MM-dd')}}</div>", sort: true });
            columns.push({ field: '订单需求数量', title: '订单需求数量', width: 150, sort: true });
            columns.push({ field: '开工余量', title: '开工余量', width: 150, sort: true });
            columns.push({ field: '小时产能', title: '小时产能', width: 150, sort: true });
            columns.push({ field: '小时产能', title: '小时产能', width: 150, sort: true, edit: 'text' });
            columns.push({ field: '生产周期', title: '生产周期', width: 150, sort: true });
            columns.push({ field: '最迟开工日期', title: '最迟开工日期', width: 150, templet: "<div>{{d.最迟开工日期 =='' ?'':layui.util.toDateString(d.最迟开工日期, 'yyyy-MM-dd')}}</div>", sort: true });
            columns.push({ field: '最迟完工日期', title: '最迟完工日期', width: 150, templet: "<div>{{d.最迟完工日期 =='' ?'':layui.util.toDateString(d.最迟完工日期, 'yyyy-MM-dd')}}</div>", sort: true });
WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_CollectionOfSingleProductDefects.html
@@ -168,6 +168,7 @@
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" lay-verify="HMaterNumber" value="" style="background-color:#efefef4d;">
                                                <input type="hidden" class="layui-input" name="HMaterID" lay-verify="HMaterID" id="HMaterID" value="0">
                                                <input type="hidden" class="layui-input" name="HProdOrgID" lay-verify="HProdOrgID" id="HProdOrgID" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -315,10 +316,12 @@
        var params = getUrlVars();
        var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  1添加 ä¿å­˜  2复制  3 ç¼–辑 4添加子工艺路线
        var linterid = params[params[1]]; //从参数中获取 å•据内码
        var HProcExchBillNo = params[params[2]]; //从参数中获取 å•据内码
        //制单人
        $("#HMaker").val(sessionStorage["HUserName"]);
        $("#hmakedate").val(Format(new Date(), "yyyy-MM-dd"));
        $("#HProdOrgID").val(sessionStorage["OrganizationID"]);
     
        //判断是否新增
        if (OperationType == 1) {
@@ -455,40 +458,65 @@
        //条码回车查询
        function txtHBarCode_KeyDown(HBarCode) {
            var index = layer.load();
            var indexs = layer.load();
            $.ajax({
                type: "GET",
                url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList",
                async: true,
                data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"]},
                url: GetWEBURL() + "/Cj_SingleStation/SNHBardCodeList",
                async: false,
                data: { "HBarCode": HBarCode, "HProcExchBillNo": HProcExchBillNo, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
                dataType: "json",
                success: function (data1) {
                    if (data1.count == 1) {
                        layer.close(index);
                        $("#HICMOBillNo").val(data1.data[0]["生产订单"]);
                        $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
                        $("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
                        $("#HProcExchBillNo").val(data1.data[0]["工序流转卡"]);
                        $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
                        $("#HProcExchEntryID").val(data1.data[0]["HProcExchEntryID"]);
                        $("#HMaterNumber").val(data1.data[0]["物料编码"]);
                        $("#HMaterID").val(data1.data[0]["HMaterID"]);
                        $("#HMaterName").val(data1.data[0]["物料名称"]);
                        $("#HModel").val(data1.data[0]["规格型号"]);
                        $("#HBarCode").val(data1.data[0]["条码"]);
                        layer.close(indexs);
                        var index = layer.load();
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList",
                            async: false,
                            data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                            dataType: "json",
                            success: function (data1) {
                                if (data1.count == 1) {
                                    layer.close(index);
                                    $("#HICMOBillNo").val(data1.data[0]["生产订单"]);
                                    $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
                                    $("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
                                    $("#HProcExchBillNo").val(data1.data[0]["工序流转卡"]);
                                    $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
                                    $("#HProcExchEntryID").val(data1.data[0]["HProcExchEntryID"]);
                                    $("#HMaterNumber").val(data1.data[0]["物料编码"]);
                                    $("#HMaterID").val(data1.data[0]["HMaterID"]);
                                    $("#HMaterName").val(data1.data[0]["物料名称"]);
                                    $("#HModel").val(data1.data[0]["规格型号"]);
                                    $("#HBarCode").val(data1.data[0]["条码"]);
                                }
                                else {
                                    layer.close(index);
                                    layer.msg(data1.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                }
                                $("#HBarCodeSN").val("");
                            },
                            error: function (err) {
                                layer.close(index);
                                layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        });
                    }
                    else {
                        layer.close(index);
                        layer.close(indexs);
                        layer.msg(data1.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                    $("#HBarCodeSN").val("");
                },
                error: function (err) {
                    layer.close(index);
                    layer.close(indexs);
                    layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                }
            });
        }
         //不良原因选择页面
WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_ProcessItemBGA.html
@@ -371,12 +371,17 @@
            // NG保存
            form.on('submit(NGSave)', function (data) {
                get_Save(data,"NG");
                if (AllowLoadData()) {
                    get_Save(data, "NG");
                }
            });
            // OK保存
            form.on('submit(OKSave)', function (data) {
                get_Save(data,"OK");
                if (AllowLoadData()) {
                    get_Save(data, "OK");
                }
            });
            //#endregion
@@ -760,6 +765,8 @@
                var HSourceBillNo = $("#HSourceBillNo").val();
                var HSourceBillType = $("#HSourceBillType").val();
                var HProcExchBillNo = $("#HProcExchBillNo").val();
                var HProcExchInterID = $("#HProcExchInterID").val();
                var HProcExchEntryID = $("#HProcExchEntryID").val();
                var HProcess = $("#HProcess").val();
                var HICMOInterID = $("#HICMOInterID").val();
                var HICMOBillNo = $("#HICMOBillNo").val();
@@ -778,6 +785,8 @@
                    , 'HSourceBillType': HSourceBillType
                    , 'HBarCode': HBarCode
                    , 'HProcExchBillNo': HProcExchBillNo
                    , 'HProcExchInterID': HProcExchInterID
                    , 'HProcExchEntryID': HProcExchEntryID
                    , 'HProcess': HProcess
                    , 'HICMOInterID': HICMOInterID
                    , 'HICMOBillNo': HICMOBillNo
@@ -808,7 +817,7 @@
            function get_Save(data, HResult) {
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache["mainTable"]);
                var sMainSub = sMainStr + ';' + sSubStr + ";" + sSubStr+ ";" + sessionStorage["HUserName"] + ";" + HResult;
                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + HResult;
                var index = layer.load();
                $.ajax({
@@ -841,6 +850,23 @@
                });
            }
            //非空验证
            function AllowLoadData(data) {
                //var HBarCode = $("#HBarCode").val();
                //if (HBarCode == "") {
                //    layer.msg("产品SN不能为空!")
                //    return false;
                //}
                var HBadReasonID = $("#HBadReasonID").val();
                if (HBadReasonID == 0) {
                    layer.msg("不良原因不能为空!")
                    return false;
                }
                return true;
            }
            //#endregion
        });
WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_ProcessItemBGA_PJGH.html
@@ -102,6 +102,8 @@
                                                <input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" value="0">
                                                <input type="hidden" name="HBatchNo" id="HBatchNo" lay-verify="HBatchNo">
                                                <input type="hidden" name="HProcExchBillNo" id="HProcExchBillNo" lay-verify="HProcExchBillNo">
                                                <input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" lay-verify="HProcExchEntryID">
                                                <input type="hidden" name="HProcExchInterID" id="HProcExchInterID" lay-verify="HProcExchInterID">
                                                <input type="hidden" name="HProcess" id="HProcess" lay-verify="HProcess">
                                                <input type="hidden" name="HICMOInterID" id="HICMOInterID" lay-verify="HICMOInterID">
                                                <input type="hidden" name="HICMOBillNo" id="HICMOBillNo" lay-verify="HICMOBillNo">
@@ -198,6 +200,8 @@
            $("#HBillNo").val(datajson.HBillNo);
            $("#HBillNo_bak").val(datajson.HBillNo);
            $("#HProcExchBillNo").val(datajson.HProcExchBillNo);
            $("#HProcExchInterID").val(datajson.HProcExchInterID);
            $("#HProcExchEntryID").val(datajson.HProcExchEntryID);
            $("#HICMOInterID").val(datajson.HICMOInterID);
            $("#HICMOBillNo").val(datajson.HICMOBillNo);
            $("#HICMOEntryID").val(datajson.HICMOEntryID);
@@ -270,7 +274,7 @@
            //查询条码绑定的返修记录
            get_RepairRecord();
            //查询物料清单数据
            get_BomList($("#HProcExchBillNo").val());
            get_BomList();
        }
        //查询
@@ -508,13 +512,13 @@
        }
        //流转卡查询关键件清单
        function get_BomList(HBarCode) {
        function get_BomList() {
            var index = layer.load();
            $.ajax({
                type: "GET",
                url: GetWEBURL() + "/Cj_SingleStation/HBardCodeBomList",
                url: GetWEBURL() + "/Cj_SingleStation/AssemHBardCodeBomList",
                async: false,
                data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                data: { "HProcExchInterID": $("#HProcExchInterID").val(), "HProcExchEntryID": $("#HProcExchEntryID").val(), "HMaterSN": $("#HMaterSN").val(), "user": sessionStorage["HUserName"] },
                dataType: "json",
                success: function (data1) {
                    if (data1.count == 1) {
@@ -549,9 +553,8 @@
                                , { field: '配件名称', title: '配件名称' }
                                , { field: '配件规格', title: '配件规格' }
                                , { field: '配件数量', title: '配件数量' }
                                , { field: 'HBarCode', title: '当前配件码' }
                                , { field: 'HBatchNo', title: '当前批次' }
                                , { field: 'BomHInterID', title: 'BomHInterID', hide: true }
                                , { field: 'BomHEntryID', title: 'BomHEntryID', hide: true }
                                , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
                                , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
                                , { field: 'HICMOBillNo', title: 'HICMOBillNo', hide: true }
@@ -559,7 +562,7 @@
                                , { field: 'HProcExchEntryID', title: 'HProcExchEntryID', hide: true }
                                , { field: 'HProcExchBillNo', title: 'HProcExchBillNo', hide: true }
                                , { field: 'HMaterID', title: 'HMaterID', hide: true }
                                , { field: 'HBarCode', title: 'HBarCode', hide: true }
                                //, { field: 'HBarCode', title: 'HBarCode', hide: true }
                                , { fixed: 'right', title: '操作', toolbar: '#barDemo2' }
                            ]]
                        }
@@ -597,8 +600,7 @@
            var HResult = "配件";
            var sMainStr = JSON.stringify(data1.field);
            var sSubStr = JSON.stringify(table.cache["mainTable2"][KNum]);
            var sSubStr2 = JSON.stringify(table.cache["mainTable2"]);
            var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr2 + ";" + sessionStorage["HUserName"] + ";" + HResult;
            var sMainSub = sMainStr + ';' + sSubStr  + ";" + sessionStorage["HUserName"] + ";" + HResult;
            var index = layer.load();
            $.ajax({
WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_ProcessItemStationPlatform.html
@@ -603,6 +603,7 @@
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/BadRecordsList',
                type: "GET",
                async: false,
                data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
@@ -631,6 +632,7 @@
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/HGRecordsList',
                type: "GET",
                async: false,
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
@@ -651,37 +653,52 @@
        
        //条码回车查询
        function txtHBarCode_KeyDown(HBarCode) {
            var index = layer.load();
            var HProcExchBillNo = $("#HProcExchBillNo").val();
            var indexs = layer.load();
            $.ajax({
                type: "GET",
                url: GetWEBURL() + "/Cj_SingleStation/HBardCodeAccessoryList",
                url: GetWEBURL() + "/Cj_SingleStation/SNHBardCodeList",
                async: false,
                data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"]},
                data: { "HBarCode": HBarCode, "HProcExchBillNo": HProcExchBillNo, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
                dataType: "json",
                success: function (data1) {
                    if (data1.count == 1) {
                        layer.close(index);
                        var HProcExchBillNo = $("#HProcExchBillNo").val();
                        //if (data1.data[0]["HSourceBillNo"] != HProcExchBillNo) {
                        //    return layer.msg("扫码错误,请重新扫!");
                        //} else {
                        //    $("#HBarCode_P").val(HBarCode);
                        //    layer.msg("扫码成功!");
                        //}
                        layer.close(indexs);
                        var index = layer.load();
                        $("#HBarCode_P").val(HBarCode);
                        //保存数据
                        set_AddAssemblyBill();
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "/Cj_SingleStation/HBardCodeSNList",
                            async: false,
                            data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                            dataType: "json",
                            success: function (data1) {
                                if (data1.count == 1) {
                                    layer.close(index);
                                    $("#HBarCode_P").val(HBarCode);
                                    //保存数据
                                    set_AddAssemblyBill();
                                }
                                else {
                                    layer.close(index);
                                    layer.msg(data1.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                }
                                $("#HBarCodeSN").val("");
                            },
                            error: function (err) {
                                layer.close(index);
                                layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        });
                    }
                    else {
                        layer.close(index);
                        layer.close(indexs);
                        layer.msg(data1.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                    $("#HBarCodeSN").val("");
                },
                error: function (err) {
                    layer.close(index);
                    layer.close(indexs);
                    layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                }
            });
@@ -822,6 +839,7 @@
                                layer.confirm('是否要把当前批次:' + option.data[i]["HBatchNo"] + '替换成批次:' + data1.data[0]["HBatchNo"], function (index) {
                                    layer.close(index);
                                    option.data[i]["HBatchNo"] = data1.data[0]["HBatchNo"];
                                    option.data[i]["配件数量"] = data1.data[0]["HQty"];
                                    option.data[i]["HBarCode"] = HBarCode;
                                    table.render(option);
                                });
@@ -829,6 +847,7 @@
                            }
                            if (data1.data[0]["HMaterNumber"] == option.data[i]["配件代码"]) {
                                option.data[i]["HBatchNo"] = data1.data[0]["HBatchNo"];
                                option.data[i]["配件数量"] = data1.data[0]["HQty"];
                                option.data[i]["HBarCode"] = HBarCode;
                                KNum += 1;
                                table.render(option);
@@ -1049,7 +1068,7 @@
                    , area: ['100%', '100%']//大小
                    , title: '工序不良汇报'//标题
                    , shift: 2//弹出动画
                    , content: ['../../车间管理/单品过站/Cj_CollectionOfSingleProductDefects.html?OperationType=1&linterid=' + $("#HInterID").val(), 'yes']
                    , content: ['../../车间管理/单品过站/Cj_CollectionOfSingleProductDefects.html?OperationType=1&linterid=' + $("#HInterID").val() + '&HProcExchBillNo=' + $("#HProcExchBillNo").val(), 'yes']
                    , end: function () {
                        get_BadRecords($("#HBardCodeProcExchBillNo").val());
                    }
@@ -1084,7 +1103,6 @@
                        get_AddBomTempList();
                        var HBardCodeProcExchBillNo = $("#HBardCodeProcExchBillNo").val();
                        get_BomList(HBardCodeProcExchBillNo);
                        get_BadRecords(HBardCodeProcExchBillNo);
                        //查询合格记录
                        get_HGRecords();
                        //查询不良记录