SVN r780

SVN-Revision: r780

插件库/Lskj.PubBill/BillModule.cs

@@ -2397,7 +2397,7 @@ namespace Lskj.PubBill
 
             }
 
-
+            if (ScanCodeTextEdit != null) ScanCodeTextEdit.Focus();
             this._waterMark = new WaterMark(this.BillModel.MasterPreFix, null);
         }
         /// <summary>
@@ -2521,7 +2521,7 @@ namespace Lskj.PubBill
                     this.gcMain.GridView.OptionsBehavior.Editable = true;
                     this.BillModel.SaveState = false;
                 }
-
+                if (ScanCodeTextEdit != null) ScanCodeTextEdit.Focus();
 
             }
             catch (Exception ex)
@@ -3103,6 +3103,7 @@ namespace Lskj.PubBill
                         DelphiHelper.LoadDelphiDll(printPath, printPath, printFile, tmpSql, tmpSql1, this.BillModel.PrintFileType, tmpSql2);
                     }
                     //LogUtil.WriteDebug(this.SysModel.ModuleCode, "打印", "单据打印：" + printFile.Replace(".rmf", "").Replace(".frx", ""), "打印格式：" + printFile);
+                    if (ScanCodeTextEdit != null) ScanCodeTextEdit.Focus();
                 }
                 catch (Exception ex)
                 {
@@ -6556,6 +6557,7 @@ namespace Lskj.PubBill
                 this.SetBillStatus(null);
                 this.ControlObj.ResetControlValue(this.BillModel.ManuallyTriggerCorrelation, true);
             }
+            if (ScanCodeTextEdit != null) ScanCodeTextEdit.Focus();
         }
 
         /// <summary>
@@ -6673,6 +6675,7 @@ namespace Lskj.PubBill
                         MessageUtil.Show("删除成功！");
                     }
                 }
+                if (ScanCodeTextEdit != null) ScanCodeTextEdit.Focus();
                 return;
             }
             catch (Exception ex)
@@ -6704,6 +6707,7 @@ namespace Lskj.PubBill
                     ToWithdrawRows.Clear();
                     this.RefreshSelectedSource();
                 }
+                if (ScanCodeTextEdit != null) ScanCodeTextEdit.Focus();
             }
             catch (Exception ex)
             {
@@ -6734,6 +6738,7 @@ namespace Lskj.PubBill
                         this.BillApply("");
                     }
                 }
+                if (ScanCodeTextEdit != null) ScanCodeTextEdit.Focus();
                 return;
             }
             catch (Exception ex)
@@ -7775,11 +7780,19 @@ namespace Lskj.PubBill
             {
                 this.pl_input.Controls.Clear();
                 this.pl_input.Visible = false;
+
+                LabelControl label = new LabelControl();
+                label.Font = new Font("宋体", 12F);
+                label.Text = "串号扫描";
+                label.Top = (pl_main_bottom.Height - label.Height) / 2;
+                label.Left = 10;
+                label.Parent = pl_main_bottom;
+
                 this.ScanCodeTextEdit = new TextEdit();
                 ScanCodeTextEdit.Height = this.pl_input.Height;
                 ScanCodeTextEdit.Width = this.pl_input.Width;
                 ScanCodeTextEdit.Properties.Appearance.Font = new Font("宋体", 10.5F);
-                ScanCodeTextEdit.Left = 10;
+                ScanCodeTextEdit.Left = label.Width + 15;
                 ScanCodeTextEdit.Top = (pl_main_bottom.Height - ScanCodeTextEdit.Height) / 2;
                 ScanCodeTextEdit.BackColor = ColorTranslator.FromHtml("#FFC0CB");
                 ScanCodeTextEdit.KeyDown += Text_KeyDown;
@@ -8609,6 +8622,22 @@ namespace Lskj.PubBill
                         MessageUtil.Show("扫码长度过长，请重新扫码");
                         return;
                     }
+                    int Quantity = 0;
+
+                    FrmAdd frmAdd = new FrmAdd();
+                    if (frmAdd.ShowDialog() == DialogResult.OK)
+                    {
+                        Quantity = frmAdd.Quantity;
+
+                    }
+                    else
+                    {
+                        textEdit.EditValue = "";
+                        textEdit.Focus();
+                        return;
+                    }
+
+
                     //获取选中行
                     DataRow MainRowItem = gcMain.GridView.GetFocusedDataRow();
                     if (MainRowItem == null)
@@ -8616,6 +8645,8 @@ namespace Lskj.PubBill
                         MainRowItem = gcMain.GridControl.DataSourceTable().NewRow();
                     }
 
+
+
                     List<string> Parameter = this.BillModel.CodeExecuteParameter.Split(',').ToList();
                     for (int i = 0; i < Parameter.Count; i++)
                     {
@@ -8625,8 +8656,12 @@ namespace Lskj.PubBill
                             string DocumentColor = this.rdBlue.Checked ? "0" : this.rdRed.Checked ? "1" : "";
                             item = ReplaceHelper.ReplaceParamToValue(item, "{DocumentColor}", DocumentColor);
                         }
+                        if (item.Contains("{amount}"))
+                        {
+                            item = Quantity + "";
+                        }
                         //替换单据号  
-                        item = ReplaceHelper.ReplaceParamToValue(item, "{" + this.BillModel.PrimaryDetailKey + "}", this.lblOrderNo.Text);
+                        item = ReplaceHelper.ReplaceParamToValue(item, "{" + this.BillModel.PrimaryKey + "}", this.lblOrderNo.Text);
                         //替换选中行（没有就传空）
                         item = ReplaceHelper.ReplaceRowParam(MainRowItem, item);
                         //替换扫码内容
