成型线转厂标识；批量绑定注浆条码

DK.Client/PCModule/F_PC_0102_1_1.Designer.cs

@@ -28,16 +28,16 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_PC_0102_1_1));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = 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 dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
             this.lblBuildingNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.txtBuildingNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
             this.lblFloorNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
@@ -85,6 +85,7 @@
             this.Remarks1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tabPage2 = new System.Windows.Forms.TabPage();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.rabBinding = new Dongke.IBOSS.PRD.Basics.BaseControls.C_RadioButton();
             this.rabAuto = new Dongke.IBOSS.PRD.Basics.BaseControls.C_RadioButton();
             this.pnlBinding = new System.Windows.Forms.Panel();
             this.lblLabel1 = new Dongke.WinForm.Controls.LblLabel();
@@ -93,16 +94,16 @@
             this.txtGMouldCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_Digital();
             this.c_Label1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.pnlAuto = new System.Windows.Forms.Panel();
-            this.scbGoods = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoods();
             this.lblGoods = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.scbGoods = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoods();
+            this.txtGroutingCount = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_Digital();
+            this.c_Label4 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.txtStandardGroutingCount = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_Digital();
             this.c_Label2 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.lblstart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.txtBeginNum = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_Digital();
-            this.rabBinding = new Dongke.IBOSS.PRD.Basics.BaseControls.C_RadioButton();
             this.btnAdaptive = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
-            this.c_Label4 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.txtGroutingCount = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_Digital();
+            this.chkNonSAP = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
             ((System.ComponentModel.ISupportInitialize)(this.dgvDetail)).BeginInit();
             this.c_GroupBox1.SuspendLayout();
             this.tabControl1.SuspendLayout();
@@ -308,8 +309,8 @@
             this.dgvDetail.AllowUserToDeleteRows = false;
             this.dgvDetail.AllowUserToModifyRows = true;
             this.dgvDetail.AllowUserToSortRows = false;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvDetail.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvDetail.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21;
             this.dgvDetail.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.dgvDetail.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
             this.dgvDetail.CellHeight = 23;
@@ -317,14 +318,14 @@
             this.dgvDetail.ChildNodeColumnText = null;
             this.dgvDetail.ColumnDeep = 1;
             this.dgvDetail.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvDetail.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle22.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle22.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle22.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvDetail.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22;
             this.dgvDetail.ColumnHeadersHeight = 29;
             this.dgvDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -341,14 +342,14 @@
             this.Remarks});
             this.dgvDetail.ColumnTreeView = null;
             this.dgvDetail.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)));
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvDetail.DefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle26.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvDetail.DefaultCellStyle = dataGridViewCellStyle26;
             this.dgvDetail.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvDetail.DynamicColumnName = "";
             this.dgvDetail.EnableHeadersVisualStyles = false;
@@ -370,8 +371,8 @@
             this.dgvDetail.RefreshAtHscroll = false;
             this.dgvDetail.RowHeadersWidth = 50;
             this.dgvDetail.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvDetail.RowsDefaultCellStyle = dataGridViewCellStyle7;
+            dataGridViewCellStyle27.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvDetail.RowsDefaultCellStyle = dataGridViewCellStyle27;
             this.dgvDetail.RowTemplate.Height = 21;
             this.dgvDetail.Size = new System.Drawing.Size(706, 236);
             this.dgvDetail.SortOrderColumnName = null;
