chenxy 6 лет назад
Родитель
Сommit
45da9b109f

Разница между файлами не показана из-за своего большого размера
+ 759 - 737
DK.Client/PMModule/F_PM_0501.Designer.cs


+ 21 - 3
DK.Client/PMModule/F_PM_0501.cs

@@ -93,7 +93,8 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 			{
 				// 加载权限
 				FormPermissionManager.FormPermissionControl(this.Name, this,
-					LogInUserInfo.CurrentUser.CurrentUserEntity.UserRightData, LogInUserInfo.CurrentUser.CurrentUserEntity.FunctionData);
+					LogInUserInfo.CurrentUser.CurrentUserEntity.UserRightData,
+                    LogInUserInfo.CurrentUser.CurrentUserEntity.FunctionData);
 				// 设置表格不自动创建列
 				this.dgvProduction.AutoGenerateColumns = false;
 				#region 设置下拉列表框的数据源
@@ -427,6 +428,23 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 			result.GoodsTypeCode = this.scbGoodsType.SearchedValue + "";
 			return result;
 		}
-		#endregion
-	}
+        #endregion
+
+        #region 漏扫补件
+        private void tsbReLoad_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                F_PM_0504 frmPM0502 = new F_PM_0504(_currentProcedureID, _fromTitle);
+                DialogResult dialogResult = frmPM0502.ShowDialog();
+            }
+            catch (Exception ex)
+            {
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(this.ToString(),
+                    System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+            }
+        }
+        #endregion
+    }
 }

+ 6 - 0
DK.Client/PMModule/F_PM_0501.resx

@@ -233,9 +233,15 @@
   <metadata name="KilnCarPositionName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Kilncarbatchno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="LogoCodeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>46</value>
+  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAgBAAAAAAAAAAAAAAAAAAAAAA

+ 739 - 0
DK.Client/PMModule/F_PM_0504.Designer.cs

