From a55730702b0b1b541d6ec40cac4469a2418936d5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 20 十二月 2024 18:50:24 +0800
Subject: [PATCH] 工单打印
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | 245 ++++++++++++++++++++++++++----------------------
1 files changed, 133 insertions(+), 112 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
index e191a1a..234d055 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -1,8 +1,7 @@
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;
using DevExpress.XtraEditors.Controls;
@@ -10,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;
@@ -24,9 +22,6 @@
{
InitializeComponent();
pageBar1.PagerEvent += PageBar1_PagerEvent;
- this.gridView1.ColumnPanelRowHeight = 60;
- this.gridView1.OptionsView.AllowHtmlDrawHeaders = true;
- this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
@@ -37,30 +32,27 @@
toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick;
toolBarMenu1.btnFjianYanClick += ToolBarMenu1_btnFjianYanClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
- gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- getPageList(1, UtilityHelper.GetPageSize());
- gridView1.CustomDrawRowIndicator += (s, e) =>
+
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
+ getPageList(1);
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ //璁剧疆缁勭粐
+ this.txt_receiveOrgId.EditChanged += (s, e) =>
{
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- };
- gridView1.CustomDrawEmptyForeground += (s, e) =>
- {
- var str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
- var f = new Font("寰蒋闆呴粦", 16);
- var r = new Rectangle(gridView1.GridControl.Width / 2 - 100,
- e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
- e.Graphics.DrawString(str, f, Brushes.Gray, r);
+ string _orgId = txt_receiveOrgId.GetId();
+ txt_suppId.getSuppler(_orgId);
+ txt_depotsId.getSuppler(_orgId);
};
//璁剧疆浠撳簱閫夋嫨
this.txt_depotsId.EditChanged += (s, e) =>
{
- txtDepotsId.Text = this.txt_depotsId.GetId();
+ txtDepotsCode.Text = this.txt_depotsId.GetCode();
};
//璁剧疆渚涘簲鍟嗛�夋嫨
this.txt_suppId.EditChanged += (s, e) =>
{
- txtSupplierId.Text = this.txt_suppId.GetId();
+ txtSupplierCode.Text = this.txt_suppId.GetCode();
};
//閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
btnSelect.Click += (s, e) =>
@@ -80,7 +72,7 @@
lst = ee.StringList;
var _obj = lst;
var strReturn = UtilityHelper.HttpPost("",
- "MesInvItemArnDetailManager/GetListPageByCgmxGuid",
+ _webServiceName + "SelectDialogToView",
JsonConvert.SerializeObject(_obj));
var dt = UtilityHelper.ReturnToList(strReturn);
DataTable _newTable = dt.rtnData;
@@ -103,46 +95,13 @@
};
frm.ShowDialog();
};
- //楠岄��
- btnTui.Click += async (s, e) =>
- {
- if (string.IsNullOrEmpty(lbGuid.Text.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("鏆傛湭淇濆瓨锛屼笉鑳介��璐э紒");
- return;
- }
- var lst = new List<string>();
- for (var i = 0; i < gvMx1.DataRowCount; i++)
- {
- var row = gvMx1.GetDataRow(i);
- if (row != null && row["gvChk"].ToString().ToUpper() == "true".ToUpper())
- lst.Add(row["guid"].ToString());
- }
- if (lst.Count <= 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浣犻渶瑕侀��鐨勭墿鏂欙紒");
- return;
- }
- UcLoading _loading = new UcLoading();
- var _obj = lst;
- try
- {
- var strJson = await UtilityHelper.HttpPostAsync("",
- _webServiceName + "TuiMx",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
+ }
- }
- MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- _loading.Stop();
- };
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ Task.Delay(100);
+ getPageList(1);
}
/// <summary>
/// 鍙屽嚮浜嬩欢
@@ -164,7 +123,7 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(curPage, pageSize);
+ getPageList(curPage);
}
/// <summary>
@@ -174,6 +133,9 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
var frm = new ShowFilter(gridView1.Columns, _filterList);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
@@ -187,7 +149,7 @@
private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
{
_filterList = e.FilterList;
- getPageList(1, pageBar1.RowsCount);
+ getPageList(1);
}
/// <summary>
/// 鏃ュ織
@@ -208,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;
@@ -222,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);
@@ -239,14 +201,14 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
getModel(lbGuid.Text.Trim(), false, 999);
else
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
}
}
catch (Exception ex)
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
/// <summary>
@@ -254,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;
@@ -268,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);
@@ -285,14 +246,13 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
getModel(lbGuid.Text.Trim(), false, 999);
else
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
}
}
catch (Exception ex)
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
}
/// <summary>
/// 鍙栨秷浜嬩欢
@@ -335,9 +295,8 @@
if (_rtn.rtnCode > 0)
{
UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
}
-
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
@@ -356,7 +315,16 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
getModel(lbGuid.Text.Trim(), false, 999);
else
- getPageList(1, UtilityHelper.GetPageSize());
+ {
+ _filterList.Clear();
+ if (gridView1.ActiveFilter.Count > 0)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ }
+ getPageList(1);
+ }
}
/// <summary>
@@ -401,31 +369,37 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- var _ckId = txt_depotsId.GetId(); //浠撳簱缂栧彿 depots_code
- var _gysId = txt_suppId.GetId(); //渚涘簲鍟嗙紪鍙�
+ string _orgId = txt_receiveOrgId.GetId();
+ string _ckId = txt_depotsId.GetId(); //浠撳簱缂栧彿 depots_code
+ string _gysId = txt_suppId.GetId(); //渚涘簲鍟嗙紪鍙�
+ if (string.IsNullOrEmpty(_orgId))
+ {
+ MsgHelper.Warning("璇烽�夋嫨鏀舵枡缁勭粐锛�");
+ txt_receiveOrgId.Focus();
+ return;
+ }
if (string.IsNullOrEmpty(_gysId))
{
MsgHelper.Warning("璇烽�夋嫨渚涘簲鍟嗭紒");
txt_suppId.Focus();
return;
}
-
if (string.IsNullOrEmpty(_ckId))
{
MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
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 = txt_urgentFlag.Checked,//0=涓嶆�ワ紝1=鎬�
- list = new List<MesInvItemArnDetail>(),
+ FType = txt_fType.Checked ? 1 : 0,//0=閲囪喘锛�1=濮斿
+ OrgId = _orgId,
+ list = new List<dynamic>(),
};
gvMx1.CloseEditor();
gvMx1.UpdateCurrentRow();
@@ -446,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("",
@@ -480,55 +454,60 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage, int pageSize)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
- var _sbSqlWhere = new StringBuilder();
- foreach (var itm in _filterList)
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
- itm.fileValue + "'");
- var pgq = new PageQueryModel(curPage, pageSize, "create_date",
+ 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);
- var dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- var dddd = dd.rtnData.pages; //鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
- pageBar1.CurrentPage = curPage; //褰撳墠椤�
- pageBar1.setTxt();
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
}
catch (Exception ex)
{
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))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
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);
@@ -538,11 +517,10 @@
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"]["listDya"]) array.Add(a);
+ foreach (var a in _job["rtnData"]["list"]) array.Add(a);
var dt =
JsonConvert.DeserializeObject<DataTable>(
array.ToString());
@@ -566,7 +544,6 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
}
/// <summary>
@@ -614,5 +591,49 @@
}
}
}
+ /// <summary>
+ /// 鏄庣粏閫�璐�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void repositoryItemButtonEdit2_ButtonClick(object sender, ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gvMx1.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾閫�璐у悧锛�"))
+ return;
+ if (string.IsNullOrEmpty(mxGuid))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鏆傛湭淇濆瓨锛屼笉鑳介��璐э紒");
+ return;
+ }
+ var lst = new List<string>();
+ lst.Add(mxGuid);
+
+ var _obj = lst;
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "TuiMx",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+
+ }
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3