不良采集增加车间,工序,计量单子字段保存,防错验证增加工单信息保存

zrg

2024-09-10 62fe5ecc28c13d1dcb26a83978441f1bf290db13

不良采集增加车间,工序,计量单子字段保存,防错验证增加工单信息保存

 WebTM/WebTM.csproj.user

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\vs\项目代码\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²»Á¼²É¼¯/Sc_QualityReportStepBill_New.html

@@ -814,6 +814,8 @@
                                        "HUnitID": data.HUnitID,
                                        "计量单位": data.计量单位,
                                        "HQty": data.数量,
                                        "HProcID": data.HProcID,
                                        "工序": data.工序名称,
                                        "HBadProcID": data.HBadProcID,
                                        "责任工序": data.责任工序,
                                        "HResult": data.判定结果,

 WebTM/views/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBill.html

@@ -83,6 +83,13 @@
                                                <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">车间</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HDeptName" id="HDeptName" value="" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" class="layui-input" name="HDeptID" id="HDeptID" value="0" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">不良数量</label>
                                            <div class="layui-input-inline">
@@ -133,6 +140,13 @@
                                            <label class="layui-form-label">规格型号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline" style="display:none">
                                            <label class="layui-form-label">计量单位</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HUnitName" id="HUnitName" value="" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" class="layui-input" name="HUnitID" id="HUnitID" value="0" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
@@ -420,7 +434,7 @@
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));                      
                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
                        layer.close(ajaxLoad);
                    }
                });
