From 39c64cd476459aab61030d163cab0841f7dc951b Mon Sep 17 00:00:00 2001
From: cyf <cyf@local>
Date: Thu, 20 Nov 2025 09:03:57 +0000
Subject: [PATCH] SVN r1049

SVN-Revision: r1049
---
 插件库/Lskj.Model/BaseAuditModel.cs    |   9 +++++++++
 插件库/Lskj.Model/BaseflowTypeModel.cs | Bin 823 -> 1022 bytes
 插件库/Lskj.Model/BillAuditModel.cs    |  10 +++++++++-
 插件库/Lskj.Model/BillModel.cs         |  12 +++++++++++-
 插件库/Lskj.Model/DynamicModel.cs      |  23 ++++++++++++++++++++++-
 插件库/Lskj.Model/ERPInfo.cs           |   2 +-
 6 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/插件库/Lskj.Model/BaseAuditModel.cs b/插件库/Lskj.Model/BaseAuditModel.cs
index c41607b..9efbfac 100644
--- a/插件库/Lskj.Model/BaseAuditModel.cs
+++ b/插件库/Lskj.Model/BaseAuditModel.cs
@@ -28,3 +28,12 @@ namespace Lskj.Model
         /// </summary>
         /// <value>The name of the step over.</value>
         public string StepOverName { get { return this.PrefixKey + "stepover"; } }
+        /// <summary>
+        /// 返退标记
+        /// </summary>
+        /// <value>The back selected.</value>
+        public string BackSelected { get; set; }
+        /// <summary>
+        /// 滚动条显示
+        /// </summary>
+        /// <param name="rowItem"></param
\ No newline at end of file
diff --git a/插件库/Lskj.Model/BaseflowTypeModel.cs b/插件库/Lskj.Model/BaseflowTypeModel.cs
index e09edab016dfc33efda5bf89dd741510dd61ec28..9935a3fd9505a21d8a05d9d13b0e0fd27dc9909f 100644
GIT binary patch
literal 1022
zcmb1;W|k5akgVa7<g3Xn%87}Lfq(=9SuleE2$pvR+%q_Mw&!^Jll_G=r<^+wW4T1J
z(XGAb{ci7j3zolGD1CDADXzO0y|RVg_1QXSEtp`~WvdvtvDByPex88>lOE$9orw!M
zR?5gQbIj>*nDD4pXRR5()y9sbH5azXBxQfsJAU)<xrkSnepTh#AA9a;bMwA%bEa{$
zgjiqBsgA=BGq?pF$}6py^yb+=Gl6;LKmBi<U-_`4OEKPUruDSAp3Qq6IdJw|D(KD2
zUf}fAp~ODl);0W6(34qL)~g6hNqKl?e3Fa&&F9DeDCX3pu)^J(?_OHH5p>j3cWTzL
zx4!IpK_y~0>xZ4P-qi;CYWYje^V<~bmM`y9VQZ^?8oy#6mwT6wROO10rOWx2YosPi
z9b>uK{^m}lZC3KZS5Gc`Yc+p6_*m3TusvEm_3|8x0!66{TLQiADC~Q4OKn+4qWSsM
z@|DaFWN&Ilcb)X?HesGM?bUBro>OnuGTr;f6q2#u;iJM|KFxJZqRB$0o3C)(->QDa
zK8Z)jLvhFN_KJUIt9GTZTob7f_!4*b<DDy)|A~B`cc&;MdfVZ%-m($CW^8^Zj8@HR
zSkb@xaKq68_bq89xjN3P`y4Eu{d%{k@cYxio{})zg-<rKUA(L6(4+TXxWy`I+wGFH
ztqNCK&1Pi(%#*&Qn(zO)`eECg-3cnwR?M!qnCX9ob$!*OM-4kdWf#~St`e&0dlK0#
zP$$7~<++4Y@t1gwRab<~&DcV1w!N4wA$g+SUQT&K<%x+uY+mu}&dysAylJt<T)B9y
z6LZ=gTy^MQJWtmBX1GiCmf2fYEq?lZ(xLN5Z|?f@ch%)9JnP@jI52C`d!=bg3uma;
z#rm|12V7K}bb~3pL8!B}{L7LTLZU~XC-JOs3A9^#=Xd{UJ+8)|HxoWQo@<;PA0c6L
zt6O;1HX+58Uq9SCXcg<8WBz#0;{6}9_sd3Tif*u<CmyTG%6$2LK)vYyQGg=^0P=8q
AAOHXW

literal 823
zcmaixzfQw25XN^u#VJ!Oqzo`dECdNvDhv=N#NZ|en7VebT|yM)$ryMfUIDw<Nt86I
zm)PHZzsvpk{r=f&CSKv8)&_S88NT9Fa*nxSQt0>w1uB-09M{y)k+f#wV<ctxWfDRJ
z-JvdNj<D9-_xM&8$Vo#0pxkdb%OU4fYq+8sU%0HYy2O8vbwJbGm@vSK#DRz7X>FA2
z#8@n~spsMw#<@#<Dt>3Ho%6^N)uTo=7k4#mv9>*rYMk`8Saz1Ccenl3H#Y^{=<j6(
zN>(eox?!I1Q};D*OvkK%OGu^oL}lVku7tTbUwH5-Vny@}XAnipzMl>a<FpAnAZQ*t
nLWLm@si2*v+~|*yPM@d4Qif#E<|)6bA>^eA(;imUl9v1d19<nz