@@ -0,0 +1,739 @@
+namespace Dongke.IBOSS.PRD.Client.PMModule
+{
+    partial class F_PM_0504
+    {
+        /// <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()
+        {
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_PM_0504));
+            this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
+            this.tsbtnDelete = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
+            this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
+            this.cmbKilnCarPosition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
+            this.lblUserID = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.c_Label1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.c_Label2 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.lblBarcode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.txtKilnCarCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.txtUserCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.txtBarcode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.dgvProduction = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.KilnCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.KilnCarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.KilnCarPosition = new System.Windows.Forms.DataGridViewComboBoxColumn();
+            this.GoodsID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Status = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.UserID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.UserName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.KilnID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.KilnCarName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.KilnName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.KilnCarID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GroutingUserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.IsPublicBody = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.GroutingNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.btnCancel = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+            this.btnSave = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.txtKiln = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.lblKiln = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.dtpFiredDate = new Dongke.WinForm.Controls.DtpDate();
+            this.c_Label3 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.c_Label4 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.txtFiredBatchNo = new Dongke.WinForm.Controls.TxtNumerical();
+            this.btnOk = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+            this.tsrOperate.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvProduction)).BeginInit();
+            this.groupBox1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // tsrOperate
+            // 
+            this.tsrOperate.AutoSize = false;
+            this.tsrOperate.BackColor = System.Drawing.Color.Transparent;
+            this.tsrOperate.BackgroundImage = global::Dongke.IBOSS.PRD.Client.PMModule.Properties.Resources.functionbackground;
+            this.tsrOperate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsrOperate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tsbtnDelete,
+            this.toolStripSeparator1,
+            this.tsbtnAdaptive,
+            this.tsbtnClose});
+            this.tsrOperate.Location = new System.Drawing.Point(0, 0);
+            this.tsrOperate.Name = "tsrOperate";
+            this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
+            this.tsrOperate.ShowItemToolTips = false;
+            this.tsrOperate.Size = new System.Drawing.Size(927, 35);
+            this.tsrOperate.TabIndex = 0;
+            this.tsrOperate.Text = "toolStrip1";
+            // 
+            // tsbtnDelete
+            // 
+            this.tsbtnDelete.AutoSize = false;
+            this.tsbtnDelete.Enabled = false;
+            this.tsbtnDelete.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsbtnDelete.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbtnDelete.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbtnDelete.Name = "tsbtnDelete";
+            this.tsbtnDelete.Size = new System.Drawing.Size(60, 25);
+            this.tsbtnDelete.Text = "删除(&D)";
+            this.tsbtnDelete.Click += new System.EventHandler(this.tsbtnDelete_Click);
+            // 
+            // toolStripSeparator1
+            // 
+            this.toolStripSeparator1.AutoSize = false;
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
+            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);
+            // 
+            // tsbtnAdaptive
+            // 
+            this.tsbtnAdaptive.AutoSize = false;
+            this.tsbtnAdaptive.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsbtnAdaptive.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbtnAdaptive.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbtnAdaptive.Name = "tsbtnAdaptive";
+            this.tsbtnAdaptive.Size = new System.Drawing.Size(90, 25);
+            this.tsbtnAdaptive.Text = "自适应列宽(&A)";
+            this.tsbtnAdaptive.Click += new System.EventHandler(this.tsbtnAdaptive_Click);
+            // 
+            // tsbtnClose
+            // 
+            this.tsbtnClose.AutoSize = false;
+            this.tsbtnClose.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsbtnClose.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbtnClose.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbtnClose.Name = "tsbtnClose";
+            this.tsbtnClose.Size = new System.Drawing.Size(60, 25);
+            this.tsbtnClose.Text = "关闭(&X)";
+            this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
+            // 
+            // cmbKilnCarPosition
+            // 
+            this.cmbKilnCarPosition.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.cmbKilnCarPosition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cmbKilnCarPosition.FormattingEnabled = true;
+            this.cmbKilnCarPosition.Location = new System.Drawing.Point(190, 47);
+            this.cmbKilnCarPosition.Name = "cmbKilnCarPosition";
+            this.cmbKilnCarPosition.Size = new System.Drawing.Size(100, 20);
+            this.cmbKilnCarPosition.TabIndex = 12;
+            // 
+            // lblUserID
+            // 
+            this.lblUserID.AutoSize = true;
+            this.lblUserID.BackColor = System.Drawing.Color.Transparent;
+            this.lblUserID.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblUserID.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.lblUserID.IsMustInput = true;
+            this.lblUserID.Location = new System.Drawing.Point(6, 51);
+            this.lblUserID.Name = "lblUserID";
+            this.lblUserID.Size = new System.Drawing.Size(53, 12);
+            this.lblUserID.TabIndex = 9;
+            this.lblUserID.Text = "生产工号";
+            // 
+            // c_Label1
+            // 
+            this.c_Label1.AutoSize = true;
+            this.c_Label1.BackColor = System.Drawing.Color.Transparent;
+            this.c_Label1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c_Label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.c_Label1.IsMustInput = true;
+            this.c_Label1.Location = new System.Drawing.Point(131, 24);
+            this.c_Label1.Name = "c_Label1";
+            this.c_Label1.Size = new System.Drawing.Size(53, 12);
+            this.c_Label1.TabIndex = 2;
+            this.c_Label1.Text = "窑炉车号";
+            // 
+            // c_Label2
+            // 
+            this.c_Label2.AutoSize = true;
+            this.c_Label2.BackColor = System.Drawing.Color.Transparent;
+            this.c_Label2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c_Label2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.c_Label2.IsMustInput = true;
+            this.c_Label2.Location = new System.Drawing.Point(131, 51);
+            this.c_Label2.Name = "c_Label2";
+            this.c_Label2.Size = new System.Drawing.Size(53, 12);
+            this.c_Label2.TabIndex = 11;
+            this.c_Label2.Text = "窑车位置";
+            // 
+            // lblBarcode
+            // 
+            this.lblBarcode.AutoSize = true;
+            this.lblBarcode.BackColor = System.Drawing.Color.Transparent;
+            this.lblBarcode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblBarcode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.lblBarcode.IsMustInput = true;
+            this.lblBarcode.Location = new System.Drawing.Point(296, 51);
+            this.lblBarcode.Name = "lblBarcode";
+            this.lblBarcode.Size = new System.Drawing.Size(53, 12);
+            this.lblBarcode.TabIndex = 13;
+            this.lblBarcode.Text = "产品条码";
+            // 
+            // txtKilnCarCode
+            // 
+            this.txtKilnCarCode.BackColor = System.Drawing.SystemColors.Window;
+            this.txtKilnCarCode.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtKilnCarCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+            this.txtKilnCarCode.ErrorMessage = "";
+            this.txtKilnCarCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtKilnCarCode.Location = new System.Drawing.Point(190, 20);
+            this.txtKilnCarCode.MaxLength = 50;
+            this.txtKilnCarCode.Name = "txtKilnCarCode";
+            this.txtKilnCarCode.Size = new System.Drawing.Size(100, 21);
+            this.txtKilnCarCode.TabIndex = 3;
+            this.txtKilnCarCode.Validating += new System.ComponentModel.CancelEventHandler(this.txtKilnCarCode_Validating);
+            // 
+            // txtUserCode
+            // 
+            this.txtUserCode.BackColor = System.Drawing.SystemColors.Window;
+            this.txtUserCode.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtUserCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+            this.txtUserCode.Enabled = false;
+            this.txtUserCode.ErrorMessage = "";
+            this.txtUserCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtUserCode.Location = new System.Drawing.Point(65, 47);
+            this.txtUserCode.MaxLength = 20;
+            this.txtUserCode.Name = "txtUserCode";
+            this.txtUserCode.Size = new System.Drawing.Size(60, 21);
+            this.txtUserCode.TabIndex = 10;
+            this.txtUserCode.MouseClick += new System.Windows.Forms.MouseEventHandler(this.txtUserCode_MouseClick);
+            this.txtUserCode.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtUserCode_KeyPress);
+            this.txtUserCode.Validating += new System.ComponentModel.CancelEventHandler(this.txtUserCode_Validating);
+            // 
+            // txtBarcode
+            // 
+            this.txtBarcode.BackColor = System.Drawing.SystemColors.Window;
+            this.txtBarcode.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtBarcode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+            this.txtBarcode.ErrorMessage = "";
+            this.txtBarcode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtBarcode.Location = new System.Drawing.Point(355, 47);
+            this.txtBarcode.MaxLength = 11;
+            this.txtBarcode.Name = "txtBarcode";
+            this.txtBarcode.Size = new System.Drawing.Size(100, 21);
+            this.txtBarcode.TabIndex = 14;
+            this.txtBarcode.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtBarcode_KeyPress);
+            // 
+            // dgvProduction
+            // 
+            this.dgvProduction.AllowUserToAddRows = false;
+            this.dgvProduction.AllowUserToDeleteRows = false;
+            this.dgvProduction.AllowUserToModifyRows = true;
+            this.dgvProduction.AllowUserToOrderColumns = true;
+            dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvProduction.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7;
+            this.dgvProduction.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.dgvProduction.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.dgvProduction.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
+            this.dgvProduction.CellHeight = 23;
+            this.dgvProduction.ChildNodeColumnName = null;
+            this.dgvProduction.ChildNodeColumnText = null;
+            this.dgvProduction.ColumnDeep = 1;
+            this.dgvProduction.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle8.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvProduction.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
+            this.dgvProduction.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvProduction.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.BarCode,
+            this.KilnCode,
+            this.KilnCarCode,
+            this.KilnCarPosition,
+            this.GoodsID,
+            this.Status,
+            this.GoodsCode,
+            this.GoodsName,
+            this.UserID,
+            this.UserCode,
+            this.UserName,
+            this.KilnID,
+            this.KilnCarName,
+            this.KilnName,
+            this.KilnCarID,
+            this.MouldCode,
+            this.GroutingDate,
+            this.GroutingUserCode,
+            this.IsPublicBody,
+            this.GroutingNum,
+            this.LogoCodeName});
+            this.dgvProduction.ColumnTreeView = null;
+            this.dgvProduction.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
+            this.dgvProduction.DynamicColumnName = "";
+            this.dgvProduction.EnableHeadersVisualStyles = false;
+            this.dgvProduction.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvProduction.FormatQuantityColumns = null;
+            this.dgvProduction.HorizontalMergeColumn = null;
+            this.dgvProduction.IsAutoCountSum = false;
+            this.dgvProduction.IsAutoResizeColumns = false;
+            this.dgvProduction.IsClickF12 = false;
+            this.dgvProduction.IsOpenMergeCellFlag = false;
+            this.dgvProduction.IsSubTotalFlag = false;
+            this.dgvProduction.IsTopDeep = false;
+            this.dgvProduction.Location = new System.Drawing.Point(12, 131);
+            this.dgvProduction.MergeColumnNames = null;
+            this.dgvProduction.MergeDetailColumnNames = null;
+            this.dgvProduction.MergeDetailOnlyColumn = null;
+            this.dgvProduction.MergeOnlyColumn = null;
+            this.dgvProduction.MultiSelect = false;
+            this.dgvProduction.Name = "dgvProduction";
+            this.dgvProduction.RefreshAtHscroll = false;
+            this.dgvProduction.RowHeadersWidth = 50;
+            this.dgvProduction.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvProduction.RowsDefaultCellStyle = dataGridViewCellStyle12;
+            this.dgvProduction.RowTemplate.Height = 21;
+            this.dgvProduction.Size = new System.Drawing.Size(903, 286);
+            this.dgvProduction.SortOrderColumnName = null;
+            this.dgvProduction.TabIndex = 2;
+            this.dgvProduction.Tag = true;
+            this.dgvProduction.TotalSumColumns = null;
+            this.dgvProduction.ViewRowFilter = "";
+            // 
+            // BarCode
+            // 
+            this.BarCode.DataPropertyName = "BarCode";
+            this.BarCode.HeaderText = "产品条码";
+            this.BarCode.Name = "BarCode";
+            this.BarCode.ReadOnly = true;
+            // 
+            // KilnCode
+            // 
+            this.KilnCode.DataPropertyName = "KilnCode";
+            this.KilnCode.HeaderText = "窑炉编码";
+            this.KilnCode.Name = "KilnCode";
+            this.KilnCode.ReadOnly = true;
+            // 
+            // KilnCarCode
+            // 
+            this.KilnCarCode.DataPropertyName = "KilnCarCode";
+            this.KilnCarCode.HeaderText = "窑车编码";
+            this.KilnCarCode.Name = "KilnCarCode";
+            this.KilnCarCode.ReadOnly = true;
+            // 
+            // KilnCarPosition
+            // 
+            this.KilnCarPosition.DataPropertyName = "KilnCarPosition";
+            this.KilnCarPosition.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.Nothing;
+            this.KilnCarPosition.HeaderText = "窑车位置";
+            this.KilnCarPosition.Name = "KilnCarPosition";
+            this.KilnCarPosition.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.KilnCarPosition.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // GoodsID
+            // 
+            this.GoodsID.HeaderText = "GoodsID";
+            this.GoodsID.Name = "GoodsID";
+            this.GoodsID.ReadOnly = true;
+            this.GoodsID.Visible = false;
+            // 
+            // Status
+            // 
+            this.Status.DataPropertyName = "Status";
+            dataGridViewCellStyle9.NullValue = "本次登车";
+            this.Status.DefaultCellStyle = dataGridViewCellStyle9;
+            this.Status.HeaderText = "产品状态";
+            this.Status.Name = "Status";
+            this.Status.ReadOnly = true;
+            // 
+            // GoodsCode
+            // 
+            this.GoodsCode.DataPropertyName = "GoodsCode";
+            this.GoodsCode.HeaderText = "产品编码";
+            this.GoodsCode.Name = "GoodsCode";
+            this.GoodsCode.ReadOnly = true;
+            // 
+            // GoodsName
+            // 
+            this.GoodsName.DataPropertyName = "GoodsName";
+            this.GoodsName.HeaderText = "产品名称";
+            this.GoodsName.Name = "GoodsName";
+            this.GoodsName.ReadOnly = true;
+            // 
+            // UserID
+            // 
+            this.UserID.DataPropertyName = "UserID";
+            this.UserID.HeaderText = "UserID";
+            this.UserID.Name = "UserID";
+            this.UserID.ReadOnly = true;
+            this.UserID.Visible = false;
+            // 
+            // UserCode
+            // 
+            this.UserCode.DataPropertyName = "UserCode";
+            this.UserCode.HeaderText = "生产工号";
+            this.UserCode.Name = "UserCode";
+            this.UserCode.ReadOnly = true;
+            // 
+            // UserName
+            // 
+            this.UserName.DataPropertyName = "UserName";
+            this.UserName.HeaderText = "UserName";
+            this.UserName.Name = "UserName";
+            this.UserName.ReadOnly = true;
+            this.UserName.Visible = false;
+            // 
+            // KilnID
+            // 
+            this.KilnID.DataPropertyName = "KilnID";
+            this.KilnID.HeaderText = "KilnID";
+            this.KilnID.Name = "KilnID";
+            this.KilnID.ReadOnly = true;
+            this.KilnID.Visible = false;
+            // 
+            // KilnCarName
+            // 
+            this.KilnCarName.DataPropertyName = "KilnCarName";
+            this.KilnCarName.HeaderText = "窑车名称";
+            this.KilnCarName.Name = "KilnCarName";
+            this.KilnCarName.ReadOnly = true;
+            this.KilnCarName.Visible = false;
+            // 
+            // KilnName
+            // 
+            this.KilnName.DataPropertyName = "KilnName";
+            this.KilnName.HeaderText = "窑炉名称";
+            this.KilnName.Name = "KilnName";
+            this.KilnName.ReadOnly = true;
+            this.KilnName.Visible = false;
+            // 
+            // KilnCarID
+            // 
+            this.KilnCarID.DataPropertyName = "KilnCarID";
+            this.KilnCarID.HeaderText = "KilnCarID";
+            this.KilnCarID.Name = "KilnCarID";
+            this.KilnCarID.ReadOnly = true;
+            this.KilnCarID.Visible = false;
+            // 
+            // MouldCode
+            // 
+            this.MouldCode.DataPropertyName = "MouldCode";
+            this.MouldCode.HeaderText = "模具编号";
+            this.MouldCode.Name = "MouldCode";
+            this.MouldCode.ReadOnly = true;
+            // 
+            // GroutingDate
+            // 
+            this.GroutingDate.DataPropertyName = "GroutingDate";
+            dataGridViewCellStyle10.Format = "yyyy-MM-dd";
+            dataGridViewCellStyle10.NullValue = null;
+            this.GroutingDate.DefaultCellStyle = dataGridViewCellStyle10;
+            this.GroutingDate.HeaderText = "注浆日期";
+            this.GroutingDate.Name = "GroutingDate";
+            this.GroutingDate.ReadOnly = true;
+            // 
+            // GroutingUserCode
+            // 
+            this.GroutingUserCode.DataPropertyName = "GroutingUserCode";
+            this.GroutingUserCode.HeaderText = "成型工号";
+            this.GroutingUserCode.Name = "GroutingUserCode";
+            this.GroutingUserCode.ReadOnly = true;
+            // 
+            // IsPublicBody
+            // 
+            this.IsPublicBody.DataPropertyName = "IsPublicBody";
+            this.IsPublicBody.FalseValue = "0";
+            this.IsPublicBody.HeaderText = "公坯标识";
+            this.IsPublicBody.Name = "IsPublicBody";
+            this.IsPublicBody.ReadOnly = true;
+            this.IsPublicBody.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.IsPublicBody.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.IsPublicBody.TrueValue = "1";
+            // 
+            // GroutingNum
+            // 
+            this.GroutingNum.DataPropertyName = "GroutingNum";
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.GroutingNum.DefaultCellStyle = dataGridViewCellStyle11;
+            this.GroutingNum.HeaderText = "注浆次数";
+            this.GroutingNum.Name = "GroutingNum";
+            this.GroutingNum.ReadOnly = true;
+            // 
+            // LogoCodeName
+            // 
+            this.LogoCodeName.DataPropertyName = "LogoCodeName";
+            this.LogoCodeName.HeaderText = "商标";
+            this.LogoCodeName.Name = "LogoCodeName";
+            this.LogoCodeName.ReadOnly = true;
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnCancel.BackColor = System.Drawing.Color.Transparent;
+            this.btnCancel.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnCancel.BackgroundImage")));
+            this.btnCancel.CausesValidation = false;
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnCancel.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnCancel.ForeColor = System.Drawing.Color.White;
+            this.btnCancel.Location = new System.Drawing.Point(830, 420);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(85, 30);
+            this.btnCancel.TabIndex = 4;
+            this.btnCancel.Text = "关闭";
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // btnSave
+            // 
+            this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnSave.BackColor = System.Drawing.Color.Transparent;
+            this.btnSave.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSave.BackgroundImage")));
+            this.btnSave.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnSave.ForeColor = System.Drawing.Color.White;
+            this.btnSave.Location = new System.Drawing.Point(739, 420);
+            this.btnSave.Name = "btnSave";
+            this.btnSave.Size = new System.Drawing.Size(85, 30);
+            this.btnSave.TabIndex = 3;
+            this.btnSave.Text = "保存";
+            this.btnSave.UseVisualStyleBackColor = true;
+            this.btnSave.Visible = false;
+            this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox1.BackColor = System.Drawing.Color.Transparent;
+            this.groupBox1.Controls.Add(this.btnOk);
+            this.groupBox1.Controls.Add(this.txtFiredBatchNo);
+            this.groupBox1.Controls.Add(this.dtpFiredDate);
+            this.groupBox1.Controls.Add(this.txtKiln);
+            this.groupBox1.Controls.Add(this.lblKiln);
+            this.groupBox1.Controls.Add(this.cmbKilnCarPosition);
+            this.groupBox1.Controls.Add(this.lblUserID);
+            this.groupBox1.Controls.Add(this.txtBarcode);
+            this.groupBox1.Controls.Add(this.c_Label3);
+            this.groupBox1.Controls.Add(this.c_Label1);
+            this.groupBox1.Controls.Add(this.txtUserCode);
+            this.groupBox1.Controls.Add(this.c_Label2);
+            this.groupBox1.Controls.Add(this.txtKilnCarCode);
+            this.groupBox1.Controls.Add(this.c_Label4);
+            this.groupBox1.Controls.Add(this.lblBarcode);
+            this.groupBox1.Location = new System.Drawing.Point(12, 38);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(903, 74);
+            this.groupBox1.TabIndex = 1;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "基础数据";
+            // 
+            // txtKiln
+            // 
+            this.txtKiln.BackColor = System.Drawing.SystemColors.Window;
+            this.txtKiln.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtKiln.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+            this.txtKiln.ErrorMessage = "";
+            this.txtKiln.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtKiln.Location = new System.Drawing.Point(65, 20);
+            this.txtKiln.MaxLength = 20;
+            this.txtKiln.Name = "txtKiln";
+            this.txtKiln.Size = new System.Drawing.Size(60, 21);
+            this.txtKiln.TabIndex = 1;
+            this.txtKiln.TextValue = "";
+            this.txtKiln.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtKiln_KeyPress);
+            this.txtKiln.Validating += new System.ComponentModel.CancelEventHandler(this.txtKiln_Validating);
+            // 
+            // lblKiln
+            // 
+            this.lblKiln.AutoSize = true;
+            this.lblKiln.BackColor = System.Drawing.Color.Transparent;
+            this.lblKiln.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblKiln.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.lblKiln.IsMustInput = true;
+            this.lblKiln.Location = new System.Drawing.Point(6, 24);
+            this.lblKiln.Name = "lblKiln";
+            this.lblKiln.Size = new System.Drawing.Size(53, 12);
+            this.lblKiln.TabIndex = 0;
+            this.lblKiln.Text = "窑炉编码";
+            // 
+            // dtpFiredDate
+            // 
+            this.dtpFiredDate.AllowNull = false;
+            this.dtpFiredDate.Location = new System.Drawing.Point(355, 20);
+            this.dtpFiredDate.Name = "dtpFiredDate";
+            this.dtpFiredDate.Size = new System.Drawing.Size(100, 21);
+            this.dtpFiredDate.TabIndex = 5;
+            this.dtpFiredDate.Value = new System.DateTime(2019, 12, 10, 0, 0, 0, 0);
+            // 
+            // c_Label3
+            // 
+            this.c_Label3.AutoSize = true;
+            this.c_Label3.BackColor = System.Drawing.Color.Transparent;
+            this.c_Label3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c_Label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.c_Label3.IsMustInput = true;
+            this.c_Label3.Location = new System.Drawing.Point(461, 24);
+            this.c_Label3.Name = "c_Label3";
+            this.c_Label3.Size = new System.Drawing.Size(53, 12);
+            this.c_Label3.TabIndex = 6;
+            this.c_Label3.Text = "烧成批次";
+            // 
+            // c_Label4
+            // 
+            this.c_Label4.AutoSize = true;
+            this.c_Label4.BackColor = System.Drawing.Color.Transparent;
+            this.c_Label4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c_Label4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.c_Label4.IsMustInput = true;
+            this.c_Label4.Location = new System.Drawing.Point(296, 24);
+            this.c_Label4.Name = "c_Label4";
+            this.c_Label4.Size = new System.Drawing.Size(53, 12);
+            this.c_Label4.TabIndex = 4;
+            this.c_Label4.Text = "装车日期";
+            // 
+            // txtFiredBatchNo
+            // 
+            this.txtFiredBatchNo.Location = new System.Drawing.Point(520, 20);
+            this.txtFiredBatchNo.MaxValue = new decimal(new int[] {
+            999,
+            0,
+            0,
+            0});
+            this.txtFiredBatchNo.MinValue = new decimal(new int[] {
+            0,
+            0,
+            0,
+            0});
+            this.txtFiredBatchNo.Name = "txtFiredBatchNo";
+            this.txtFiredBatchNo.Number = new System.Drawing.Point(3, 0);
+            this.txtFiredBatchNo.Size = new System.Drawing.Size(60, 21);
+            this.txtFiredBatchNo.TabIndex = 7;
+            // 
+            // btnOk
+            // 
+            this.btnOk.BackColor = System.Drawing.Color.Transparent;
+            this.btnOk.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnOk.BackgroundImage")));
+            this.btnOk.CausesValidation = false;
+            this.btnOk.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnOk.ForeColor = System.Drawing.Color.White;
+            this.btnOk.Location = new System.Drawing.Point(586, 15);
+            this.btnOk.Name = "btnOk";
+            this.btnOk.Size = new System.Drawing.Size(85, 30);
+            this.btnOk.TabIndex = 8;
+            this.btnOk.Text = "确定";
+            this.btnOk.UseVisualStyleBackColor = true;
+            // 
+            // F_PM_0504
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnCancel;
+            this.ClientSize = new System.Drawing.Size(927, 473);
+            this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.btnSave);
+            this.Controls.Add(this.dgvProduction);
+            this.Controls.Add(this.tsrOperate);
+            this.IsSaveFormSize = false;
+            this.Name = "F_PM_0504";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "F_PM_0504";
+            this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.F_PM_0504_FormClosing);
+            this.Load += new System.EventHandler(this.F_PM_0504_Load);
+            this.Controls.SetChildIndex(this.tsrOperate, 0);
+            this.Controls.SetChildIndex(this.dgvProduction, 0);
+            this.Controls.SetChildIndex(this.btnSave, 0);
+            this.Controls.SetChildIndex(this.btnCancel, 0);
+            this.Controls.SetChildIndex(this.groupBox1, 0);
+            this.tsrOperate.ResumeLayout(false);
+            this.tsrOperate.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvProduction)).EndInit();
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private Basics.BaseControls.C_ToolStrip tsrOperate;
+        private System.Windows.Forms.ToolStripButton tsbtnDelete;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+        private System.Windows.Forms.ToolStripButton tsbtnAdaptive;
+        private System.Windows.Forms.ToolStripButton tsbtnClose;
+        private Basics.BaseControls.C_Label lblUserID;
+        private Basics.BaseControls.C_Label lblBarcode;
+        private Basics.BaseControls.C_TextBox txtUserCode;
+        private Basics.BaseControls.C_TextBox txtBarcode;
+        private Basics.BaseControls.C_DataGridView dgvProduction;
+        private Basics.BaseControls.C_Button btnCancel;
+        private Basics.BaseControls.C_Button btnSave;
+        private Basics.BaseControls.C_Label c_Label1;
+        private Basics.BaseControls.C_TextBox txtKilnCarCode;
+        private Basics.BaseControls.C_Label c_Label2;
+        private Basics.BaseControls.C_ComboBox cmbKilnCarPosition;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private Basics.BaseControls.C_TextBox txtKiln;
+        private Basics.BaseControls.C_Label lblKiln;
+		private System.Windows.Forms.DataGridViewTextBoxColumn BarCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarCode;
+		private System.Windows.Forms.DataGridViewComboBoxColumn KilnCarPosition;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsID;
+		private System.Windows.Forms.DataGridViewTextBoxColumn Status;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn UserID;
+		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn UserName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn KilnID;
+		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn KilnName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarID;
+		private System.Windows.Forms.DataGridViewTextBoxColumn MouldCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDate;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingUserCode;
+		private System.Windows.Forms.DataGridViewCheckBoxColumn IsPublicBody;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingNum;
+		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
+        private WinForm.Controls.DtpDate dtpFiredDate;
+        private Basics.BaseControls.C_Label c_Label3;
+        private Basics.BaseControls.C_Label c_Label4;
+        private WinForm.Controls.TxtNumerical txtFiredBatchNo;
+        private Basics.BaseControls.C_Button btnOk;
+    }
+}