@@ -457,8 +458,8 @@
             // GROUTINGCOUNT
             // 
             this.GROUTINGCOUNT.DataPropertyName = "GROUTINGCOUNT";
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.GROUTINGCOUNT.DefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.GROUTINGCOUNT.DefaultCellStyle = dataGridViewCellStyle23;
             this.GROUTINGCOUNT.HeaderText = "注浆次数";
             this.GROUTINGCOUNT.MaxValue = new decimal(new int[] {
             999999,
@@ -479,8 +480,8 @@
             // StandardGroutingCount
             // 
             this.StandardGroutingCount.DataPropertyName = "StandardGroutingCount";
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.StandardGroutingCount.DefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.StandardGroutingCount.DefaultCellStyle = dataGridViewCellStyle24;
             this.StandardGroutingCount.HeaderText = "标准注浆次数";
             this.StandardGroutingCount.MaxValue = new decimal(new int[] {
             999999,
@@ -511,8 +512,8 @@
             // Remarks
             // 
             this.Remarks.DataPropertyName = "Remarks";
-            dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
-            this.Remarks.DefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle25.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
+            this.Remarks.DefaultCellStyle = dataGridViewCellStyle25;
             this.Remarks.HeaderText = "备注";
             this.Remarks.MinimumWidth = 6;
             this.Remarks.Name = "Remarks";
@@ -597,6 +598,7 @@
             this.c_GroupBox1.BackColor = System.Drawing.Color.Transparent;
             this.c_GroupBox1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("c_GroupBox1.BackgroundImage")));
             this.c_GroupBox1.CanExpand = false;
+            this.c_GroupBox1.Controls.Add(this.chkNonSAP);
             this.c_GroupBox1.Controls.Add(this.HighPressureFlag);
             this.c_GroupBox1.Controls.Add(this.scbUser1);
             this.c_GroupBox1.Controls.Add(this.lblGMouldType);
@@ -624,13 +626,13 @@
             this.c_GroupBox1.Size = new System.Drawing.Size(720, 100);
             this.c_GroupBox1.TabIndex = 0;
             this.c_GroupBox1.TabStop = false;
-            this.c_GroupBox1.Text = "成型线信息           ";
+            this.c_GroupBox1.Text = "成型线信息            ";
             // 
             // HighPressureFlag
             // 
             this.HighPressureFlag.AutoSize = true;
             this.HighPressureFlag.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.HighPressureFlag.Location = new System.Drawing.Point(464, 21);
+            this.HighPressureFlag.Location = new System.Drawing.Point(464, 22);
             this.HighPressureFlag.Margin = new System.Windows.Forms.Padding(2);
             this.HighPressureFlag.Name = "HighPressureFlag";
             this.HighPressureFlag.Size = new System.Drawing.Size(72, 16);
@@ -727,8 +729,8 @@
             // dgvUser
             // 
             this.dgvUser.AllowUserToModifyRows = true;
-            dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle28.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle28;
             this.dgvUser.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.dgvUser.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
             this.dgvUser.CellHeight = 23;
@@ -736,14 +738,14 @@
             this.dgvUser.ChildNodeColumnText = null;
             this.dgvUser.ColumnDeep = 1;
             this.dgvUser.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle9.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
+            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle29.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle29.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle29.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle29;
             this.dgvUser.ColumnHeadersHeight = 29;
             this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -776,8 +778,8 @@
             this.dgvUser.RefreshAtHscroll = false;
             this.dgvUser.RowHeadersWidth = 50;
             this.dgvUser.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvUser.RowsDefaultCellStyle = dataGridViewCellStyle10;
+            dataGridViewCellStyle30.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvUser.RowsDefaultCellStyle = dataGridViewCellStyle30;
             this.dgvUser.RowTemplate.Height = 21;
             this.dgvUser.Size = new System.Drawing.Size(706, 301);
             this.dgvUser.SortOrderColumnName = null;
@@ -869,6 +871,20 @@
             this.panel1.Size = new System.Drawing.Size(706, 65);
             this.panel1.TabIndex = 0;
             // 
+            // rabBinding
+            // 
+            this.rabBinding.AutoSize = true;
+            this.rabBinding.Checked = true;
+            this.rabBinding.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.rabBinding.Location = new System.Drawing.Point(7, 38);
+            this.rabBinding.Name = "rabBinding";
+            this.rabBinding.Size = new System.Drawing.Size(71, 16);
+            this.rabBinding.TabIndex = 2;
+            this.rabBinding.TabStop = true;
+            this.rabBinding.Text = "条码模具";
+            this.rabBinding.UseVisualStyleBackColor = true;
+            this.rabBinding.CheckedChanged += new System.EventHandler(this.rabAuto_CheckedChanged);
+            // 
             // rabAuto
             // 
             this.rabAuto.AutoSize = true;
@@ -977,15 +993,6 @@
             this.pnlAuto.Size = new System.Drawing.Size(631, 30);
             this.pnlAuto.TabIndex = 1;
             // 
-            // scbGoods
-            // 
-            this.scbGoods.CheckedData = null;
-            this.scbGoods.DisplayMember = "GoodsCode";
-            this.scbGoods.Location = new System.Drawing.Point(59, 5);
-            this.scbGoods.Name = "scbGoods";
-            this.scbGoods.Size = new System.Drawing.Size(115, 21);
-            this.scbGoods.TabIndex = 1;
-            // 
             // lblGoods
             // 
             this.lblGoods.AutoSize = true;
@@ -998,6 +1005,53 @@
             this.lblGoods.TabIndex = 0;
             this.lblGoods.Text = "产品编码";
             // 
+            // scbGoods
+            // 
+            this.scbGoods.CheckedData = null;
+            this.scbGoods.DisplayMember = "GoodsCode";
+            this.scbGoods.Location = new System.Drawing.Point(59, 5);
+            this.scbGoods.Name = "scbGoods";
+            this.scbGoods.Size = new System.Drawing.Size(115, 21);
+            this.scbGoods.TabIndex = 1;
+            // 
+            // txtGroutingCount
+            // 
+            this.txtGroutingCount.AllowNegative = false;
+            this.txtGroutingCount.BackColor = System.Drawing.SystemColors.Window;
+            this.txtGroutingCount.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtGroutingCount.ErrorMessage = "";
+            this.txtGroutingCount.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtGroutingCount.ImeMode = System.Windows.Forms.ImeMode.Off;
+            this.txtGroutingCount.Location = new System.Drawing.Point(505, 5);
+            this.txtGroutingCount.MaxLength = 0;
+            this.txtGroutingCount.MaxValue = new decimal(new int[] {
+            999999,
+            0,
+            0,
+            0});
+            this.txtGroutingCount.MinValue = new decimal(new int[] {
+            0,
+            0,
+            0,
+            0});
+            this.txtGroutingCount.Name = "txtGroutingCount";
+            this.txtGroutingCount.Size = new System.Drawing.Size(36, 21);
+            this.txtGroutingCount.TabIndex = 9;
+            this.txtGroutingCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+            this.txtGroutingCount.TextValue = "";
+            // 
+            // 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.SystemColors.ControlText;
+            this.c_Label4.Location = new System.Drawing.Point(449, 9);
+            this.c_Label4.Name = "c_Label4";
+            this.c_Label4.Size = new System.Drawing.Size(53, 12);
+            this.c_Label4.TabIndex = 8;
+            this.c_Label4.Text = "已注次数";
+            // 
             // txtStandardGroutingCount
             // 
             this.txtStandardGroutingCount.AllowNegative = false;
@@ -1073,20 +1127,6 @@
             this.txtBeginNum.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtBeginNum.TextValue = "";
             // 
-            // rabBinding
-            // 
-            this.rabBinding.AutoSize = true;
-            this.rabBinding.Checked = true;
-            this.rabBinding.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.rabBinding.Location = new System.Drawing.Point(7, 38);
-            this.rabBinding.Name = "rabBinding";
-            this.rabBinding.Size = new System.Drawing.Size(71, 16);
-            this.rabBinding.TabIndex = 2;
-            this.rabBinding.TabStop = true;
-            this.rabBinding.Text = "条码模具";
-            this.rabBinding.UseVisualStyleBackColor = true;
-            this.rabBinding.CheckedChanged += new System.EventHandler(this.rabAuto_CheckedChanged);
-            // 
             // btnAdaptive
             // 
             this.btnAdaptive.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -1102,43 +1142,17 @@
             this.btnAdaptive.UseVisualStyleBackColor = false;
             this.btnAdaptive.Click += new System.EventHandler(this.btnAdaptive_Click);
             // 
-            // 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.SystemColors.ControlText;
-            this.c_Label4.Location = new System.Drawing.Point(449, 9);
-            this.c_Label4.Name = "c_Label4";
-            this.c_Label4.Size = new System.Drawing.Size(53, 12);
-            this.c_Label4.TabIndex = 8;
-            this.c_Label4.Text = "已注次数";
-            // 
-            // txtGroutingCount
+            // chkNonSAP
             // 
-            this.txtGroutingCount.AllowNegative = false;
-            this.txtGroutingCount.BackColor = System.Drawing.SystemColors.Window;
-            this.txtGroutingCount.BackgroundColor = System.Drawing.SystemColors.Window;
-            this.txtGroutingCount.ErrorMessage = "";
-            this.txtGroutingCount.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtGroutingCount.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtGroutingCount.Location = new System.Drawing.Point(505, 5);
-            this.txtGroutingCount.MaxLength = 0;
-            this.txtGroutingCount.MaxValue = new decimal(new int[] {
-            999999,
-            0,
-            0,
-            0});
-            this.txtGroutingCount.MinValue = new decimal(new int[] {
-            0,
-            0,
-            0,
-            0});
-            this.txtGroutingCount.Name = "txtGroutingCount";
-            this.txtGroutingCount.Size = new System.Drawing.Size(36, 21);
-            this.txtGroutingCount.TabIndex = 9;
-            this.txtGroutingCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.txtGroutingCount.TextValue = "";
+            this.chkNonSAP.AutoSize = true;
+            this.chkNonSAP.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.chkNonSAP.Location = new System.Drawing.Point(545, 22);
+            this.chkNonSAP.Margin = new System.Windows.Forms.Padding(2);
+            this.chkNonSAP.Name = "chkNonSAP";
+            this.chkNonSAP.Size = new System.Drawing.Size(108, 16);
+            this.chkNonSAP.TabIndex = 22;
+            this.chkNonSAP.Text = "转厂虚拟成型线";
+            this.chkNonSAP.UseVisualStyleBackColor = true;
             // 
             // F_PC_0102_1_1
             // 
@@ -1249,5 +1263,6 @@
         private Controls.SearchBox.ScbGoods scbGoods;
         private Basics.BaseControls.C_TXT_Digital txtGroutingCount;
         private Basics.BaseControls.C_Label c_Label4;
+        private Basics.BaseControls.C_CheckBox chkNonSAP;
     }
 }

DK.Client/PCModule/F_PC_0102_1_1.cs

