~tjx/GsMesClient.git

2024-10-25 fe09fca3e77be09fed738a975ff9c5a508c2dd0d

检验

已修改3个文件

	DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs	81 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs

@@ -40,14 +40,15 @@
            // 
            // lookSearchSupplier
            // 
            this.lookSearchSupplier.Location = new System.Drawing.Point(0, 3);
            this.lookSearchSupplier.Dock = System.Windows.Forms.DockStyle.Fill;
            this.lookSearchSupplier.Location = new System.Drawing.Point(0, 0);
            this.lookSearchSupplier.Name = "lookSearchSupplier";
            this.lookSearchSupplier.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lookSearchSupplier.Properties.Appearance.Options.UseFont = true;
            this.lookSearchSupplier.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.lookSearchSupplier.Properties.PopupView = this.searchLookUpEdit1View;
            this.lookSearchSupplier.Size = new System.Drawing.Size(207, 28);
            this.lookSearchSupplier.Size = new System.Drawing.Size(219, 28);
            this.lookSearchSupplier.TabIndex = 8;
            // 
            // searchLookUpEdit1View
@@ -98,8 +99,9 @@
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.Controls.Add(this.lookSearchSupplier);
            this.Margin = new System.Windows.Forms.Padding(0);
            this.Name = "UcLookCk";
            this.Size = new System.Drawing.Size(219, 37);
            this.Size = new System.Drawing.Size(219, 30);
            ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
            this.ResumeLayout(false);

 DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs

@@ -40,14 +40,15 @@
            // 
            // lookSearchSupplier
            // 
            this.lookSearchSupplier.Location = new System.Drawing.Point(3, 3);
            this.lookSearchSupplier.Dock = System.Windows.Forms.DockStyle.Fill;
            this.lookSearchSupplier.Location = new System.Drawing.Point(0, 0);
            this.lookSearchSupplier.Name = "lookSearchSupplier";
            this.lookSearchSupplier.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lookSearchSupplier.Properties.Appearance.Options.UseFont = true;
            this.lookSearchSupplier.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.lookSearchSupplier.Properties.PopupView = this.searchLookUpEdit1View;
            this.lookSearchSupplier.Size = new System.Drawing.Size(207, 28);
            this.lookSearchSupplier.Size = new System.Drawing.Size(228, 28);
            this.lookSearchSupplier.TabIndex = 7;
            // 
            // searchLookUpEdit1View
@@ -98,8 +99,9 @@
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.Controls.Add(this.lookSearchSupplier);
            this.Margin = new System.Windows.Forms.Padding(0);
            this.Name = "UcLookSupplier";
            this.Size = new System.Drawing.Size(228, 37);
            this.Size = new System.Drawing.Size(228, 30);
            ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
            this.ResumeLayout(false);

 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs

@@ -2,6 +2,7 @@
using DevExpress.Utils.DirectXPaint;
using DevExpress.XtraBars;
using DevExpress.XtraLayout.Customization;
using DevExpress.XtraReports.Design;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
@@ -192,21 +193,7 @@
            }
            if (!MsgHelper.AskQuestion("你选择了1条数据，确定反审核吗？"))
                return;
            var _obj = new
            {
                guid = this.guidKey,
                parameter = this.chkParameter
            };
            string strJson = UtilityHelper.HttpPost("", "General/GeneralFCheck", JsonConvert.SerializeObject(_obj));
            ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
            if (_rtn.rtnCode > 0)
            {
                ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnData["outMsg"].ToString());
            }
            else
            {
                ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
            }
            _ckService(0.ToString());
        }
        private void BtnChk_ItemClick(object sender, ItemClickEventArgs e)
        {
@@ -229,21 +216,7 @@
            }
            if (!MsgHelper.AskQuestion("你选择了1条数据，确定审核吗？"))
                return;
            var _obj = new
            {
                guid = this.guidKey,
                parameter = this.chkParameter
            };
            string strJson = UtilityHelper.HttpPost("", "General/GeneralCheck", JsonConvert.SerializeObject(_obj));
            ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
            if (_rtn.rtnCode > 0)
            {
                ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnData["outMsg"].ToString());
            }
            else
            {
                ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
            }
            _ckService(1.ToString());
        }

        private void BtnFjianYan_ItemClick(object sender, ItemClickEventArgs e)
@@ -267,21 +240,7 @@
            }
            if (!MsgHelper.AskQuestion("你选择了1条数据，确定反检验吗？"))
                return;
            var _obj = new
            {
                guid = this.guidKey,
                parameter = this.chkParameter
            };
            string strJson = UtilityHelper.HttpPost("", "General/GeneralFCheck", JsonConvert.SerializeObject(_obj));
            ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
            if (_rtn.rtnCode > 0)
            {
                ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnData["outMsg"].ToString());
            }
            else
            {
                ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
            }
            _ckService(0.ToString());
        }

        private void BtnJianYan_ItemClick(object sender, ItemClickEventArgs e)
@@ -310,16 +269,7 @@
                guid = this.guidKey,
                parameter = this.chkParameter
            };
            string strJson = UtilityHelper.HttpPost("", "General/GeneralCheck", JsonConvert.SerializeObject(_obj));
            ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
            if (_rtn.rtnCode > 0)
            {
                ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnData["outMsg"].ToString());
            }
            else
            {
                ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
            }
            _ckService(1.ToString());
        }

        private async void BtnIn_ItemClick(object sender, ItemClickEventArgs e)