+ 1087 - 0
DK.Client/PMModule/F_PM_0504.cs

@@ -0,0 +1,1087 @@
+/*******************************************************************************
+ * Copyright(c) 2014 DongkeSoft All rights reserved. / Confidential
+ * 类的信息:
+ *      1.程序名称:F_PM_0504.cs
+ *      2.功能描述:新建装窑车漏扫计件
+ * 编辑履历:
+ *      作者            日期            版本            修改内容
+ *      chenxy          2019/12/10      1.00            设计窗体布局
+ *******************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Windows.Forms;
+
+using Dongke.IBOSS.PRD.Basics.BaseControls;
+using Dongke.IBOSS.PRD.Basics.BaseResources;
+using Dongke.IBOSS.PRD.Basics.Library;
+using Dongke.IBOSS.PRD.Client.CommonModule;
+using Dongke.IBOSS.PRD.Client.Controls.FormCommon;
+using Dongke.IBOSS.PRD.WCF.DataModels;
+using Dongke.IBOSS.PRD.WCF.Proxys;
+
+namespace Dongke.IBOSS.PRD.Client.PMModule
+{
+    /// <summary>
+    /// 新建装窑车计件
+    /// </summary>
+    public partial class F_PM_0504 : FormBase
+    {
+        #region 成员变量
+
+        // 工序ID
+        private int _procedureID;
+        //窗体名称
+        private string _fromTitle;
+        // 工序实体类
+        ProcedureEntity _procedureDataEntity;
+        // 生产数据实体类
+        List<ProductionDataEntity> _productionDataEntity = new List<ProductionDataEntity>();
+        // 数据源Table
+        private DataTable _dataSourceTable = null;
+        // 添加行数据源
+        private DataTable _collectType = null;
+        // 当前操作实体
+        ProductionDataEntity _productionEntity = new ProductionDataEntity();
+        // 配置文件的全路径
+        private string _iniFilePath = LocalPath.RootPath + Constant.INI_FILE_NAME;
+        //窑车最大装载数
+        private int MaxGoodsNum = 0;
+        // 是否有商标
+        private int? _isLogo = null;
+
+        // 是否有商标编码
+        private string _isLogoCode = "";
+
+        // 是否有商标名称
+        private string _isLogoName = "";
+
+        #endregion
+
+        #region 构造函数
+
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        public F_PM_0504()
+        {
+            InitializeComponent();
+        }
+
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        /// <param name="procedureID">工序编号</param>
+        /// <param name="fromTitle">窗体名称</param>
+        public F_PM_0504(int procedureID, string fromTitle)
+        {
+            InitializeComponent();
+            this._procedureID = procedureID;
+            this._fromTitle = fromTitle;
+            this.SetFromTitleInfo();
+        }
+
+        #endregion
+
+        #region 属性
+
+        /// <summary>
+        ///  绑定GridView数据源
+        /// </summary>
+        public DataTable DataSourceTable
+        {
+            set
+            {
+                _dataSourceTable = value;
+            }
+            get
+            {
+                if (_dataSourceTable == null)
+                {
+                    _dataSourceTable = new DataTable("Table1");
+                    _dataSourceTable.Columns.Add("BarCode");
+                    _dataSourceTable.Columns.Add("GoodsID");
+                    _dataSourceTable.Columns.Add("GoodsCode");
+                    _dataSourceTable.Columns.Add("GoodsName");
+                    _dataSourceTable.Columns.Add("UserID");
+                    _dataSourceTable.Columns.Add("UserCode");
+                    _dataSourceTable.Columns.Add("UserName");
+                    _dataSourceTable.Columns.Add("KilnID");
+                    _dataSourceTable.Columns.Add("KilnCode");
+                    _dataSourceTable.Columns.Add("KilnName");
+                    _dataSourceTable.Columns.Add("KilnCarID");
+                    _dataSourceTable.Columns.Add("KilnCarCode");
+                    _dataSourceTable.Columns.Add("KilnCarName");
+                    _dataSourceTable.Columns.Add("KilnCarPosition", typeof(decimal));
+                    _dataSourceTable.Columns.Add("IsSave");//是否保存,为了的在此车上有此产品时显示出来(1不保存,只是查看)
+                    _dataSourceTable.Columns.Add("Status");//登车状态,只是查看
+                    _dataSourceTable.Columns.Add("IsPublicBody");
+                    _dataSourceTable.Columns.Add("MouldCode");
+                    _dataSourceTable.Columns.Add("GroutingUserCode");
+                    _dataSourceTable.Columns.Add("GroutingNum");
+                    _dataSourceTable.Columns.Add("GroutingDate", typeof(DateTime));
+                    _dataSourceTable.Columns.Add("LogoID");
+                    _dataSourceTable.Columns.Add("LogoCodeName");
+                    return _dataSourceTable;
+                }
+                else
+                {
+                    return _dataSourceTable;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 添加行数据源
+        /// </summary>
+        public DataTable DataSourceCollectTypeTable
+        {
+            set
+            {
+                _collectType = value;
+            }
+            get
+            {
+                if (_collectType == null)
+                {
+                    _collectType = new DataTable("Table2");
+                    _collectType.Columns.Add("BarCode");
+                    _collectType.Columns.Add("GoodsID");
+                    _collectType.Columns.Add("GoodsCode");
+                    _collectType.Columns.Add("GoodsName");
+                    _collectType.Columns.Add("UserID");
+                    _collectType.Columns.Add("UserCode");
+                    _collectType.Columns.Add("UserName");
+                    _collectType.Columns.Add("KilnID");
+                    _collectType.Columns.Add("KilnCode");
+                    _collectType.Columns.Add("KilnName");
+                    _collectType.Columns.Add("KilnCarID");
+                    _collectType.Columns.Add("KilnCarCode");
+                    _collectType.Columns.Add("KilnCarName");
+                    _collectType.Columns.Add("KilnCarPosition", typeof(decimal));
+                    return _collectType;
+                }
+                else
+                {
+                    return _collectType;
+                }
+            }
+        }
+
+        #endregion
+
+        #region 事件
+
+        /// <summary>
+        /// 窗体加载事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void F_PM_0504_Load(object sender, EventArgs e)
+        {
+            try
+			{
+				//string getKiln = Utility.ReadIniFile(Constant.INI_SECTION_SETTINGS,
+				//		  Constant.INI_KEY_KILN_CODE, this._iniFilePath);
+				string getKiln = Utility.ReadIniFile(Constant.INI_SECTION_SETTINGS,
+						  Constant.INI_KEY_KILN_CODE, LocalPath.LocalINIFilePath);
+
+                if (getKiln != string.Empty)
+                {
+                    this.txtKiln.Text = getKiln;
+                    if (this.txtKiln.Text.Trim() != "")
+                    {
+                        DataSet dsResultAccount = (DataSet)DoAsync(new BaseAsyncMethod(() =>
+                        {
+                            return SystemModuleProxy.Service.GetAllKilntInfo();
+                        }));
+                        if (dsResultAccount != null && dsResultAccount.Tables[0].Rows.Count > 0)
+                        {
+                            DataView dv = dsResultAccount.Tables[0].DefaultView;
+                            dv.RowFilter = "ValueFlag=1 and KilnCode='" + this.txtKiln.Text.Trim() + "'";
+                            DataTable dt = dv.ToTable();
+                            if (dt.Rows.Count == 0)
+                            {
+                                // 提示信息
+                                //MessageBox.Show("不存在此窑炉编号",
+                                //      this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                                this.txtKiln.SelectAll();
+                                this.txtKiln.Focus();
+                                //return;
+                            }
+                        }
+
+                    }
+
+                    this.txtKilnCarCode.Focus();
+                }
+                else
+                {
+                    this.txtKiln.Focus();
+                }
+                // 加载权限
+                FormPermissionManager.FormPermissionControl(this.Name, this,
+                    Dongke.IBOSS.PRD.Client.DataModels.LogInUserInfo.CurrentUser.CurrentUserEntity.UserRightData,
+                    Dongke.IBOSS.PRD.Client.DataModels.LogInUserInfo.CurrentUser.CurrentUserEntity.FunctionData);
+                DataTable tKilnCarInfo = GetMSTKilnCarPositionInfo();
+                this.cmbKilnCarPosition.DataSource = tKilnCarInfo;
+                this.cmbKilnCarPosition.DisplayMember = "DictionaryValue";
+                this.cmbKilnCarPosition.ValueMember = "DictionaryID";
+                this._productionEntity.UserID = Constant.INT_IS_NEGATIE_ONE;
+                this._productionEntity.KilnCarID = Constant.INT_IS_NEGATIE_ONE;
+                this.dgvProduction.DataSource = DataSourceTable;
+                this.KilnCarPosition.DisplayMember = "DictionaryValue";
+                this.KilnCarPosition.ValueMember = "DictionaryID";
+                this.KilnCarPosition.DataSource = tKilnCarInfo.Copy();
+                this.dgvProduction.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
+                // 获取工序明细数据
+                ProcedureEntity procedureDataEntity = (ProcedureEntity)DoAsync(new BaseAsyncMethod(() =>
+                {
+                    return PMModuleProxy.Service.GetProcedureDataEntityByID(this._procedureID);
+                }));
+                this._procedureDataEntity = procedureDataEntity;
+                // 设置控件禁用或启用
+                SetControlEnable();
+                //this.txtUserCode.Focus();
+            }
+            catch (Exception ex)
+            {
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(this.ToString(),
+                    System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+            }
+        }
+
+        /// <summary>
+        /// 窗体关闭事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnCancel_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        /// <summary>
+        /// 窗体关闭事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void tsbtnClose_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        /// <summary>
+        /// 自动适应列宽
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void tsbtnAdaptive_Click(object sender, EventArgs e)
+        {
+            this.dgvProduction.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.AllCells);
+        }
+
+        /// <summary>
+        /// 控件数据校验时发生
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void txtUserCode_Validating(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            try
+            {
+                if (txtUserCode.Text.Trim() == string.Empty) // 如果未添加数据,则此项获取焦点
+                {
+                    this.txtUserCode.IsMustInput = true;
+                    this.txtUserCode.SelectAll();
+                    e.Cancel = true;
+                    return;
+                }
+                else if (!this.txtUserCode.ReadOnly)
+                {
+                    SUserEntity userEntity = new SUserEntity();
+                    userEntity.UserCode = this.txtUserCode.Text.Trim();
+                    // 是否存在此用户编码的生产工号
+                    CheckProcedureUserResult MsgCheckProcedureUser = (CheckProcedureUserResult)DoAsync(new BaseAsyncMethod(() =>
+                    {
+                        return PMModuleProxy.Service.CheckProcedureUser(this._procedureID, this.txtUserCode.Text.Trim());
+                    }));
+                    if (MsgCheckProcedureUser != null)
+                    {
+                        if (!string.IsNullOrEmpty(MsgCheckProcedureUser.ErrMsg))
+                        {
+                            MessageBox.Show(MsgCheckProcedureUser.ErrMsg,
+                                this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                            this.txtUserCode.SelectAll();
+                            e.Cancel = true;
+                            return;
+                        }
+                        // 有此生产工号
+                        if (this._productionEntity.UserID != -Constant.INT_IS_ONE)
+                        {
+                            if (MsgCheckProcedureUser.UserID != this._productionEntity.UserID)
+                            {
+                                this.SaveDataInfo();
+                            }
+                        }
+                        this._productionEntity.UserID = MsgCheckProcedureUser.UserID;
+                        this._productionEntity.UserCode = MsgCheckProcedureUser.UserCode;
+                        this._productionEntity.UserName = MsgCheckProcedureUser.UserName;
+                        this.txtUserCode.ReadOnly = true;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(this.ToString(),
+                    System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+            }
+        }
+
+        /// <summary>
+        /// 控件数据校验时发生
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void txtKilnCarCode_Validating(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            try
+            {
+                if (this.txtKilnCarCode.Text.Trim() == string.Empty) // 如果未添加数据,则此项获取焦点
+                {
+                    //this.txtKilnCarCode.IsMustInput = true;
+                    //this.txtKilnCarCode.SelectAll();
+                    //e.Cancel = true;
+                    //return;
+                }
+                else if (!this.txtKilnCarCode.ReadOnly)
+                {
+                    // 是否存在此用户编码的生产工号
+                    CheckKilnCarResultEntity kilnCarEntity = (CheckKilnCarResultEntity)DoAsync(new BaseAsyncMethod(() =>
+                    {
+                        return PMModuleProxy.Service.CheckKilnCar(this._procedureID, this.txtKiln.Text.Trim() + this.txtKilnCarCode.Text.Trim(), this._procedureDataEntity.ModelType);
+                    }));
+                    if (!string.IsNullOrEmpty(kilnCarEntity.ErrMsg))
+                    {
+                        MessageBox.Show(kilnCarEntity.ErrMsg,
+                                  this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                        this.txtKilnCarCode.SelectAll();
+                        e.Cancel = true;
+                        return;
+                    }
+                    if (this._productionEntity.KilnID != -Constant.INT_IS_ONE)
+                    {
+                        if (kilnCarEntity.KilnCarInfos[Constant.INT_IS_ZERO].KilnID != this._productionEntity.KilnID)
+                        {
+                            this.SaveDataInfo();
+                        }
+                    }
+                    this._productionEntity.KilnID = kilnCarEntity.KilnCarInfos[Constant.INT_IS_ZERO].KilnID;
+                    this._productionEntity.KilnCode = kilnCarEntity.KilnCarInfos[Constant.INT_IS_ZERO].KilnCode;
+                    this._productionEntity.KilnName = kilnCarEntity.KilnCarInfos[Constant.INT_IS_ZERO].KilnName;
+                    this._productionEntity.KilnCarID = kilnCarEntity.KilnCarInfos[Constant.INT_IS_ZERO].KilnCarID;
+                    //this._productionEntity.KilnCarCode = this.txtKiln.Text.Trim() + this.txtKilnCarCode.Text.Trim();
+                    this._productionEntity.KilnCarCode = kilnCarEntity.KilnCarInfos[Constant.INT_IS_ZERO].KilnCarCode;
+                    this._productionEntity.KilnCarName = kilnCarEntity.KilnCarInfos[Constant.INT_IS_ZERO].KilnCarName;
+                    this.MaxGoodsNum = kilnCarEntity.KilnCarInfos[Constant.INT_IS_ZERO].MaxGoodsNum;
+                    this.txtKilnCarCode.ReadOnly = true;
+                    this.txtKiln.ReadOnly = true;
+
+                    //获取此窑车上是否有产品,并显示
+                    DataSet dsGoods = (DataSet)DoAsync(new BaseAsyncMethod(() =>
+                    {
+                        return PMModuleProxy.Service.GetKilnCarGoodsByKilnCarID(Convert.ToInt32(this._productionEntity.KilnCarID == null ? 0 : this._productionEntity.KilnCarID));
+                    }));
+                    if (dsGoods != null && dsGoods.Tables[0].Rows.Count > 0)
+                    {
+                        for (int i = 0; i < dsGoods.Tables[0].Rows.Count; i++)
+                        {
+                            DataRow[] drRows = this.DataSourceTable.Select("BarCode='" + dsGoods.Tables[0].Rows[i]["BarCode"].ToString() + "'");
+                            if (drRows.Length > Constant.INT_IS_ZERO)
+                            {
+                                this.txtBarcode.Text = "";
+                                continue;
+                            }
+                            DataRow dr = this.DataSourceTable.NewRow();
+                            dr["BarCode"] = dsGoods.Tables[0].Rows[i]["BarCode"].ToString();
+                            dr["GoodsID"] = dsGoods.Tables[0].Rows[i]["GoodsID"].ToString();
+                            dr["GoodsCode"] = dsGoods.Tables[0].Rows[i]["GoodsCode"].ToString();
+                            dr["GoodsName"] = dsGoods.Tables[0].Rows[i]["GoodsName"].ToString();
+                            dr["UserID"] = dsGoods.Tables[0].Rows[i]["UserID"].ToString();
+                            dr["UserCode"] = dsGoods.Tables[0].Rows[i]["UserCode"].ToString();
+                            dr["UserName"] = dsGoods.Tables[0].Rows[i]["UserName"].ToString();
+                            dr["KilnID"] = dsGoods.Tables[0].Rows[i]["KilnID"].ToString();
+                            dr["KilnCode"] = dsGoods.Tables[0].Rows[i]["KilnCode"].ToString();
+                            dr["KilnName"] = dsGoods.Tables[0].Rows[i]["KilnName"].ToString();
+                            dr["KilnCarID"] = dsGoods.Tables[0].Rows[i]["KilnCarID"].ToString();
+                            dr["KilnCarCode"] = dsGoods.Tables[0].Rows[i]["Kilncarcode"].ToString();
+                            dr["KilnCarName"] = dsGoods.Tables[0].Rows[i]["Kilncarname"].ToString();
+                            dr["KilnCarPosition"] = dsGoods.Tables[0].Rows[i]["KilnCarPosition"].ToString();
+                            dr["IsSave"] = 1;
+                            dr["Status"] = "己登车";
+                            dr["MouldCode"] = dsGoods.Tables[0].Rows[i]["MouldCode"];
+                            dr["GroutingUserCode"] = dsGoods.Tables[0].Rows[i]["GroutingUserCode"];
+                            dr["GroutingNum"] = dsGoods.Tables[0].Rows[i]["GroutingNum"];
+                            dr["IsPublicBody"] = dsGoods.Tables[0].Rows[i]["IsPublicBody"].ToString() != "1" ? 0 : 1;
+                            dr["GroutingDate"] = Convert.ToDateTime(dsGoods.Tables[0].Rows[i]["GroutingDate"]);
+                            dr["LogoCodeName"] = dsGoods.Tables[0].Rows[i]["logoname"] + "[" + dsGoods.Tables[0].Rows[i]["logocode"] + "]";
+                            this.DataSourceTable.Rows.Add(dr);
+                            //this.dgvProduction.CurrentCell = null;
+                            //this.dgvProduction.Rows[dgvProduction.RowCount - 1].Selected = true;
+                            //this.dgvProduction.CurrentCell = this.dgvProduction.Rows[dgvProduction.RowCount - 1].Cells[0];
+                        }
+                    }
+
+                }
+            }
+            catch (Exception ex)
+            {
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(this.ToString(),
+                    System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+            }
+        }
+
+        /// <summary>
+        /// 条形码按键事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void txtBarcode_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            try
+            {
+                if (this.txtBarcode.ReadOnly)
+                {
+                    return;
+                }
+                if (this._productionEntity.KilnID == null || this._productionEntity.KilnID <= 0)
+                {
+                    // 提示信息
+                    MessageBox.Show("请输入窑炉车号",
+                         this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    return;
+                }
+
+                if ((int)e.KeyChar == Constant.SYSTEM_KEYBOARD_ENTER_VALUE) // 按了回车键
+                {
+                    if (this.txtUserCode.Text.Trim() == string.Empty)
+                    {
+                        this.txtUserCode.Focus();
+                        this.txtBarcode.Text = string.Empty;
+                        return;
+                    }
+                    if (this.txtKilnCarCode.Text.Trim() == string.Empty)
+                    {
+                        this.txtKilnCarCode.Focus();
+                        this.txtBarcode.Text = string.Empty;
+                        return;
+                    }
+                    if (this.txtBarcode.Text.Trim() == string.Empty)
+                    {
+                        this.txtBarcode.SelectAll();
+                        this.txtBarcode.Focus();
+                        return;
+                    }
+                    DataRow[] drRows = this.DataSourceTable.Select("BarCode='" + this.txtBarcode.Text.Trim() + "'");
+                    if (drRows.Length == Constant.INT_IS_ZERO)
+                    {
+                        // 校验条码 获取校验条码信
+                        DataSet dsCheckBarcode = (DataSet)DoAsync(new BaseAsyncMethod(() =>
+                        {
+                            return PMModuleProxy.Service.CheckBarcode(this._procedureID, this.txtBarcode.Text.Trim());
+                        }));
+                        if (dsCheckBarcode != null && dsCheckBarcode.Tables[Constant.INT_IS_ZERO].Rows.Count > Constant.INT_IS_ZERO)
+                        {
+                            if (dsCheckBarcode.Tables[Constant.INT_IS_ZERO].Rows[Constant.INT_IS_ZERO]
+                                [Constant.BarCodeResultTableColumns.out_errMsg.ToString()].ToString() != string.Empty)
+                            {
+                                // 表示有错误
+                                //MessageBox.Show(string.Format(dsCheckBarcode.Tables[Constant.INT_IS_ZERO].Rows[Constant.INT_IS_ZERO]
+                                //    [Constant.BarCodeResultTableColumns.out_errMsg.ToString()].ToString(),
+                                //    this.txtBarcode.Text.Trim(), "产品条码"),
+                                //     this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                                //this.txtBarcode.SelectAll();
+                                //this.txtBarcode.Focus();
+                                //return;
+
+                                if (dsCheckBarcode.Tables[0].Rows[0][Constant.BarCodeResultTableColumns.out_missFlag.ToString()].ToString() == "0")
+                                {
+                                    // 表示有错误
+                                    MessageBox.Show(string.Format(dsCheckBarcode.Tables[0].Rows[0][Constant.BarCodeResultTableColumns.out_errMsg.ToString()].ToString(), this.txtBarcode.Text.Trim(), "产品条码"),
+                                         this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                                }
+                                else
+                                {
+                                    S_CMN_020 frmscmn020 = new S_CMN_020(Convert.ToInt32(dsCheckBarcode.Tables[0].Rows[0][Constant.BarCodeResultTableColumns.out_missFlag.ToString()])
+                                        , dsCheckBarcode.Tables[0].Rows[0][Constant.BarCodeResultTableColumns.out_errMsg.ToString()].ToString());
+                                    frmscmn020.ShowDialog();
+                                }
+                                this.txtBarcode.Focus();
+                                this.txtBarcode.SelectAll();
+                                return;
+
+                            }
+                            else
+                            {
+                                this.DataSourceTable.AcceptChanges();
+                                if (this.DataSourceTable.Rows.Count > Constant.INT_IS_ZERO)
+                                {
+                                    if (this.MaxGoodsNum > 0 && this.DataSourceTable.Rows.Count >= this.MaxGoodsNum)
+                                    {
+                                        // 提示信息
+                                        MessageBox.Show("超出登车产品最大装载数量" + this.MaxGoodsNum.ToString(),
+                                             this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                                        return;
+                                    }
+                                }
+
+                                if (dsCheckBarcode.Tables[0].Rows[0][Constant.BarCodeResultTableColumns.out_logoID.ToString()].ToString() != "")
+                                {
+                                    this._isLogo = Convert.ToInt32(dsCheckBarcode.Tables[0].Rows[0][Constant.BarCodeResultTableColumns.out_logoID.ToString()]);
+                                    this._isLogoCode = dsCheckBarcode.Tables[0].Rows[0][Constant.BarCodeResultTableColumns.out_logoCode.ToString()].ToString();
+                                    this._isLogoName = dsCheckBarcode.Tables[0].Rows[0][Constant.BarCodeResultTableColumns.out_logoName.ToString()].ToString();
+                                }
+
+
+                                // 生产数据实体
+                                ProductionDataEntity procedureDataEntity = new ProductionDataEntity();
+                                procedureDataEntity.Barcode = this.txtBarcode.Text.Trim(); // 产品条码
+                                procedureDataEntity.GoodsID = Convert.ToInt32(dsCheckBarcode.Tables[Constant.INT_IS_ZERO].Rows[Constant.INT_IS_ZERO]
+                                    [Constant.BarCodeResultTableColumns.out_goodsID.ToString()]);
+                                procedureDataEntity.GoodsCode = dsCheckBarcode.Tables[Constant.INT_IS_ZERO].Rows[Constant.INT_IS_ZERO]
+                                    [Constant.BarCodeResultTableColumns.out_goodsCode.ToString()].ToString();
+                                procedureDataEntity.GoodsName = dsCheckBarcode.Tables[Constant.INT_IS_ZERO].Rows[Constant.INT_IS_ZERO]
+                                    [Constant.BarCodeResultTableColumns.out_goodsName.ToString()].ToString();
+                                procedureDataEntity.UserID = this._productionEntity.UserID;
+                                procedureDataEntity.UserCode = this._productionEntity.UserCode;
+                                procedureDataEntity.UserName = this._productionEntity.UserName;
+                                procedureDataEntity.KilnID = this._productionEntity.KilnID;
+                                procedureDataEntity.KilnCode = this._productionEntity.KilnCode;
+                                procedureDataEntity.KilnName = this._productionEntity.KilnName;
+                                procedureDataEntity.KilnCarID = this._productionEntity.KilnCarID;
+                                procedureDataEntity.KilnCarCode = this._productionEntity.KilnCarCode;
+                                procedureDataEntity.KilnCarName = this._productionEntity.KilnCarName;
+                                procedureDataEntity.KilnCarPosition = Convert.ToInt32(this.cmbKilnCarPosition.SelectedValue);
+                                procedureDataEntity.ValueFlag = Constant.ValueFlag.Effective.GetHashCode();
+                                procedureDataEntity.LogoID = this._isLogo;
+                                //if (this._procedureDataEntity.CollectType == (int)Constant.ProcedureCollectType.Point) // 单点采集 直接保存
+                                //{
+                                //    this.CollectTypeTwo(procedureDataEntity);
+                                //}
+                                //else
+                                //{
+                                this.CollectTypeOne(procedureDataEntity,dsCheckBarcode); // 集中采集
+                                //}
+                                this.txtBarcode.Text = string.Empty;
+                                this.txtBarcode.Focus();
+                            }
+                        }
+                    }
+                    else
+                    {
+                        this.txtBarcode.Text = "";
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(this.ToString(),
+                    System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+            }
+        }
+
+        /// <summary>
+        ///  删除按钮事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void tsbtnDelete_Click(object sender, EventArgs e)
+        {
+            if (this.dgvProduction.CurrentCell != null)
+            {
+                if (this.dgvProduction.Rows[this.dgvProduction.CurrentCell.RowIndex].Cells["Status"].Value.ToString() != "己登车")
+                {
+                    this.DataSourceTable.Rows[this.dgvProduction.CurrentCell.RowIndex].Delete();
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存按钮事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnSave_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                this.SaveDataInfo();
+            }
+            catch (Exception ex)
+            {
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(this.ToString(),
+                    System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+            }
+        }
+
+        /// <summary>
+        /// 窗体关闭时事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+
+        private void F_PM_0504_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            if (this.btnSave.Visible)
+            {
+                try
+                {
+                    this.DataSourceTable.AcceptChanges();
+                    this.DataSourceCollectTypeTable.Clear();
+                    if (this.DataSourceTable.Rows.Count > Constant.INT_IS_ZERO)
+                    {
+                        if (DataSourceTable.Select("IsSave<>1").Length > 0)
+                        {
+                            DialogResult result = MessageBox.Show(Messages.MSG_CMN_Q001, this.Text,
+                            MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
+                            if (result == DialogResult.Yes)
+                            {
+                                // 保存数据
+                                btnSave_Click(sender, e);
+                            }
+                            else if (result == DialogResult.Cancel)
+                            {
+                                e.Cancel = true;
+                            }
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    // 对异常进行共通处理
+                    ExceptionManager.HandleEventException(this.ToString(),
+                        System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 鼠标单击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void txtUserCode_MouseClick(object sender, MouseEventArgs e)
+        {
+            if (this.txtUserCode.Text.Trim() != string.Empty)
+            {
+                this.txtUserCode.SelectAll();
+            }
+        }
+
+        /// <summary>
+        /// 生产工号回车事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void txtUserCode_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if ((int)e.KeyChar == 13) // 按了回车键
+            {
+                this.txtKilnCarCode.Focus();
+            }
+        }
+
+        #endregion
+
+        #region 私有方法
+
+        /// <summary>
+        /// 设置窗体按钮的文本信息
+        /// </summary>
+        private void SetFromTitleInfo()
+        {
+            this.Text = this._fromTitle;
+            this.tsbtnDelete.Text = ButtonText.TSBTN_DELETE;
+            //自动适应列宽
+            this.tsbtnAdaptive.Text = ButtonText.TSBTN_ADAPTIVE;
+            //关闭
+            this.tsbtnClose.Text = ButtonText.TSBTN_CLOSE;
+            this.btnSave.Text = ButtonText.BTN_SAVE;
+            this.btnCancel.Text = ButtonText.BTN_CLOSE;
+        }
+
+        /// <summary>
+        /// 设置控件禁用或启用
+        /// </summary>
+        private void SetControlEnable()
+        {
+            if (this._procedureDataEntity != null)
+            {
+                //if (this._procedureDataEntity.CollectType == (int)Constant.ProcedureCollectType.Togather)
+                //{
+                //    this.txtUserCode.Enabled = true;
+                //    this.tsbtnDelete.Visible = true;
+                //    this.tsbtnDelete.Enabled = true;
+                //    this.btnSave.Visible = true;
+                //}
+                //else
+                {
+                    this.tsbtnDelete.Visible = true;
+                    this.tsbtnDelete.Enabled = true;
+                    this.txtUserCode.Enabled = true;
+                    this.txtUserCode.ReadOnly = true;
+                    this._productionEntity.UserID = Dongke.IBOSS.PRD.Client.DataModels.LogInUserInfo.CurrentUser.CurrentUserEntity.UserID;
+                    this._productionEntity.UserCode = Dongke.IBOSS.PRD.Client.DataModels.LogInUserInfo.CurrentUser.CurrentUserEntity.UserCode;
+                    this._productionEntity.UserName = Dongke.IBOSS.PRD.Client.DataModels.LogInUserInfo.CurrentUser.CurrentUserEntity.UserName;
+                    this.txtUserCode.Text = this._productionEntity.UserCode;
+                    this.btnSave.Visible = true;
+                    // 此工号是否能生产工序 
+                    CheckProcedureUserResult checkProcedureUser = (CheckProcedureUserResult)DoAsync(new BaseAsyncMethod(() =>
+                    {
+                        return PMModuleProxy.Service.CheckProcedureUser(this._procedureID,
+                            Dongke.IBOSS.PRD.Client.DataModels.LogInUserInfo.CurrentUser.CurrentUserEntity.UserCode);
+                    }));
+                    if (checkProcedureUser != null)
+                    {
+                        if (!string.IsNullOrEmpty(checkProcedureUser.ErrMsg))
+                        {
+                            // 此工号不允许生产工序
+                            MessageBox.Show(checkProcedureUser.ErrMsg,
+                                this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                            this.Close();
+                            return;
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取窑车位置字典表数据
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetMSTKilnCarPositionInfo()
+        {
+            DataTable dtDicInfo = (DataTable)DoAsync(new BaseAsyncMethod(() =>
+            {
+                return CommonModuleProxy.Service.GetDataDictionaryByType(Constant.TPC_TPC003);
+            }));
+            return dtDicInfo;
+        }
+
+        /// <summary>
+        /// 单点采集模式
+        /// </summary>
+        /// <param name="procedureDataEntity"></param>
+        private void CollectTypeTwo(ProductionDataEntity procedureDataEntity)
+        {
+            try
+            {
+                #region 单点采集
+                // 添加行就可以 并保存
+                // 保存到数据库
+                DataSourceCollectTypeTable.Rows.Clear();
+                DataRow drCollectType = DataSourceCollectTypeTable.NewRow();
+                drCollectType["BarCode"] = procedureDataEntity.Barcode;
+                drCollectType["GoodsID"] = procedureDataEntity.GoodsID;
+                drCollectType["GoodsCode"] = procedureDataEntity.GoodsCode;
+                drCollectType["GoodsName"] = procedureDataEntity.GoodsName;
+                drCollectType["UserID"] = procedureDataEntity.UserID;
+                drCollectType["UserCode"] = procedureDataEntity.UserCode;
+                drCollectType["UserName"] = procedureDataEntity.UserName;
+                drCollectType["KilnID"] = procedureDataEntity.KilnID;
+                drCollectType["KilnCode"] = procedureDataEntity.KilnCode;
+                drCollectType["KilnName"] = procedureDataEntity.KilnName;
+                drCollectType["KilnCarID"] = procedureDataEntity.KilnCarID;
+                drCollectType["KilnCarCode"] = procedureDataEntity.KilnCarCode;
+                drCollectType["KilnCarName"] = procedureDataEntity.KilnCarName;
+                drCollectType["KilnCarPosition"] = procedureDataEntity.KilnCarPosition;
+                DataSourceCollectTypeTable.Rows.Add(drCollectType);
+                DataTable returnString = (DataTable)DoAsync(new BaseAsyncMethod(() =>
+                {
+                    return PMModuleProxy.Service.AddWorkPiece(this._procedureID, DataSourceCollectTypeTable);
+                }
+                ));
+                DataRow dr = this.DataSourceTable.NewRow();
+                dr["BarCode"] = procedureDataEntity.Barcode;
+                dr["GoodsID"] = procedureDataEntity.GoodsID;
+                dr["GoodsCode"] = procedureDataEntity.GoodsCode;
+                dr["GoodsName"] = procedureDataEntity.GoodsName;
+                dr["UserID"] = procedureDataEntity.UserID;
+                dr["UserCode"] = procedureDataEntity.UserCode;
+                dr["UserName"] = procedureDataEntity.UserName;
+                dr["KilnID"] = procedureDataEntity.KilnID;
+                dr["KilnCode"] = procedureDataEntity.KilnCode;
+                dr["KilnName"] = procedureDataEntity.KilnName;
+                dr["KilnCarID"] = procedureDataEntity.KilnCarID;
+                dr["KilnCarCode"] = procedureDataEntity.KilnCarCode;
+                dr["KilnCarName"] = procedureDataEntity.KilnCarName;
+                dr["KilnCarPosition"] = procedureDataEntity.KilnCarPosition;
+                this.DataSourceTable.Rows.Add(dr);
+                this.dgvProduction.CurrentCell = null;
+                this.dgvProduction.Rows[dgvProduction.RowCount - 1].Selected = true;
+                this.dgvProduction.CurrentCell = this.dgvProduction.Rows[dgvProduction.RowCount - 1].Cells[0];
+                #endregion
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        /// <summary>
+        ///集中采集模式
+        /// </summary>
+        /// <param name="procedureDataEntity"></param>
+        private void CollectTypeOne(ProductionDataEntity procedureDataEntity,DataSet dsGroutingProduct)
+        {
+            try
+            {
+                #region 集中采集
+                DataRow[] drRows = this.DataSourceTable.Select("BarCode='" + procedureDataEntity.Barcode + "'");
+                if (drRows.Length > Constant.INT_IS_ZERO)
+                {
+                    this.txtBarcode.Text = "";
+                    return;
+                }
+                // 由产品条码获取注浆信息
+                //DataSet dsGroutingProduct = (DataSet)DoAsync(new BaseAsyncMethod(() =>
+                //{
+                //    return PMModuleProxy.Service.GetGroutingProducttByBarCode(procedureDataEntity.Barcode);
+                //}));
+                DataRow dr = this.DataSourceTable.NewRow();
+                dr["BarCode"] = procedureDataEntity.Barcode;
+                dr["GoodsID"] = procedureDataEntity.GoodsID;
+                dr["GoodsCode"] = procedureDataEntity.GoodsCode;
+                dr["GoodsName"] = procedureDataEntity.GoodsName;
+                dr["UserID"] = procedureDataEntity.UserID;
+                dr["UserCode"] = procedureDataEntity.UserCode;
+                dr["UserName"] = procedureDataEntity.UserName;
+                dr["KilnID"] = procedureDataEntity.KilnID;
+                dr["KilnCode"] = procedureDataEntity.KilnCode;
+                dr["KilnName"] = procedureDataEntity.KilnName;
+                dr["KilnCarID"] = procedureDataEntity.KilnCarID;
+                dr["KilnCarCode"] = procedureDataEntity.KilnCarCode;
+                dr["KilnCarName"] = procedureDataEntity.KilnCarName;
+                dr["KilnCarPosition"] = procedureDataEntity.KilnCarPosition;
+                dr["MouldCode"] = dsGroutingProduct.Tables[0].Rows[0][Constant.BarCodeResultTableColumns.out_mouldCode.ToString()];
+                dr["GroutingUserCode"] = dsGroutingProduct.Tables[0].Rows[0][Constant.BarCodeResultTableColumns.out_groutingUserCode.ToString()];
+                dr["GroutingNum"] = dsGroutingProduct.Tables[0].Rows[0][Constant.BarCodeResultTableColumns.out_groutingNum.ToString()];
+                dr["GroutingDate"] = Convert.ToDateTime(dsGroutingProduct.Tables[0].Rows[0][Constant.BarCodeResultTableColumns.out_groutingdate.ToString()]);
+                dr["IsPublicBody"] = dsGroutingProduct.Tables[0].Rows[0][Constant.BarCodeResultTableColumns.out_ispublicbody.ToString()].ToString() != "1" ? 0 : 1;
+                dr["LogoID"] = procedureDataEntity.LogoID;
+                dr["LogoCodeName"] = this._isLogoName + "[" + this._isLogoCode + "]";
+                this.DataSourceTable.Rows.Add(dr);
+                this.dgvProduction.CurrentCell = null;
+                this.dgvProduction.Rows[dgvProduction.RowCount - 1].Selected = true;
+                this.dgvProduction.CurrentCell = this.dgvProduction.Rows[dgvProduction.RowCount - 1].Cells[0];
+                #endregion
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        /// <summary>
+        /// 保存数据到数据库
+        /// </summary>
+        private void SaveDataInfo()
+        {
+            this.DataSourceTable.AcceptChanges();
+            this.DataSourceCollectTypeTable.Clear();
+            if (this.DataSourceTable.Rows.Count > Constant.INT_IS_ZERO)
+            {
+                //if (this.MaxGoodsNum > 0 && this.DataSourceTable.Rows.Count > this.MaxGoodsNum)
+                //{
+                //    // 提示信息
+                //    MessageBox.Show("超出登车产品最大装载数量" + this.MaxGoodsNum.ToString(),
+                //         this.Text, MessageBoxButtons.OK, MessageBoxIcon.Information);
+                //    return;
+                //}
+                foreach (DataRow drproductionData in this.DataSourceTable.Rows)
+                {
+                    if (drproductionData["IsSave"].ToString() != "1")
+                    {
+                        DataRow drCollectType = DataSourceCollectTypeTable.NewRow();
+                        drCollectType["BarCode"] = drproductionData["BarCode"];
+                        drCollectType["GoodsID"] = drproductionData["GoodsID"];
+                        drCollectType["GoodsCode"] = drproductionData["GoodsCode"];
+                        drCollectType["GoodsName"] = drproductionData["GoodsName"];
+                        drCollectType["UserID"] = drproductionData["UserID"];
+                        drCollectType["UserCode"] = drproductionData["UserCode"];
+                        drCollectType["UserName"] = drproductionData["UserName"];
+                        drCollectType["KilnID"] = drproductionData["KilnID"];
+                        drCollectType["KilnCode"] = drproductionData["KilnCode"];
+                        drCollectType["KilnName"] = drproductionData["KilnName"];
+                        drCollectType["KilnCarID"] = drproductionData["KilnCarID"];
+                        drCollectType["KilnCarCode"] = drproductionData["KilnCarCode"];
+                        drCollectType["KilnCarName"] = drproductionData["KilnCarName"];
+                        drCollectType["KilnCarPosition"] = drproductionData["KilnCarPosition"];
+                        DataSourceCollectTypeTable.Rows.Add(drCollectType);
+                    }
+                }
+                if (DataSourceCollectTypeTable.Rows.Count == 0)
+                {
+                    // 提示信息
+                    MessageBox.Show("以上产品已经登车",
+                         this.Text, MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    return;
+                }
+                DataTable returnRow = (DataTable)DoAsync(new BaseAsyncMethod(() =>
+                {
+                    return PMModuleProxy.Service.AddWorkPiece(this._procedureID, DataSourceCollectTypeTable);
+                }));
+                if (returnRow.Rows.Count <= Constant.INT_IS_ZERO)
+                {
+                    // 提示信息
+                    MessageBox.Show(Messages.MSG_PM_W012,
+                         this.Text, MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+                else
+                {
+                    if (string.IsNullOrEmpty(returnRow.Rows[0][Constant.BarCodeResultTableColumns.out_errMsg.ToString()].ToString()))//成功
+                    {
+                        // 提示信息
+                        MessageBox.Show(string.Format(Messages.MSG_CMN_I001, "新增" + this.Text, "保存"),
+                             this.Text, MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    }
+                    else
+                    {
+                        // 提示信息
+                        MessageBox.Show(string.Format(returnRow.Rows[0][Constant.BarCodeResultTableColumns.out_errMsg.ToString()].ToString()),
+                              this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                        return;
+                    }
+                }
+                this.txtBarcode.Text = "";
+                this._productionDataEntity.Clear();
+                this.DataSourceTable.Rows.Clear();
+                this.txtKilnCarCode.Text = "";
+                //this.txtKiln.Text = "";
+                if (this._procedureDataEntity.CollectType == (int)Constant.ProcedureCollectType.Togather)
+                {
+                    this.txtUserCode.Text = "";
+                    this.txtUserCode.Focus();
+                    this.txtUserCode.ReadOnly = false;
+                    this.txtKilnCarCode.ReadOnly = false;
+                    this.txtKiln.ReadOnly = false;
+                    this.txtKilnCarCode.Enabled = true;
+                    this.txtKiln.Enabled = true;
+                }
+                else
+                {
+                    this.txtBarcode.Focus();
+                    this.txtKilnCarCode.ReadOnly = false;
+                    this.txtKiln.ReadOnly = false;
+                    this.txtKilnCarCode.Enabled = true;
+                    this.txtKiln.Enabled = true;
+                }
+            }
+        }
+
+        #endregion
+
+        private void txtKiln_Validating(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            try
+            {
+                if (this.txtKiln.Text.Trim() == string.Empty)
+                {
+                    return;
+                }
+                if (this.txtKiln.Text.Trim() != "")
+                {
+                    if (!this.txtKiln.ReadOnly)
+                    {
+                        DataSet dsResultAccount = (DataSet)DoAsync(new BaseAsyncMethod(() =>
+                        {
+                            return SystemModuleProxy.Service.GetAllKilntInfo();
+                        }));
+                        if (dsResultAccount != null && dsResultAccount.Tables[0].Rows.Count > 0)
+                        {
+                            DataView dv = dsResultAccount.Tables[0].DefaultView;
+                            dv.RowFilter = "ValueFlag=1 and KilnCode='" + this.txtKiln.Text.Trim() + "'";
+                            DataTable dt = dv.ToTable();
+                            if (dt.Rows.Count == 0)
+                            {
+                                // 提示信息
+                                MessageBox.Show("不存在此窑炉编号",
+                                      this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                                this.txtKiln.SelectAll();
+                                this.txtKiln.Focus();
+                                return;
+                            }
+                            // 保存业务系统配置
+                            Utility.WriteIniFile(Constant.INI_SECTION_SETTINGS, Constant.INI_KEY_KILN_CODE,
+                                this.txtKiln.Text.Trim(), this._iniFilePath);
+                        }
+                    }
+                }
+
+            }
+            catch (Exception ex)
+            {
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(this.ToString(),
+                    System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+            }
+        }
+
+        private void txtKiln_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            try
+            {
+                if ((int)e.KeyChar == Constant.SYSTEM_KEYBOARD_ENTER_VALUE) // 按了回车键
+                {
+                    if (this.txtKiln.Text.Trim() == string.Empty)
+                    {
+                        return;
+                    }
+                    if (this.txtKiln.Text.Trim() != "")
+                    {
+                        DataSet dsResultAccount = (DataSet)DoAsync(new BaseAsyncMethod(() =>
+                        {
+                            return SystemModuleProxy.Service.GetAllKilntInfo();
+                        }));
+                        if (dsResultAccount != null && dsResultAccount.Tables[0].Rows.Count > 0)
+                        {
+                            DataView dv = dsResultAccount.Tables[0].DefaultView;
+                            dv.RowFilter = "ValueFlag=1 and KilnCode='" + this.txtKiln.Text.Trim() + "'";
+                            DataTable dt = dv.ToTable();
+                            if (dt.Rows.Count == 0)
+                            {
+                                // 提示信息
+                                MessageBox.Show("不存在此窑炉编号",
+                                      this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                                this.txtKiln.SelectAll();
+                                this.txtKiln.Focus();
+                                return;
+                            }
+                            else
+                            {
+                                // 保存业务系统配置
+                                Utility.WriteIniFile(Constant.INI_SECTION_SETTINGS, Constant.INI_KEY_KILN_CODE,
+                                    this.txtKiln.Text.Trim(), this._iniFilePath);
+                                this.txtKilnCarCode.Focus();
+                            }
+                        }
+
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(this.ToString(),
+                    System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+            }
+        }
+    }
+}

+ 202 - 0
DK.Client/PMModule/F_PM_0504.resx

@@ -0,0 +1,202 @@
+<?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>
+  <metadata name="tsrOperate.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>147, 17</value>
+  </metadata>
+  <metadata name="KilnCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="KilnCarCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="KilnCarPosition.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="GoodsID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Status.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="UserID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="UserName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="KilnID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="KilnCarName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="KilnName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="KilnCarID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="MouldCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="GroutingDate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="GroutingUserCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="IsPublicBody.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="GroutingNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LogoCodeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btnCancel.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="btnSave.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="btnOk.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>55</value>
+  </metadata>
+</root>

Разница между файлами не показана из-за своего большого размера
+ 511 - 510
DK.Client/PMModule/F_PM_0601.Designer.cs


+ 3 - 0
DK.Client/PMModule/F_PM_0601.resx

@@ -263,6 +263,9 @@
   <metadata name="KilnCarPositionName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Kilncarbatchno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="LogoCodeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

+ 9 - 0
DK.Client/PMModule/PMModule.csproj

@@ -109,6 +109,12 @@
     <Compile Include="F_PM_0102.Designer.cs">
       <DependentUpon>F_PM_0102.cs</DependentUpon>
     </Compile>
+    <Compile Include="F_PM_0504.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="F_PM_0504.Designer.cs">
+      <DependentUpon>F_PM_0504.cs</DependentUpon>
+    </Compile>
     <Compile Include="F_PM_2405.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -725,6 +731,9 @@
     <EmbeddedResource Include="F_PM_0102.resx">
       <DependentUpon>F_PM_0102.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="F_PM_0504.resx">
+      <DependentUpon>F_PM_0504.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="F_PM_2405.resx">
       <DependentUpon>F_PM_2405.cs</DependentUpon>
     </EmbeddedResource>

+ 73 - 1
DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -1066,6 +1066,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                     #region 如果窑车状态为空,需要插入窑车状态表
                     if (string.IsNullOrEmpty(kilnCarStatus))
                     {
+                        // 自动生成窑车烧成批次号
+                        kilnCarBatchNo = GetFiredKilnCarBatchNo(oracleTrConn, kilnCarID);
                         // 插入窑车状态表
                         errMsg = AddkilnCarStatus(oracleTrConn, procedure, kilnCarID, kilnID, kilnCarBatchNo, sUserInfo);
 
@@ -2890,11 +2892,81 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
             }
             else
             {
-                return System.Guid.NewGuid().ToString();
+                // 自动生成窑车烧成批次号
+                //return System.Guid.NewGuid().ToString();
+                return GetFiredKilnCarBatchNo(oracleTrConn, kilnCarID);
             }
         }
 
         /// <summary>
+        /// 自动生成窑车烧成批次号
+        /// </summary>
+        /// <param name="oracleTrConn"></param>
+        /// <param name="kilnCarID"></param>
+        /// <returns></returns>
+        public static string GetFiredKilnCarBatchNo(IDBTransaction oracleTrConn, int kilnCarID)
+        {
+            DateTime now = DateTime.Now.Date;
+            string sqlString = "select k.kilnid, k.kilncode, k.fireddate, k.firedbatchno, kc.kilncarcode\n" +
+            "  from TP_MST_Kiln k\n" +
+            " inner join tp_mst_kilncar kc\n" +
+            "    on k.kilnid = kc.kilnid\n" +
+            " where kc.kilncarid = :kilncarid\n" +
+            //"   and k.fireddate = :fireddate"
+            "   for update";
+            OracleParameter[] paras = new OracleParameter[] {
+                new OracleParameter(":kilncarid",kilnCarID),
+                //new OracleParameter(":fireddate",now),
+            };
+            DataTable dt = oracleTrConn.GetSqlResultToDt(sqlString, paras);
+            if (dt == null || dt.Rows.Count == 0)
+            {
+                // 窑车、窑炉不存在
+                return null;
+            }
+            int kilnid = Convert.ToInt32(dt.Rows[0]["kilnid"]);
+            string kilncode = dt.Rows[0]["kilncode"] + "";
+            string kilncarcode = dt.Rows[0]["kilncarcode"] + "";
+            int firedbatchno = 0;
+            if (dt.Rows[0]["fireddate"] == null || dt.Rows[0]["fireddate"] == DBNull.Value)
+            {
+                firedbatchno = -1;
+            }
+            else
+            {
+                DateTime fireddate = Convert.ToDateTime(dt.Rows[0]["fireddate"]);
+                if (now > fireddate)
+                {
+                    firedbatchno = -1;
+                }
+            }
+            if (firedbatchno < 0)
+            {
+                // 单日第一车
+                sqlString = "update TP_MST_Kiln k\n" +
+                "   set k.fireddate = :fireddate, k.firedbatchno = 1\n" +
+                " where k.kilnid = :kilnid";
+                paras = new OracleParameter[] {
+                    new OracleParameter(":kilnid",kilnid),
+                    new OracleParameter(":fireddate",now),
+                };
+                oracleTrConn.ExecuteNonQuery(sqlString, paras);
+                return $"{kilncode}#{kilncarcode}#{now.ToString("yyyyMMdd")}#001";
+            }
+
+            firedbatchno = Convert.ToInt32(dt.Rows[0]["firedbatchno"]) + 1;
+
+            sqlString = "update TP_MST_Kiln k\n" +
+            "   set k.firedbatchno = k.firedbatchno + 1\n" +
+            " where k.kilnid = :kilnid";
+            paras = new OracleParameter[] {
+                new OracleParameter(":kilnid",kilnid),
+            };
+            oracleTrConn.ExecuteNonQuery(sqlString, paras);
+            return $"{kilncode}#{kilncarcode}#{now.ToString("yyyyMMdd")}#{firedbatchno.ToString("000")}";
+        }
+
+        /// <summary>
         /// 插入窑车状态表
         /// </summary>
         /// <param name="oracleTrConn">连接对象</param>

BIN
DLL/Curtain.Core.dll


BIN
DLL/Curtain.DataAccess.dll


+ 57 - 0
DLL/Curtain.DataAccess.xml

@@ -638,6 +638,11 @@
             开启事务
             </summary>
         </member>
+        <member name="M:Curtain.DataAccess.DataAccessBase.BeginTransactionCore">
+            <summary>
+            开启事务
+            </summary>
+        </member>
         <member name="M:Curtain.DataAccess.DataAccessBase.SavePoint(System.String)">
             <summary>
             在事务中设置保存点
@@ -1100,6 +1105,23 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="T:Curtain.DataAccess.CDAExtension">
+            <summary>
+            扩展方法
+            </summary>
+        </member>
+        <member name="M:Curtain.DataAccess.CDAExtension.ClearDbParameter(System.Collections.Generic.List{Curtain.DataAccess.CDAParameter})">
+            <summary>
+            清除DbParameter(再执行SQL时,会重新生成新的清除DbParameter)
+            </summary>
+            <param name="list"></param>
+        </member>
+        <member name="M:Curtain.DataAccess.CDAExtension.ClearDbParameter(Curtain.DataAccess.CDAParameter[])">
+            <summary>
+            清除DbParameter(再执行SQL时,会重新生成新的清除DbParameter)
+            </summary>
+            <param name="list"></param>
+        </member>
         <member name="T:Curtain.DataAccess.SQLServerVersion">
             <summary>
             SQLServer数据库版本
@@ -7463,6 +7485,13 @@
             <param name="dataType"></param>
             <returns>NpgsqlDbType</returns>
         </member>
+        <member name="M:Curtain.DataAccess.PostgreSQL.ToDataType(NpgsqlTypes.NpgsqlDbType)">
+            <summary>
+            转换为DataType
+            </summary>
+            <param name="dbType"></param>
+            <returns></returns>
+        </member>
         <member name="T:Curtain.DataAccess.MySql">
             <summary>
             MySql 数据库操作类
@@ -7648,6 +7677,13 @@
             <param name="dataType"></param>
             <returns>MySqlDbType</returns>
         </member>
+        <member name="M:Curtain.DataAccess.MySql.ToDataType(MySql.Data.MySqlClient.MySqlDbType)">
+            <summary>
+            转换为DataType
+            </summary>
+            <param name="dbType"></param>
+            <returns></returns>
+        </member>
         <member name="T:Curtain.DataAccess.MySqlDBType">
             <summary>
             Specifies MySQL specific data type of a field, property, for use in a MySql.Data.MySqlClient.MySqlParameter.
@@ -8068,6 +8104,13 @@
             <param name="dataType"></param>
             <returns>OracleDbType</returns>
         </member>
+        <member name="M:Curtain.DataAccess.Oracle.ToDataType(Oracle.ManagedDataAccess.Client.OracleDbType)">
+            <summary>
+            转换为DataType
+            </summary>
+            <param name="dbType"></param>
+            <returns></returns>
+        </member>
         <member name="T:Curtain.DataAccess.OracleDBType">
             <summary>
             Oracle数据类型
@@ -8255,6 +8298,13 @@
             <param name="dataType"></param>
             <returns>SQLiteDbType</returns>
         </member>
+        <member name="M:Curtain.DataAccess.SQLite.ToDataType(System.Data.DbType)">
+            <summary>
+            转换为DataType
+            </summary>
+            <param name="dbType"></param>
+            <returns></returns>
+        </member>
         <member name="M:Curtain.DataAccess.SQLite.ChangePassword(System.String)">
             <summary>
             修改数据库密码
@@ -8458,6 +8508,13 @@
             <param name="dataType"></param>
             <returns>SqlDbType</returns>
         </member>
+        <member name="M:Curtain.DataAccess.SQLServer.ToDataType(System.Data.SqlDbType)">
+            <summary>
+            转换为DataType
+            </summary>
+            <param name="dbType"></param>
+            <returns></returns>
+        </member>
         <member name="M:Curtain.DataAccess.INIHelper.Write(System.String,System.String,System.String,System.String)">
             <summary>
             写入INI文件

BIN
DLL/Curtain.Framework.dll


BIN
DLL/Curtain.Net.Sockets.dll


+ 5 - 0
IBOSS.PRD.sln

@@ -104,12 +104,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DLL", "DLL", "{7B766D59-13A
 		DLL\Curtain.Core.dll = DLL\Curtain.Core.dll
 		DLL\Curtain.Core.xml = DLL\Curtain.Core.xml
 		DLL\Curtain.DataAccess.dll = DLL\Curtain.DataAccess.dll
+		DLL\Curtain.DataAccess.xml = DLL\Curtain.DataAccess.xml
 		DLL\Curtain.Framework.dll = DLL\Curtain.Framework.dll
+		DLL\Curtain.Framework.xml = DLL\Curtain.Framework.xml
 		DLL\Curtain.Net.Sockets.dll = DLL\Curtain.Net.Sockets.dll
+		DLL\Curtain.Net.Sockets.xml = DLL\Curtain.Net.Sockets.xml
 		DLL\Newtonsoft.Json.dll = DLL\Newtonsoft.Json.dll
+		DLL\Newtonsoft.Json.xml = DLL\Newtonsoft.Json.xml
 		DLL\Oracle.ManagedDataAccess.dll = DLL\Oracle.ManagedDataAccess.dll
 		DLL\Utilities.dll = DLL\Utilities.dll
 		DLL\zxing.dll = DLL\zxing.dll
+		DLL\zxing.xml = DLL\zxing.xml
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InvoiceLayout", "DK.Basics\InvoiceLayout\InvoiceLayout.csproj", "{2F6FE234-9A61-4D2D-A951-547B492E9A44}"

Некоторые файлы не были показаны из-за большого количества измененных файлов