From 6d3a998272f70396de772e8a538082cbe1ff213b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 20 六月 2025 14:45:21 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs | 46 ++++
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs | 21 ++
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqDetect01.Designer.cs | 60 ++++++
DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs | 29 ++
DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs | 175 +++++++++-------
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqDetect01.cs | 21 ++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 15 +
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs | 110 ----------
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.resx | 120 ++++++++++++
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 3
10 files changed, 412 insertions(+), 188 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqDetect01.Designer.cs
new file mode 100644
index 0000000..6e922b3
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqDetect01.Designer.cs
@@ -0,0 +1,60 @@
+锘縰sing Gs.DevApp.ToolBox;
+
+namespace Gs.DevApp.DevFrm.RkQC
+{
+ partial class Frm_CqDetect01
+ {
+ /// <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.rkDetect011 = new Gs.DevApp.DevFrm.RkQC.RkDetect01(QcSeason.瓒呮湡妫�.ToString());
+ this.SuspendLayout();
+ //
+ // rkDetect011
+ //
+ this.rkDetect011.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.rkDetect011.Location = new System.Drawing.Point(0, 0);
+ this.rkDetect011.Name = "rkDetect011";
+ this.rkDetect011.Size = new System.Drawing.Size(1118, 648);
+ this.rkDetect011.TabIndex = 0;
+ //
+ // Frm_RkDetect01
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1118, 648);
+ this.Controls.Add(this.rkDetect011);
+ this.Name = "Frm_RkDetect01";
+ this.Text = "瓒呮湡妫�";
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private RkDetect01 rkDetect011;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqDetect01.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqDetect01.cs
new file mode 100644
index 0000000..1d493c2
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqDetect01.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.DevFrm.RkQC
+{
+ public partial class Frm_CqDetect01 : DevExpress.XtraEditors.XtraForm
+ {
+ public Frm_CqDetect01()
+ {
+ InitializeComponent();
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs
new file mode 100644
index 0000000..217b21c
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs
@@ -0,0 +1,46 @@
+锘縩amespace Gs.DevApp.DevFrm.RkQC
+{
+ partial class Frm_Cqsq
+ {
+ /// <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();
+ //
+ // Frm_Cqsq
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(298, 260);
+ this.Name = "Frm_Cqsq";
+ this.Text = "瓒呮湡妫�楠岀敵璇�";
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs
new file mode 100644
index 0000000..e537ef7
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.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.DevFrm.RkQC
+{
+ public partial class Frm_Cqsq : DevExpress.XtraEditors.XtraForm
+ {
+ public Frm_Cqsq()
+ {
+ InitializeComponent();
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.resx b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.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
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
index 9618fa2..0d5f213 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
@@ -30,19 +30,19 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -202,6 +202,7 @@
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -407,7 +408,8 @@
this.gridColumn4,
this.gridColumn7,
this.gridColumn14,
- this.gridColumn15});
+ this.gridColumn15,
+ this.gridColumn16});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -425,7 +427,7 @@
this.gv_orderNo.OptionsColumn.AllowEdit = false;
this.gv_orderNo.Tag = "query_a.ORDER_NO";
this.gv_orderNo.Visible = true;
- this.gv_orderNo.VisibleIndex = 0;
+ this.gv_orderNo.VisibleIndex = 3;
this.gv_orderNo.Width = 120;
//
// gv_businessStatus
@@ -438,7 +440,7 @@
this.gv_businessStatus.OptionsColumn.AllowEdit = false;
this.gv_businessStatus.Tag = "query_a.BUSINESS_STATUS";
this.gv_businessStatus.Visible = true;
- this.gv_businessStatus.VisibleIndex = 2;
+ this.gv_businessStatus.VisibleIndex = 5;
this.gv_businessStatus.Width = 50;
//
// gridColumn3
@@ -448,7 +450,7 @@
this.gridColumn3.MinWidth = 10;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 3;
+ this.gridColumn3.VisibleIndex = 6;
this.gridColumn3.Width = 100;
//
// gridColumn2
@@ -458,7 +460,7 @@
this.gridColumn2.MinWidth = 10;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 4;
+ this.gridColumn2.VisibleIndex = 7;
this.gridColumn2.Width = 150;
//
// gridColumn1
@@ -468,7 +470,7 @@
this.gridColumn1.MinWidth = 10;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 5;
+ this.gridColumn1.VisibleIndex = 8;
this.gridColumn1.Width = 150;
//
// gv_erpProductionOrderNo
@@ -481,7 +483,7 @@
this.gv_erpProductionOrderNo.OptionsColumn.AllowEdit = false;
this.gv_erpProductionOrderNo.Tag = "query_a.ERP_PRODUCTION_ORDER_NO";
this.gv_erpProductionOrderNo.Visible = true;
- this.gv_erpProductionOrderNo.VisibleIndex = 1;
+ this.gv_erpProductionOrderNo.VisibleIndex = 4;
this.gv_erpProductionOrderNo.Width = 94;
//
// gv_orderType
@@ -494,7 +496,7 @@
this.gv_orderType.OptionsColumn.AllowEdit = false;
this.gv_orderType.Tag = "query_a.ORDER_TYPE";
this.gv_orderType.Visible = true;
- this.gv_orderType.VisibleIndex = 6;
+ this.gv_orderType.VisibleIndex = 9;
this.gv_orderType.Width = 94;
//
// gv_workOrderQty
@@ -507,7 +509,7 @@
this.gv_workOrderQty.OptionsColumn.AllowEdit = false;
this.gv_workOrderQty.Tag = "query_a.WORK_ORDER_QTY";
this.gv_workOrderQty.Visible = true;
- this.gv_workOrderQty.VisibleIndex = 7;
+ this.gv_workOrderQty.VisibleIndex = 10;
this.gv_workOrderQty.Width = 50;
//
// gv_nostockinqty
@@ -520,7 +522,7 @@
this.gv_nostockinqty.OptionsColumn.AllowEdit = false;
this.gv_nostockinqty.Tag = "query_a.NOSTOCKINQTY";
this.gv_nostockinqty.Visible = true;
- this.gv_nostockinqty.VisibleIndex = 9;
+ this.gv_nostockinqty.VisibleIndex = 12;
this.gv_nostockinqty.Width = 50;
//
// gv_stockinqty
@@ -533,7 +535,7 @@
this.gv_stockinqty.OptionsColumn.AllowEdit = false;
this.gv_stockinqty.Tag = "query_a.STOCKINQTY";
this.gv_stockinqty.Visible = true;
- this.gv_stockinqty.VisibleIndex = 8;
+ this.gv_stockinqty.VisibleIndex = 11;
this.gv_stockinqty.Width = 50;
//
// gv_unit
@@ -546,7 +548,7 @@
this.gv_unit.OptionsColumn.AllowEdit = false;
this.gv_unit.Tag = "query_a.UNIT";
this.gv_unit.Visible = true;
- this.gv_unit.VisibleIndex = 12;
+ this.gv_unit.VisibleIndex = 15;
this.gv_unit.Width = 50;
//
// gv_estimatedStartTime
@@ -559,7 +561,7 @@
this.gv_estimatedStartTime.OptionsColumn.AllowEdit = false;
this.gv_estimatedStartTime.Tag = "query_a.ESTIMATED_START_TIME";
this.gv_estimatedStartTime.Visible = true;
- this.gv_estimatedStartTime.VisibleIndex = 10;
+ this.gv_estimatedStartTime.VisibleIndex = 13;
this.gv_estimatedStartTime.Width = 180;
//
// gv_estimatedEndTime
@@ -572,7 +574,7 @@
this.gv_estimatedEndTime.OptionsColumn.AllowEdit = false;
this.gv_estimatedEndTime.Tag = "query_a.ESTIMATED_END_TIME";
this.gv_estimatedEndTime.Visible = true;
- this.gv_estimatedEndTime.VisibleIndex = 11;
+ this.gv_estimatedEndTime.VisibleIndex = 14;
this.gv_estimatedEndTime.Width = 180;
//
// gv_planReleaseDate
@@ -585,7 +587,7 @@
this.gv_planReleaseDate.OptionsColumn.AllowEdit = false;
this.gv_planReleaseDate.Tag = "query_a.PLAN_RELEASE_DATE";
this.gv_planReleaseDate.Visible = true;
- this.gv_planReleaseDate.VisibleIndex = 13;
+ this.gv_planReleaseDate.VisibleIndex = 16;
this.gv_planReleaseDate.Width = 94;
//
// gv_storageUpperLimit
@@ -598,7 +600,7 @@
this.gv_storageUpperLimit.OptionsColumn.AllowEdit = false;
this.gv_storageUpperLimit.Tag = "query_a.STORAGE_UPPER_LIMIT";
this.gv_storageUpperLimit.Visible = true;
- this.gv_storageUpperLimit.VisibleIndex = 14;
+ this.gv_storageUpperLimit.VisibleIndex = 17;
this.gv_storageUpperLimit.Width = 50;
//
// gv_storageLowerLimit
@@ -611,7 +613,7 @@
this.gv_storageLowerLimit.OptionsColumn.AllowEdit = false;
this.gv_storageLowerLimit.Tag = "query_a.STORAGE_LOWER_LIMIT";
this.gv_storageLowerLimit.Visible = true;
- this.gv_storageLowerLimit.VisibleIndex = 15;
+ this.gv_storageLowerLimit.VisibleIndex = 18;
this.gv_storageLowerLimit.Width = 50;
//
// gv_trackingNo
@@ -635,7 +637,7 @@
this.gv_batchNo.OptionsColumn.AllowEdit = false;
this.gv_batchNo.Tag = "query_a.BATCH_NO";
this.gv_batchNo.Visible = true;
- this.gv_batchNo.VisibleIndex = 16;
+ this.gv_batchNo.VisibleIndex = 19;
this.gv_batchNo.Width = 94;
//
// gv_bomVersion
@@ -648,7 +650,7 @@
this.gv_bomVersion.OptionsColumn.AllowEdit = false;
this.gv_bomVersion.Tag = "query_a.BOM_VERSION";
this.gv_bomVersion.Visible = true;
- this.gv_bomVersion.VisibleIndex = 17;
+ this.gv_bomVersion.VisibleIndex = 20;
this.gv_bomVersion.Width = 94;
//
// gv_generationMethod
@@ -661,7 +663,7 @@
this.gv_generationMethod.OptionsColumn.AllowEdit = false;
this.gv_generationMethod.Tag = "query_a.GENERATION_METHOD";
this.gv_generationMethod.Visible = true;
- this.gv_generationMethod.VisibleIndex = 18;
+ this.gv_generationMethod.VisibleIndex = 21;
this.gv_generationMethod.Width = 94;
//
// gv_demandOrderNo
@@ -674,7 +676,7 @@
this.gv_demandOrderNo.OptionsColumn.AllowEdit = false;
this.gv_demandOrderNo.Tag = "query_a.DEMAND_ORDER_NO";
this.gv_demandOrderNo.Visible = true;
- this.gv_demandOrderNo.VisibleIndex = 19;
+ this.gv_demandOrderNo.VisibleIndex = 22;
this.gv_demandOrderNo.Width = 94;
//
// gv_demandOrderLineNo
@@ -687,7 +689,7 @@
this.gv_demandOrderLineNo.OptionsColumn.AllowEdit = false;
this.gv_demandOrderLineNo.Tag = "query_a.DEMAND_ORDER_LINE_NO";
this.gv_demandOrderLineNo.Visible = true;
- this.gv_demandOrderLineNo.VisibleIndex = 20;
+ this.gv_demandOrderLineNo.VisibleIndex = 23;
this.gv_demandOrderLineNo.Width = 60;
//
// gv_closingPerson
@@ -722,7 +724,7 @@
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.REMARKS";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 21;
+ this.gv_remarks.VisibleIndex = 24;
this.gv_remarks.Width = 94;
//
// gv_purchaseorderno
@@ -735,7 +737,7 @@
this.gv_purchaseorderno.OptionsColumn.AllowEdit = false;
this.gv_purchaseorderno.Tag = "query_a.PURCHASEORDERNO";
this.gv_purchaseorderno.Visible = true;
- this.gv_purchaseorderno.VisibleIndex = 22;
+ this.gv_purchaseorderno.VisibleIndex = 25;
this.gv_purchaseorderno.Width = 94;
//
// gv_purchaseorderentryseq
@@ -748,7 +750,7 @@
this.gv_purchaseorderentryseq.OptionsColumn.AllowEdit = false;
this.gv_purchaseorderentryseq.Tag = "query_a.PURCHASEORDERENTRYSEQ";
this.gv_purchaseorderentryseq.Visible = true;
- this.gv_purchaseorderentryseq.VisibleIndex = 23;
+ this.gv_purchaseorderentryseq.VisibleIndex = 26;
this.gv_purchaseorderentryseq.Width = 70;
//
// gv_auditor
@@ -760,6 +762,8 @@
this.gv_auditor.Name = "gv_auditor";
this.gv_auditor.OptionsColumn.AllowEdit = false;
this.gv_auditor.Tag = "query_a.AUDITOR";
+ this.gv_auditor.Visible = true;
+ this.gv_auditor.VisibleIndex = 2;
this.gv_auditor.Width = 94;
//
// gv_auditDate
@@ -771,6 +775,8 @@
this.gv_auditDate.Name = "gv_auditDate";
this.gv_auditDate.OptionsColumn.AllowEdit = false;
this.gv_auditDate.Tag = "query_a.AUDIT_DATE";
+ this.gv_auditDate.Visible = true;
+ this.gv_auditDate.VisibleIndex = 1;
this.gv_auditDate.Width = 94;
//
// gv_stockowner
@@ -799,7 +805,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 24;
+ this.gridColumn7.VisibleIndex = 27;
this.gridColumn7.Width = 94;
//
// gridColumn14
@@ -809,7 +815,7 @@
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 25;
+ this.gridColumn14.VisibleIndex = 28;
this.gridColumn14.Width = 94;
//
// gridColumn15
@@ -1296,47 +1302,47 @@
this.layoutControlItem35});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition9.Height = 100D;
- rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition12.Height = 100D;
+ rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition13.Height = 100D;
+ rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition14.Height = 100D;
+ rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition15.Height = 100D;
+ rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition16.Height = 100D;
+ rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition17.Height = 100D;
+ rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition18.Height = 100D;
+ rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5,
- rowDefinition6,
- rowDefinition7,
- rowDefinition8,
- rowDefinition9});
+ rowDefinition10,
+ rowDefinition11,
+ rowDefinition12,
+ rowDefinition13,
+ rowDefinition14,
+ rowDefinition15,
+ rowDefinition16,
+ rowDefinition17,
+ rowDefinition18});
this.Root.Size = new System.Drawing.Size(1126, 303);
this.Root.TextVisible = false;
//
@@ -2210,6 +2216,16 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // gridColumn16
+ //
+ this.gridColumn16.Caption = "瀹℃牳";
+ this.gridColumn16.FieldName = "auditStatusChk";
+ this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.Visible = true;
+ this.gridColumn16.VisibleIndex = 0;
+ this.gridColumn16.Width = 94;
+ //
// Frm_ProductionOrder
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2478,5 +2494,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
index 25803ee..5189607 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
@@ -23,6 +23,8 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
this.toolBarMenu1.btnJieAnClick += ToolBarMenu1_btnJieAnClick1;
this.toolBarMenu1.btnFjieAnClick += ToolBarMenu1_btnFjieAnClick;
+ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+ toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "auditStatusChk", "", (value) =>
@@ -236,6 +238,27 @@
}
/// <summary>
+ /// 瀹℃牳浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+ {
+ _toolCk(8);
+ }
+
+ /// <summary>
+ /// 鍙嶅鏍�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+ {
+ _toolCk(9);
+ }
+
+ /// <summary>
/// 宸ュ叿鏉′簨浠�
/// </summary>
/// <param name="inFieldValue"></param>
@@ -253,6 +276,12 @@
case 3:
strMsg = "鍙嶇粨妗堬紙鍙嶆墽琛岃嚦瀹屽伐锛�";
break;
+ case 8:
+ strMsg = "瀹℃牳";
+ break;
+ case 9:
+ strMsg = "鍙嶅鏍�";
+ break;
};
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
index b93c9aa..ca6ecfd 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
@@ -19,8 +19,6 @@
public Frm_WwGd()
{
InitializeComponent();
- this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
- this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
@@ -29,7 +27,6 @@
this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
- this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "pcShChk", "", (value) =>
@@ -162,111 +159,8 @@
getPageList(this.pageBar1.CurrentPage);
}
}
- /// <summary>
- /// 淇敼浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
- {
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_daa001, gridView1);
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- {
- getModel(rowGuid);
- }
- else
- {
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
- }
-
- }
- /// <summary>
- /// 鍒犻櫎宸ュ崟
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- /// <exception cref="NotImplementedException"></exception>
- private void ToolBarMenu1_btnDelClick(object sender, EventArgs e)
- {
- string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_daa001, gridView1, "daa001");
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
- return;
- var _obj = new
- {
- guid = rowGuid,
- mxGuid = Guid.Empty.ToString(),
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "DeleteModelOrMx",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- if (xtraTabControl1.SelectedTabPageIndex == 0)
- { }
- else
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
- getPageList(this.pageBar1.CurrentPage);
- }
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
- /// <summary>
- /// 淇濆瓨浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
- {
- //toolBarMenu1.isSetBtn = false;
- //var _obj = new
- //{
- // guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- // sjxt = txt_sjXt.GetCode(), //瀹為檯绾夸綋
- // bz = txt_daa009.Text.Trim()//澶囨敞
- //};
- //try
- //{
- // string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
- // ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- // ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- // if (_rtn.rtnCode > 0)
- // {
- // lbGuid.Text = _rtn.rtnData;
- // toolBarMenu1.isSetBtn = true;
- // UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
- //toolBarMenu1.currentAction = "";
- //Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
- // }
- //}
- //catch (Exception ex)
- //{
- // ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- //}
- }
-
+
+
/// <summary>
///
/// </summary>
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 73063ed..679a2dd 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -566,6 +566,18 @@
<Compile Include="DevFrm\QC\Models\MesQmCheckitemDt.cs" />
<Compile Include="DevFrm\QC\Models\MesSysLookups.cs" />
<Compile Include="DevFrm\QC\Models\MesSysLookupTypes.cs" />
+ <Compile Include="DevFrm\RkQC\Frm_CqDetect01.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\Frm_CqDetect01.Designer.cs">
+ <DependentUpon>Frm_CqDetect01.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\Frm_Cqsq.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\Frm_Cqsq.Designer.cs">
+ <DependentUpon>Frm_Cqsq.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\RkQC\Frm_QtrkDetect01.cs">
<SubType>Form</SubType>
</Compile>
@@ -1501,6 +1513,9 @@
<EmbeddedResource Include="DevFrm\QC\MesQcExceptional.resx">
<DependentUpon>MesQcExceptional.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\RkQC\Frm_Cqsq.resx">
+ <DependentUpon>Frm_Cqsq.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\RkQC\Frm_SctlDetect01.resx">
<DependentUpon>Frm_SctlDetect01.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 0bac2a1..5d2a28b 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -2437,7 +2437,8 @@
ipqc棣栨,
fqc,
鐢熶骇閫�鏂欏叆搴撴,
- 鍏跺畠鍏ュ簱妫�
+ 鍏跺畠鍏ュ簱妫�,
+ 瓒呮湡妫�
}
--
Gitblit v1.9.3