焊工确认页面

2025-08-14 10:42:15 +08:00 · 2025-08-14 10:42:15 +08:00 · 797759e2d4
parent c0abd5db77
commit 797759e2d4
6 changed files with 416 additions and 7 deletions
--- a/HJGL_DS/BLL/HJGL/PersonManage/HJGL_PersonManageService.cs
+++ b/HJGL_DS/BLL/HJGL/PersonManage/HJGL_PersonManageService.cs
@ -205,7 +205,10 @@ namespace BLL
        {
            return Funs.DB.HJGL_BS_Welder.FirstOrDefault(x => x.WED_ID == wenid);
        }
-
+        public static Model.HJGL_BS_Welder GetWelderByWedCode(string wedcode)
+        {
+            return Funs.DB.HJGL_BS_Welder.FirstOrDefault(x => x.WED_Code == wedcode);
+        }
        /// <summary>
        /// 根据计划获取领料焊工
        /// </summary>
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
@ -1341,6 +1341,7 @@
    <Content Include="WeldMat\UsingSentMat\ShowReturnMat.aspx" />
    <Content Include="WeldMat\UsingSentMat\ShowStockIn.aspx" />
    <Content Include="WeldMat\UsingSentMat\UsingMat.aspx" />
+    <Content Include="WeldMat\UsingSentMat\WelderConfirm.aspx" />
    <Content Include="WeldMat\UsingSentMat\UsingMatCheck.aspx" />
    <Content Include="WeldMat\UsingSentMat\UsingtMatSelect.aspx" />
    <Content Include="WeldMat\UsingSentMat\WelderUsing.aspx" />
@ -7004,6 +7005,13 @@
    <Compile Include="WeldMat\UsingSentMat\UsingMat.aspx.designer.cs">
      <DependentUpon>UsingMat.aspx</DependentUpon>
    </Compile>
+    <Compile Include="WeldMat\UsingSentMat\WelderConfirm.aspx.cs">
+      <DependentUpon>WelderConfirm.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="WeldMat\UsingSentMat\WelderConfirm.aspx.designer.cs">
+      <DependentUpon>WelderConfirm.aspx</DependentUpon>
+    </Compile>
    <Compile Include="WeldMat\UsingSentMat\UsingMatCheck.aspx.cs">
      <DependentUpon>UsingMatCheck.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx
@ -94,10 +94,7 @@

                video.style = "";
                canvas.style = "display:none";
