Merge remote-tracking branch 'origin/master'

啊鑫

2024-11-05 8dfc8d054b5b14e3fcde6415dd22cedf10c09915

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs

@@ -40,6 +40,7 @@
                    e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
                e.Graphics.DrawString(str, f, Brushes.Gray, r);
            };

        }

        /// <summary>
@@ -133,7 +134,6 @@
                MsgHelper.Warning("提示：" + ex.Message);
            }
        }

        private void getModel(string strGuid, bool isEdit, int tabIdx)
        {
            if (string.IsNullOrEmpty(strGuid))