智云MES-UI前端
parent: 43c633b5 | 补丁 | 提交 | ignore whitespace
zrg
2024-07-02 d54fc5fd8eb915769cafd2b638648388eeb6391c 
修复生产质量汇报单批量保存,更改异常反馈单消息模版
3个文件已修改
67 ■■■■■ 已修改文件
WebTM/WebTM.csproj.user 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBill.html 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 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>Debug|Any CPU</LastActiveSolutionConfig>


    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>


    <UseIISExpress>true</UseIISExpress>


    <Use64BitIISExpress />


    <IISExpressSSLPort />


@@ -16,8 +16,9 @@


    <VisualStudio>


      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">


        <WebProjectProperties>


          <StartPageUrl>views/user/login.html</StartPageUrl>


          <StartAction>SpecificPage</StartAction>


          <StartPageUrl>


          </StartPageUrl>


          <StartAction>CurrentPage</StartAction>


          <AspNetDebugging>True</AspNetDebugging>


          <SilverlightDebugging>False</SilverlightDebugging>


          <NativeDebugging>False</NativeDebugging>




 WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/Sc_Add_MESExecptFeedBackBillList.html


@@ -540,7 +540,7 @@


                $.ajax({


                    type: "GET",


                    url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_Sc_ICMOBillStatus", //方法所在页面和方法名


                    async: true,


                    async: false,


                    data: {


                        "HSourceBill": HSourceBill


                    },


@@ -573,7 +573,7 @@


                    {


                        type: "GET",


                        url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_ErrMsgBackType", //方法所在页面和方法名


                        async: true,


                        async: false,


                        data: {


                            "TypeName": HType


                        },


@@ -601,7 +601,7 @@


                    {


                        type: "GET",


                        url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_UserSuperiors", //方法所在页面和方法名


                        async: true,


                        async: false,


                        data: {


                            "HName": sessionStorage["HUserName"]


                        },


@@ -1127,7 +1127,9 @@


            //报工太异常跳转自动生成内容


            function generateString(Datetime, Person, HSourceName, HICMOBillNo, HType) {


                // æ‹¼æŽ¥å­—符串


                var result = '单据号为:' + $("#HBillNo").val() + ',制单日期为:' + Datetime + ', ' + Person + '在' + HSourceName + '上生产工单为' + HICMOBillNo + ', å‘生异常类型为:' + HType;


                var result = '异常类型:' + HType + ',订单号:' + HICMOBillNo + ',流转卡号:' + HICMOBillNo


                    + ', äº§å“ç¼–码:' + $("#HMaterNumber").val() + ',产品名称:' + $("#HMaterName").val() + ',规格型号:' + $("#HMaterModel").val()


                    + ',发送人:' + Person + ',发生时间:' + Datetime + ',生产资源:' + HSourceName;


                return result;


            }






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


@@ -83,12 +83,12 @@


                                                <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>


                                            </div>


                                        </div>


                                        <div class="layui-col-xs4 layui-inline">


                                        <!--<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="HBadReasonHQty" id="HBadReasonHQty" value="0">


                                            </div>


                                        </div>


                                        </div>-->


                                    </div>


                                    <div class="layui-row">


                                        <div class="layui-col-xs4 layui-inline">


@@ -383,7 +383,7 @@


            //var HSouceBillType = 3722;




            get_Display_UserList();


            get_ConfigFileInfo_EquipFile();


            //get_ConfigFileInfo_EquipFile();




            //判断操作类型


            if (OperationType == 1) {//无源单新增


@@ -398,9 +398,12 @@


                        $("#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"));


                        $("#HMaker").val(sessionStorage["HUserName"]);


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


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


                        $("#HProcID").val(sessionStorage["HProcID"]); //工序ID


                        $("#HProcNo").val(sessionStorage["HProcName"]); //工序名称


                        $("#HSourceID").val(sessionStorage["HSource"]); //生产资源ID


                        $("#HSourceName").val(sessionStorage["HSourceID"]); //生产资源名称


                        layer.close(ajaxLoad);


                    }


                });


@@ -417,10 +420,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"));


                        $("#HMaker").val(sessionStorage["HUserName"]);


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


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


                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));                      


                        layer.close(ajaxLoad);


                    }


                });


@@ -470,7 +470,31 @@






            //#region æ‰¹é‡ä¿å­˜æŒ‰é’®


            form.on('submit(btnSumSave)', function () {


            form.on('submit(btnSumSave)', function (data) {


                var sMainStr = JSON.stringify(data.field);


                var oMain = sMainStr + ';' + OperationType;


                var ajaxLoad = layer.load();


                $("#HBarCode").val("");


                $.ajax({


                    type: "POST",


                    url: GetWEBURL() + "/Sc_QualityReportBill/set_SaveBarCode",


                    async: true,


                    data: { "oMain": oMain },


                    dataType: "json",


                    success: function (data) {


                        if (data.count == 1) {


                            layer.close(ajaxLoad);                           


                        }


                        else {


                            layer.close(ajaxLoad);


                            layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });


                        }


                    },


                    error: function (err) {


                        layer.close(ajaxLoad);


                        layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });


                    }


                });


                get_SumSave();


            });


            //#endregion


@@ -601,7 +625,7 @@


                $.ajax({


                    url: GetWEBURL() + '/Sc_QualityReportBill/set_SaveBill',


                    type: "GET",


                    data: { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HChecker": sessionStorage["HUserName"],"HBadReasonHQty": $("#HBadReasonHQty").val() },


                    data: { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HChecker": sessionStorage["HUserName"]/*,"HBadReasonHQty": $("#HBadReasonHQty").val()*/ },


                    success: function (result) {


                        if (result.count == 1) {


                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);


@@ -686,6 +710,10 @@


                            $("#HCheckManName").val(data1.data[0]["质检员"]);


                            $("#HGroupID").val(data1.data[0]["HGroupID"]);


                            $("#HGroupName").val(data1.data[0]["生产班组"]);


                            $("#HProcID").val(data1.data[0]["HProcID"]); //工序ID


                            $("#HProcNo").val(data1.data[0]["工序"]); //工序名称


                            $("#HSourceID").val(data1.data[0]["HSourceID"]); //生产资源ID


                            $("#HSourceName").val(data1.data[0]["生产资源"]); //生产资源名称


                            layer.close(ajaxLoad);




                            //layer.alert("查询成功", { icon: 1 });