-            }
-           
-
-
+            } 

        });
        function upLoadFile(data) {
@ -125,7 +122,7 @@

                        var node = {
                           
-                            iframeUrl: './WeldMat/UsingSentMat/UsingMat.aspx?welderCode=' + data.d, 
+                            iframeUrl: './WeldMat/UsingSentMat/WelderConfirm.aspx?welderCode=' + data.d, 
                            title: "焊材领用",
                            id: "UsingMat" + getFormattedDate()
                        };
@ -144,7 +141,6 @@
            const hours = String(now.getHours()).padStart(2, '0');
            const minutes = String(now.getMinutes()).padStart(2, '0');
            const seconds = String(now.getSeconds()).padStart(2, '0');
-
            return year + month + day + hours + minutes + seconds;
        }
    </script>
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/WelderConfirm.aspx
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/WelderConfirm.aspx
@ -0,0 +1,191 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WelderConfirm.aspx.cs" Inherits="FineUIPro.Web.WeldMat.UsingSentMat.WelderConfirm" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+    <title>领料确认单</title>
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+ 
+    <style type="text/css">
+        .customlabel
+        {
+            color: red;
+            font-weight: bold;
+            font-size: 30px;
+        }
+        .customText
+        {
+            font-weight: bold;
+            font-size: 30px;
+        }
+        .customfont
+        {
+            font-size: 26px;
+        }
+        .titlefont
+        {
+            font-weight: bold;
+            font-size: 35px;
+        }
+        .photo
+        {
+            height: 150px;
+            width: 150px;
+            vertical-align: middle;
+        }
+        .bgStyle
+        {
+            background-color: #B1EEEF;
+            background-image: url(../Images/login_02.jpg);
+        }
+        .buttonfont
+        {
+            font-weight: bold;
+            font-size: 42px;
+        }
+       
+    </style>
+    <script type="text/javascript" language="javascript">
+        function Speak(content) {
+
+        }
+        function DoSpeak(v) {
+            if (v == '') {
+                alert('请先输入要测试文本!');
+            } else {
+                /**
+                ***
+                Speak ( text, volumn, speed );
+                volumn = 0 ~ 100 100最大声音
+                speed = 0 ~ 10  10最快速度
+                **/
+                //document.vs.Speak("100", 100, 0);
+                //document.getElementById('vvvd').Speak(v, 100, 0);
+            }
+        }
+
+        function FingerConfirm(keyId, flag, grid) {
+            var result = window.showModalDialog("../../FingerMark/FingerConfirm.aspx?keyId=" + keyId + "&flag=" + flag + "&grid=" + grid, "", "status=no;dialogWidth=610px;dialogHeight=460px;menu=no;resizeable=no;scroll=no;center=yes;edge=raise;location=no");
+        }
+
+        function FaceConfirm(keyId, flag, grid) {
+            var result = window.showModalDialog("../../RLSB/FaceConfirm.aspx?keyId=" + keyId + "&flag=" + flag + "&grid=" + grid, "", "status=no;dialogWidth=1260px;dialogHeight=680px;menu=no;resizeable=no;scroll=yes;center=yes;edge=raise;location=no");
+        }
+
+        // function CodeConfirm(keyId, flag, grid) {
+        //    var result = window.showModalDialog("CodeConfirm.aspx?keyId=" + keyId + "&flag=" + flag + "&grid=" + grid, "", "status=no;dialogWidth=600px;dialogHeight=280px;menu=no;resizeable=no;scroll=yes;center=yes;edge=raise;location=no");
+        //}
+
+              function CodeConfirm(keyId, flag, grid) {
+            var result = window.showModalDialog("LC700.aspx?keyId=" + keyId + "&flag=" + flag + "&grid=" + grid, "", "status=no;dialogWidth=600px;dialogHeight=280px;menu=no;resizeable=no;scroll=yes;center=yes;edge=raise;location=no");
+        }
+
+        function ReportPrint(reportId, replaceParameter, varValue) {
+            var result = window.showModalDialog("../../Common/ReportPrint/ExReportPrint.aspx?ispop=1&projectId=0&reportId=" + reportId + "&replaceParameter=" + replaceParameter + "&varValue=" + varValue, "", "status=no;dialogWidth=610px;dialogHeight=460px;menu=no;resizeable=no;scroll=no;center=yes;edge=raise;location=no");
+        }
+
+        function backData(data) {
+            //debugger
+            //alert(data);
+            alert("焊工已确认领料!");
+        }
+    </script>
+</head>
+<body class="bgStyle">
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+    <object id="vvvd" width="1" height="1" classid="CLSID:DF69ADAE-D8B4-494E-ACAA-E5D09142A1DD">
+    </object>
+    <div>
+        <table id="table1" width="100%">
+            <tr>
+                <td colspan="2" class="titlefont" align="center" style="height:80px">
+                    焊工确认
+                </td>
+                <td> 
+                    <f:Button ID="btnClose" runat="server" Text="关闭" Icon="SystemClose" OnClick="btnClose_Click">
+                            </f:Button> 
+                    </td>
+            </tr>
+            <tr>
+                <td style="width: 72%">
+                    <table width="100%" id="table2">
+                        <tr style="height: 75px;">
+                           <td class="customfont" align="right" style="width: 23%">
+                                焊工姓名：
+                            </td>
+                            <td class="customfont" align="left" style="width: 27%">
+                                <asp:Label ID="txtName" runat="server"></asp:Label>
+                            </td>
+                            <td class="customfont" align="right" style="width: 23%">
+                                焊工代号：
+                            </td>
+                            <td class="customfont" align="left" style="width: 27%">
+                                <asp:Label ID="txtCode" runat="server"></asp:Label>
+                            </td>
+                        </tr>
+                        
+                        <tr style="height: 75px;">
+                            <td class="customfont" align="right" style="width: 23%">
+                                身份证号：
+                            </td>
+                            <td class="customfont" align="left" style="width: 27%">
+                                <asp:Label ID="txtIdentityCard" runat="server"></asp:Label>
+                            </td> 
+                             <td class="customfont" align="right" style="width: 23%">
+                                焊工等级：
+                            </td>
+                            <td class="customfont" align="left" style="width: 27%">
+                                <asp:Label ID="txtClass" runat="server"></asp:Label>
+                            </td>
+                        </tr> 
+                       
+                        <tr style="height: 75px;">
+                           <td class="customfont" align="right" style="width: 23%">
+                                证书编号：
+                            </td>
+                            <td class="customfont" align="left" style="width: 27%">
+                                <asp:Label ID="txtWorkCode" runat="server"></asp:Label>
+                            </td>
+                             <td class="customfont" align="right" style="width: 23%">
+                                  有效期限：
+                              </td>
+                              <td class="customfont" align="left" style="width: 27%">
+                                  <asp:Label ID="txtLimitDate" runat="server"></asp:Label>
+                              </td>
+                        </tr>
+                    </table>
+                </td>
+                <td style="width: 28%" valign="top">
+                    <table>
+                         <tr align="center">
+                            <td align="center" valign="top">
+                               <asp:Button ID="btnWelder"  runat="server" Text="焊工确认" CssClass="buttonfont" OnClientClick="onConfirm()"
+                                  Width="280px" Height="120px">
+                               </asp:Button>
+                            </td>
+                        </tr>
+                        <tr >
+                            <td style="height:20px" ></td>
+                        </tr>
+                        <tr align="center">
+                            
+                        </tr>
+                       
+                    </table>
+                </td>
+            </tr>
+        </table>
+    </div>
+    </form>
+    <f:Window ID="Window2" Title="焊工领料" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Top" EnableResize="true" runat="server" IsModal="true" Width="1024px" 
+            Height="640px">
+        </f:Window>
+</body>
+</html>
+<script type="text/javascript">
+    function onConfirm() {
+        window.location.href = 'UsingMat.aspx?welderQRCode=<%=welderCode%>'; 
+    }
+</script>
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/WelderConfirm.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/WelderConfirm.aspx.cs
@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using BLL;
+
+namespace FineUIPro.Web.WeldMat.UsingSentMat
+{
+    public partial class WelderConfirm : PageBase
+    {
+
+        public string welderCode
+        {
+            get
+            {
+                return (string)ViewState["welderCode"];
+            }
+            set
+            {
+                ViewState["welderCode"] = value;
+            }
+        }
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                  welderCode = Request.Params["welderCode"];
+
+
+                var person = BLL.HJGL_PersonManageService.GetWelderByWedCode(welderCode);
+                if (person != null)
+                {
+                     
+                    //this.drpEducation.Items.Clear();
+                    //this.drpEducation.DataTextField = "TeamGroupName";
+                    //this.drpEducation.DataValueField = "TeamGroupId";
+                    //this.drpEducation.DataSource = BLL.Base_TeamGroupService.GetTeamGroupByUnit(drpUnit.SelectedValue);
+                    //this.drpEducation.DataBind();
+                    //Funs.FineUIPleaseSelect(this.drpEducation);
+
+                    //if (!String.IsNullOrEmpty(person.EDU_ID))
+                    //{
+                    //    var q = BLL.Base_TeamGroupService.GetTeamGroupByTeamGroupId(person.EDU_ID);
+                    //    if (q != null)
+                    //    {
+                    //        this.drpEducation.SelectedValue = person.EDU_ID;
+                    //    }
+                    //}
+
+                    this.txtName.Text = person.WED_Name;
+                    this.txtCode.Text = person.WED_Code;
+                    this.txtWorkCode.Text = person.WED_WorkCode;
+                    this.txtClass.Text = person.WED_Class;
+                    
+                     
+                    this.txtLimitDate.Text = string.Format("{0:yyyy-MM-dd}", person.LimitDate); 
+                    this.txtIdentityCard.Text = person.IdentityCard;
+                   
+                }
+
+
+            }
+        }
+        #endregion
+
+        
+
+         
+
+        protected void btnClose_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+
+         
+    }
+}
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/WelderConfirm.aspx.designer.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/WelderConfirm.aspx.designer.cs
@ -0,0 +1,125 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.WeldMat.UsingSentMat
+{
+
+
+    public partial class WelderConfirm
+    {
+
+        /// <summary>
+        /// Head1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// txtName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label txtName;
+
+        /// <summary>
+        /// txtCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label txtCode;
+
+        /// <summary>
+        /// txtIdentityCard 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label txtIdentityCard;
+
+        /// <summary>
+        /// txtClass 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label txtClass;
+
+        /// <summary>
+        /// txtWorkCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label txtWorkCode;
+
+        /// <summary>
+        /// txtLimitDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label txtLimitDate;
+
+        /// <summary>
+        /// btnWelder 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnWelder;
+
+        /// <summary>
+        /// Window2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window2;
+    }
+}