From da1667144a6160a2ea78e9c4b112272dea20cbec Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 09 八月 2025 17:55:54 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.Designer.cs | 13 ++
DevApp/Gs.DevApp/XtraForm2.cs | 21 ++++
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 12 ++
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 4
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 1
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs | 15 ++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9 +
DevApp/Gs.DevApp/XtraForm2.Designer.cs | 46 +++++++++
DevApp/Gs.DevApp/XtraForm2.resx | 120 ++++++++++++++++++++++++
9 files changed, 235 insertions(+), 6 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 667d8df..6917f0c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -1,4 +1,5 @@
using DevExpress.Pdf.Native.BouncyCastle.Utilities.Collections;
+using DevExpress.XtraLayout.Customization;
using DevExpress.XtraRichEdit.API.Native;
using Gs.DevApp.DevFrm.QC;
using Gs.DevApp.Entity;
@@ -143,8 +144,10 @@
//娓呯┖
this.btnClean.Click += (s, e) =>
{
- _setWeigth(1, "");
- this.txtW1.Text = this.txtW2.Text = this.txtW3.Text = this.txtW4.Text = this.txtW5.Text = "";
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + txt_releaseNo.Text.Trim() + "銆戯紝纭畾娓呴櫎鎵�鏈夌О閲嶆暟鎹悧锛�"))
+ return;
+ _setWeigth(99, "");
+
};
}
/// <summary>
@@ -195,6 +198,11 @@
txtW5.Text = _weight;
return;
}
+ if (_weightType == 99)
+ {
+ this.txtW1.Text = this.txtW2.Text = this.txtW3.Text = this.txtW4.Text = this.txtW5.Text = "";
+ return;
+ }
}
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.Designer.cs
index 133e637..457aef9 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.Designer.cs
@@ -30,8 +30,10 @@
{
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
this.SuspendLayout();
//
// gcMx1
@@ -50,12 +52,21 @@
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
//
+ // textEdit1
+ //
+ this.textEdit1.Location = new System.Drawing.Point(230, 13);
+ this.textEdit1.Name = "textEdit1";
+ this.textEdit1.Properties.ReadOnly = true;
+ this.textEdit1.Size = new System.Drawing.Size(125, 24);
+ this.textEdit1.TabIndex = 1;
+ //
// Frm_MesQaItemsDetect01Input
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(918, 549);
this.Controls.Add(this.gcMx1);
+ this.Controls.Add(this.textEdit1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.MinimizeBox = false;
this.Name = "Frm_MesQaItemsDetect01Input";
@@ -64,6 +75,7 @@
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -72,5 +84,6 @@
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+ private DevExpress.XtraEditors.TextEdit textEdit1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs
index 0f1c7d0..0210f25 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs
@@ -1,9 +1,12 @@
-锘縰sing Gs.DevApp.Entity;
+锘縰sing DevExpress.Utils.MVVM.Services;
+using DevExpress.XtraLayout.Customization;
+using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Data;
using System.Drawing;
+using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.QC
@@ -32,7 +35,14 @@
//绂佺敤鏍锋湰鏁颁箣澶栫殑鍗曞厓鏍间笖鏀瑰彉棰滆壊
gvMx1.CustomDrawCell += GvMx1_CustomDrawCell;
getModel();
+
+ this.FormClosing += (s, e) =>
+ {
+ textEdit1.Focus();
+ };
}
+
+
/// <summary>
/// 鍒ゆ柇鍗曞厓鏍肩殑缂栬緫鎬�
@@ -87,7 +97,8 @@
{
e.Appearance.BackColor = Color.Red;
e.Appearance.ForeColor = Color.White;
- };
+ }
+ ;
}
}
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 0d1bdd5..0b5697d 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1515,6 +1515,12 @@
<Compile Include="XtraForm1.Designer.cs">
<DependentUpon>XtraForm1.cs</DependentUpon>
</Compile>
+ <Compile Include="XtraForm2.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="XtraForm2.Designer.cs">
+ <DependentUpon>XtraForm2.cs</DependentUpon>
+ </Compile>
<EmbeddedResource Include="DevFrm\BasicData\Frm_Customer.resx">
<DependentUpon>Frm_Customer.cs</DependentUpon>
</EmbeddedResource>
@@ -2138,6 +2144,9 @@
<EmbeddedResource Include="XtraForm1.resx">
<DependentUpon>XtraForm1.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="XtraForm2.resx">
+ <DependentUpon>XtraForm2.cs</DependentUpon>
+ </EmbeddedResource>
<None Include="App.config" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 3c8c24b..6b00aa0 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -619,7 +619,7 @@
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 68);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 206);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
//
@@ -648,7 +648,7 @@
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 68);
+ this.Size = new System.Drawing.Size(1543, 206);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 5db6917..4488ac2 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -506,6 +506,7 @@
lst.Add(btnLianBan.Name);
// lst.Add(btnEsc.Name);
lst.Add(btnGx.Name);
+ lst.Add(btnWeight.Name);
_enabledBtn(lst);
}
}
diff --git a/DevApp/Gs.DevApp/XtraForm2.Designer.cs b/DevApp/Gs.DevApp/XtraForm2.Designer.cs
new file mode 100644
index 0000000..ebf3f00
--- /dev/null
+++ b/DevApp/Gs.DevApp/XtraForm2.Designer.cs
@@ -0,0 +1,46 @@
+锘縩amespace Gs.DevApp
+{
+ partial class XtraForm2
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.SuspendLayout();
+ //
+ // XtraForm2
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(613, 369);
+ this.Name = "XtraForm2";
+ this.Text = "XtraForm2";
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/XtraForm2.cs b/DevApp/Gs.DevApp/XtraForm2.cs
new file mode 100644
index 0000000..bee5936
--- /dev/null
+++ b/DevApp/Gs.DevApp/XtraForm2.cs
@@ -0,0 +1,21 @@
+锘縰sing DevExpress.XtraEditors;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp
+{
+ public partial class XtraForm2 : DevExpress.XtraEditors.XtraForm
+ {
+ public XtraForm2()
+ {
+ InitializeComponent();
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/XtraForm2.resx b/DevApp/Gs.DevApp/XtraForm2.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/XtraForm2.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
--
Gitblit v1.9.3