From 796126e3f8bbb628a00e0b3b62753dbd323b8a70 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 19 十一月 2024 15:04:13 +0800
Subject: [PATCH] 工单
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs | 86 ++++++++++---------------------------------
1 files changed, 20 insertions(+), 66 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
index 0128048..e6335f6 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
@@ -24,11 +24,9 @@
public Frm_MesDepot()
{
InitializeComponent();
- toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
- toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
@@ -137,55 +135,16 @@
}
/// <summary>
- /// 鍒犻櫎浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
- {
- string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_depotCode, gridView1);
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
-
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
- return;
- var lst = new List<dynamic>();
- lst.Add(rowGuid);
- var _obj = lst;
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "DeleteModel",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
- }
-
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
- /// <summary>
/// 鍒锋柊浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ getPageList(1, UtilityHelper.GetPageSize());
}
/// <summary>
@@ -207,20 +166,7 @@
getModel(rowGuid, true, 1);
}
- /// <summary>
- /// 鏂板浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 1);
- lbGuid.Text = "";
- var gridViews = new List<GridView>();
- gridViews.Add(gvMx1);
- UtilityHelper.CleanValueByControl(panel1.Controls, true, gridViews);
- UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
- }
+
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -243,7 +189,6 @@
txt_depotName.Focus();
return;
}
-
gvMx1.CloseEditor();
gvMx1.UpdateCurrentRow();
var lst = new List<MesDepotSections>();
@@ -253,17 +198,19 @@
if (row != null)
lst.Add(new MesDepotSections
{
- Guid = null,
+ Guid = UtilityHelper.ToGuid(row["guid"].ToString()),
DepotSectionCode = row["depotSectionCode"].ToString(),
- DepotSectionName = row["DepotSectionName"].ToString()
+ DepotSectionName = row["DepotSectionName"].ToString(),
+ Description = row["Description"].ToString(),
+ KbQty =Gs.DevApp.ToolBox.UtilityHelper.ToInt(row["KbQty"].ToString()),
+ DepotSectionNamet = row["depotSectionNamet"].ToString(),
+ CompletenessFlag = Gs.DevApp.ToolBox.UtilityHelper.ToInt(row["completenessFlag"].ToString()),
});
}
var _obj = new MesDepots
{
- Guid = lbGuid.Text.Trim().Length > 0
- ? Guid.Parse(lbGuid.Text.Trim())
- : Guid.Empty,
+ Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
DepotCode = txt_depotCode.Text,
DepotName = txt_depotName.Text,
Description = txt_description.Text,
@@ -300,7 +247,7 @@
foreach (var itm in _filterList)
_sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
itm.fileValue + "'");
- var pgq = new PageQueryModel(curPage, pageSize, "depot_code", "asc",
+ var pgq = new PageQueryModel(curPage, pageSize, "a.depot_code", "asc",
"", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
@@ -383,6 +330,8 @@
private void repositoryItemButtonEdit1_ButtonClick(object sender,
ButtonPressedEventArgs e)
{
+ gvMx1.CloseEditor();
+ gvMx1.UpdateCurrentRow();
var rowhandle = gvMx1.FocusedRowHandle;
if (rowhandle < 0)
return;
@@ -392,6 +341,11 @@
var mxGuid = dr["guid"].ToString();
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
return;
+ if (string.IsNullOrEmpty(mxGuid))
+ {
+ gvMx1.DeleteRow(rowhandle);
+ return;
+ }
var strJson = "";
var lst = new List<string>();
lst.Add(mxGuid);
--
Gitblit v1.9.3