@@ -409,8 +409,9 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 }
                 //xuwei add 2019-11-13 高压注浆
                 ginfo.HIGHPRESSUREFLAG = HighPressureFlag.Checked ? 1 : 0;
+                ginfo.NON_SAP = chkNonSAP.Checked ? "1" : "0";
                 //xuwei end
-				ginfo.MOULDTYPEID = this.scbGMouldType.SearchedPKMember;
+                ginfo.MOULDTYPEID = this.scbGMouldType.SearchedPKMember;
 				ginfo.MouldStatus = Convert.ToInt32(Constant.GMouldStatus.Normal);
 				ginfo.VALUEFLAG = Convert.ToInt32(Constant.ValueFlag.Effective);
 				ginfo.MOULDQUANTITY = dtDetail.Rows.Count;//this._addDetailList.Count;

DK.Client/PCModule/F_PC_0103_1.Designer.cs

@@ -83,6 +83,9 @@
             this.lblGStatus = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
             this.pnlAuto = new System.Windows.Forms.Panel();
+            this.txtGroutingCount = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_Digital();
+            this.c_Label4 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.scbGoods = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoods();
             this.lblGoods = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.lblstart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.txtBeginNum = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_Digital();
@@ -99,9 +102,7 @@
             this.rabBinding = new Dongke.IBOSS.PRD.Basics.BaseControls.C_RadioButton();
             this.rabAuto = new Dongke.IBOSS.PRD.Basics.BaseControls.C_RadioButton();
             this.btnAdaptive = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
-            this.scbGoods = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoods();
-            this.txtGroutingCount = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_Digital();
-            this.c_Label4 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.chkNonSAP = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
             this.c_GroupBox1.SuspendLayout();
             this.tabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
@@ -260,6 +261,7 @@
             this.c_GroupBox1.BackColor = System.Drawing.Color.Transparent;
             this.c_GroupBox1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("c_GroupBox1.BackgroundImage")));
             this.c_GroupBox1.CanExpand = false;
+            this.c_GroupBox1.Controls.Add(this.chkNonSAP);
             this.c_GroupBox1.Controls.Add(this.HighPressureFlag);
             this.c_GroupBox1.Controls.Add(this.scbUser1);
             this.c_GroupBox1.Controls.Add(this.c_Label3);
@@ -282,14 +284,14 @@
             this.c_GroupBox1.Size = new System.Drawing.Size(720, 75);
             this.c_GroupBox1.TabIndex = 0;
             this.c_GroupBox1.TabStop = false;
-            this.c_GroupBox1.Text = "成型线信息    ";
+            this.c_GroupBox1.Text = "成型线信息     ";
             // 
             // HighPressureFlag
             // 
             this.HighPressureFlag.AutoSize = true;
             this.HighPressureFlag.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.HighPressureFlag.Location = new System.Drawing.Point(640, 23);
-            this.HighPressureFlag.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.HighPressureFlag.Margin = new System.Windows.Forms.Padding(2);
             this.HighPressureFlag.Name = "HighPressureFlag";
             this.HighPressureFlag.Size = new System.Drawing.Size(72, 16);
             this.HighPressureFlag.TabIndex = 24;
@@ -372,7 +374,7 @@
             this.tabPage1.Controls.Add(this.dgvUser);
             this.tabPage1.Location = new System.Drawing.Point(4, 22);
             this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
             this.tabPage1.Size = new System.Drawing.Size(712, 332);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "成型工号";
@@ -506,7 +508,7 @@
             this.tabPage2.Controls.Add(this.panel1);
             this.tabPage2.Location = new System.Drawing.Point(4, 22);
             this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
             this.tabPage2.Size = new System.Drawing.Size(712, 332);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "模具产品";
@@ -781,6 +783,53 @@
             this.pnlAuto.Size = new System.Drawing.Size(631, 30);
             this.pnlAuto.TabIndex = 13;
             // 
+            // txtGroutingCount
+            // 
+            this.txtGroutingCount.AllowNegative = false;
+            this.txtGroutingCount.BackColor = System.Drawing.SystemColors.Window;
+            this.txtGroutingCount.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtGroutingCount.ErrorMessage = "";
+            this.txtGroutingCount.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtGroutingCount.ImeMode = System.Windows.Forms.ImeMode.Off;
+            this.txtGroutingCount.Location = new System.Drawing.Point(505, 4);
+            this.txtGroutingCount.MaxLength = 0;
+            this.txtGroutingCount.MaxValue = new decimal(new int[] {
+            999999,
+            0,
+            0,
+            0});
+            this.txtGroutingCount.MinValue = new decimal(new int[] {
+            0,
+            0,
+            0,
+            0});
+            this.txtGroutingCount.Name = "txtGroutingCount";
+            this.txtGroutingCount.Size = new System.Drawing.Size(36, 21);
+            this.txtGroutingCount.TabIndex = 9;
+            this.txtGroutingCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+            this.txtGroutingCount.TextValue = "";
+            // 
+            // 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.SystemColors.ControlText;
+            this.c_Label4.Location = new System.Drawing.Point(449, 8);
+            this.c_Label4.Name = "c_Label4";
+            this.c_Label4.Size = new System.Drawing.Size(53, 12);
+            this.c_Label4.TabIndex = 8;
+            this.c_Label4.Text = "已注次数";
+            // 
+            // scbGoods
+            // 
+            this.scbGoods.CheckedData = null;
+            this.scbGoods.DisplayMember = "GoodsCode";
+            this.scbGoods.Location = new System.Drawing.Point(59, 5);
+            this.scbGoods.Name = "scbGoods";
+            this.scbGoods.Size = new System.Drawing.Size(115, 21);
+            this.scbGoods.TabIndex = 1;
+            // 
             // lblGoods
             // 
             this.lblGoods.AutoSize = true;
@@ -1023,52 +1072,17 @@
             this.btnAdaptive.UseVisualStyleBackColor = false;
             this.btnAdaptive.Click += new System.EventHandler(this.btnAdaptive_Click);
             // 
-            // scbGoods
+            // chkNonSAP
             // 
-            this.scbGoods.CheckedData = null;
-            this.scbGoods.DisplayMember = "GoodsCode";
-            this.scbGoods.Location = new System.Drawing.Point(59, 5);
-            this.scbGoods.Name = "scbGoods";
-            this.scbGoods.Size = new System.Drawing.Size(115, 21);
-            this.scbGoods.TabIndex = 1;
-            // 
-            // txtGroutingCount
-            // 
-            this.txtGroutingCount.AllowNegative = false;
-            this.txtGroutingCount.BackColor = System.Drawing.SystemColors.Window;
-            this.txtGroutingCount.BackgroundColor = System.Drawing.SystemColors.Window;
-            this.txtGroutingCount.ErrorMessage = "";
-            this.txtGroutingCount.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtGroutingCount.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtGroutingCount.Location = new System.Drawing.Point(505, 4);
-            this.txtGroutingCount.MaxLength = 0;
-            this.txtGroutingCount.MaxValue = new decimal(new int[] {
-            999999,
-            0,
-            0,
-            0});
-            this.txtGroutingCount.MinValue = new decimal(new int[] {
-            0,
-            0,
-            0,
-            0});
-            this.txtGroutingCount.Name = "txtGroutingCount";
-            this.txtGroutingCount.Size = new System.Drawing.Size(36, 21);
-            this.txtGroutingCount.TabIndex = 9;
-            this.txtGroutingCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.txtGroutingCount.TextValue = "";
-            // 
-            // 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.SystemColors.ControlText;
-            this.c_Label4.Location = new System.Drawing.Point(449, 8);
-            this.c_Label4.Name = "c_Label4";
-            this.c_Label4.Size = new System.Drawing.Size(53, 12);
-            this.c_Label4.TabIndex = 8;
-            this.c_Label4.Text = "已注次数";
+            this.chkNonSAP.AutoSize = true;
+            this.chkNonSAP.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.chkNonSAP.Location = new System.Drawing.Point(590, 49);
+            this.chkNonSAP.Margin = new System.Windows.Forms.Padding(2);
+            this.chkNonSAP.Name = "chkNonSAP";
+            this.chkNonSAP.Size = new System.Drawing.Size(108, 16);
+            this.chkNonSAP.TabIndex = 25;
+            this.chkNonSAP.Text = "转厂虚拟成型线";
+            this.chkNonSAP.UseVisualStyleBackColor = true;
             // 
             // F_PC_0103_1
             // 