@@ -483,7 +497,7 @@
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {
                            layer.close(ajaxLoad);                           
                            layer.close(ajaxLoad);
                        }
                        else {
                            layer.close(ajaxLoad);
@@ -675,7 +689,10 @@
                            $("#HMaterID").val(data.HMaterID);
                            $("#HMaterModel").val(data.HMaterModel);
                            $("#HICMOEntryID").val(data.HICMOEntryID);

                            $("#HDeptID").val(data.HDeptID);
                            $("#HDeptName").val(data.HDeptName);
                            $("#HUnitID").val(data.HUnitID);
                            $("#HUnitName").val(data.HUnitName);
                            if (HSouceBillType == "3772") {
                                $("#HQty").val(data.HDatePlanQty);
                                $("#HProcExchBillNo").val(data.HSourceBillNo);
@@ -737,7 +754,7 @@
                $("#HSourceID").val(objdata.HSourceID); //生产资源ID
                $("#HSourceName").val(objdata.HSourceName); //生产资源名称
            }
        //#endregion
            //#endregion

            //#region é€‰æ‹©ç”Ÿäº§èµ„源方法
            function get_checkSource() {
@@ -831,8 +848,8 @@
                    success: function (dom, index) {
                        var data = [];
                        data.push({
                            "HInterID":$("#HInterID").val(),
                            "HBillNo":$("#HBillNo").val(),
                            "HInterID": $("#HInterID").val(),
                            "HBillNo": $("#HBillNo").val(),
                            "HMaterID": $("#HMaterID").val(),
                            "HMaterNumber": $("#HMaterNumber").val(),
                            "HMaterName": $("#HMaterName").val(),
@@ -842,6 +859,8 @@
                            "HGroupName": $("#HGroupName").val(),
                            "HSourceID": $("#HSourceID").val(),
                            "HSourceName": $("#HSourceName").val(),
                            "HUnitID": $("#HUnitID").val(),
                            "HUnitName": $("#HUnitName").val(),
                            "HICMOInterID": $("#HICMOInterID").val(),
                            "HICMOEntryID": $("#HICMOEntryID").val(),
                            "HICMOBillNo": $("#HICMOBillNo").val(),

 WebTM/views/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBillSumSave.html

@@ -50,7 +50,7 @@
                                    <div class="layui-row">
                                        <div class="layui-col-xs4  layui-inline">
                                            <label class="layui-form-label">单据号<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline" >
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HBillNo_bak" lay-verify="HBillNo_bak" id="HBillNo_bak" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
                                            </div>
@@ -76,6 +76,13 @@
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HProcNo" id="HProcNo" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HProcID" id="HProcID" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline" style="display:none">
                                            <label class="layui-form-label">计量单位</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HUnitName" id="HUnitName" value="" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" class="layui-input" name="HUnitID" id="HUnitID" value="0" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
@@ -230,6 +237,8 @@
        var HProcExchBillNo = "";     // å·¥åºæµè½¬å¡å·
        var HProcID = "";           //工序
        var HProcNo = "";           //工序名称
        var HUnitID = "";           //计量单位id
        var HUnitName = "";           //计量单位
        var HInterID = "";
        var HBillNo_bak = "";
       
@@ -246,6 +255,8 @@
            HGroupName = data[0].HGroupName;
            HSourceID = data[0].HSourceID;
            HSourceName = data[0].HSourceName;
            HUnitID = data[0].HUnitID;
            HUnitName = data[0].HUnitName;
            HICMOInterID = data[0].HICMOInterID
            HICMOEntryID = data[0].HICMOEntryID;
            HICMOBillNo = data[0].HICMOBillNo
@@ -317,6 +328,8 @@
                $("#HGroupName").val(HGroupName);
                $("#HSourceID").val(HSourceID);
                $("#HSourceName").val(HSourceName);
                $("#HUnitID").val(HUnitID);
                $("#HUnitName").val(HUnitName);
                $("#HICMOInterID").val(HICMOInterID);
                $("#HICMOEntryID").val(HICMOEntryID);
                $("#HICMOBillNo").val(HICMOBillNo);
@@ -327,14 +340,6 @@
                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化项目阶段表
                get_InitGrid();

              
                //初始化制单人和制单时间

                //$("#HGroupID").val(sessionStorage["HGroupID"]); //根据登录用户带出班组ID
                //$("#HGroupName").val(sessionStorage["HGroup"]); //根据登录用户带出班组               
                //$("#HSourceID").val(sessionStorage["HSourceID"]); //根据登录用户带出班组ID
                //$("#HSourceName").val(sessionStorage["HSource"]); //根据登录用户带出班组

            }
           
@@ -349,10 +354,6 @@
            //#endregion

            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等

            //#region å¼¹çª—选择触发事件
         
            //#endregion

            //#region æ“ä½œæŒ‰é’®è§¦å‘事件
            //#region ä¿å­˜æäº¤
@@ -387,6 +388,8 @@
                    "HBillNo_bak": $("#HBillNo_bak").val(),
                    "HMaterID": $("#HMaterID").val(),
                    "HMaterName": $("#HMaterName").val(),
                    "HUnitID": $("#HUnitID").val(),
                    "HUnitName": $("#HUnitName").val(),
                    "HBadReasonID": "",
                    "HBadReasonNumber": "",
                    "HBadReasonHName": "",
@@ -396,6 +399,8 @@
                    "HGroupName": HGroupName,
                    "HSourceID": $("#HSourceID").val(),
                    "HSourceName": $("#HSourceName").val(),
                    "HProcID": $("#HProcID").val(),
                    "HProcName": $("#HProcNo").val(),
                    "HQty": "",
                    "HSourceInterID": $("#HICMOInterID").val(),
                    "HSourceEntryID": $("#HICMOEntryID").val(),
@@ -533,6 +538,8 @@
                        , { field: 'HBillNo_bak', title: '单据号', hide: true }
                        , { field: 'HMaterID', title: '物料id', hide: true }
                        , { field: 'HMaterName', title: '物料名称', style: 'background-color: #f9f9f9;' }
                        , { field: 'HUnitID', title: '计量单位id', hide: true }
                        , { field: 'HUnitName', title: '计量单位', style: 'background-color: #f9f9f9;' }
                        , { field: 'HBadReasonID', title: '不良原因id', hide: true }
                        , { field: 'HBadReasonNumber', title: '不良原因代码', edit: 'text' , event: "HBadReasonNumber"}
                        , { field: 'HBadReasonHName', title: '不良原因', style: 'background-color: #f9f9f9;' }
@@ -542,6 +549,8 @@
                        , { field: 'HGroupName', title: '生产班组', event: "HGroupName" }
                        , { field: 'HSourceID', title: '生产资源id', hide: true }
                        , { field: 'HSourceName', title: '生产资源', event: "HSourceName" }
                        , { field: 'HProcID', title: '工序id', hide: true }
                        , { field: 'HProcName', title: '工序', event: "HSourceName" }
                        , { field: 'HQty', title: '不良数量', edit: 'text' }
                        , { field: 'HSourceInterID', title: '源单内码', hide: true, style: 'background-color: #f9f9f9;' }     
                        , { field: 'HSourceEntryID', title: '源单子内码', hide: true, style: 'background-color: #f9f9f9;' }   
@@ -565,6 +574,8 @@
                        "HBillNo_bak": $("#HBillNo_bak").val(),
                        "HMaterID": $("#HMaterID").val(),
                        "HMaterName": $("#HMaterName").val(),
                        "HUnitID": $("#HUnitID").val(),
                        "HUnitName": $("#HUnitName").val(),
                        "HBadReasonID": "",
                        "HBadReasonNumber": "",
                        "HBadReasonHName": "",
@@ -574,6 +585,8 @@
                        "HGroupName": HGroupName,
                        "HSourceID": $("#HSourceID").val(),
                        "HSourceName": $("#HSourceName").val(),
                        "HProcID": $("#HProcID").val(),
                        "HProcName": $("#HProcNo").val(),
                        "HQty": "",
                        "HSourceInterID": $("#HICMOInterID").val(),
                        "HSourceEntryID": $("#HICMOEntryID").val(),

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_EquipMentCollectionTechParam.html

@@ -531,6 +531,11 @@
                        HVaule.push(option.data[i].数采值);
                    }
                }

                var minValue = Math.min(...HVaule) - 10; //折线的最大值
                var maxValue = Math.max(...HVaule) + 10; //折线的最小值
                var interval = Math.floor((maxValue - minValue) / 10); //显示折线的间隔

                option_ZZT = {
                    title: {
                        text: HTitle,
@@ -566,7 +571,10 @@
                    ],
                    yAxis: [
                        {
                            type: 'value'
                            type: 'value',
                            min: minValue,
                            max: maxValue,
                            interval: interval
                        }
                    ],
                    series: [

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_ProcessPerformanceFirstPass.html

@@ -531,6 +531,7 @@
                        {
                            name: '一次合格率',
                            type: 'line',
                            yAxisIndex: 1, // ä½¿ç”¨ç¬¬äºŒä¸ª yAxis æ˜¾ç¤ºç™¾åˆ†æ¯”
                            label: {
                                show: true,
                                formatter: '{c}%'
@@ -553,6 +554,7 @@
                        {
                            name: '目标值',
                            type: 'line',
                            yAxisIndex: 1, // ä½¿ç”¨ç¬¬äºŒä¸ª yAxis æ˜¾ç¤ºç™¾åˆ†æ¯”
                            label: {
                                show: true,
                                formatter: '{c}%'

 WebTM/views/³µ¼ä¹ÜÀí/·À´íÑéÖ¤/Qc_PreventErrMouldCheckBill.html

@@ -139,7 +139,14 @@
                                                </select>
                                            </div>
                                        </div>
                                    </div>
                                        <div class="layui-inline">
                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
                                                <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" lay-verify="HMainSourceInterID" value="0">
                                                <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" lay-verify="HMainSourceEntryID" value="0">
                                                <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" lay-verify="HMainSourceBillNo" value="">
                                            </div>
                                        </div>
                                    </div>                                    
                                </div>
                            </div>
                            <!--其他信息-->
@@ -949,6 +956,9 @@

                            "HMaterID": tableMain[0]["物料ID"]
                            , "HMaterName": tableMain[0]["物料名称"]
                            , "HMainSourceInterID": tableMain[0]["工单号"]   //生产状态临时表内码
                            , "HMainSourceEntryID": tableMain[0]["工序流转卡子内码"]
                            , "HMainSourceBillNo": tableMain[0]["工序流转卡号"]

                        });
                        //组织的值HOrgID变化，重新渲染