@@ -8639,6 +8674,7 @@ namespace Lskj.PubBill
                     List<SqlParameter> sqlParamList = new List<SqlParameter>();
                     string[] paramStr = procParams[0].Replace("{", "").Replace("}", "").Split(',');
                     SqlParameter pMsg = new SqlParameter("@msg", SqlDbType.VarChar, 2000);
+                    //SqlParameter pMaount = new SqlParameter("@maount", SqlDbType.Int);
 
                     for (int i = 0; i < paramStr.Length; i++)
                     {
@@ -8674,7 +8710,9 @@ namespace Lskj.PubBill
                     }
                     catch (Exception ex)
                     {
-                        result = 0;
+                        string Message = ErrorMessage.PromptErrorMessage(ex);
+                        MessageUtil.Show(Message, ex.Message);
+                        return;
                     }
                     int rValue = Convert.ToInt32(returnValue.Value);
                     string varchar = pMsg.Value + "";
@@ -8690,31 +8728,4 @@ namespace Lskj.PubBill
                             {
                                 //刷新返回的单据号
                                 this.lblOrderNo.Text = varchar;
-                                this.SetBillStatus(BillImpl.GetDataRowResult(string.Format("select * from {0} where {1}='{2}'", BillModel.MasterTable, BillModel.PrimaryKey, varchar)));
+                                this.SetBillStatus(BillImpl.GetDataRowResult(string.Format("select * from {0} where {1}='{2}
-                            }
-                            break;
-                        case -1:
-                            MessageUtil.Show(ResourceKeys.OperFault + "\n" + pMsg.Value);
-                            break;
-                    }
-
-                }
-                //刷新单据管理（sourceType=2）
-                foreach (XtraTabPage tabPage in this.xtc_left_container.TabPages)
-                {
-                    BillSourceUnionModel model = tabPage.Tag as BillSourceUnionModel;
-                    if (model != null && model.GridControlObj != null && model.ModelObj.SourceType == 2)
-                    {
-                        this.RefreshSource(model);
-                    }
-                }
-
-
-                //刷新下方配置的附件模块
-                this.OngcMainRowCellClick(null, null);
-                textEdit.EditValue = "";
-                textEdit.Focus();
-            }
-        }
-    }
-}

插件库/Lskj.PubBill/FrmAdd.Designer.cs

@@ -0,0 +1,55 @@
+
+namespace Lskj.PubBill
+{
+    partial class FrmAdd
+    {
+        /// <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.txtEdit = new DevExpress.XtraEditors.TextEdit();
+            this.label1 = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this.txtEdit.Properties)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // txtEdit
+            // 
+            this.txtEdit.EditValue = "1";
+            this.txtEdit.Location = new System.Drawing.Point(12, 39);
+            this.txtEdit.Name = "txtEdit";
+            this.txtEdit.Properties.Appearance.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.txtEdit.Properties.Appearance.Options.UseFont = true;
+            this.txtEdit.Size = new System.Drawing.Size(198, 28);
+            this.txtEdit.TabIndex = 25;
+            this.txtEdit.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtEdit_KeyDown);
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(10, 14);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(77, 12);
+            this.label1.TabIndex = 22;
+            this.label1.Text = "请输入

插件库/Lskj.PubBill/FrmAdd.cs

@@ -0,0 +1,77 @@
+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;
+using Lskj.Control;
+using Lskj.Business;
+using Lskj.Business.Impl;
+
+namespace Lskj.PubBill
+{
+    public partial class FrmAdd : BaseForm
+    {
+        public int Quantity;
+        public Label LabelObj { get { return label1; } }
+
+        public FrmAdd()
+        {
+            InitializeComponent();
+        }
+
+        /// <summary>
+        /// <para>说明：确定事件</para>
+        /// <para>创建人：龚宇超</para>
+        /// <para>创建日期：2019-06-21 </para>
+        /// <para>修改人：</para>
+        /// <para>修改日期：</para>
+        /// <para>修改备注：</para>
+        /// <para>版本：1.0</para>
+        /// </summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
+        void OnBtnOKClick(object sender, EventArgs e)
+        {
+            try
+            {
+                string text=this.txtEdit.Text;
+                if (string.IsNullOrWhiteSpace(text)) text = "0";
+                if (!this.IsDigitsOnly(text))
+                {
+                    MessageUtil.Show("请输入数字");
+                }
+
+                this.Quantity = int.Parse(text);
+                this.Close();
+                this.DialogResult = System.Windows.Forms.DialogResult.OK;
+            }
+            catch (Exception ex)
+            {
+                LogUtil.WriteError("确定事件出错！", ex);
+                string Message = ErrorMessage.PromptErrorMessage(ex);
+                MessageUtil.Show(Message, ex.Message);
+            }
+
+
+        }
+        /// <summary>
+        /// <para>说明：取消事件</para>
+        /// <para>创建人：龚宇超</para>
+        /// <para>创建日期：2019-06-21 </para>
+        /// <para>修改人：</para>
+        /// <para>修改日期：</para>
+        /// <para>修改备注：</para>
+        /// <para>版本：1.0</para>
+        /// </summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
+        void OnBtnCancelClick(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+
+        bool Is

插件库/Lskj.PubBill/FrmAdd.resx

@@ -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>