@@ -1083,7 +1097,7 @@
             this.Controls.Add(this.btnSave);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.IsSaveFormSize = false;
-            this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.Margin = new System.Windows.Forms.Padding(5);
             this.Name = "F_PC_0103_1";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "编辑成型线（上模）";
@@ -1176,5 +1190,6 @@
         private Controls.SearchBox.ScbGoods scbGoods;
         private Basics.BaseControls.C_TXT_Digital txtGroutingCount;
         private Basics.BaseControls.C_Label c_Label4;
+        private Basics.BaseControls.C_CheckBox chkNonSAP;
     }
 }

DK.Client/PCModule/F_PC_0103_1.cs

@@ -222,6 +222,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
 
                 //xuwei add 2019-11-13 高压注浆
                 this._lineEntity.HIGHPRESSUREFLAG = HighPressureFlag.Checked ? 1 : 0;
+                this._lineEntity.NON_SAP = chkNonSAP.Checked ? "1" : "0";
                 //xuwei end 
 
                 //this._lineEntity.USERID = this.dkUser.UserID;
@@ -1120,6 +1121,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
 
                     //xuwei add 2019-11-13 高压注浆
                     this.HighPressureFlag.Checked = this._lineEntity.HIGHPRESSUREFLAG == 1 ? true : false;
+                    this.chkNonSAP.Checked = this._lineEntity.NON_SAP == "1" ? true : false;
                     //xuwei end
 
                     if (this._lineEntity.ValueFlag2 == "1")
@@ -1177,6 +1179,14 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 {
                     this._lineEntity.HIGHPRESSUREFLAG = Convert.ToInt32(drGrouting["HIGHPRESSUREFLAG"]);
                 }
+                if (drGrouting["NON_SAP"] == DBNull.Value)
+                {
+                    this._lineEntity.NON_SAP = "0";
+                }
+                else
+                {
+                    this._lineEntity.NON_SAP = drGrouting["NON_SAP"] + "";
+                }
                 //xuwei end
                 this._lineEntity.MOULDQUANTITY = Convert.ToDecimal(drGrouting["MOULDQUANTITY"]);
 				this._lineEntity.MOULDTYPEID = Convert.ToInt32(drGrouting["GMOULDTYPEID"]);

DK.Client/PMModule/F_PM_0103.Designer.cs

@@ -29,11 +29,11 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_PM_0103));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             this.btnClose = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.btnSave = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.dgvDetail = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
@@ -66,16 +66,17 @@
             this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
             this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
             this.gbxInfo = new System.Windows.Forms.GroupBox();
+            this.txtGrouting = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.btnNGRSetting = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.cmbLogo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
             this.btnClearBarCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.txtBarCodeStart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_BarCode();
+            this.btnBindss = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.btnBindBarCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.lblBarCodeStart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.lblGroutingDateValue = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.lblGrouting = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.c_Label1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.txtGrouting = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             ((System.ComponentModel.ISupportInitialize)(this.dgvDetail)).BeginInit();
             this.tsrOperate.SuspendLayout();
             this.gbxInfo.SuspendLayout();
@@ -118,8 +119,8 @@
             this.dgvDetail.AllowUserToAddRows = false;
             this.dgvDetail.AllowUserToDeleteRows = false;
             this.dgvDetail.AllowUserToModifyRows = true;
-            dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvDetail.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvDetail.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
             this.dgvDetail.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)));
@@ -130,14 +131,14 @@
             this.dgvDetail.ChildNodeColumnText = null;
             this.dgvDetail.ColumnDeep = 1;
             this.dgvDetail.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle12.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvDetail.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvDetail.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
             this.dgvDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.GroutingDailyID,
@@ -164,14 +165,14 @@
             this.DeliverFlag});
             this.dgvDetail.ColumnTreeView = null;
             this.dgvDetail.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)));
-            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle14.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvDetail.DefaultCellStyle = dataGridViewCellStyle14;
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvDetail.DefaultCellStyle = dataGridViewCellStyle4;
             this.dgvDetail.DynamicColumnName = "";
             this.dgvDetail.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
             this.dgvDetail.EnableHeadersVisualStyles = false;
@@ -194,8 +195,8 @@
             this.dgvDetail.RefreshAtHscroll = false;
             this.dgvDetail.RowHeadersWidth = 50;
             this.dgvDetail.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle15.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvDetail.RowsDefaultCellStyle = dataGridViewCellStyle15;
+            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvDetail.RowsDefaultCellStyle = dataGridViewCellStyle5;
             this.dgvDetail.RowTemplate.Height = 21;
             this.dgvDetail.Size = new System.Drawing.Size(862, 318);
             this.dgvDetail.SortOrderColumnName = null;
@@ -309,8 +310,8 @@
             // GroutingBatchNo
             // 
             this.GroutingBatchNo.DataPropertyName = "GroutingBatchNo";
-            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.GroutingBatchNo.DefaultCellStyle = dataGridViewCellStyle13;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.GroutingBatchNo.DefaultCellStyle = dataGridViewCellStyle3;
             this.GroutingBatchNo.HeaderText = "注浆批次";
             this.GroutingBatchNo.Name = "GroutingBatchNo";
             this.GroutingBatchNo.ReadOnly = true;
@@ -455,6 +456,7 @@
             this.gbxInfo.Controls.Add(this.cmbLogo);
             this.gbxInfo.Controls.Add(this.btnClearBarCode);
             this.gbxInfo.Controls.Add(this.txtBarCodeStart);
+            this.gbxInfo.Controls.Add(this.btnBindss);
             this.gbxInfo.Controls.Add(this.btnBindBarCode);
             this.gbxInfo.Controls.Add(this.lblBarCodeStart);
             this.gbxInfo.Controls.Add(this.lblGroutingDateValue);
@@ -468,6 +470,17 @@
             this.gbxInfo.TabStop = false;
             this.gbxInfo.Text = "注浆信息";
             // 
