提交当前本机整理版本

插件库/Lskj.SweepCode/FrmMain.Designer.cs

@@ -29,7 +29,7 @@ namespace Lskj.SweepCode
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
             this.splitMain = new DevExpress.XtraEditors.SplitContainerControl();
             this.panelMain = new DevExpress.XtraEditors.PanelControl();
             this.splitLeftSide = new DevExpress.XtraEditors.SplitContainerControl();
@@ -391,7 +391,7 @@ namespace Lskj.SweepCode
             this.txtFixKey.Properties.AutoHeight = false;
             this.txtFixKey.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
             this.txtFixKey.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, DevExpress.XtraEditors.ImageLocation.MiddleCenter, global::Lskj.SweepCode.Properties.Resources.扫码, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject2, "", null, null, true)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, DevExpress.XtraEditors.ImageLocation.MiddleCenter, global::Lskj.SweepCode.Properties.Resources.扫码, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, "", null, null, true)});
             this.txtFixKey.Size = new System.Drawing.Size(347, 40);
             this.txtFixKey.TabIndex = 43;
             this.txtFixKey.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnKeyDown);

插件库/Lskj.SweepCode/FrmMain.cs

@@ -2387,4 +2387,32 @@ namespace Lskj.SweepCode
                     }
 
                 }
-           
+            }
+        }
+        #endregion
+        #endregion
+
+
+
+        /// <summary>
+        /// <para>说明：明细分割条移动保存位置</para>
+        /// <para>创建人：龚宇超</para>
+        /// <para>创建日期：2018-03-06 </para>
+        /// <para>修改人：</para>
+        /// <para>修改日期：</para>
+        /// <para>修改备注：</para>
+        /// <para>版本：1.0</para>
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
+        private void OnDetailsSplitterMoved(object sender, EventArgs e)
+        {
+            if (this._isInitFinish)
+            {
+                SplitContainerControl splitContainerControl = sender as SplitContainerControl;
+                IniHelper.Write(string.Format("Step_splitLeftSide_{0}", this.SysModel.ModuleCode), splitContainerControl.SplitterPosition + "");
+            }
+        }
+
+    }
+}

插件库/Lskj.SweepCode/Lskj.SweepCode.csproj

@@ -188,10 +188,6 @@
       <Project>{24E9A18A-BAF8-4052-809E-582B4FC6A8C4}</Project>
       <Name>Lskj.Interface.Api</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Lskj.Main\Lskj.Main.csproj">
-      <Project>{bca1e2b3-c4ab-4d2c-b519-3dcfdb5b83d6}</Project>
-      <Name>Lskj.Main</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Lskj.Model\Lskj.Model.csproj">
       <Project>{52bc40e0-c0c6-4f78-996b-cae028d209ca}</Project>
       <Name>Lskj.Model</Name>

插件库/Lskj.SweepCode/Properties/licenses.licx

@@ -0,0 +1,2 @@
+DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

插件库/Lskj.SweepCode/TabIntoControl.cs

@@ -963,4 +963,59 @@ namespace Lskj.SweepCode
                                 GridColumnModel model = col.Tag as GridColumnModel;
                                 string fieldValue = BaseImpl.GetDefaultValue(model.DefaultValue);
 
-                                if (!s
+                                if (!string.IsNullOrEmpty(model.DefaultValue))
+                                {
+                                    newRow[col.FieldName] = fieldValue;
+                                }
+                            }
+                        }
+                        table.Rows.Add(newRow);
+                    }
+
+                    this.ParentGridEx.GridView.ClearSelection();
+                    this.ParentGridEx.GridView.SelectRowHandler(table.Rows.Count - 1);
+                    this.ParentGridEx.GridView.UpdateCurrentRow();
+                    this.ParentGridEx.GridView.ShowEditor();
+                }
+            }
+            catch (Exception ex)
+            {
+                LogUtil.WriteError("表格拖拽错误", ex);
+                LogHelper.Instance.WriteError(ex);
+                //MessageUtil.Show(ResourceKeys.OperFault); 
+                string Message = ErrorMessage.PromptErrorMessage(ex);
+                MessageUtil.Show(Message, ex.Message);
+            }
+        }
+
+
+        /// <summary>
+        /// 设置主表选中行
+        /// </summary>
+        public void SetMainRow(DataRow dataRow) 
+        {
+            foreach (XtraTabPage page in this.TabIntoControlObj.TabPages) 
+            {
+                Object moduleObject = page.Controls.Cast<Object>().FirstOrDefault();
+                ModuleGridEx moduleGridEx = null;
+                if (moduleObject is ModuleGridEx)
+                {
+                    moduleGridEx = moduleObject as ModuleGridEx;
+                    if (moduleGridEx.SearchObj != null && moduleGridEx.SearchObj.SystemModel != null) 
+                    {
+                        moduleGridEx.SearchObj.SystemModel.maintabFocusedRow = dataRow;
+                    }
+                }
+
+            }
+
+
+        }
+
+
+
+
+
+
+    }
+}