@@ -716,5 +666,26 @@
            }
            return false;
        }

        private void _ckService(string _ckValue)
        {
            var _obj = new
            {
                guid = this.guidKey,
                parameter = this.chkParameter,
                ckValue = _ckValue
            };
            string strJson = UtilityHelper.HttpPost("", "General/GeneralCheck", JsonConvert.SerializeObject(_obj));
            ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
            ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnData["outMsg"].ToString());
            if (_rtn.rtnCode > 0)
            {

            }
            else
            {

            }
        }
    }
}

			@@ -40,14 +40,15 @@
			//
			// lookSearchSupplier
			//
			this.lookSearchSupplier.Location = new System.Drawing.Point(0, 3);
			this.lookSearchSupplier.Dock = System.Windows.Forms.DockStyle.Fill;
			this.lookSearchSupplier.Location = new System.Drawing.Point(0, 0);
			this.lookSearchSupplier.Name = "lookSearchSupplier";
			this.lookSearchSupplier.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.lookSearchSupplier.Properties.Appearance.Options.UseFont = true;
			this.lookSearchSupplier.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
			new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
			this.lookSearchSupplier.Properties.PopupView = this.searchLookUpEdit1View;
			this.lookSearchSupplier.Size = new System.Drawing.Size(207, 28);
			this.lookSearchSupplier.Size = new System.Drawing.Size(219, 28);
			this.lookSearchSupplier.TabIndex = 8;
			//
			// searchLookUpEdit1View
			@@ -98,8 +99,9 @@
			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
			this.Controls.Add(this.lookSearchSupplier);
			this.Margin = new System.Windows.Forms.Padding(0);
			this.Name = "UcLookCk";
			this.Size = new System.Drawing.Size(219, 37);
			this.Size = new System.Drawing.Size(219, 30);
			((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
			this.ResumeLayout(false);

			@@ -2,6 +2,7 @@
			using DevExpress.Utils.DirectXPaint;
			using DevExpress.XtraBars;
			using DevExpress.XtraLayout.Customization;
			using DevExpress.XtraReports.Design;
			using Gs.DevApp.Entity;
			using Gs.DevApp.ToolBox;
			using Newtonsoft.Json;
			@@ -192,21 +193,7 @@
			}
			if (!MsgHelper.AskQuestion("你选择了1条数据，确定反审核吗？"))
			return;
			var _obj = new
			{
			guid = this.guidKey,
			parameter = this.chkParameter
			};
			string strJson = UtilityHelper.HttpPost("", "General/GeneralFCheck", JsonConvert.SerializeObject(_obj));
			ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
			if (_rtn.rtnCode > 0)
			{
			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnData["outMsg"].ToString());
			}
			else
			{
			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			}
			_ckService(0.ToString());
			}
			private void BtnChk_ItemClick(object sender, ItemClickEventArgs e)
			{
			@@ -229,21 +216,7 @@
			}
			if (!MsgHelper.AskQuestion("你选择了1条数据，确定审核吗？"))
			return;
			var _obj = new
			{
			guid = this.guidKey,
			parameter = this.chkParameter
			};
			string strJson = UtilityHelper.HttpPost("", "General/GeneralCheck", JsonConvert.SerializeObject(_obj));
			ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
			if (_rtn.rtnCode > 0)
			{
			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnData["outMsg"].ToString());
			}
			else
			{
			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			}
			_ckService(1.ToString());
			}

			private void BtnFjianYan_ItemClick(object sender, ItemClickEventArgs e)
			@@ -267,21 +240,7 @@
			}
			if (!MsgHelper.AskQuestion("你选择了1条数据，确定反检验吗？"))
			return;
			var _obj = new
			{
			guid = this.guidKey,
			parameter = this.chkParameter
			};
			string strJson = UtilityHelper.HttpPost("", "General/GeneralFCheck", JsonConvert.SerializeObject(_obj));
			ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
			if (_rtn.rtnCode > 0)
			{
			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnData["outMsg"].ToString());
			}
			else
			{
			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			}
			_ckService(0.ToString());
			}

			private void BtnJianYan_ItemClick(object sender, ItemClickEventArgs e)
			@@ -310,16 +269,7 @@
			guid = this.guidKey,
			parameter = this.chkParameter
			};
			string strJson = UtilityHelper.HttpPost("", "General/GeneralCheck", JsonConvert.SerializeObject(_obj));
			ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
			if (_rtn.rtnCode > 0)
			{
			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnData["outMsg"].ToString());
			}
			else
			{
			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			}
			_ckService(1.ToString());
			}

			private async void BtnIn_ItemClick(object sender, ItemClickEventArgs e)
			@@ -716,5 +666,26 @@
			}
			return false;
			}

			private void _ckService(string _ckValue)
			{
			var _obj = new
			{
			guid = this.guidKey,
			parameter = this.chkParameter,
			ckValue = _ckValue
			};
			string strJson = UtilityHelper.HttpPost("", "General/GeneralCheck", JsonConvert.SerializeObject(_obj));
			ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnData["outMsg"].ToString());
			if (_rtn.rtnCode > 0)
			{

			}
			else
			{

			}
			}
			}
			}