+            // txtGrouting
+            // 
+            this.txtGrouting.AutoSize = true;
+            this.txtGrouting.BackColor = System.Drawing.Color.Transparent;
+            this.txtGrouting.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtGrouting.Location = new System.Drawing.Point(220, 23);
+            this.txtGrouting.Name = "txtGrouting";
+            this.txtGrouting.Size = new System.Drawing.Size(17, 12);
+            this.txtGrouting.TabIndex = 3;
+            this.txtGrouting.Text = "--";
+            // 
             // btnNGRSetting
             // 
             this.btnNGRSetting.BackColor = System.Drawing.Color.Transparent;
@@ -527,6 +540,22 @@
             this.txtBarCodeStart.TextValue = "";
             this.txtBarCodeStart.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtBarCodeStart_KeyPress);
             // 
+            // btnBindss
+            // 
+            this.btnBindss.BackColor = System.Drawing.Color.Transparent;
+            this.btnBindss.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnBindss.BackgroundImage")));
+            this.btnBindss.Enabled = false;
+            this.btnBindss.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnBindss.ForeColor = System.Drawing.Color.White;
+            this.btnBindss.Location = new System.Drawing.Point(677, 42);
+            this.btnBindss.Name = "btnBindss";
+            this.btnBindss.Size = new System.Drawing.Size(85, 30);
+            this.btnBindss.TabIndex = 6;
+            this.btnBindss.Text = "批量绑定(&T)";
+            this.btnBindss.UseVisualStyleBackColor = false;
+            this.btnBindss.Visible = false;
+            this.btnBindss.Click += new System.EventHandler(this.btnBindss_Click);
+            // 
             // btnBindBarCode
             // 
             this.btnBindBarCode.BackColor = System.Drawing.Color.Transparent;
@@ -591,17 +620,6 @@
             this.c_Label1.TabIndex = 0;
             this.c_Label1.Text = "产品商标";
             // 
-            // txtGrouting
-            // 
-            this.txtGrouting.AutoSize = true;
-            this.txtGrouting.BackColor = System.Drawing.Color.Transparent;
-            this.txtGrouting.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtGrouting.Location = new System.Drawing.Point(220, 23);
-            this.txtGrouting.Name = "txtGrouting";
-            this.txtGrouting.Size = new System.Drawing.Size(17, 12);
-            this.txtGrouting.TabIndex = 3;
-            this.txtGrouting.Text = "--";
-            // 
             // F_PM_0103
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -678,5 +696,6 @@
         private System.Windows.Forms.DataGridViewCheckBoxColumn colOScrapFlag;
         private System.Windows.Forms.DataGridViewTextBoxColumn DeliverFlag;
         private Basics.BaseControls.C_Label txtGrouting;
+        private Basics.BaseControls.C_Button btnBindss;
     }
 }

DK.Client/PMModule/F_PM_0103.cs

@@ -275,9 +275,15 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 					DKMessageBox.ShowDialog(this, DKMessageCode.W_CMN_C_003, this.lblBarCodeStart.Text);
 					this.txtBarCodeStart.Focus();
 					return;
-				}
+                }
+                if (barcodeBegin.Length != 11)
+                {
+                    MessageBox.Show(this, "起始条码需要11位", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    this.txtBarCodeStart.Focus();
+                    return;
+                }
 
-				System.Text.RegularExpressions.Match mc =
+                System.Text.RegularExpressions.Match mc =
 					System.Text.RegularExpressions.Regex.Match(barcodeBegin, @"^([a-zA-Z]*|[a-zA-Z0-9]*[a-zA-Z]+)([0-9]{10,})$");
 				if (!mc.Success)
 				{
@@ -451,7 +457,8 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 			this.btnClearBarCode.Text = ButtonText.BTN_CLEARBARCODE;
 			this.txtBarCodeStart.ReadOnly = true;
 			this.btnBindBarCode.Enabled = false;
-			this.btnClearBarCode.Enabled = false;
+            this.btnBindss.Enabled = false;
+            this.btnClearBarCode.Enabled = false;
 		}
 
 		/// <summary>
@@ -508,11 +515,13 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                     if (_canEdit)
                     {
                         this.btnBindBarCode.Enabled = true;
+                        this.btnBindss.Enabled = true;
                         this.txtBarCodeStart.ReadOnly = false;
                     }
                     else
                     {
                         this.btnBindBarCode.Enabled = false;
+                        this.btnBindss.Enabled = false;
                         this.txtBarCodeStart.ReadOnly = true;
                     }
 					this.btnClearBarCode.Enabled = true;
@@ -532,9 +541,16 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 		private void SetEditGrid()
 		{
 			foreach (DataGridViewRow row in this.dgvDetail.Rows)
-			{
-				// 未注浆的，不能编辑
-				object groutingFlag = row.Cells["GroutingFlag"].Value;
+            {
+                if (!_canEdit)
+                {
+                    // 过期后不能撤销报损
+                    row.Cells["BarCode"].ReadOnly = true;
+                    row.Cells["ScrapFlag"].ReadOnly = true;
+                }
+
+                // 未注浆的，不能编辑
+                object groutingFlag = row.Cells["GroutingFlag"].Value;
 				if (groutingFlag == null || ((int)Constant.GroutingFlag.Yes).ToString() != groutingFlag.ToString())
 				{
 					row.Cells["BarCode"].ReadOnly = true;
@@ -581,6 +597,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                 if (!_canEdit)
                 {
                     row.Cells["BarCode"].ReadOnly = true;
+                    row.Cells["ScrapFlag"].ReadOnly = true;
                     continue;
                 }
 
@@ -618,5 +635,34 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                     MethodBase.GetCurrentMethod().Name, this.Text, ex);
             }
         }
-	}
+
+        private void btnBindss_Click(object sender, EventArgs e)
+        {
+            if (!_canEdit)
+            {
+                return;
+            }
+            try
+            {
+                F_PM_0103_1 f = new F_PM_0103_1();
+                f.BarCodeGrid = this.dgvDetail;
+                if (f.ShowDialog() == DialogResult.OK)
+                {
+                    List<string> error_list = f.ERROR_LIST;
+                    if (error_list?.Count > 0)
+                    {
+                        F_PM_0103_2 f2 = new F_PM_0103_2();
+                        f2.ERROR_TEXT = string.Join(Environment.NewLine, error_list);
+                        f2.Show();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(this.ToString(),
+                    MethodBase.GetCurrentMethod().Name, this.Text, ex);
+            }
+        }
+    }
 }

DK.Client/PMModule/F_PM_0103.resx

@@ -219,6 +219,14 @@
         NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
 </value>
   </data>
+  <data name="btnBindss.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="btnBindBarCode.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO

DK.Client/PMModule/F_PM_0103_1.Designer.cs

@@ -0,0 +1,152 @@
+namespace Dongke.IBOSS.PRD.Client.PMModule
+{
+    partial class F_PM_0103_1
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.tsrSupplier = new Dongke.WinForm.Controls.TsrToolStrip();
+            this.tsbtnClearBarCode = new System.Windows.Forms.ToolStripButton();
+            this.tsbtnClearCondition = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+            this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
+            this.txtBarCodes = new System.Windows.Forms.TextBox();
+            this.tsbtnBindss = new System.Windows.Forms.ToolStripButton();
+            this.pnlBack.SuspendLayout();
+            this.tsrSupplier.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // pnlBack
+            // 
+            this.pnlBack.Controls.Add(this.txtBarCodes);
+            this.pnlBack.Controls.Add(this.tsrSupplier);
+            this.pnlBack.Size = new System.Drawing.Size(340, 355);
+            // 
+            // tsrSupplier
+            // 
+            this.tsrSupplier.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsrSupplier.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tsbtnBindss,
+            this.tsbtnClearBarCode,
+            this.toolStripSeparator4,
+            this.tsbtnClearCondition,
+            this.tsbtnClose});
+            this.tsrSupplier.Location = new System.Drawing.Point(0, 0);
+            this.tsrSupplier.Name = "tsrSupplier";
+            this.tsrSupplier.Size = new System.Drawing.Size(340, 35);
+            this.tsrSupplier.TabIndex = 4;
+            this.tsrSupplier.Text = "tsrToolStrip1";
+            // 
+            // tsbtnClearBarCode
+            // 
+            this.tsbtnClearBarCode.AutoSize = false;
+            this.tsbtnClearBarCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsbtnClearBarCode.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbtnClearBarCode.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbtnClearBarCode.Name = "tsbtnClearBarCode";
+            this.tsbtnClearBarCode.Size = new System.Drawing.Size(60, 25);
+            this.tsbtnClearBarCode.Text = "取消(&R)";
+            this.tsbtnClearBarCode.Click += new System.EventHandler(this.tsbtnClearBarCode_Click);
+            // 
+            // tsbtnClearCondition
+            // 
+            this.tsbtnClearCondition.AutoSize = false;
+            this.tsbtnClearCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsbtnClearCondition.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbtnClearCondition.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbtnClearCondition.Name = "tsbtnClearCondition";
+            this.tsbtnClearCondition.Size = new System.Drawing.Size(60, 25);
+            this.tsbtnClearCondition.Text = "清空(&C)";
+            this.tsbtnClearCondition.Click += new System.EventHandler(this.tsbtnClearCondition_Click);
+            // 
+            // toolStripSeparator4
+            // 
+            this.toolStripSeparator4.AutoSize = false;
+            this.toolStripSeparator4.Name = "toolStripSeparator4";
+            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 25);
+            // 
+            // 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);
+            // 
+            // txtBarCodes
+            // 
+            this.txtBarCodes.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.txtBarCodes.Location = new System.Drawing.Point(0, 35);
+            this.txtBarCodes.Multiline = true;
+            this.txtBarCodes.Name = "txtBarCodes";
+            this.txtBarCodes.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+            this.txtBarCodes.Size = new System.Drawing.Size(340, 320);
+            this.txtBarCodes.TabIndex = 5;
+            this.txtBarCodes.WordWrap = false;
+            // 
+            // tsbtnBindss
+            // 
+            this.tsbtnBindss.AutoSize = false;
+            this.tsbtnBindss.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsbtnBindss.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbtnBindss.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbtnBindss.Name = "tsbtnBindss";
+            this.tsbtnBindss.Size = new System.Drawing.Size(60, 25);
+            this.tsbtnBindss.Text = "绑定(&S)";
+            this.tsbtnBindss.Click += new System.EventHandler(this.tsbtnBindss_Click);
+            // 
+            // F_PM_0103_1
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(340, 377);
+            this.MaximizeBox = true;
+            this.MinimizeBox = true;
+            this.Name = "F_PM_0103_1";
+            this.Text = "批量绑定条码";
+            this.pnlBack.ResumeLayout(false);
+            this.pnlBack.PerformLayout();
+            this.tsrSupplier.ResumeLayout(false);
+            this.tsrSupplier.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private WinForm.Controls.TsrToolStrip tsrSupplier;
+        private System.Windows.Forms.ToolStripButton tsbtnClearBarCode;
+        private System.Windows.Forms.ToolStripButton tsbtnClearCondition;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+        private System.Windows.Forms.ToolStripButton tsbtnClose;
+        private System.Windows.Forms.TextBox txtBarCodes;
+        private System.Windows.Forms.ToolStripButton tsbtnBindss;
+    }
+}

