首巡末检,根据用户带出相关信息减少用户录入,以及选着检验方案根据物料过滤,只显示当前物料
8个文件已修改
249 ■■■■■ 已修改文件
WebTM/WebTM.csproj.user 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/IpadIndex.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/检验方案单/QC_CheckProjectList.html 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/车间自检单/QC_Add_Edit_WorkSelfCheckBill.html 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html 170 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user
@@ -12,5 +12,29 @@
    <IISExpressUseClassicPipelineMode />
    <UseGlobalApplicationHostFile />
  </PropertyGroup>
  <ProjectExtensions />
  <ProjectExtensions>
    <VisualStudio>
      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
        <WebProjectProperties>
          <StartPageUrl>
          </StartPageUrl>
          <StartAction>CurrentPage</StartAction>
          <AspNetDebugging>True</AspNetDebugging>
          <SilverlightDebugging>False</SilverlightDebugging>
          <NativeDebugging>False</NativeDebugging>
          <SQLDebugging>False</SQLDebugging>
          <ExternalProgram>
          </ExternalProgram>
          <StartExternalURL>
          </StartExternalURL>
          <StartCmdLineArguments>
          </StartCmdLineArguments>
          <StartWorkingDirectory>
          </StartWorkingDirectory>
          <EnableENC>True</EnableENC>
          <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
        </WebProjectProperties>
      </FlavorProperties>
    </VisualStudio>
  </ProjectExtensions>
</Project>
WebTM/views/IpadIndex.html
@@ -958,7 +958,7 @@
                , shade: 0.6
                , maxmin: false
                , anim: 0
                , content: ['质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=2&linterid=' + HProcExchInterID  + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID, 'yes']
                , content: ['质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=2&linterid=' + HProcExchInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID + '&HSourceEntryID=' + HSourceEntryID+'', 'yes']
                , resize: false
                , cancel: function () {
                }
@@ -981,7 +981,7 @@
                , shade: 0.6
                , maxmin: false
                , anim: 0
                , content: ['质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=2&linterid=' + HProcExchInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID, 'yes']
                , content: ['质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=2&linterid=' + HProcExchInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID+ '&HSourceEntryID=' + HSourceEntryID+'', 'yes']
                , resize: false
                , cancel: function () {
WebTM/views/ÖÊÁ¿¹ÜÀí/Ѳ¼ì¼Ç¼µ¥/QC_Add_Edit_PatrolProcCheckOtherill.html
@@ -717,6 +717,7 @@
                var linterid = params[params[1]];//源单id
                var HSouceBillType = params[params[2]];//源单类型
                var HICMOEntryID = params[params[3]];//源单子id
                var HEntryID = params[params[4]];//源单子id
            }
            /*固定代码,每张单据都要begin*/
            //////测试用数据
