工艺路线增加多选返回,车间自检单增加工序流转卡下推获取源单数据

zrg

2024-07-18 9dffd2ef1aa4ec4f4dc23206e533c6f596b4f73d

工艺路线增加多选返回,车间自检单增加工序流转卡下推获取源单数据

 WebTM/WebTM.csproj.user

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú±¨±í/Sc_QualityReportBillMonth.html

@@ -42,7 +42,7 @@
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                <div class="layui-inline "style="display:none">
                                    <label class="layui-form-label" style="width: 85px;">工作中心</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 120px;">
                                        <select name="HWorkCenter" id="HWorkCenter" lay-verify="HWorkCenter">
@@ -227,10 +227,10 @@
                            type: 'value',
                            name: '趋势率%',
                            min: 0,
                            max: 100,
                            interval: 10,
                            max: 1,
                            interval: 0.1,
                            axisLabel: {
                                formatter: '{value} ' + '%'
                                formatter: '{value} '
                            }
                        }
                    ],

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_MaterialTechParamBillMain.html

@@ -205,7 +205,7 @@
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" style=" width: 500px;">
                                            </div>
                                        </div>                                       
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
@@ -559,10 +559,10 @@

                //新增行表格数据
                var NewRow = {
                    "HTechParamID": "",
                    "HTechParamID": 0,
                    "HTechParamNumber": "",
                    "HTechParamName": "",
                    "HTechParamUnitID": "",
                    "HTechParamUnitID": 0,
                    "HTechParamUnitName": "",
                    "HStd": "0",
                    "HMax": "0",
@@ -911,11 +911,10 @@
                    if (event.key == "F7") {
                        //工艺参数
                        if (obj.event == "HTechParamNumber") {
                            //打开器具管理小窗体
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', //加上边框
                                title: '模具列表',
                                title: '工艺列表',
                                closeBtn: 1,
                                shift: 2,
                                area: ['80%', '80%'],
@@ -929,12 +928,47 @@
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('请选择数据');
                                    }
                                    obj.update({
                                        "HTechParamID": checkStatus.data[0].HItemID,
                                        "HTechParamNumber": checkStatus.data[0].工艺参数代码,
                                        "HTechParamName": checkStatus.data[0].工艺参数名称,

                                    });
                                    table.cache["mainTable"].splice(0, 1);
                                    for (var rowData of checkStatus.data) {
                                        var NewRow = {
                                            "HTechParamID": rowData.HItemID,
                                            "HTechParamNumber": rowData.工艺参数代码,
                                            "HTechParamName": rowData.工艺参数名称,
                                            "HTechParamUnitID": 0,
                                            "HTechParamUnitName": "",
                                            "HStd": "0",
                                            "HMax": "0",
                                            "HMin": "0",
                                            "HDataForm": "手工录入",
                                            "HDataUnit": "秒",
                                            "HDataTimes": "0",
                                            "HSourceBillNo": "0",
                                            "HSourceBillType": "0",
                                            "HSourceEntryID": "0",
                                            "HSourceInterID": "0"
                                        };
                                        table.cache["mainTable"].push(NewRow);
                                    }
                                    option.data = table.cache["mainTable"];
                                    table.render(option);

                                    //for (var i = 0; i < checkStatus.data.length; i++) {
                                    //    option.data.push({
                                    //        "HTechParamID": checkStatus.data[i].HItemID,
                                    //        "HTechParamNumber": checkStatus.data[i].工艺参数代码,
                                    //        "HTechParamName": checkStatus.data[i].工艺参数名称,
                                    //    })
                                    //}


                                    //obj.update({
                                    //    "HTechParamID": checkStatus.data[0].HItemID,
                                    //    "HTechParamNumber": checkStatus.data[0].工艺参数代码,
                                    //    "HTechParamName": checkStatus.data[0].工艺参数名称,

                                    //});
                                    //table.render(option);
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                }
                                , end: function () {

 WebTM/views/ÖÊÁ¿¹ÜÀí/³µ¼ä×Լ쵥/QC_Add_Edit_WorkSelfCheckBill.html

@@ -352,13 +352,13 @@
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">样本量</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HSampleQty" id="HSampleQty" style="background-color:#efefef4d;" readonly>
                                            <input type="text" class="layui-input" name="HSampleQty" id="HSampleQty" value="0" style="background-color:#efefef4d;" readonly>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">样本破坏数</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HSampleDamageQty" id="HSampleDamageQty" style="">
                                            <input type="text" class="layui-input" name="HSampleDamageQty" id="HSampleDamageQty" value="0" style="">
                                        </div>
                                    </div>
                                </div>
@@ -401,7 +401,7 @@
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">拒绝数</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HRejectQty" id="HRejectQty" style="background-color:#efefef4d;" readonly>
                                            <input type="text" class="layui-input" name="HRejectQty" id="HRejectQty" value="0" style="background-color:#efefef4d;" readonly>
                                        </div>
                                    </div>
                                    <!--<div class="layui-inline">
@@ -996,8 +996,8 @@
                    "HQCCheckItemID": "", "检验项目": "", "HInspectInstruMentID": "0", "检验仪器": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
                    "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
                    "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
                    "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "0",
                    "HStrictness": "", "HSampleUnRightQty": "0", "HAQL": "", "HSamplingType": ""
                };

                switch (obj.event) {
@@ -1484,19 +1484,19 @@
                                , "HCloseDate": data.关闭日期
                                , "HUpDateDate": data.修改日期
                                , "HDeleteDate": data.作废日期
                                , "HSampleSchemeID": data.HSampleSchemeID
                                , "HSampleSchemeID": data.HSampleSchemeID == '' ? 0 : data.HSampleSchemeID
                                , "HSampleSchemeName": data.抽样方案名称
                                , "HSampleQty": data.样本量
                                , "HSampleQty2": data.样本量
                                , "HSampleDamageQty": data.样本破坏数
                                , "HSampleDamageQty": data.样本破坏数 == '' ? 0 : data.HSampleDamageQty
                                , "HSamplingType": data.抽样类型
                                , "HAcceptQty": data.允许数
                                , "HInspectResultToSee2":data.检验结果
                                , "HInspectionLevel": data.检验水平
                                , "HRejectQty": data.拒绝数
                                , "HRejectQty": data.拒绝数 == '' ? 0 : data.拒绝数
                                , "HStrictness": data.严格度
                                , "HSampleUnRightQty": data.样本不合格数
                                , "HSampleUnRightQty2": data.样本不合格数
                                , "HSampleUnRightQty": data.样本不合格数 == '' ? 0 : data.样本不合格数
                                , "HSampleUnRightQty2": data.样本不合格数 == '' ? 0 : data.样本不合格数
                                , "HAQL": data.AQL
                                , "HEntryID": data.hsubid
                                , "HQCCheckItemName": data.检验项目名称
@@ -1841,7 +1841,7 @@
                                rowdata.push(
                                    {
                                        "HQCCheckItemID": data[i]["HQCCheckItemID"], "检验项目": data[i]["检验项目"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "检验仪器": data[i]["检验仪器"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["单位名称"], "HQCNote": "", "HAnalysisMethod": data[i]["分析方法"], "HResult": data[i]["默认结论"],
                                        "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["重点检查"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
                                        "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["重点检查"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"] == null ? 0 : data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
                                        "HSampleSchemeName": data[i].抽样方案名称, "HSampleQty": data[i].样本量, "HAcceptQty": data[i].允许数 == null ? 0 : data[i].允许数, "HInspectionLevel": data[i].检验水平, "HRejectQty": data[i].拒绝数 == null ? 0 : data[i].拒绝数,
                                        "HStrictness": data[i].严格度, "HSampleUnRightQty": "0", "HAQL": data[i].AQL, "HSamplingType": data[i].抽样类型
@@ -2181,7 +2181,7 @@
                    "HQCCheckItemID": "", "检验项目": "", "HInspectInstruMentID": "0", "检验仪器": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
                    "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
                    "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "0",
                    "HStrictness": "", "HSampleUnRightQty": "0", "HAQL": "", "HSamplingType": ""
                }];
                option = {
@@ -2621,21 +2621,21 @@
                    $("#HDownLimit").val(0);
                    $("#HUpOffSet").val(0);
                    $("#HDownOffSet").val(0);
                    $("#HSampleDamageQty").val("")
                    $("#HSampleQty").val("")
                    $("#HSampleQty2").val("")
                    $("#HSampleDamageQty").val("0")
                    $("#HSampleQty").val("0")
                    $("#HSampleQty2").val("0")
                    $("#HAcceptQty").val("0")
                    $("#HInspectionLevel").val("")
                    $("#HRejectQty").val("")
                    $("#HRejectQty").val("0")
                    $("#HStrictness").val("")
                    $("#HSampleUnRightQty").val("")
                    $("#HSampleUnRightQty2").val("")
                    $("#HSampleUnRightQty").val("0")
                    $("#HSampleUnRightQty2").val("0")
                    $("#HAQL").val("")
                    $("#HSamplingType").val("")
                    $("#HSampleQty").val("")
                    $("#HSampleQty").val("0")
                    $("#HInspectResultToSee").val("")
                    $("#HInspectResultToSee2").val("")
                    $("#HSampleUnRightQty").val("")
                    $("#HSampleUnRightQty").val("0")
                    $("#HUnitID").val("0")
                    $("#HUnitName").val("")
                    $("#HInspectValB").val("0")

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html

@@ -266,6 +266,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_FirstPieceCheck" id="set_FirstPieceCheck"><i class="layui-icon layui-icon-form"></i>首检</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ProcessCheck" id="set_ProcessCheck"><i class="layui-icon layui-icon-form"></i>工序检</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_PatrolCheck" id="set_PatrolCheck"><i class="layui-icon layui-icon-form"></i>巡检</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_WorkCheck" id="set_WorkCheck"><i class="layui-icon layui-icon-form"></i>自检</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo2">
@@ -486,6 +487,9 @@
                        break;
                    //巡检
                    case 'set_PatrolCheck': set_PatrolCheck();
                        break;
                    //自检
                    case 'set_WorkCheck': set_WorkCheck();
                        break;
                };
            });
@@ -2838,6 +2842,34 @@
                }
            }

            //车间自检
            function set_WorkCheck() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.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();
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }

            //生产质量汇报单
            function set_ProcessExchange() {
                var checkStatus = table.checkStatus('mainTable2')