From f5b68343056a31c0d221e6aa0d671a9f8ef798cd Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 05 五月 2025 11:25:17 +0800
Subject: [PATCH] 结案
---
DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.cs | 0
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs | 107 +++++++++++++
DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.Designer.cs | 0
DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.resx | 0
DevApp/Gs.DevApp/DevFrm/WOM/ShowJieAn.cs | 42 +++++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 15 +
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 36 ---
DevApp/Gs.DevApp/DevFrm/WOM/ShowJieAn.resx | 120 +++++++++++++++
DevApp/Gs.DevApp/DevFrm/WOM/ShowJieAn.Designer.cs | 115 ++++++++++++++
9 files changed, 402 insertions(+), 33 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
index 8e183ed..1d31c71 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
@@ -1,3 +1,4 @@
+using Gs.DevApp.DevFrm.WOM;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -20,6 +21,8 @@
InitializeComponent();
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ this.toolBarMenu1.btnJieAnClick += ToolBarMenu1_btnJieAnClick1;
+ this.toolBarMenu1.btnFjieAnClick += ToolBarMenu1_btnFjieAnClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "fstatus", "", (value) =>
@@ -99,6 +102,44 @@
//getPageList(1);
getPageList(this.pageBar1.CurrentPage);
}
+ }
+
+ /// <summary>
+ /// 缁撴
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+
+ private void ToolBarMenu1_btnJieAnClick1(object sender, EventArgs e)
+ {
+ var frm = new ShowJieAn();
+ frm.UpdateParent += (ss, ee) =>
+ {
+ string strType = ee.StringSingle.Replace("(鎵ц鑷崇粨妗�)", "").Replace("(寮哄埗缁撴)", "");
+ if (strType == "toclose")
+ {
+ _toolCk(1);
+ }
+ else
+ {
+ if (strType == "closure")
+ {
+ _toolCk(2);
+ }
+ }
+ };
+ frm.ShowDialog();
+ }
+ /// <summary>
+ /// 鍙嶇粨妗�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnFjieAnClick(object sender, EventArgs e)
+ {
+ _toolCk(3);
}
/// <summary>
@@ -199,5 +240,71 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
+
+ /// <summary>
+ /// 宸ュ叿鏉′簨浠�
+ /// </summary>
+ /// <param name="inFieldValue"></param>
+ private void _toolCk(int _inFieldValue)
+ {
+ string strMsg = "";
+ switch (_inFieldValue)
+ {
+ case 1:
+ strMsg = "鎵ц鑷崇粨妗�";
+ break;
+ case 2:
+ strMsg = "寮哄埗缁撴";
+ break;
+ case 3:
+ strMsg = "鍙嶇粨妗堬紙鍙嶆墽琛岃嚦瀹屽伐锛�";
+ break;
+ };
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_caa001, gridView1, "caa001");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+ return;
+
+ var _obj = new
+ {
+ guid = rowGuid,
+ inFieldValue = _inFieldValue,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "EditModelSubmit",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+ if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(lbGuid.Text.Trim());
+ }
+ else
+ {
+ //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
+ getPageList(this.pageBar1.CurrentPage);
+ int rowHandle = gridView1.LocateByValue("guid", rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 3148c76..b960d46 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -1,4 +1,5 @@
using DevExpress.XtraPivotGrid.Data;
+using Gs.DevApp.DevFrm.WOM;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -28,8 +29,6 @@
this.toolBarMenu1.btnTzblClick += ToolBarMenu1_btnTzblClick;
this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
- this.toolBarMenu1.btnJieAnClick += ToolBarMenu1_btnJieAnClick1;
- this.toolBarMenu1.btnFjieAnClick += ToolBarMenu1_btnFjieAnClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
this.toolBarMenu1.btnShouJianClick += ToolBarMenu1_btnShouJianClick;
this.toolBarMenu1.getXmlConfig();
@@ -89,7 +88,7 @@
};
}
-
+
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -152,7 +151,7 @@
var _obj = new
{
guid = rowGuid,
- inFieldValue ="",
+ inFieldValue = "",
};
try
{
@@ -181,28 +180,7 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
- /// <summary>
- /// 缁撴
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- /// <exception cref="NotImplementedException"></exception>
- private void ToolBarMenu1_btnFjieAnClick(object sender, EventArgs e)
- {
-
- }
- /// <summary>
- /// 鍙嶇粨妗�
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- /// <exception cref="NotImplementedException"></exception>
-
- private void ToolBarMenu1_btnJieAnClick1(object sender, EventArgs e)
- {
- _toolCk(99);
- }
+
private void ToolBarMenu1_btnTzblClick(object sender, EventArgs e)
{
_toolCk(7);
@@ -353,7 +331,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "desc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -551,9 +529,6 @@
case 9:
strMsg = "鎵嬪姩瀹屽伐";
break;
- case 99:
- strMsg = "缁撴";
- break;
};
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
@@ -566,6 +541,7 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
return;
+
var _obj = new
{
guid = rowGuid,
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/ShowJieAn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/ShowJieAn.Designer.cs
new file mode 100644
index 0000000..d21384b
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/ShowJieAn.Designer.cs
@@ -0,0 +1,115 @@
+锘縰sing Gs.DevApp.UserControl;
+
+namespace Gs.DevApp.DevFrm.WOM
+{
+ partial class ShowJieAn
+ {
+ /// <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.btnCancel = new DevExpress.XtraEditors.SimpleButton();
+ this.btnSave = new DevExpress.XtraEditors.SimpleButton();
+ this.comZt = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
+ ((System.ComponentModel.ISupportInitialize)(this.comZt.Properties)).BeginInit();
+ this.SuspendLayout();
+ //
+ // btnCancel
+ //
+ this.btnCancel.Appearance.Options.UseFont = true;
+ this.btnCancel.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
+ this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnCancel.Location = new System.Drawing.Point(196, 160);
+ this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.btnCancel.Name = "btnCancel";
+ this.btnCancel.Size = new System.Drawing.Size(87, 37);
+ this.btnCancel.TabIndex = 240;
+ this.btnCancel.Text = "鍙栨秷 (&C)";
+ //
+ // btnSave
+ //
+ this.btnSave.Appearance.Options.UseFont = true;
+ this.btnSave.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
+ this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnSave.Location = new System.Drawing.Point(79, 160);
+ this.btnSave.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.btnSave.Name = "btnSave";
+ this.btnSave.Size = new System.Drawing.Size(87, 37);
+ this.btnSave.TabIndex = 239;
+ this.btnSave.Text = "纭畾 (&L)";
+ //
+ // comZt
+ //
+ this.comZt.EditValue = "-璇烽�夋嫨-";
+ this.comZt.Location = new System.Drawing.Point(156, 56);
+ this.comZt.Name = "comZt";
+ this.comZt.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.comZt.Properties.Items.AddRange(new object[] {
+ "-璇烽�夋嫨缁撴绫诲瀷-",
+ "toclose(鎵ц鑷崇粨妗�)",
+ "closure(寮哄埗缁撴)"});
+ this.comZt.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.comZt.Size = new System.Drawing.Size(191, 24);
+ this.comZt.TabIndex = 2;
+ //
+ // labelControl1
+ //
+ this.labelControl1.Location = new System.Drawing.Point(45, 59);
+ this.labelControl1.Name = "labelControl1";
+ this.labelControl1.Size = new System.Drawing.Size(105, 18);
+ this.labelControl1.TabIndex = 0;
+ this.labelControl1.Text = "閫夋嫨缁撴绫诲瀷锛�";
+ //
+ // ShowJieAn
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(387, 260);
+ this.Controls.Add(this.btnCancel);
+ this.Controls.Add(this.btnSave);
+ this.Controls.Add(this.comZt);
+ this.Controls.Add(this.labelControl1);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "ShowJieAn";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "璇烽�夋嫨缁撴绫诲瀷";
+ this.TopMost = true;
+ ((System.ComponentModel.ISupportInitialize)(this.comZt.Properties)).EndInit();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+ private DevExpress.XtraEditors.ComboBoxEdit comZt;
+ private DevExpress.XtraEditors.SimpleButton btnCancel;
+ private DevExpress.XtraEditors.SimpleButton btnSave;
+ private DevExpress.XtraEditors.LabelControl labelControl1;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/ShowJieAn.cs b/DevApp/Gs.DevApp/DevFrm/WOM/ShowJieAn.cs
new file mode 100644
index 0000000..2e1d016
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/ShowJieAn.cs
@@ -0,0 +1,42 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.ToolBox;
+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.WOM
+{
+ public partial class ShowJieAn : DevExpress.XtraEditors.XtraForm
+ {
+ public ShowJieAn()
+ {
+ InitializeComponent();
+ btnSave.Click += (s, e) =>
+ {
+ if (comZt.SelectedIndex <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨缁撴绫诲瀷锛�");
+ return;
+ }
+ string str = comZt.Text.Trim();
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringSingle = str });
+ Close();
+ };
+ btnCancel.Click += (s, e) =>
+ {
+ this.Close();
+ };
+ }
+
+ /// <summary>
+ /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+ /// </summary>
+ public event EventHandler<UpdateParentEventArgs> UpdateParent;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/ShowJieAn.resx b/DevApp/Gs.DevApp/DevFrm/WOM/ShowJieAn.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/ShowJieAn.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/UserControl/showZhongTai.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.Designer.cs
similarity index 100%
rename from DevApp/Gs.DevApp/UserControl/showZhongTai.Designer.cs
rename to DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.Designer.cs
diff --git a/DevApp/Gs.DevApp/UserControl/showZhongTai.cs b/DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.cs
similarity index 100%
rename from DevApp/Gs.DevApp/UserControl/showZhongTai.cs
rename to DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.cs
diff --git a/DevApp/Gs.DevApp/UserControl/showZhongTai.resx b/DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.resx
similarity index 100%
rename from DevApp/Gs.DevApp/UserControl/showZhongTai.resx
rename to DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.resx
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 01e41cb..4c41caf 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -772,6 +772,12 @@
<Compile Include="DevFrm\WOM\Frm_MesWorkProd.Designer.cs">
<DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\WOM\ShowJieAn.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\WOM\ShowJieAn.Designer.cs">
+ <DependentUpon>ShowJieAn.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Work\Frm_Repair.cs">
<SubType>Form</SubType>
</Compile>
@@ -1027,10 +1033,10 @@
<Compile Include="UserControl\ShowUp.Designer.cs">
<DependentUpon>ShowUp.cs</DependentUpon>
</Compile>
- <Compile Include="UserControl\showZhongTai.cs">
+ <Compile Include="DevFrm\WOM\showZhongTai.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="UserControl\showZhongTai.Designer.cs">
+ <Compile Include="DevFrm\WOM\showZhongTai.Designer.cs">
<DependentUpon>showZhongTai.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\UcBtnPrint.cs">
@@ -1470,6 +1476,9 @@
<EmbeddedResource Include="DevFrm\WOM\Frm_MesWorkProd.resx">
<DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WOM\ShowJieAn.resx">
+ <DependentUpon>ShowJieAn.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Work\Frm_Repair.resx">
<DependentUpon>Frm_Repair.cs</DependentUpon>
</EmbeddedResource>
@@ -1596,7 +1605,7 @@
<EmbeddedResource Include="UserControl\ShowUp.resx">
<DependentUpon>ShowUp.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="UserControl\showZhongTai.resx">
+ <EmbeddedResource Include="DevFrm\WOM\showZhongTai.resx">
<DependentUpon>showZhongTai.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcBtnPrint.resx">
--
Gitblit v1.9.3