diff --git a/插件库/Lskj.Model/BillAuditModel.cs b/插件库/Lskj.Model/BillAuditModel.cs
index 169c176..f3167f5 100644
--- a/插件库/Lskj.Model/BillAuditModel.cs
+++ b/插件库/Lskj.Model/BillAuditModel.cs
@@ -41,4 +41,12 @@ namespace Lskj.Model
         /// 返回标记
         /// </summary>
         /// <value>The back selected.</value>
-        public b
\ No newline at end of file
+        public bool SaveRefresh { get; set; }
+        /// <summary>
+        /// 保存成功才刷新
+        /// </summary>
+        public bool SaveSuccessfullyRefresh;
+        /// <summary>
+        /// 审核时保存附加模块
+        /// </summary>
+        public bool ReviewSaveAdditional
\ No newline at end of file
diff --git a/插件库/Lskj.Model/BillModel.cs b/插件库/Lskj.Model/BillModel.cs
index 427995b..2af79ab 100644
--- a/插件库/Lskj.Model/BillModel.cs
+++ b/插件库/Lskj.Model/BillModel.cs
@@ -411,6 +411,14 @@ namespace Lskj.Model
         ///单据来源控件FieldName（设置后界面上不显示来源和来源明细）
         /// </summary>
         public string BillSourceControlName;
+        /// <summary>
+        ///单据明细拖拽条件（为树表格时推拽改变父节点和来源明细中推拽内容上去）
+        /// </summary>
+        public string TreeTableDragCondition;
+        /// <summary>
+        ///是否固定替换（默认为true，主表中固定后缀的控件会替换为固定的默认值）
+        /// </summary>
+        public bool isReplaceFixed;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="BillModel"/> class.
@@ -494,4 +502,6 @@ namespace Lskj.Model
             this.CodeExecuteParameter = rowItem.Table.Columns.Contains("CodeExecuteParameter") ? rowItem["CodeExecuteParameter"] + "" : "";
             //this.CenterMain = rowItem.Table.Columns.Contains("CenterMain") ? "1".Equals(rowItem["CenterMain"] + "") : false;
             this.ScanCodeModuleCode = rowItem.Table.Columns.Contains("ScanCodeModuleCode") ? rowItem["ScanCodeModuleCode"] + "" : "";
-            t
\ No newline at end of file
+            this.ScanCodeFixedPrefix = rowItem.Table.Columns.Contains("ScanCodeFixedPrefix") ? rowItem["ScanCodeFixedPrefix"] + "" : "";
+            this.RightModuleCode = rowItem.Table.Columns.Contains("RightModuleCode") ? rowItem["RightModuleCode"] + "" : "";
+            this.RefreshSelectedDe
\ No newline at end of file
diff --git a/插件库/Lskj.Model/DynamicModel.cs b/插件库/Lskj.Model/DynamicModel.cs
index 5e87611..eb1a711 100644
--- a/插件库/Lskj.Model/DynamicModel.cs
+++ b/插件库/Lskj.Model/DynamicModel.cs
@@ -698,6 +698,7 @@ namespace Lskj.Model
         /// </summary>
         public string StepOver;
 
+
         public DynamicPubAccraditionPopModel(string[] args)
             : base(args)
         {
@@ -2645,4 +2646,24 @@ namespace Lskj.Model
             {
                 base.ModuleId = Convert.ToInt32(args[5]);
             }
-            if (args.
\ No newline at end of file
+            if (args.Length > 6 && !string.IsNullOrWhiteSpace(args[6]))
+            {
+                base.ModuleCode = args[6];
+            }
+            if (args.Length > 10)
+            {
+                this.Params = new string[args.Length];
+                for (int i = 10; i < args.Length; i++)
+                {
+                    Params[i - 10] = args[i];
+                }
+            }
+            if (!string.IsNullOrEmpty(args[args.Length - 1]))
+            {
+                try
+                {
+                    JObject rowObject = JsonConvert.DeserializeObject<JObject>(args[args.Length - 1]);
+                    JArray jArray = new JArray();
+                    jArray.Add(rowObject);
+                    DataTable dataTable = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(jArray));
+                
\ No newline at end of file
diff --git a/插件库/Lskj.Model/ERPInfo.cs b/插件库/Lskj.Model/ERPInfo.cs
index b4b525c..fd1048a 100644
--- a/插件库/Lskj.Model/ERPInfo.cs
+++ b/插件库/Lskj.Model/ERPInfo.cs
@@ -264,7 +264,7 @@ namespace Lskj.Model
         /// </summary>
         public string MrpTag = "";
         /// <summary>  
-        /// 记录本机MAC地址（每次获取速度很慢）
+        /// 记录本机MAC地址（只记录初始获取的，每次获取导致速度很慢）
         /// </summary>  
         public string RecordMAC = "";