DK.Client/PMModule/F_PM_0103_1.cs

@@ -0,0 +1,158 @@
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Reflection;
+using System.Windows.Forms;
+
+using Dongke.IBOSS.PRD.Client.CommonModule;
+using Dongke.WinForm.Controls;
+
+namespace Dongke.IBOSS.PRD.Client.PMModule
+{
+    public partial class F_PM_0103_1 : FormDialog
+    {
+        public F_PM_0103_1()
+        {
+            InitializeComponent();
+        }
+
+        public DataGridView BarCodeGrid
+        {
+            get;
+            set;
+        }
+        public List<string> ERROR_LIST
+        {
+            get;
+            set;
+        }
+
+        private void tsbtnClose_Click(object sender, System.EventArgs e)
+        {
+            ERROR_LIST = null;
+            this.DialogResult = DialogResult.Cancel;
+            this.Close();
+        }
+
+        private void tsbtnClearCondition_Click(object sender, System.EventArgs e)
+        {
+            this.txtBarCodes.Clear();
+        }
+
+        private void tsbtnBindss_Click(object sender, System.EventArgs e)
+        {
+            if (this.BarCodeGrid == null ||
+                string.IsNullOrWhiteSpace(this.txtBarCodes.Text))
+            {
+                return;
+            }
+            try
+            {
+                string[] barcode_lines = this.txtBarCodes.Lines;
+                string barcode = null;
+                string goodscode = null;
+                bool bindFlag = false;
+                ERROR_LIST = new List<string>();
+                DataTable dt = this.BarCodeGrid.DataSource as DataTable;
+                foreach (string item in barcode_lines)
+                {
+                    if (string.IsNullOrWhiteSpace(item))
+                    {
+                        continue;
+                    }
+                    if (item.Contains("\t"))
+                    {
+                        string[] ss = item.Split('\t');
+                        barcode = ss[0];
+                        goodscode = ss[1];
+                    }
+                    else if (item.Contains("@"))
+                    {
+                        string[] ss = item.Split('@');
+                        barcode = ss[0];
+                        goodscode = ss[1];
+                    }
+                    else
+                    {
+                        barcode = item;
+                        goodscode = null;
+                    }
+                    if (barcode?.Length != 11 || !long.TryParse(barcode, out long logbarcode))
+                    {
+                        ERROR_LIST.Add(item);
+                        continue;
+                    }
+                    if (dt?.Select($"barcode='{barcode}'")?.Length > 0)
+                    {
+                        ERROR_LIST.Add(item);
+                        continue;
+                    }
+                    bindFlag = false;
+                    foreach (DataGridViewRow row in this.BarCodeGrid.Rows)
+                    {
+                        if (row.Cells["BarCode"].ReadOnly)
+                        {
+                            continue;
+                        }
+                        string bc = row.Cells["BarCode"].Value + "";
+                        string sf = row.Cells["ScrapFlag"].Value + "";
+                        string gf = row.Cells["GroutingFlag"].Value + "";
+                        string gc = row.Cells["GoodsCode"].Value + "";
+                        if (!string.IsNullOrWhiteSpace(bc) || gf != "1" || sf != "0")
+                        {
+                            continue;
+                        }
+                        if (!string.IsNullOrWhiteSpace(goodscode) && goodscode != gc)
+                        {
+                            continue;
+                        }
+                        bindFlag = true;
+                        row.Cells["BarCode"].Value = barcode;
+                        (row.DataBoundItem as DataRowView)?.EndEdit();
+                        break;
+                    }
+                    if (!bindFlag)
+                    {
+                        ERROR_LIST.Add(item);
+                    }
+                }
+
+                this.DialogResult = DialogResult.OK;
+                this.Close();
+            }
+            catch (Exception ex)
+            {
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(this.ToString(),
+                    MethodBase.GetCurrentMethod().Name, this.Text, ex);
+            }
+        }
+
+        private void tsbtnClearBarCode_Click(object sender, EventArgs e)
+        {
+            if (this.BarCodeGrid == null)
+            {
+                return;
+            }
+            try
+            {
+                //DataTable dd = this.BarCodeGrid.DataSource as DataTable;
+                foreach (DataGridViewRow row in this.BarCodeGrid.Rows)
+                {
+                    if (!row.Cells["BarCode"].ReadOnly)
+                    {
+                        row.Cells["BarCode"].Value = DBNull.Value;
+                        (row.DataBoundItem as DataRowView)?.EndEdit();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(this.ToString(),
+                    MethodBase.GetCurrentMethod().Name, this.Text, ex);
+            }
+        }
+    }
+}

DK.Client/PMModule/F_PM_0103_1.resx

@@ -0,0 +1,126 @@
+<?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="tsrSupplier.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>184, 17</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>43</value>
+  </metadata>
+</root>

DK.Client/PMModule/F_PM_0103_2.Designer.cs

@@ -0,0 +1,122 @@
+namespace Dongke.IBOSS.PRD.Client.PMModule
+{
+    partial class F_PM_0103_2
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.tsrSupplier = new Dongke.WinForm.Controls.TsrToolStrip();
+            this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
+            this.txtBarCodes = new System.Windows.Forms.TextBox();
+            this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.pnlBack.SuspendLayout();
+            this.tsrSupplier.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // pnlBack
+            // 
+            this.pnlBack.Controls.Add(this.txtBarCodes);
+            this.pnlBack.Controls.Add(this.tsrSupplier);
+            this.pnlBack.Size = new System.Drawing.Size(340, 256);
+            // 
+            // tsrSupplier
+            // 
+            this.tsrSupplier.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsrSupplier.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripLabel1,
+            this.toolStripSeparator1,
+            this.tsbtnClose});
+            this.tsrSupplier.Location = new System.Drawing.Point(0, 0);
+            this.tsrSupplier.Name = "tsrSupplier";
+            this.tsrSupplier.Size = new System.Drawing.Size(340, 35);
+            this.tsrSupplier.TabIndex = 4;
+            this.tsrSupplier.Text = "tsrToolStrip1";
+            // 
+            // 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);
+            // 
+            // txtBarCodes
+            // 
+            this.txtBarCodes.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.txtBarCodes.Location = new System.Drawing.Point(0, 35);
+            this.txtBarCodes.Multiline = true;
+            this.txtBarCodes.Name = "txtBarCodes";
+            this.txtBarCodes.ReadOnly = true;
+            this.txtBarCodes.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+            this.txtBarCodes.Size = new System.Drawing.Size(340, 221);
+            this.txtBarCodes.TabIndex = 5;
+            this.txtBarCodes.WordWrap = false;
+            // 
+            // toolStripLabel1
+            // 
+            this.toolStripLabel1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.toolStripLabel1.ForeColor = System.Drawing.Color.Red;
+            this.toolStripLabel1.Name = "toolStripLabel1";
+            this.toolStripLabel1.Size = new System.Drawing.Size(174, 32);
+            this.toolStripLabel1.Text = "以下数据没有匹配到注浆信息";
+            // 
+            // toolStripSeparator1
+            // 
+            this.toolStripSeparator1.AutoSize = false;
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
+            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);
+            // 
+            // F_PM_0103_2
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(340, 278);
+            this.MaximizeBox = true;
+            this.MinimizeBox = true;
+            this.Name = "F_PM_0103_2";
+            this.Text = "未绑定条码";
+            this.pnlBack.ResumeLayout(false);
+            this.pnlBack.PerformLayout();
+            this.tsrSupplier.ResumeLayout(false);
+            this.tsrSupplier.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private WinForm.Controls.TsrToolStrip tsrSupplier;
+        private System.Windows.Forms.ToolStripButton tsbtnClose;
+        private System.Windows.Forms.TextBox txtBarCodes;
+        private System.Windows.Forms.ToolStripLabel toolStripLabel1;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+    }
+}

