lu
2025-05-05 f5b68343056a31c0d221e6aa0d671a9f8ef798cd
结案
已添加3个文件
已重命名3个文件
已修改3个文件
435 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs 107 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/ShowJieAn.Designer.cs 115 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/ShowJieAn.cs 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/ShowJieAn.resx 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.Designer.cs 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.cs 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.resx 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
            }
        }
    }
}
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,
DevApp/Gs.DevApp/DevFrm/WOM/ShowJieAn.Designer.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,115 @@
using 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;
    }
}
DevApp/Gs.DevApp/DevFrm/WOM/ShowJieAn.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,42 @@
using 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;
    }
}
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>
DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.Designer.cs
DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.cs
DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.resx
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">