SVN r788
SVN-Revision: r788
This commit is contained in:
cyf
+21
-22
@@ -28,7 +28,6 @@
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
this.ssc_main = new DevExpress.XtraEditors.SplitContainerControl();
|
||||
this.ssc_main_top = new DevExpress.XtraEditors.SplitContainerControl();
|
||||
this.pl_main = new DevExpress.XtraEditors.PanelControl();
|
||||
@@ -41,7 +40,7 @@
|
||||
this.pl_treeview_detault_search = new DevExpress.XtraEditors.PanelControl();
|
||||
this.panelControl4 = new DevExpress.XtraEditors.PanelControl();
|
||||
this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
|
||||
this.barManager1 = new DevExpress.XtraBars.BarManager(this.components);
|
||||
this.barManager1 = new DevExpress.XtraBars.BarManager();
|
||||
this.barDockControl1 = new DevExpress.XtraBars.BarDockControl();
|
||||
this.barDockControl2 = new DevExpress.XtraBars.BarDockControl();
|
||||
this.barDockControl3 = new DevExpress.XtraBars.BarDockControl();
|
||||
@@ -74,11 +73,11 @@
|
||||
this.rdRed = new System.Windows.Forms.RadioButton();
|
||||
this.pl_blue = new DevExpress.XtraEditors.PanelControl();
|
||||
this.rdBlue = new System.Windows.Forms.RadioButton();
|
||||
this.pMprint = new DevExpress.XtraBars.PopupMenu(this.components);
|
||||
this.pmFP = new DevExpress.XtraBars.PopupMenu(this.components);
|
||||
this.pmBillExp = new DevExpress.XtraBars.PopupMenu(this.components);
|
||||
this.pmBill = new DevExpress.XtraBars.PopupMenu(this.components);
|
||||
this.pMenu = new DevExpress.XtraBars.PopupMenu(this.components);
|
||||
this.pMprint = new DevExpress.XtraBars.PopupMenu();
|
||||
this.pmFP = new DevExpress.XtraBars.PopupMenu();
|
||||
this.pmBillExp = new DevExpress.XtraBars.PopupMenu();
|
||||
this.pmBill = new DevExpress.XtraBars.PopupMenu();
|
||||
this.pMenu = new DevExpress.XtraBars.PopupMenu();
|
||||
this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
|
||||
this.backgroundWorker2 = new System.ComponentModel.BackgroundWorker();
|
||||
((System.ComponentModel.ISupportInitialize)(this.ssc_main)).BeginInit();
|
||||
@@ -388,11 +387,11 @@
|
||||
//
|
||||
this.btnPrint.AllowFocus = false;
|
||||
this.btnPrint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnPrint.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.btnPrint.Appearance.Font = new System.Drawing.Font("宋体", 10F);
|
||||
this.btnPrint.Appearance.Options.UseFont = true;
|
||||
this.btnPrint.Location = new System.Drawing.Point(1424, 11);
|
||||
this.btnPrint.Location = new System.Drawing.Point(1418, 11);
|
||||
this.btnPrint.Name = "btnPrint";
|
||||
this.btnPrint.Size = new System.Drawing.Size(67, 45);
|
||||
this.btnPrint.Size = new System.Drawing.Size(80, 40);
|
||||
this.btnPrint.TabIndex = 30;
|
||||
this.btnPrint.Text = "打印单据";
|
||||
this.btnPrint.Click += new System.EventHandler(this.btnPrint_Click);
|
||||
@@ -491,11 +490,11 @@
|
||||
//
|
||||
this.btnBillAdd.AllowFocus = false;
|
||||
this.btnBillAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnBillAdd.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.btnBillAdd.Appearance.Font = new System.Drawing.Font("宋体", 10F);
|
||||
this.btnBillAdd.Appearance.Options.UseFont = true;
|
||||
this.btnBillAdd.Location = new System.Drawing.Point(1136, 11);
|
||||
this.btnBillAdd.Location = new System.Drawing.Point(1074, 11);
|
||||
this.btnBillAdd.Name = "btnBillAdd";
|
||||
this.btnBillAdd.Size = new System.Drawing.Size(67, 45);
|
||||
this.btnBillAdd.Size = new System.Drawing.Size(80, 40);
|
||||
this.btnBillAdd.TabIndex = 19;
|
||||
this.btnBillAdd.Text = "新建单据";
|
||||
this.btnBillAdd.Click += new System.EventHandler(this.OnBillAddClick);
|
||||
@@ -504,11 +503,11 @@
|
||||
//
|
||||
this.btnBillApply.AllowFocus = false;
|
||||
this.btnBillApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnBillApply.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.btnBillApply.Appearance.Font = new System.Drawing.Font("宋体", 10F);
|
||||
this.btnBillApply.Appearance.Options.UseFont = true;
|
||||
this.btnBillApply.Location = new System.Drawing.Point(1352, 11);
|
||||
this.btnBillApply.Location = new System.Drawing.Point(1332, 11);
|
||||
this.btnBillApply.Name = "btnBillApply";
|
||||
this.btnBillApply.Size = new System.Drawing.Size(67, 45);
|
||||
this.btnBillApply.Size = new System.Drawing.Size(80, 40);
|
||||
this.btnBillApply.TabIndex = 25;
|
||||
this.btnBillApply.Text = "提交单据";
|
||||
this.btnBillApply.Click += new System.EventHandler(this.OnBillApplyClick);
|
||||
@@ -517,11 +516,11 @@
|
||||
//
|
||||
this.btnDelete.AllowFocus = false;
|
||||
this.btnDelete.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnDelete.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.btnDelete.Appearance.Font = new System.Drawing.Font("宋体", 10F);
|
||||
this.btnDelete.Appearance.Options.UseFont = true;
|
||||
this.btnDelete.Location = new System.Drawing.Point(1208, 11);
|
||||
this.btnDelete.Location = new System.Drawing.Point(1160, 11);
|
||||
this.btnDelete.Name = "btnDelete";
|
||||
this.btnDelete.Size = new System.Drawing.Size(67, 45);
|
||||
this.btnDelete.Size = new System.Drawing.Size(80, 40);
|
||||
this.btnDelete.TabIndex = 20;
|
||||
this.btnDelete.Text = "删除记录";
|
||||
this.btnDelete.Click += new System.EventHandler(this.OnDeleteClick);
|
||||
@@ -530,11 +529,11 @@
|
||||
//
|
||||
this.btnBillSave.AllowFocus = false;
|
||||
this.btnBillSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnBillSave.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.btnBillSave.Appearance.Font = new System.Drawing.Font("宋体", 10F);
|
||||
this.btnBillSave.Appearance.Options.UseFont = true;
|
||||
this.btnBillSave.Location = new System.Drawing.Point(1280, 11);
|
||||
this.btnBillSave.Location = new System.Drawing.Point(1246, 11);
|
||||
this.btnBillSave.Name = "btnBillSave";
|
||||
this.btnBillSave.Size = new System.Drawing.Size(67, 45);
|
||||
this.btnBillSave.Size = new System.Drawing.Size(80, 40);
|
||||
this.btnBillSave.TabIndex = 21;
|
||||
this.btnBillSave.Text = "保存单据";
|
||||
this.btnBillSave.Click += new System.EventHandler(this.OnBillSaveClick);
|
||||
|
||||
+6692
-6584
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,74 @@
|
||||
|
||||
namespace Lskj.PubBillSpecial
|
||||
{
|
||||
partial class FrmScanCodeAssociation
|
||||
{
|
||||
/// <summary>
|
||||
/// Required designer variable.
|
||||
/// </summary>
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
/// <summary>
|
||||
/// Clean up any resources being used.
|
||||
/// </summary>
|
||||
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Windows Form Designer generated code
|
||||
|
||||
/// <summary>
|
||||
/// Required method for Designer support - do not modify
|
||||
/// the contents of this method with the code editor.
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.plm_bottom = new DevExpress.XtraEditors.PanelControl();
|
||||
this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
|
||||
this.gcMain = new Lskj.Control.GridControlEx();
|
||||
((System.ComponentModel.ISupportInitialize)(this.plm_bottom)).BeginInit();
|
||||
this.plm_bottom.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// plm_bottom
|
||||
//
|
||||
this.plm_bottom.Controls.Add(this.simpleButton1);
|
||||
this.plm_bottom.Dock = System.Windows.Forms.DockStyle.Bottom;
|
||||
this.plm_bottom.Location = new System.Drawing.Point(0, 410);
|
||||
this.plm_bottom.Margin = new System.Windows.Forms.Padding(4);
|
||||
this.plm_bottom.Name = "plm_bottom";
|
||||
this.plm_bottom.Size = new System.Drawing.Size(800, 40);
|
||||
this.plm_bottom.TabIndex = 18;
|
||||
//
|
||||
// simpleButton1
|
||||
//
|
||||
this.simpleButton1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.simpleButton1.Appearance.Font = new System.Drawing.Font("宋体", 9F);
|
||||
this.simpleButton1.Appearance.Options.UseFont = true;
|
||||
this.simpleButton1.Location = new System.Drawing.Point(696, 6);
|
||||
this.simpleButton1.Margin = new System.Windows.Forms.Padding(4);
|
||||
this.simpleButton1.Name = "simpleButton1";
|
||||
this.simpleButton1.Size = new System.Drawing.Size(90, 30);
|
||||
this.simpleButton1.TabIndex = 41;
|
||||
this.simpleButton1.Text = "确定";
|
||||
this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
|
||||
//
|
||||
// gcMain
|
||||
//
|
||||
this.gcMain.AdapterObj = null;
|
||||
this.gcMain.BackColor = System.Drawing.Color.Transparent;
|
||||
this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.gcMain.Location = new System.Drawing.Point(0, 0);
|
||||
this.gcMain.Margin = new System.Windows.Forms.Padding(5);
|
||||
this.gcMain.Name = "gcMain";
|
||||
this.gcMain.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
|
||||
this.gcMain.Size = new System.Drawing.Size(800, 410);
|
||||
this.gcMain.TabIndex = 21;
|
||||
//
|
||||
// FrmScanC
|
||||
@@ -0,0 +1,50 @@
|
||||
using Lskj.Business.Impl;
|
||||
using Lskj.Control;
|
||||
using Lskj.Control.Model;
|
||||
using Lskj.Model;
|
||||
using Lskj.Util;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.Data;
|
||||
using System.Drawing;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace Lskj.PubBillSpecial
|
||||
{
|
||||
public partial class FrmScanCodeAssociation : BaseForm
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// 系统模块实体对象
|
||||
/// </summary>
|
||||
/// <value>The system model.</value>
|
||||
public ModuleModel SysModel { get; private set; }
|
||||
/// <summary>
|
||||
///主表条件控件
|
||||
/// </summary>
|
||||
public MyControl SearchMainObj;
|
||||
/// <summary>
|
||||
///扫码内容
|
||||
/// </summary>
|
||||
public string ScanCodeData;
|
||||
/// <summary>
|
||||
//选中的串码
|
||||
/// </summary>
|
||||
public string StringCodes;
|
||||
|
||||
public FrmScanCodeAssociation()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
public FrmScanCodeAssociation(DataRow modelRow, string scanCodeData)
|
||||
{
|
||||
InitializeComponent();
|
||||
this.ScanCodeData = scanCodeData;
|
||||
//根据传入的模块号获取模块信息
|
||||
this.SysModel = new ModuleModel(modelRow);
|
||||
DataTable mainGridColumns = BaseModuleImpl.GetBaseGridColumns(this.SysModel.ModeCode);
|
||||
this.gcMain.SetReadOnlyColu
|
||||
@@ -0,0 +1,120 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
</root>
|
||||
@@ -102,6 +102,12 @@
|
||||
<Compile Include="FrmBomSelect.Designer.cs">
|
||||
<DependentUpon>FrmBomSelect.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="FrmScanCodeAssociation.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="FrmScanCodeAssociation.Designer.cs">
|
||||
<DependentUpon>FrmScanCodeAssociation.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="FrmSource.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
@@ -135,6 +141,9 @@
|
||||
<EmbeddedResource Include="FrmMain.resx">
|
||||
<DependentUpon>FrmMain.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="FrmScanCodeAssociation.resx">
|
||||
<DependentUpon>FrmScanCodeAssociation.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="FrmSource.resx">
|
||||
<DependentUpon>FrmSource.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
|
||||
Reference in New Issue
Block a user