DK.Client/PMModule/F_PM_0103_2.cs

@@ -0,0 +1,37 @@
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Reflection;
+using System.Windows.Forms;
+
+using Dongke.IBOSS.PRD.Client.CommonModule;
+using Dongke.WinForm.Controls;
+
+namespace Dongke.IBOSS.PRD.Client.PMModule
+{
+    public partial class F_PM_0103_2 : FormMultiple
+    {
+        public F_PM_0103_2()
+        {
+            InitializeComponent();
+        }
+
+        public string ERROR_TEXT
+        {
+            get
+            {
+                return this.txtBarCodes.Text;
+            }
+            set
+            {
+                this.txtBarCodes.Text = value;
+            }
+        }
+
+        private void tsbtnClose_Click(object sender, System.EventArgs e)
+        {
+            this.Close();
+        }
+    }
+}

DK.Client/PMModule/F_PM_0103_2.resx

@@ -0,0 +1,126 @@
+<?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="tsrSupplier.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>184, 17</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>43</value>
+  </metadata>
+</root>

DK.Client/PMModule/PMModule.csproj

@@ -109,6 +109,18 @@
     <Compile Include="F_PM_0102.Designer.cs">
       <DependentUpon>F_PM_0102.cs</DependentUpon>
     </Compile>
+    <Compile Include="F_PM_0103_2.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="F_PM_0103_2.Designer.cs">
+      <DependentUpon>F_PM_0103_2.cs</DependentUpon>
+    </Compile>
+    <Compile Include="F_PM_0103_1.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="F_PM_0103_1.Designer.cs">
+      <DependentUpon>F_PM_0103_1.cs</DependentUpon>
+    </Compile>
     <Compile Include="F_PM_0106.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -761,6 +773,12 @@
     <EmbeddedResource Include="F_PM_0102.resx">
       <DependentUpon>F_PM_0102.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="F_PM_0103_2.resx">
+      <DependentUpon>F_PM_0103_2.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="F_PM_0103_1.resx">
+      <DependentUpon>F_PM_0103_1.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="F_PM_0106.resx">
       <DependentUpon>F_PM_0106.cs</DependentUpon>
     </EmbeddedResource>

DK.Service/PCModuleLogic/PCModuleLogicDALPartial.cs

@@ -6326,14 +6326,14 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                 sbSql.Append("Insert into TP_PC_GroutingLine");
                 sbSql.Append("(GroutingLineID,BuildingNo,FloorNo,GroutingLineNo,GroutingLineCode,");
                 //xuwei add 2019-11-13 高压注浆