@@ -857,7 +858,7 @@
                $.ajax({
                    url: GetWEBURL() + '/QC_PatrolProcCheckOtherBill/get_ProcessExchangeBill',
                    type: "GET",
                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
                    data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
                        if (result.count == 1) {
@@ -2193,6 +2194,7 @@
            //表头信息检验方案弹窗
            form.on('submit(btnSearchQCScheme)', function () {
                var HName = $("#HMaterName").val();
                //页面层-自定义
                layer.open({
                    type: 2,
@@ -2202,7 +2204,7 @@
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../质量管理/检验方案单/QC_CheckProjectList.html', 'yes'],
                    content: ['../../质量管理/检验方案单/QC_CheckProjectList.html?OperationType=1&HName=' + HName + '', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBill.html
@@ -761,6 +761,7 @@
                var linterid = params[params[1]];//源单id
                var HSouceBillType = params[params[2]];//源单类型
                var HICMOEntryID = params[params[3]];//源单子id
                var HEntryID = params[params[4]];//源单子id
            }
            /*固定代码,每张单据都要begin*/
@@ -829,7 +830,7 @@
                        //根据源单id获取源单信息
                        LoadingInformation_StationOutBill();
                    }
                    //工序流转卡列表首检
                    //工序流转卡列表工序检
                    else if (HSouceBillType == 3772) {
                        //根据源单id获取源单信息
                        LoadingInformation_ProcExchange();
@@ -940,7 +941,7 @@
                $.ajax({
                    url: GetWEBURL() + '/CheckBill/get_ProcessExchangeBill',
                    type: "GET",
                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
                    data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
                        if (result.count == 1) {
@@ -1557,6 +1558,7 @@
            //表头信息检验方案弹窗
            form.on('submit(btnSearchQCScheme)', function () {
                var HName = $("#HMaterName").val();
                //页面层-自定义
                layer.open({
                    type: 2,
@@ -1566,7 +1568,7 @@
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../质量管理/检验方案单/QC_CheckProjectList.html', 'yes'],
                    content: ['../../质量管理/检验方案单/QC_CheckProjectList.html?OperationType=1&HName=' + HName +'', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
WebTM/views/ÖÊÁ¿¹ÜÀí/¼ìÑé·½°¸µ¥/QC_CheckProjectList.html
@@ -90,7 +90,10 @@
        //获取页面跳转参数  //单据编辑状态: 1.无源单新增  Â 2.有源单新增  Â 3.编辑  4.浏览  5.变更
        var params = get_UrlVars();
        if (typeof (params[params[0]]) == "undefined") {
            var OperationType = 1;//操作类型
            var OperationType = 1;//操作类型
        } else {
            var OperationType = params[params[0]];//操作类型
            var HName = decodeURI(params[params[1]]);//物料名称
        }
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
@@ -214,7 +217,13 @@
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
                if (HName=="") {
                    get_Display(sWhere);
                } else {
                    sWhere += " and ç‰©æ–™åç§° = '" + HName + "'";
                    get_Display(sWhere);
                }
            }
            //初始化网格
WebTM/views/ÖÊÁ¿¹ÜÀí/³µ¼ä×Լ쵥/QC_Add_Edit_WorkSelfCheckBill.html
@@ -704,6 +704,7 @@
                var linterid = params[params[1]];//源单id
                var HSouceBillType = params[params[2]];//源单类型
                var HICMOEntryID = params[params[3]];//源单子id
                var HEntryID = params[params[4]];//源单子id
            }
            /*固定代码,每张单据都要begin*/
            //////测试用数据
@@ -843,7 +844,7 @@
                $.ajax({
                    url: GetWEBURL() + '/QC_WorkSelfCheckBill/get_ProcessExchangeBill',
                    type: "GET",
                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
                    data: { "HInterID": linterid, "HEntryID": HEntryID,  "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
                        if (result.count == 1) {
@@ -2172,6 +2173,7 @@
            //表头信息检验方案弹窗
            form.on('submit(btnSearchQCScheme)', function () {
                var HName = $("#HMaterName").val();
                //页面层-自定义
                layer.open({
                    type: 2,
@@ -2181,7 +2183,7 @@
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../质量管理/检验方案单/QC_CheckProjectList.html', 'yes'],
                    content: ['../../质量管理/检验方案单/QC_CheckProjectList.html?OperationType=1&HName=' + HName + '', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_Add_Edit_FirstPieceCheckBill.html
@@ -741,6 +741,7 @@
                var linterid = params[params[1]];//源单id
                var HSouceBillType = params[params[2]];//源单类型
                var HICMOEntryID = params[params[3]];//源单子id
                var HEntryID = params[params[4]];//源单子id
            }
            /*固定代码,每张单据都要begin*/
            //////测试用数据
@@ -884,7 +885,7 @@
                $.ajax({
                    url: GetWEBURL() + '/CheckBill/get_ProcessExchangeBill',
                    type: "GET",
                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
                    data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
                        if (result.count == 1) {
@@ -1651,6 +1652,7 @@
            //表头信息检验方案弹窗
            form.on('submit(btnSearchQCScheme)', function () {
                var HName = $("#HMaterName").val();
                //页面层-自定义
                layer.open({
                    type: 2,
@@ -1660,7 +1662,7 @@
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../质量管理/检验方案单/QC_CheckProjectList.html', 'yes'],
                    content: ['../../质量管理/检验方案单/QC_CheckProjectList.html?OperationType=1&HName=' + HName+'', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
@@ -3893,24 +3895,24 @@
            }
            //#endregion
            //#region ã€åºŸå¼ƒä»£ç ã€‘
            //#region ã€åºŸå¼ƒä»£ç (斯莫尔已启用)】
            table.on('edit(mainTable)', function (obj) {
                // å•元格编辑之前的值
                var oldText = $(this).prev().text();
                var value = obj.value //得到修改后的值
                    , data = obj.data //得到所在行所有键值
                    , field = obj.field; //得到字段
                //layer.msg('[ID: ' + data.id + '] ' + field + ' å­—段更改为:' + value);
                    , field = obj.field; //得到字段
                var HInspectVal = $("#HInspectVal").val(); //检验值
                var HTargetVal = $("#HTargetVal").val(); //目标值
                var HComparator = $("#HComparator").val(); //比较符
                var HEntryID = $("#HEntryID").val() - 1;
                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //分析方法
                var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //上限值
                var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //下限值
                switch (field) {
                    case "HInspectVal":  //检验值
                        value = isNaN(value) ? 0 : value;
                        if (HInspectVal) {
                        if (HInspectVal < HUpLimit && HInspectVal > HDownLimit) {
                        }
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html
@@ -3105,25 +3105,32 @@
            function set_FirstPieceCheck() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var checkStatus2 = table.checkStatus('mainTable2')
                    , data2 = checkStatus2.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var OperationType = 2;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '首件检验单-编辑'
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0', 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();
                        }
                        , end: function () {
                            get_FastQuery();
                        }
                    })
                    if (data2.length > 0) {
                        var HEntryID = data2[0].HEntryID.toString();
                        var OperationType = 2;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '首件检验单-编辑'
                            , shade: 0.6
                            , maxmin: false
                            , anim: 0
                            , content: ['../../质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0&HEntryID=' + HEntryID + '', 'yes']
                            , resize: false
                            , cancel: function () {
                                btnIs();
                            }
                            , end: function () {
                                get_FastQuery();
                            }
                        })
                    } else {
                        layer.msg('请在下方表格选择对应的工序!');
                    }
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
@@ -3133,84 +3140,105 @@
            function set_ProcessCheck() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var checkStatus2 = table.checkStatus('mainTable2')
                    , data2 = checkStatus2.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var OperationType = 2;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '工序转移检验单-编辑'
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../质量管理/工序检验单/QC_ProcessCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0', 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();
                        }
                        , end: function () {
                            get_FastQuery();
                        }
                    })
                    if (data2.length > 0) {
                        var HEntryID = data2[0].HEntryID.toString();
                        var OperationType = 2;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '工序转移检验单-编辑'
                            , shade: 0.6
                            , maxmin: false
                            , anim: 0
                            , content: ['../../质量管理/工序检验单/QC_ProcessCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0&HEntryID=' + HEntryID +'', 'yes']
                            , resize: false
                            , cancel: function () {
                                btnIs();
                            }
                            , end: function () {
                                get_FastQuery();
                            }
                        })
                    } else {
                        layer.msg('请在下方表格选择对应的工序!');
                    }
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
                }
            }
            //巡检
            function set_PatrolCheck() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var checkStatus2 = table.checkStatus('mainTable2')
                    , data2 = checkStatus2.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var OperationType = 2;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '巡检记录单-编辑'
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0', 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();
                        }
                        , end: function () {
                            get_FastQuery();
                        }
                    })
                    if (data2.length > 0) {
                        var HEntryID = data2[0].HEntryID.toString();
                        var OperationType = 2;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '巡检记录单-编辑'
                            , shade: 0.6
                            , maxmin: false
                            , anim: 0
                            , content: ['../../质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0&HEntryID=' + HEntryID +'', 'yes']
                            , resize: false
                            , cancel: function () {
                                btnIs();
                            }
                            , end: function () {
                                get_FastQuery();
                            }
                        })
                    } else {
                        layer.msg('请在下方表格选择对应的工序!');
                    }
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
                }
            }
            //车间自检
            function set_WorkCheck() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var checkStatus2 = table.checkStatus('mainTable2')
                    , data2 = checkStatus2.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var OperationType = 2;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '车间自检单-编辑'
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../质量管理/车间自检单/QC_Add_Edit_WorkSelfCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0', 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();
                        }
                        , end: function () {
                            get_FastQuery();
                        }
                    })
                    if (data2.length > 0) {
                        var HEntryID = data2[0].HEntryID.toString();
                        var OperationType = 2;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '车间自检单-编辑'
                            , shade: 0.6
                            , maxmin: false
                            , anim: 0
                            , content: ['../../质量管理/车间自检单/QC_Add_Edit_WorkSelfCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0&HEntryID=' + HEntryID +'', 'yes']
                            , resize: false
                            , cancel: function () {
                                btnIs();
                            }
                            , end: function () {
                                get_FastQuery();
                            }
                        })
                    } else {
                        layer.msg('请在下方表格选择对应的工序!');
                    }
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
                }
            }
            //生产质量汇报单