From e27f99ba36dd11fe8e50182bb40769fbd61de4f1 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 10 二月 2025 11:22:43 +0800
Subject: [PATCH] 生产工单细节
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 16 +++++
DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs | 27 +++++---
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs | 4 -
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs | 41 ++++++-------
DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs | 37 ++++++------
5 files changed, 70 insertions(+), 55 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
index a898d7f..c65a670 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
@@ -27,11 +27,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx1bld014 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1bld012 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
@@ -107,6 +107,7 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -123,7 +124,6 @@
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).BeginInit();
this.tabMxPage1.SuspendLayout();
@@ -494,10 +494,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1076,6 +1076,17 @@
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "缁勭粐";
+ this.gridColumn9.FieldName = "fSubsidiary";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Tag = "org.Fnamber";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 19;
+ this.gridColumn9.Width = 94;
+ //
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1113,7 +1124,6 @@
this.xtraTabPage2.Controls.Add(this.tabMx);
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
//
@@ -1263,17 +1273,6 @@
this.picCheckBox.TabIndex = 7;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
- //
- // gridColumn9
- //
- this.gridColumn9.Caption = "缁勭粐";
- this.gridColumn9.FieldName = "fSubsidiary";
- this.gridColumn9.MinWidth = 25;
- this.gridColumn9.Name = "gridColumn9";
- this.gridColumn9.Tag = "org.Fnamber";
- this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 19;
- this.gridColumn9.Width = 94;
//
// UcBlcl
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
index ede0783..4fafda5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
@@ -17,7 +17,6 @@
string _webServiceName = "MesItemBlManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
-
public string strType = "";
public UcBlcl(string _strType)
{
@@ -364,6 +363,7 @@
private void getPageList(int curPage)
{
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ _sbSqlWhere += " and a.bl008='"+ strType + "'";
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -529,7 +529,6 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e)
{
SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
@@ -541,7 +540,6 @@
gvMx1.SetFocusedRowCellValue("dwName", SelectedDataRow["dwName"]);
gvMx1.SetFocusedRowCellValue("dabGuid", SelectedDataRow["dabGuid"]);
}
-
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
var rowhandle = gvMx1.FocusedRowHandle;
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs
index 138e9db..b6e07f3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs
@@ -440,7 +440,7 @@
this.gv_pbillNo.AppearanceCell.Options.UseFont = true;
this.gv_pbillNo.Caption = "宸ュ崟鍗曞彿";
this.gv_pbillNo.FieldName = "pbillNo";
- this.gv_pbillNo.MinWidth = 50;
+ this.gv_pbillNo.MinWidth = 25;
this.gv_pbillNo.Name = "gv_pbillNo";
this.gv_pbillNo.OptionsColumn.AllowEdit = false;
this.gv_pbillNo.Tag = "query_a.pbill_no";
@@ -454,7 +454,7 @@
this.gv_boardItem.AppearanceCell.Options.UseFont = true;
this.gv_boardItem.Caption = "浜у搧缂栫爜";
this.gv_boardItem.FieldName = "boardItem";
- this.gv_boardItem.MinWidth = 50;
+ this.gv_boardItem.MinWidth = 25;
this.gv_boardItem.Name = "gv_boardItem";
this.gv_boardItem.OptionsColumn.AllowEdit = false;
this.gv_boardItem.Tag = "query_a.board_item";
@@ -487,7 +487,7 @@
this.gv_outType.AppearanceCell.Options.UseFont = true;
this.gv_outType.Caption = "鍑哄簱绫诲埆 ";
this.gv_outType.FieldName = "outType";
- this.gv_outType.MinWidth = 50;
+ this.gv_outType.MinWidth = 25;
this.gv_outType.Name = "gv_outType";
this.gv_outType.OptionsColumn.AllowEdit = false;
this.gv_outType.Tag = "query_a.out_type";
@@ -520,7 +520,7 @@
this.gv_workNo.AppearanceCell.Options.UseFont = true;
this.gv_workNo.Caption = "浠诲姟鍗曞彿";
this.gv_workNo.FieldName = "workNo";
- this.gv_workNo.MinWidth = 100;
+ this.gv_workNo.MinWidth = 25;
this.gv_workNo.Name = "gv_workNo";
this.gv_workNo.OptionsColumn.AllowEdit = false;
this.gv_workNo.Tag = "query_a.work_no";
@@ -534,7 +534,7 @@
this.gv_receiver.AppearanceCell.Options.UseFont = true;
this.gv_receiver.Caption = "棰嗘枡浜�";
this.gv_receiver.FieldName = "receiver";
- this.gv_receiver.MinWidth = 50;
+ this.gv_receiver.MinWidth = 25;
this.gv_receiver.Name = "gv_receiver";
this.gv_receiver.OptionsColumn.AllowEdit = false;
this.gv_receiver.Tag = "query_a.receiver";
@@ -558,7 +558,7 @@
this.gv_outPart.AppearanceCell.Options.UseFont = true;
this.gv_outPart.Caption = "棰嗘枡閮ㄩ棬 ";
this.gv_outPart.FieldName = "outPart";
- this.gv_outPart.MinWidth = 50;
+ this.gv_outPart.MinWidth = 25;
this.gv_outPart.Name = "gv_outPart";
this.gv_outPart.OptionsColumn.AllowEdit = false;
this.gv_outPart.Tag = "query_a.out_part";
@@ -572,7 +572,7 @@
this.gv_outDate.AppearanceCell.Options.UseFont = true;
this.gv_outDate.Caption = "鍑哄簱鏃ユ湡 ";
this.gv_outDate.FieldName = "outDate";
- this.gv_outDate.MinWidth = 120;
+ this.gv_outDate.MinWidth = 25;
this.gv_outDate.Name = "gv_outDate";
this.gv_outDate.OptionsColumn.AllowEdit = false;
this.gv_outDate.Tag = "query_a.out_date";
@@ -605,7 +605,7 @@
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡 ";
this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.MinWidth = 120;
+ this.gv_checkDate.MinWidth = 25;
this.gv_checkDate.Name = "gv_checkDate";
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
@@ -638,7 +638,7 @@
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "瀹℃牳浜� ";
this.gv_checkUser.FieldName = "checkUser";
- this.gv_checkUser.MinWidth = 50;
+ this.gv_checkUser.MinWidth = 25;
this.gv_checkUser.Name = "gv_checkUser";
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.check_user";
@@ -652,7 +652,7 @@
this.gv_reason.AppearanceCell.Options.UseFont = true;
this.gv_reason.Caption = "鍑哄簱鍘熷洜 ";
this.gv_reason.FieldName = "reason";
- this.gv_reason.MinWidth = 50;
+ this.gv_reason.MinWidth = 25;
this.gv_reason.Name = "gv_reason";
this.gv_reason.OptionsColumn.AllowEdit = false;
this.gv_reason.Tag = "query_a.reason";
@@ -685,7 +685,7 @@
this.gv_remark.AppearanceCell.Options.UseFont = true;
this.gv_remark.Caption = "澶囨敞淇℃伅 ";
this.gv_remark.FieldName = "remark";
- this.gv_remark.MinWidth = 50;
+ this.gv_remark.MinWidth = 25;
this.gv_remark.Name = "gv_remark";
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
@@ -718,7 +718,7 @@
this.gv_createDate.AppearanceCell.Options.UseFont = true;
this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 50;
+ this.gv_createDate.MinWidth = 25;
this.gv_createDate.Name = "gv_createDate";
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
@@ -751,7 +751,7 @@
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜�";
this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 50;
+ this.gv_createBy.MinWidth = 25;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
@@ -830,7 +830,7 @@
this.gv_itemOutNo.AppearanceCell.Options.UseFont = true;
this.gv_itemOutNo.Caption = "鍑哄簱鍗曞彿";
this.gv_itemOutNo.FieldName = "itemOutNo";
- this.gv_itemOutNo.MinWidth = 100;
+ this.gv_itemOutNo.MinWidth = 25;
this.gv_itemOutNo.Name = "gv_itemOutNo";
this.gv_itemOutNo.OptionsColumn.AllowEdit = false;
this.gv_itemOutNo.Tag = "query_a.item_out_no";
@@ -899,7 +899,7 @@
// gridColumn1
//
this.gridColumn1.Caption = "浜у搧鍚嶇О";
- this.gridColumn1.MinWidth = 120;
+ this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 5;
@@ -1048,16 +1048,15 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // Frm_MesItemBlDJ
+ // UcBlclDj
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1128, 682);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
- this.Name = "Frm_MesItemBlDJ";
- this.Text = "鐢熶骇琛ユ枡";
+ this.Name = "UcBlclDj";
+ this.Size = new System.Drawing.Size(1128, 682);
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs
index 300afe5..5fcfe9d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs
@@ -136,14 +136,15 @@
getModel(lbGuid.Text.Trim());
else
{
- _filterList.Clear();
- if (gridView1.ActiveFilter.Count > 0)
- {
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- }
- getPageList(1);
+ //_filterList.Clear();
+ //if (gridView1.ActiveFilter.Count > 0)
+ //{
+ // gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ // gridView1.ActiveFilter.Clear();
+ // gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ //}
+ //getPageList(1);
+ getPageList(this.pageBar1.CurrentPage);
}
}
@@ -296,12 +297,16 @@
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
- if (_rtn.rtnCode > 0)
+ if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
getModel(lbGuid.Text.Trim());
- else
- getPageList(this.pageBar1.CurrentPage);
+ }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ Form parentForm = this.FindForm();
+ UtilityHelper.SetCheckIco(gridView1, "statusChk", "checkUser", "checkDate", picCheckBox, parentForm, _inFieldValue.ToString());
}
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index 7ae5238..9562418 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -56,6 +56,7 @@
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_closeType = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_forceCloserid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_saleOrderEntryseq = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -392,7 +393,8 @@
this.gvMx1issueType,
this.gridColumn16,
this.gvMx1scraprate,
- this.gvMx1scrapqty});
+ this.gvMx1scrapqty,
+ this.gridColumn17});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -479,6 +481,16 @@
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 19;
this.gridColumn16.Width = 94;
+ //
+ // gridColumn17
+ //
+ this.gridColumn17.Caption = "鐢ㄦ枡娓呭崟";
+ this.gridColumn17.FieldName = "typebTxt";
+ this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.Name = "gridColumn17";
+ this.gridColumn17.Visible = true;
+ this.gridColumn17.VisibleIndex = 22;
+ this.gridColumn17.Width = 94;
//
// gv_closeType
//
@@ -1034,6 +1046,7 @@
// gridColumn9
//
this.gridColumn9.Caption = "鐢ㄦ枡娓呭崟鐘舵��";
+ this.gridColumn9.FieldName = "typebTxt";
this.gridColumn9.MaxWidth = 60;
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
@@ -1455,5 +1468,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
}
}
\ No newline at end of file
--
Gitblit v1.9.3