From d48678b5f13f51369a545d959e21ba81b551e45a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 06 十二月 2024 17:28:59 +0800
Subject: [PATCH] 精细化
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | 74 +++++++++++++++++--------------------
1 files changed, 34 insertions(+), 40 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
index 4716658..a89f5ed 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.Data;
-using System.Drawing;
-using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
@@ -11,7 +9,6 @@
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
-using MES.Service.Modes;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@@ -36,12 +33,16 @@
toolBarMenu1.btnFjianYanClick += ToolBarMenu1_btnFjianYanClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
- gvMx1.ValidatingEditor += (sender, e) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx1);
+ //璁剧疆缁勭粐
+ this.txt_receiveOrgId.EditChanged += (s, e) =>
{
- Gs.DevApp.ToolBox.UtilityHelper.SetValidatingEditor(sender, e);
+ string _orgId = txt_receiveOrgId.GetId();
+ txt_suppId.getSuppler(_orgId);
+ txt_depotsId.getSuppler(_orgId);
};
//璁剧疆浠撳簱閫夋嫨
this.txt_depotsId.EditChanged += (s, e) =>
@@ -94,12 +95,12 @@
};
frm.ShowDialog();
};
-
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
/// <summary>
@@ -169,7 +170,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private async void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e)
{
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
@@ -183,14 +184,14 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎾ゅ洖宸叉彁浜ょ殑妫�楠屽悧锛�"))
return;
- UcLoading _loading = new UcLoading();
+
var _obj = new
{
guid = rowGuid,
};
try
{
- var strJson = await UtilityHelper.HttpPostAsync("",
+ var strJson = UtilityHelper.HttpPost("",
_webServiceName + "EditModelSubmitF",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
@@ -207,7 +208,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
/// <summary>
@@ -215,7 +216,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private async void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
{
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
@@ -229,14 +230,13 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎻愪氦妫�楠屽悧锛�"))
return;
- UcLoading _loading = new UcLoading();
var _obj = new
{
guid = rowGuid,
};
try
{
- var strJson = await UtilityHelper.HttpPostAsync("",
+ var strJson = UtilityHelper.HttpPost("",
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
@@ -253,7 +253,6 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
}
/// <summary>
/// 鍙栨秷浜嬩欢
@@ -371,8 +370,8 @@
{
toolBarMenu1.isSetBtn = false;
string _orgId = txt_receiveOrgId.GetId();
- var _ckId = txt_depotsId.GetId(); //浠撳簱缂栧彿 depots_code
- var _gysId = txt_suppId.GetId(); //渚涘簲鍟嗙紪鍙�
+ string _ckId = txt_depotsId.GetId(); //浠撳簱缂栧彿 depots_code
+ string _gysId = txt_suppId.GetId(); //渚涘簲鍟嗙紪鍙�
if (string.IsNullOrEmpty(_orgId))
{
MsgHelper.Warning("璇烽�夋嫨鏀舵枡缁勭粐锛�");
@@ -391,16 +390,16 @@
txt_depotsId.Focus();
return;
}
- var _obj = new MesInvItemArn()
+ var _obj = new
{
Guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()), //鍒拌揣鍗曚富閿�
PaperBillNo = txt_paperBillNo.Text.Trim(), //閫佽揣鍗曞彿;
Remark = txt_remark.Text.Trim(), //澶囨敞
SuppId = _gysId, //渚涘簲鍟�
DepotsId = _ckId,//浠撳簱
- FType = txt_fType.Checked,//0=閲囪喘锛�1=濮斿
- UrgentFlag = false,
- list = new List<MesInvItemArnDetail>(),
+ FType = txt_fType.Checked ? 1 : 0,//0=閲囪喘锛�1=濮斿
+ OrgId = _orgId,
+ list = new List<dynamic>(),
};
gvMx1.CloseEditor();
gvMx1.UpdateCurrentRow();
@@ -421,16 +420,16 @@
MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
return;
}
- _obj.list.Add(new MesInvItemArnDetail
+ _obj.list.Add(new
{
Guid = _guid,
AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
ItemId = int.Parse(row["itemId"].ToString()),
- Quantity = decimal.Parse(row["quantity"].ToString())
+ Quantity = decimal.Parse(row["quantity"].ToString()),
+ UrgentFlag = Gs.DevApp.ToolBox.UtilityHelper.ToBit(row["urgentFlag"].ToString()),
});
}
}
-
try
{
var strJson = UtilityHelper.HttpPost("",
@@ -455,16 +454,15 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("",
+ var strReturn = UtilityHelper.HttpPost("",
_webServiceName + "GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
@@ -493,10 +491,9 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
}
- private async void getModel(string strGuid, bool isEdit, int tabIdx)
+ private void getModel(string strGuid, bool isEdit, int tabIdx)
{
if (string.IsNullOrEmpty(strGuid))
{
@@ -504,14 +501,13 @@
return;
}
UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
- UcLoading _loading = new UcLoading();
var _obj = new
{
guid = strGuid //涓诲缓
};
try
{
- var strJson = await UtilityHelper.HttpPostAsync("",
+ var strJson = UtilityHelper.HttpPost("",
_webServiceName + "GetModel",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
@@ -521,8 +517,7 @@
lbGuid.Text = strGuid;
var gvList = new List<GridView>();
gvList.Add(gvMx1);
- UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit,
- gvList);
+ UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit, gvList);
var _job = JObject.Parse(strJson);
var array = new JArray();
foreach (var a in _job["rtnData"]["list"]) array.Add(a);
@@ -549,7 +544,6 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
}
/// <summary>
@@ -602,7 +596,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private async void repositoryItemButtonEdit2_ButtonClick(object sender, ButtonPressedEventArgs e)
+ private void repositoryItemButtonEdit2_ButtonClick(object sender, ButtonPressedEventArgs e)
{
var rowhandle = gvMx1.FocusedRowHandle;
if (rowhandle < 0)
@@ -620,11 +614,11 @@
}
var lst = new List<string>();
lst.Add(mxGuid);
- UcLoading _loading = new UcLoading();
+
var _obj = lst;
try
{
- var strJson = await UtilityHelper.HttpPostAsync("",
+ var strJson = UtilityHelper.HttpPost("",
_webServiceName + "TuiMx",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
@@ -638,7 +632,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
}
}
--
Gitblit v1.9.3