From c7bf48f709dbddd7744c2d005686606bc168a88a Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 25 十月 2025 09:13:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 7a82dca..a18c74c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -401,7 +401,7 @@
             // 
             this.gv_createBy.AppearanceCell.Options.UseFont = true;
             this.gv_createBy.Caption = "鍒涘缓浜�";
-            this.gv_createBy.FieldName = "createBy";
+            this.gv_createBy.FieldName = "cjPeople";
             this.gv_createBy.Name = "gv_createBy";
             this.gv_createBy.OptionsColumn.AllowEdit = false;
             this.gv_createBy.Tag = "query_a.create_by";
@@ -425,7 +425,7 @@
             // 
             this.gv_checkUser.AppearanceCell.Options.UseFont = true;
             this.gv_checkUser.Caption = "鎻愪氦妫�楠屼汉";
-            this.gv_checkUser.FieldName = "checkUser";
+            this.gv_checkUser.FieldName = "shPeople";
             this.gv_checkUser.Name = "gv_checkUser";
             this.gv_checkUser.OptionsColumn.AllowEdit = false;
             this.gv_checkUser.Tag = "query_a.check_user";
@@ -520,7 +520,7 @@
             // gridColumn23
             // 
             this.gridColumn23.Caption = "鍒拌揣鏁伴噺";
-            this.gridColumn23.FieldName = "鍒拌揣鎬婚噺";
+            this.gridColumn23.FieldName = "qtyDh";
             this.gridColumn23.MinWidth = 24;
             this.gridColumn23.Name = "gridColumn23";
             this.gridColumn23.Visible = true;
@@ -530,7 +530,7 @@
             // gridColumn24
             // 
             this.gridColumn24.Caption = "妫�楠屾暟閲�";
-            this.gridColumn24.FieldName = "妫�楠屾�婚噺";
+            this.gridColumn24.FieldName = "jyQty";
             this.gridColumn24.MinWidth = 24;
             this.gridColumn24.Name = "gridColumn24";
             this.gridColumn24.Width = 90;
@@ -538,7 +538,7 @@
             // gridColumn25
             // 
             this.gridColumn25.Caption = "鍏ュ簱鏁伴噺";
-            this.gridColumn25.FieldName = "鍏ュ簱鎬婚噺";
+            this.gridColumn25.FieldName = "rkQty";
             this.gridColumn25.MinWidth = 24;
             this.gridColumn25.Name = "gridColumn25";
             this.gridColumn25.Visible = true;
@@ -548,7 +548,7 @@
             // gridColumn26
             // 
             this.gridColumn26.Caption = "鎵撳嵃鏁伴噺";
-            this.gridColumn26.FieldName = "鎵撳嵃鎬婚噺";
+            this.gridColumn26.FieldName = "printQty";
             this.gridColumn26.MinWidth = 24;
             this.gridColumn26.Name = "gridColumn26";
             this.gridColumn26.Width = 90;

--
Gitblit v1.9.3