-                sbSql.Append("HighPressureFlag,");
+                sbSql.Append("HighPressureFlag,NON_SAP,");
                 //xuwei end 
                 sbSql.Append("GroutingLineName,MouldQuantity,GMouldTypeID,UserID,MonitorID,");
                 sbSql.Append("BeginUsedDate,GMouldStatus,Remarks,AccountID,");
                 sbSql.Append("CreateUserID,UpdateUserID,UserCount)");
                 sbSql.Append("values(:GroutingLineID,:BuildingNo,:FloorNo,:GroutingLineNo,:GroutingLineCode,");
                 //xuwei add 2019-11-13 高压注浆
-                sbSql.Append(":HighPressureFlag,");
+                sbSql.Append(":HighPressureFlag,:NON_SAP,");
                 //xuwei end 
                 sbSql.Append(":GroutingLineName,:MouldQuantity,:GMouldTypeID,:UserID,:MonitorID,");
                 sbSql.Append(":BeginUsedDate,:GMouldStatus,:Remarks,:AccountID,");
@@ -6352,6 +6352,8 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                         //xuwei add 2019-11-13 高压注浆
                         new OracleParameter(":HighPressureFlag",OracleDbType.Char,
                             groutingLineEntity.HIGHPRESSUREFLAG,ParameterDirection.Input),
+                        new OracleParameter(":NON_SAP",OracleDbType.Char,
+                            groutingLineEntity.NON_SAP,ParameterDirection.Input),
                         //xuwei end
                         new OracleParameter(":GroutingLineName",OracleDbType.NVarchar2,
                             groutingLineEntity.GROUTINGLINENAME,ParameterDirection.Input),
@@ -6643,6 +6645,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                 sbSql.Append("MonitorID=:MonitorID,");
                 //xuwei add 2019-11-13 高压注浆
                 sbSql.Append("HighPressureFlag=:HighPressureFlag,");
+                sbSql.Append("NON_SAP=:NON_SAP,");
                 //xuwei end
                 sbSql.Append("Remarks=:Remarks,");
                 sbSql.Append("AccountID=:AccountID,");
@@ -6723,6 +6726,8 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                         //xuwei add 2019-11-13 高压注浆
                         new OracleParameter(":HighPressureFlag",OracleDbType.Char,
                             groutingLineEntity.HIGHPRESSUREFLAG,ParameterDirection.Input),
+                        new OracleParameter(":NON_SAP",OracleDbType.Char,
+                            groutingLineEntity.NON_SAP,ParameterDirection.Input),
                         //xuwei end 
                         new OracleParameter(":UpdateTime",OracleDbType.Date,
                             DateTime.Now,ParameterDirection.Input),

DK.Service/PMModuleService/PMModuleLogic.cs

@@ -2422,42 +2422,62 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                 #endregion 校验时间戳
 
                 #region 校验条码
-                StringBuilder barcodes = new StringBuilder(",");
+                //StringBuilder barcodes = new StringBuilder(",");
+                //foreach (DataRow row in groutingInfo.Tables[1].Rows)
+                //{
+                //    if ((row["OBarCode"] == null || row["OBarCode"] == DBNull.Value) &&
+                //        (row["BarCode"] != null && row["BarCode"] != DBNull.Value))
+                //    {
+                //        barcodes.Append(row["BarCode"].ToString() + ",");
+                //    }
+                //}
+                //// todo 条码状态表
+                //string checkBarcodeSql =
+                //    "SELECT UBC.BarCode FROM TP_PM_UsedBarCode UBC " +
+                //    " WHERE INSTR(:BarCodes, ',' || UBC.BarCode || ',') > 0";
+                //OracleParameter[] checkBarcodeParas = new OracleParameter[]
+                //{
+                //    new OracleParameter(":BarCodes", OracleDbType.NVarchar2, barcodes.ToString(), ParameterDirection.Input),
+                //};
+                StringBuilder barcodes = new StringBuilder();
                 foreach (DataRow row in groutingInfo.Tables[1].Rows)
                 {
                     if ((row["OBarCode"] == null || row["OBarCode"] == DBNull.Value) &&
                         (row["BarCode"] != null && row["BarCode"] != DBNull.Value))
                     {
-                        barcodes.Append(row["BarCode"].ToString() + ",");
+                        if (barcodes.Length > 0)
+                        {
+                            barcodes.Append($" OR BarCode='{row["BarCode"]}'");
+                        }
+                        else
+                        {
+                            barcodes.Append($" BarCode='{row["BarCode"]}'");
+                        }
                     }
                 }
-                // todo 条码状态表
-                string checkBarcodeSql =
-                    "SELECT UBC.BarCode FROM TP_PM_UsedBarCode UBC " +
-                    " WHERE INSTR(:BarCodes, ',' || UBC.BarCode || ',') > 0";
-                OracleParameter[] checkBarcodeParas = new OracleParameter[]
+                if (barcodes.Length > 0)
                 {
-                    new OracleParameter(":BarCodes", OracleDbType.NVarchar2, barcodes.ToString(), ParameterDirection.Input),
-                };
-                DataTable barCodeDataTable = tran.GetSqlResultToDt(checkBarcodeSql, checkBarcodeParas);
-                if (barCodeDataTable != null && barCodeDataTable.Rows.Count > 0)
-                {
-                    barcodes.Clear();
-                    //foreach (DataRow row in groutingInfo.Tables[1].Rows)
-                    foreach (DataRow row in barCodeDataTable.Rows)
+                    // 条码状态表
+                    DataTable barCodeDataTable = tran.GetSqlResultToDt($"SELECT UBC.BarCode FROM TP_PM_UsedBarCode UBC WHERE {barcodes}");
+                    if (barCodeDataTable != null && barCodeDataTable.Rows.Count > 0)
                     {
-                        if (barcodes.Length > 0)
+                        barcodes.Clear();
+                        //foreach (DataRow row in groutingInfo.Tables[1].Rows)
+                        foreach (DataRow row in barCodeDataTable.Rows)
                         {
-                            barcodes.Append(",");
+                            if (barcodes.Length > 0)
+                            {
+                                barcodes.Append(",");
+                            }
+                            barcodes.Append(row["BarCode"].ToString());
                         }
-                        barcodes.Append(row["BarCode"].ToString());
-                    }
 
-                    sre.Status = Constant.ServiceResultStatus.Other;
-                    sre.OtherStatus = 1;
-                    //sre.Message = string.Format("条码（{0}）已被使用", barcode);
-                    sre.Message = "以下条码已被使用" + System.Environment.NewLine + barcodes.ToString();
-                    return sre;
+                        sre.Status = Constant.ServiceResultStatus.Other;
+                        sre.OtherStatus = 1;
+                        //sre.Message = string.Format("条码（{0}）已被使用", barcode);
+                        sre.Message = "以下条码已被使用" + System.Environment.NewLine + barcodes.ToString();
+                        return sre;
+                    }
                 }
                 #endregion 校验条码
 

WCF.Service/WCF.DataModels/PCModule/GroutingLineEntity.cs

@@ -145,6 +145,15 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
             get { return _highpressureflag; }
         }
         //xuwei end
+        /// <summary>
+        /// 转厂虚拟成型线 (1：虚拟  0：正常)
+        /// </summary>
+        [DataMember]
+        public string NON_SAP
+        {
+            set;
+            get;
+        }
 
         /// <summary>
         /// 工号ID (关联工号表)