From d7079288b62bc875bc17b86754f3601554a3d085 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 10 二月 2025 14:39:35 +0800
Subject: [PATCH] 工单明细
---
DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs | 13 +++---
DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs | 94 +++++++++++++++++++++++++++++++---------------
2 files changed, 70 insertions(+), 37 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs
index b6e07f3..f83992c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs
@@ -37,9 +37,10 @@
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1tlQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1rkQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1workNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1createDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -50,6 +51,8 @@
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_depotId = new DevExpress.XtraEditors.LabelControl();
this.gv_pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_boardItem = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -140,7 +143,7 @@
this.gvMx2remark.Name = "gvMx2remark";
this.gvMx2remark.Tag = "query_a.REMARK";
this.gvMx2remark.Visible = true;
- this.gvMx2remark.VisibleIndex = 6;
+ this.gvMx2remark.VisibleIndex = 8;
this.gvMx2remark.Width = 94;
//
// gvMx2depotSectionCode
@@ -187,7 +190,7 @@
this.gvMx2lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2lotNo.AppearanceCell.Options.UseFont = true;
this.gvMx2lotNo.Caption = "鐗╂枡鍚嶇О";
- this.gvMx2lotNo.FieldName = "lotNo";
+ this.gvMx2lotNo.FieldName = "itemName";
this.gvMx2lotNo.MinWidth = 50;
this.gvMx2lotNo.Name = "gvMx2lotNo";
this.gvMx2lotNo.Tag = "query_a.LOT_NO";
@@ -248,13 +251,34 @@
this.gvMx2quantity,
this.gvMx2depotCode,
this.gvMx2depotSectionCode,
+ this.gridColumn2,
+ this.gridColumn3,
this.gvMx2remark});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx2.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx2.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "寤虹珛鑰�";
+ this.gridColumn2.FieldName = "createBy";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 6;
+ this.gridColumn2.Width = 94;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "寤虹珛鏃堕棿";
+ this.gridColumn3.FieldName = "createDate";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 7;
+ this.gridColumn3.Width = 94;
//
// gvMx1itemId
//
@@ -266,7 +290,7 @@
this.gvMx1itemId.Name = "gvMx1itemId";
this.gvMx1itemId.Tag = "query_a.item_id";
this.gvMx1itemId.Visible = true;
- this.gvMx1itemId.VisibleIndex = 9;
+ this.gvMx1itemId.VisibleIndex = 2;
this.gvMx1itemId.Width = 94;
//
// gvMx1tlQty
@@ -279,21 +303,8 @@
this.gvMx1tlQty.Name = "gvMx1tlQty";
this.gvMx1tlQty.Tag = "query_a.tl_qty";
this.gvMx1tlQty.Visible = true;
- this.gvMx1tlQty.VisibleIndex = 8;
+ this.gvMx1tlQty.VisibleIndex = 6;
this.gvMx1tlQty.Width = 94;
- //
- // gvMx1rkQty
- //
- this.gvMx1rkQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1rkQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1rkQty.Caption = "宸插叆搴撴暟 ";
- this.gvMx1rkQty.FieldName = "rkQty";
- this.gvMx1rkQty.MinWidth = 50;
- this.gvMx1rkQty.Name = "gvMx1rkQty";
- this.gvMx1rkQty.Tag = "query_a.rk_qty";
- this.gvMx1rkQty.Visible = true;
- this.gvMx1rkQty.VisibleIndex = 7;
- this.gvMx1rkQty.Width = 94;
//
// gvMx1workNo
//
@@ -305,7 +316,7 @@
this.gvMx1workNo.Name = "gvMx1workNo";
this.gvMx1workNo.Tag = "query_a.work_no";
this.gvMx1workNo.Visible = true;
- this.gvMx1workNo.VisibleIndex = 6;
+ this.gvMx1workNo.VisibleIndex = 0;
this.gvMx1workNo.Width = 94;
//
// gvMx1remark
@@ -318,7 +329,7 @@
this.gvMx1remark.Name = "gvMx1remark";
this.gvMx1remark.Tag = "query_a.remark";
this.gvMx1remark.Visible = true;
- this.gvMx1remark.VisibleIndex = 5;
+ this.gvMx1remark.VisibleIndex = 7;
this.gvMx1remark.Width = 94;
//
// gvMx1createDate
@@ -326,7 +337,7 @@
this.gvMx1createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1createDate.AppearanceCell.Options.UseFont = true;
this.gvMx1createDate.Caption = "鐗╂枡瑙勬牸";
- this.gvMx1createDate.FieldName = "createDate";
+ this.gvMx1createDate.FieldName = "itemModel";
this.gvMx1createDate.MinWidth = 50;
this.gvMx1createDate.Name = "gvMx1createDate";
this.gvMx1createDate.Tag = "query_a.create_date";
@@ -339,7 +350,7 @@
this.gvMx1createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
this.gvMx1createBy.Caption = "鐗╂枡鍚嶇О";
- this.gvMx1createBy.FieldName = "createBy";
+ this.gvMx1createBy.FieldName = "itemName";
this.gvMx1createBy.MinWidth = 50;
this.gvMx1createBy.Name = "gvMx1createBy";
this.gvMx1createBy.Tag = "query_a.create_by";
@@ -357,7 +368,7 @@
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "query_a.quantity";
this.gvMx1quantity.Visible = true;
- this.gvMx1quantity.VisibleIndex = 2;
+ this.gvMx1quantity.VisibleIndex = 5;
this.gvMx1quantity.Width = 94;
//
// gvMx1itemNo
@@ -382,8 +393,6 @@
this.gvMx1guid.MinWidth = 50;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Visible = true;
- this.gvMx1guid.VisibleIndex = 0;
this.gvMx1guid.Width = 94;
//
// tabMxPage1
@@ -410,19 +419,39 @@
this.gvMx1guid,
this.gvMx1workNo,
this.gvMx1itemNo,
+ this.gvMx1itemId,
this.gvMx1createBy,
this.gvMx1createDate,
this.gvMx1quantity,
- this.gvMx1remark,
- this.gvMx1rkQty,
this.gvMx1tlQty,
- this.gvMx1itemId});
+ this.gvMx1remark,
+ this.gridColumn4,
+ this.gridColumn5});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx1.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "寤虹珛鑰�";
+ this.gridColumn4.FieldName = "createBy";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 8;
+ this.gridColumn4.Width = 94;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "寤虹珛鏃堕棿";
+ this.gridColumn5.FieldName = "createDate";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 9;
+ this.gridColumn5.Width = 94;
//
// lb_depotId
//
@@ -1111,7 +1140,6 @@
private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1tlQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1rkQty;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1workNo;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1remark;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1createDate;
@@ -1174,5 +1202,9 @@
private UserControl.UcLookCk depot_id;
private UserControl.UcLookDepartment txt_outPart;
private System.Windows.Forms.PictureBox picCheckBox;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs
index 5fcfe9d..b97faff 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs
@@ -1,16 +1,11 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -38,6 +33,8 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
Form parentForm = this.FindForm();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, parentForm, "statusChk", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -156,6 +153,7 @@
private void getPageList(int curPage)
{
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ _sbSqlWhere += " and a.out_type='" + strType + "'";
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_out_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -171,6 +169,7 @@
{
gcMain.DataSource = dt;
gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
}
else
UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -227,6 +226,7 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
}
else
{
@@ -243,6 +243,7 @@
gcMx2.BindingContext = new BindingContext();
gcMx2.DataSource = dt1;
gcMx2.ForceInitialize();
+ gvMx2.BestFitColumns();
}
else
{
--
Gitblit v1.9.3