From dd3064d7f5bb6c7d570f21e87b29012bfd95b1d2 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 17 二月 2025 11:29:12 +0800
Subject: [PATCH] 生产退料

---
 DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs |  130 +++++++++++++++++++++++++++++--------------
 1 files changed, 88 insertions(+), 42 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs
index b6e07f3..4abb7a6 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();
@@ -102,6 +105,7 @@
             this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.lbGuid = new System.Windows.Forms.Label();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -140,7 +144,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 +191,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 +252,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 +291,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 +304,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 +317,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 +330,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 +338,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 +351,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 +369,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 +394,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 +420,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
             // 
@@ -453,7 +483,7 @@
             this.gv_boardItem.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_boardItem.AppearanceCell.Options.UseFont = true;
             this.gv_boardItem.Caption = "浜у搧缂栫爜";
-            this.gv_boardItem.FieldName = "boardItem";
+            this.gv_boardItem.FieldName = "itemNo";
             this.gv_boardItem.MinWidth = 25;
             this.gv_boardItem.Name = "gv_boardItem";
             this.gv_boardItem.OptionsColumn.AllowEdit = false;
@@ -492,7 +522,7 @@
             this.gv_outType.OptionsColumn.AllowEdit = false;
             this.gv_outType.Tag = "query_a.out_type";
             this.gv_outType.Visible = true;
-            this.gv_outType.VisibleIndex = 7;
+            this.gv_outType.VisibleIndex = 8;
             this.gv_outType.Width = 94;
             // 
             // lb_workNo
@@ -539,7 +569,7 @@
             this.gv_receiver.OptionsColumn.AllowEdit = false;
             this.gv_receiver.Tag = "query_a.receiver";
             this.gv_receiver.Visible = true;
-            this.gv_receiver.VisibleIndex = 10;
+            this.gv_receiver.VisibleIndex = 11;
             this.gv_receiver.Width = 94;
             // 
             // lb_outPart
@@ -563,7 +593,7 @@
             this.gv_outPart.OptionsColumn.AllowEdit = false;
             this.gv_outPart.Tag = "query_a.out_part";
             this.gv_outPart.Visible = true;
-            this.gv_outPart.VisibleIndex = 11;
+            this.gv_outPart.VisibleIndex = 12;
             this.gv_outPart.Width = 94;
             // 
             // gv_outDate
@@ -577,7 +607,7 @@
             this.gv_outDate.OptionsColumn.AllowEdit = false;
             this.gv_outDate.Tag = "query_a.out_date";
             this.gv_outDate.Visible = true;
-            this.gv_outDate.VisibleIndex = 6;
+            this.gv_outDate.VisibleIndex = 7;
             this.gv_outDate.Width = 120;
             // 
             // lb_checkDate
@@ -610,7 +640,7 @@
             this.gv_checkDate.OptionsColumn.AllowEdit = false;
             this.gv_checkDate.Tag = "query_a.check_date";
             this.gv_checkDate.Visible = true;
-            this.gv_checkDate.VisibleIndex = 9;
+            this.gv_checkDate.VisibleIndex = 10;
             this.gv_checkDate.Width = 120;
             // 
             // lb_checkUser
@@ -643,7 +673,7 @@
             this.gv_checkUser.OptionsColumn.AllowEdit = false;
             this.gv_checkUser.Tag = "query_a.check_user";
             this.gv_checkUser.Visible = true;
-            this.gv_checkUser.VisibleIndex = 8;
+            this.gv_checkUser.VisibleIndex = 9;
             this.gv_checkUser.Width = 94;
             // 
             // gv_reason
@@ -657,7 +687,7 @@
             this.gv_reason.OptionsColumn.AllowEdit = false;
             this.gv_reason.Tag = "query_a.reason";
             this.gv_reason.Visible = true;
-            this.gv_reason.VisibleIndex = 15;
+            this.gv_reason.VisibleIndex = 16;
             this.gv_reason.Width = 94;
             // 
             // lb_remark
@@ -690,7 +720,7 @@
             this.gv_remark.OptionsColumn.AllowEdit = false;
             this.gv_remark.Tag = "query_a.remark";
             this.gv_remark.Visible = true;
-            this.gv_remark.VisibleIndex = 14;
+            this.gv_remark.VisibleIndex = 15;
             this.gv_remark.Width = 94;
             // 
             // lb_createDate
@@ -723,7 +753,7 @@
             this.gv_createDate.OptionsColumn.AllowEdit = false;
             this.gv_createDate.Tag = "query_a.create_date";
             this.gv_createDate.Visible = true;
-            this.gv_createDate.VisibleIndex = 13;
+            this.gv_createDate.VisibleIndex = 14;
             this.gv_createDate.Width = 94;
             // 
             // lb_createBy
@@ -756,7 +786,7 @@
             this.gv_createBy.OptionsColumn.AllowEdit = false;
             this.gv_createBy.Tag = "query_a.create_by";
             this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 12;
+            this.gv_createBy.VisibleIndex = 13;
             this.gv_createBy.Width = 94;
             // 
             // lb_status
@@ -879,6 +909,7 @@
             this.gv_pbillNo,
             this.gv_boardItem,
             this.gridColumn1,
+            this.gridColumn6,
             this.gv_outDate,
             this.gv_outType,
             this.gv_checkUser,
@@ -899,6 +930,7 @@
             // gridColumn1
             // 
             this.gridColumn1.Caption = "浜у搧鍚嶇О";
+            this.gridColumn1.FieldName = "itemName";
             this.gridColumn1.MinWidth = 25;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
@@ -1048,6 +1080,16 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "浜у搧鍨嬪彿";
+            this.gridColumn6.FieldName = "itemModel";
+            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 6;
+            this.gridColumn6.Width = 94;
+            // 
             // UcBlclDj
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1111,7 +1153,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 +1215,10 @@
         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;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3