From 85ecc95bfcfd7276107794bae4b635bc09495136 Mon Sep 17 00:00:00 2001
From: tdx <tdx@local>
Date: Sat, 14 Jun 2025 14:29:24 +0000
Subject: [PATCH] SVN r733

SVN-Revision: r733
---
 插件库/Lskj.PubBomImportNew/DllBaseClass.cs | 46 +++++++--------------
 1 file changed, 15 insertions(+), 31 deletions(-)

diff --git a/插件库/Lskj.PubBomImportNew/DllBaseClass.cs b/插件库/Lskj.PubBomImportNew/DllBaseClass.cs
index 5994345..87c6951 100644
--- a/插件库/Lskj.PubBomImportNew/DllBaseClass.cs
+++ b/插件库/Lskj.PubBomImportNew/DllBaseClass.cs
@@ -36,7 +36,7 @@ namespace Lskj.PubBomImportNew
         {
             try
             {
-                FrmMain main = new FrmMain();
+                FrmMain2 main = new FrmMain2();
                 this.SubForm = main;
                 main.Model = new DynamicBomImportNew(obj);
             }
@@ -53,51 +53,35 @@ namespace Lskj.PubBomImportNew
     public class DynamicBomImportNew : DynamicModel
     {
         /// <summary>
-        /// 标题行
+        /// 模块编号
         /// </summary>
-        public string FirstRowIndex = "";
+        public string ModelCode = "";
         /// <summary>
-        /// 结束标识
+        /// 主键名
         /// </summary>
-        public string EndTableCond = "";
+        public string primkey = "";
         /// <summary>
-        /// sheet名称
+        /// 主键值
         /// </summary>
-        public string SheetName = "";
+        public string keyvalue = "";
         /// <summary>
-        /// 字段对照
+        /// 起始行号
         /// </summary>
-        public string MainFieldDic = "";
+        public string stratRowHand = "";
         /// <summary>
-        /// 读取筛选条件
+        /// 终止行号
         /// </summary>
-        public string ReadTableCond = "";
-        /// <summary>
-        /// 忽略合并明细列标题行
-        /// </summary>
-        public bool CustomerServiceApp = false;
-        /// <summary>
-        /// 模块编码
-        /// </summary>
-        public string SaveModuleCode = "";
+        public string endRowHand = "";
+      
         public DynamicBomImportNew(string[] args)
             : base(args)
         {
             if (args.Length > 5 && !string.IsNullOrWhiteSpace(args[5]))
             {
-                FirstRowIndex = args[5] + "";
+                ModelCode = args[5] + "";
             }
             if (args.Length > 6 && !string.IsNullOrWhiteSpace(args[6]))
             {
-                EndTableCond = args[6] + "";
+                primkey = args[6] + "";
             }
-            if (args.Length > 7 && !string.IsNullOrWhiteSpace(args[7]))
-            {
-                SheetName = args[7] + "";
-            }
-            if (args.Length > 8 && !string.IsNullOrWhiteSpace(args[8]))
-            {
-                MainFieldDic = args[8] + "";
-            }
-            if (args.Length > 9 && !string.IsNullOrWhiteSpace(args[9]))
-            {
\ No newline at end of file
+            if (args.Length > 7 && !string.IsNull
\ No newline at end of file