From 5614d12346dc567febdcc51e5533a3b98e67348d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 30 十二月 2024 15:12:51 +0800
Subject: [PATCH] 到货条码打印
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 100 +++++++++++++++++++++++++------------------------
1 files changed, 51 insertions(+), 49 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 8e644af..386d9ec 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -1,17 +1,13 @@
-using DevExpress.Utils.About;
-using DevExpress.XtraGrid.Views.Grid.ViewInfo;
-using DevExpress.XtraRichEdit.Model;
+using DevExpress.Utils.MVVM.Services;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
-using MES.Service.Modes;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
-using System.Drawing;
using System.Net;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -35,12 +31,21 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick;
- gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- gcMx1.MouseClick += GcMx1_MouseClick;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx2);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx3);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "modify1FlagTxt", "", (value) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ });
+ Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ {
+ getModel(value);
+ }, (value) =>
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ });
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
txt_itemId.EditChanged += (s, e) =>
@@ -52,7 +57,9 @@
this.btnLoad.Click += BtnLoad_Click;
ucUpFile1.UpChanged += UcUpFile1_UpChanged;
xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
-
+ gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
+ //鏈夋�ц兘闂
+ this.txt_suppId.getSuppler("");
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -60,16 +67,17 @@
Task.Delay(100);
getPageList(1);
}
- private void GcMx1_MouseClick(object sender, MouseEventArgs e)
+ private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
{
- string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gvMx1, e, "guid");
- if (string.IsNullOrEmpty(rowGuid))
- return;
- var info = gvMx1.CalcHitInfo(e.Location);
- this._currentHandle5 = info.RowHandle;
- getList12(rowGuid);
+ if (e.FocusedRowHandle >= 0)
+ {
+ DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
+ string rowGuid = row["guid"].ToString();
+ if (string.IsNullOrEmpty(rowGuid))
+ return;
+ getList12(rowGuid);
+ }
}
-
/// <summary>
/// 閲嶆柊鍔犺浇妫�楠�
/// </summary>
@@ -95,7 +103,7 @@
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- getModel(lbGuid.Text.Trim(), false, 999);
+ getModel(lbGuid.Text.Trim());
}
}
catch (Exception ex)
@@ -111,6 +119,7 @@
private void TxtJianYan_KeyDown(object sender, KeyEventArgs e)
{
int intHandle = this.gvMx1.FocusedRowHandle;
+ this._currentHandle5 = intHandle;
if (intHandle < 0)
{
ToolBox.MsgHelper.Warning("鎻愮ず锛氳閫夋嫨妫�楠岄」鐩紒");
@@ -179,7 +188,7 @@
if (_rtn.rtnCode > 0)
{
txtJianYan.Text = "";
- getModel(lbGuid.Text.Trim(), false, 999);
+ getModel(lbGuid.Text.Trim());
}
}
catch (Exception ex)
@@ -189,17 +198,6 @@
}
}
- /// <summary>
- /// 鍙屽嚮浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
- {
- string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
- if (!string.IsNullOrEmpty(rowGuid))
- getModel(rowGuid, false, 999);
- }
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -281,9 +279,9 @@
if (_rtn.rtnCode > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), false, 999);
+ getModel(lbGuid.Text.Trim());
else
- getPageList(1);
+ getPageList(this.pageBar1.CurrentPage);
}
}
catch (Exception ex)
@@ -300,7 +298,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
}
/// <summary>
@@ -311,7 +309,7 @@
private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1);
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -328,8 +326,10 @@
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1);
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
+ getPageList(this.pageBar1.CurrentPage);
+ else
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
}
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
@@ -347,7 +347,7 @@
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), false, 999);
+ getModel(lbGuid.Text.Trim());
else
{
_filterList.Clear();
@@ -368,13 +368,14 @@
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1);
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- getModel(rowGuid, true, 1);
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
}
/// <summary>
/// 鏂板浜嬩欢
@@ -383,8 +384,8 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 1);
lbGuid.Text = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gridViews.Add(gvMx1);
gridViews.Add(gvMx2);
@@ -442,9 +443,10 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
-
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
+ _sbSqlWhere += " and isnull(fsubmit,0)=0";
+ MessageBox.Show(_sbSqlWhere.ToString());
+ PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
@@ -478,15 +480,16 @@
}
}
- private void getModel(string strGuid, bool isEdit, int tabIdx)
+ private void getModel(string strGuid)
{
+ bool isEdit = false;
+ if (toolBarMenu1.currentAction == "add") return;
+ if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
-
var _obj = new
{
guid = strGuid,//涓诲缓
@@ -593,7 +596,6 @@
/// <param name="guid5"></param>
private void getList12(string guid5)
{
-
var _obj = new
{
parentGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
--
Gitblit v1.9.3