产成品交接

DK.Basics/BaseControls/Button/C_Button.designer.cs

@@ -37,9 +37,9 @@
             // 
             this.imgButton.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imgButton.ImageStream")));
             this.imgButton.TransparentColor = System.Drawing.Color.Transparent;
-            this.imgButton.Images.SetKeyName(0, "iboss_system-z2q_15-03.png");
-            this.imgButton.Images.SetKeyName(1, "iboss_system-z2q_15-02.png");
-            this.imgButton.Images.SetKeyName(2, "iboss_system-z2q_15.png");
+            //this.imgButton.Images.SetKeyName(0, "iboss_system-z2q_15-03.png");
+            //this.imgButton.Images.SetKeyName(1, "iboss_system-z2q_15-02.png");
+            //this.imgButton.Images.SetKeyName(2, "iboss_system-z2q_15.png");
             // 
             // dkButton
             // 

DK.Client/PMModule/F_PM_0102.Designer.cs

@@ -88,7 +88,7 @@
             // 
             this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnClose.BackColor = System.Drawing.Color.Transparent;
-            this.btnClose.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnClose.BackgroundImage")));
+            //this.btnClose.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnClose.BackgroundImage")));
             this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             this.btnClose.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnClose.ForeColor = System.Drawing.Color.White;
@@ -104,7 +104,7 @@
             // 
             this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnSave.BackColor = System.Drawing.Color.Transparent;
-            this.btnSave.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSave.BackgroundImage")));
+            //this.btnSave.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSave.BackgroundImage")));
             this.btnSave.Enabled = false;
             this.btnSave.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSave.ForeColor = System.Drawing.Color.White;
@@ -226,7 +226,7 @@
             // 
             this.tsrOperate.AutoSize = false;
             this.tsrOperate.BackColor = System.Drawing.SystemColors.Control;
-            this.tsrOperate.BackgroundImage = global::Dongke.IBOSS.PRD.Client.PMModule.Properties.Resources.functionbackground;
+            //this.tsrOperate.BackgroundImage = global::Dongke.IBOSS.PRD.Client.PMModule.Properties.Resources.functionbackground;
             this.tsrOperate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.tsrOperate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbtnAllGrouting,
@@ -330,7 +330,7 @@
             // 
             this.gbxInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.gbxInfo.BackgroundImage = global::Dongke.IBOSS.PRD.Client.PMModule.Properties.Resources.bg;
+            //this.gbxInfo.BackgroundImage = global::Dongke.IBOSS.PRD.Client.PMModule.Properties.Resources.bg;
             this.gbxInfo.Controls.Add(this.txtGrouting1);
             this.gbxInfo.Controls.Add(this.c_Button1);
             this.gbxInfo.Controls.Add(this.cmbLogo);
@@ -364,7 +364,7 @@
             // c_Button1
             // 
             this.c_Button1.BackColor = System.Drawing.Color.Transparent;
-            this.c_Button1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("c_Button1.BackgroundImage")));
+            //this.c_Button1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("c_Button1.BackgroundImage")));
             this.c_Button1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.c_Button1.ForeColor = System.Drawing.Color.White;
             this.c_Button1.Location = new System.Drawing.Point(200, 35);
@@ -415,7 +415,7 @@
             // btnNGRSetting
             // 
             this.btnNGRSetting.BackColor = System.Drawing.Color.Transparent;
-            this.btnNGRSetting.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnNGRSetting.BackgroundImage")));
+            //this.btnNGRSetting.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnNGRSetting.BackgroundImage")));
             this.btnNGRSetting.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnNGRSetting.ForeColor = System.Drawing.Color.White;
             this.btnNGRSetting.Location = new System.Drawing.Point(200, 64);

DK.Client/PMModule/F_PM_2401.Designer.cs

@@ -32,22 +32,11 @@
             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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_PM_2401));
             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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_PM_2401));
             this.dgvOrder = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-            this.OrderNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.FHTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.FHUserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.FinishedBarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.LogoName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GroutingUserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.DeliverTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.imglstNavigation = new System.Windows.Forms.ImageList(this.components);
             this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
             this.lblGoodsType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
@@ -74,6 +63,17 @@
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
             this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
+            this.OrderNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.FHTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.FHUserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.FinishedBarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.LogoName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GroutingUserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DeliverTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.dgvOrder)).BeginInit();
             this.gbxCondition.SuspendLayout();
             this.tsrOperate.SuspendLayout();
@@ -157,92 +157,6 @@
             this.dgvOrder.TotalSumColumns = null;
             this.dgvOrder.ViewRowFilter = "";
             // 
-            // OrderNo
-            // 
-            this.OrderNo.DataPropertyName = "OrderNo";
-            this.OrderNo.HeaderText = "生产订单";
-            this.OrderNo.Name = "OrderNo";
-            this.OrderNo.ReadOnly = true;
-            // 
-            // FHTime
-            // 
-            this.FHTime.DataPropertyName = "FHTime";
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle3.Format = "yyyy-MM-dd HH:mm:ss";
-            this.FHTime.DefaultCellStyle = dataGridViewCellStyle3;
-            this.FHTime.HeaderText = "交接时间";
-            this.FHTime.Name = "FHTime";
-            this.FHTime.ReadOnly = true;
-            // 
-            // FHUserCode
-            // 
-            this.FHUserCode.DataPropertyName = "FHUserCode";
-            this.FHUserCode.HeaderText = "交接工号";
-            this.FHUserCode.Name = "FHUserCode";
-            this.FHUserCode.ReadOnly = true;
-            // 
-            // barcode
-            // 
-            this.barcode.DataPropertyName = "barcode";
-            this.barcode.HeaderText = "产品条码";
-            this.barcode.Name = "barcode";
-            this.barcode.ReadOnly = true;
-            // 
-            // FinishedBarCode
-            // 
-            this.FinishedBarCode.DataPropertyName = "FinishedBarCode";
-            this.FinishedBarCode.HeaderText = "包装条码";
-            this.FinishedBarCode.Name = "FinishedBarCode";
-            this.FinishedBarCode.ReadOnly = true;
-            // 
-            // GoodsCode
-            // 
-            this.GoodsCode.DataPropertyName = "GoodsCode";
-            this.GoodsCode.HeaderText = "产品编码";
-            this.GoodsCode.Name = "GoodsCode";
-            this.GoodsCode.ReadOnly = true;
-            // 
-            // LogoName
-            // 
-            this.LogoName.DataPropertyName = "LogoName";
-            this.LogoName.HeaderText = "产品商标";
-            this.LogoName.Name = "LogoName";
-            this.LogoName.ReadOnly = true;
-            // 
-            // GroutingUserCode
-            // 
-            this.GroutingUserCode.DataPropertyName = "GroutingUserCode";
-            this.GroutingUserCode.HeaderText = "成型工号";
-            this.GroutingUserCode.Name = "GroutingUserCode";
-            this.GroutingUserCode.ReadOnly = true;
-            // 
-            // GroutingMouldCode
-            // 
-            this.GroutingMouldCode.DataPropertyName = "GroutingMouldCode";
-            this.GroutingMouldCode.HeaderText = "模具编号";
-            this.GroutingMouldCode.Name = "GroutingMouldCode";
-            this.GroutingMouldCode.ReadOnly = true;
-            // 
-            // GroutingDate
-            // 
-            this.GroutingDate.DataPropertyName = "GroutingDate";
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle4.Format = "yyyy-MM-dd";
-            this.GroutingDate.DefaultCellStyle = dataGridViewCellStyle4;
-            this.GroutingDate.HeaderText = "注浆日期";
-            this.GroutingDate.Name = "GroutingDate";
-            this.GroutingDate.ReadOnly = true;
-            // 
-            // DeliverTime
-            // 
-            this.DeliverTime.DataPropertyName = "DeliverTime";
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle5.Format = "yyyy-MM-dd HH:mm:ss";
-            this.DeliverTime.DefaultCellStyle = dataGridViewCellStyle5;
-            this.DeliverTime.HeaderText = "交坯日期";
-            this.DeliverTime.Name = "DeliverTime";
-            this.DeliverTime.ReadOnly = true;
-            // 
             // imglstNavigation
             // 
             this.imglstNavigation.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
@@ -312,6 +226,7 @@
             this.txtOrderNo.Name = "txtOrderNo";
             this.txtOrderNo.Size = new System.Drawing.Size(144, 21);
             this.txtOrderNo.TabIndex = 1;
+            this.txtOrderNo.Visible = false;
             // 
             // dkLogoSearchBox1
             // 
@@ -341,7 +256,7 @@
             this.chkDateTime.Checked = true;
             this.chkDateTime.CheckState = System.Windows.Forms.CheckState.Checked;
             this.chkDateTime.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chkDateTime.Location = new System.Drawing.Point(438, 16);
+            this.chkDateTime.Location = new System.Drawing.Point(225, 14);
             this.chkDateTime.Name = "chkDateTime";
             this.chkDateTime.Size = new System.Drawing.Size(72, 16);
             this.chkDateTime.TabIndex = 4;
@@ -354,7 +269,7 @@
             this.lblAccountDateEnd.BackColor = System.Drawing.Color.Transparent;
             this.lblAccountDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblAccountDateEnd.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblAccountDateEnd.Location = new System.Drawing.Point(646, 15);
+            this.lblAccountDateEnd.Location = new System.Drawing.Point(443, 12);
             this.lblAccountDateEnd.Name = "lblAccountDateEnd";
             this.lblAccountDateEnd.Size = new System.Drawing.Size(35, 16);
             this.lblAccountDateEnd.TabIndex = 6;
@@ -364,7 +279,7 @@
             // 
             this.dtpEndTime.CustomFormat = "yyyy-MM-dd HH:mm";
             this.dtpEndTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpEndTime.Location = new System.Drawing.Point(687, 12);
+            this.dtpEndTime.Location = new System.Drawing.Point(484, 9);
             this.dtpEndTime.Name = "dtpEndTime";
             this.dtpEndTime.Size = new System.Drawing.Size(134, 21);
             this.dtpEndTime.TabIndex = 7;
@@ -374,7 +289,7 @@
             // 
             this.dtpStartTime.CustomFormat = "yyyy-MM-dd HH:mm";
             this.dtpStartTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpStartTime.Location = new System.Drawing.Point(511, 12);
+            this.dtpStartTime.Location = new System.Drawing.Point(303, 10);
             this.dtpStartTime.Name = "dtpStartTime";
             this.dtpStartTime.Size = new System.Drawing.Size(134, 21);
             this.dtpStartTime.TabIndex = 5;
@@ -418,7 +333,7 @@
             this.txtFHUserCode.ErrorMessage = "";
             this.txtFHUserCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtFHUserCode.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtFHUserCode.Location = new System.Drawing.Point(281, 14);
+            this.txtFHUserCode.Location = new System.Drawing.Point(64, 13);
             this.txtFHUserCode.MaxLength = 21;
             this.txtFHUserCode.Name = "txtFHUserCode";
             this.txtFHUserCode.Size = new System.Drawing.Size(145, 21);
@@ -446,7 +361,7 @@
             this.lblFHUserCode.BackColor = System.Drawing.Color.Transparent;
             this.lblFHUserCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblFHUserCode.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblFHUserCode.Location = new System.Drawing.Point(223, 18);
+            this.lblFHUserCode.Location = new System.Drawing.Point(6, 18);
             this.lblFHUserCode.Name = "lblFHUserCode";
             this.lblFHUserCode.Size = new System.Drawing.Size(53, 12);
             this.lblFHUserCode.TabIndex = 2;
@@ -475,6 +390,7 @@
             this.lblOrderNo.Size = new System.Drawing.Size(53, 12);
             this.lblOrderNo.TabIndex = 0;
             this.lblOrderNo.Text = "生产订单";
+            this.lblOrderNo.Visible = false;
             // 
             // tsrOperate
             // 
@@ -529,6 +445,7 @@
             this.tsbtnTradeMark.Name = "tsbtnTradeMark";
             this.tsbtnTradeMark.Size = new System.Drawing.Size(60, 25);
             this.tsbtnTradeMark.Text = "商标";
+            this.tsbtnTradeMark.Visible = false;
             this.tsbtnTradeMark.Click += new System.EventHandler(this.tsbtnTradeMark_Click);
             // 
             // tsbtnChangeOrderNo
@@ -539,6 +456,7 @@
             this.tsbtnChangeOrderNo.Name = "tsbtnChangeOrderNo";
             this.tsbtnChangeOrderNo.Size = new System.Drawing.Size(80, 25);
             this.tsbtnChangeOrderNo.Text = "变更单号";
+            this.tsbtnChangeOrderNo.Visible = false;
             this.tsbtnChangeOrderNo.Click += new System.EventHandler(this.tsbtnValueFlag_Click);
             // 
             // tsbtnChangeOrderNoForPlate
@@ -549,6 +467,7 @@
             this.tsbtnChangeOrderNoForPlate.Name = "tsbtnChangeOrderNoForPlate";
             this.tsbtnChangeOrderNoForPlate.Size = new System.Drawing.Size(100, 25);
             this.tsbtnChangeOrderNoForPlate.Text = "变更单号整板";
+            this.tsbtnChangeOrderNoForPlate.Visible = false;
             this.tsbtnChangeOrderNoForPlate.Click += new System.EventHandler(this.tsbtnChangeOrderNoForPlate_Click);
             // 
             // toolStripSeparator1
@@ -579,6 +498,93 @@
             this.tsbtnClose.Text = "关闭(&X)";
             this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
             // 
+            // OrderNo
+            // 
+            this.OrderNo.DataPropertyName = "OrderNo";
+            this.OrderNo.HeaderText = "生产订单";
+            this.OrderNo.Name = "OrderNo";
+            this.OrderNo.ReadOnly = true;
+            this.OrderNo.Visible = false;
+            // 
+            // FHTime
+            // 
+            this.FHTime.DataPropertyName = "FHTime";
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle3.Format = "yyyy-MM-dd HH:mm:ss";
+            this.FHTime.DefaultCellStyle = dataGridViewCellStyle3;
+            this.FHTime.HeaderText = "交接时间";
+            this.FHTime.Name = "FHTime";
+            this.FHTime.ReadOnly = true;
+            // 
+            // FHUserCode
+            // 
+            this.FHUserCode.DataPropertyName = "FHUserCode";
+            this.FHUserCode.HeaderText = "交接工号";
+            this.FHUserCode.Name = "FHUserCode";
+            this.FHUserCode.ReadOnly = true;
+            // 
+            // barcode
+            // 
+            this.barcode.DataPropertyName = "barcode";
+            this.barcode.HeaderText = "产品条码";
+            this.barcode.Name = "barcode";
+            this.barcode.ReadOnly = true;
+            // 
+            // FinishedBarCode
+            // 
+            this.FinishedBarCode.DataPropertyName = "FinishedBarCode";
+            this.FinishedBarCode.HeaderText = "包装条码";
+            this.FinishedBarCode.Name = "FinishedBarCode";
+            this.FinishedBarCode.ReadOnly = true;
+            // 
+            // GoodsCode
+            // 
+            this.GoodsCode.DataPropertyName = "GoodsCode";
+            this.GoodsCode.HeaderText = "产品编码";
+            this.GoodsCode.Name = "GoodsCode";
+            this.GoodsCode.ReadOnly = true;
+            // 
+            // LogoName
+            // 
+            this.LogoName.DataPropertyName = "LogoName";
+            this.LogoName.HeaderText = "产品商标";
+            this.LogoName.Name = "LogoName";
+            this.LogoName.ReadOnly = true;
+            // 
+            // GroutingUserCode
+            // 
+            this.GroutingUserCode.DataPropertyName = "GroutingUserCode";
+            this.GroutingUserCode.HeaderText = "成型工号";
+            this.GroutingUserCode.Name = "GroutingUserCode";
+            this.GroutingUserCode.ReadOnly = true;
+            // 
+            // GroutingMouldCode
+            // 
+            this.GroutingMouldCode.DataPropertyName = "GroutingMouldCode";
+            this.GroutingMouldCode.HeaderText = "模具编号";
+            this.GroutingMouldCode.Name = "GroutingMouldCode";
+            this.GroutingMouldCode.ReadOnly = true;
+            // 
+            // GroutingDate
+            // 
+            this.GroutingDate.DataPropertyName = "GroutingDate";
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle4.Format = "yyyy-MM-dd";
+            this.GroutingDate.DefaultCellStyle = dataGridViewCellStyle4;
+            this.GroutingDate.HeaderText = "注浆日期";
+            this.GroutingDate.Name = "GroutingDate";
+            this.GroutingDate.ReadOnly = true;
+            // 
+            // DeliverTime
+            // 
+            this.DeliverTime.DataPropertyName = "DeliverTime";
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle5.Format = "yyyy-MM-dd HH:mm:ss";
+            this.DeliverTime.DefaultCellStyle = dataGridViewCellStyle5;
+            this.DeliverTime.HeaderText = "交坯日期";
+            this.DeliverTime.Name = "DeliverTime";
+            this.DeliverTime.ReadOnly = true;
+            // 
             // F_PM_2401
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -632,6 +638,10 @@
         private Basics.BaseControls.C_Label lblFHUserCode;
         private Controls.SearchTextBox.dkLogoSearchBox dkLogoSearchBox1;
         private Basics.BaseControls.C_TextBox txtOrderNo;
+		private Basics.BaseControls.C_Label lblGoodsType;
+		private Controls.SearchBox.ScbGoodsType scbGoodsType;
+		private System.Windows.Forms.ToolStripButton tsbtnChangeOrderNoForPlate;
+		private System.Windows.Forms.ToolStripButton tsbtnTradeMark;
         private System.Windows.Forms.DataGridViewTextBoxColumn OrderNo;
         private System.Windows.Forms.DataGridViewTextBoxColumn FHTime;
         private System.Windows.Forms.DataGridViewTextBoxColumn FHUserCode;
@@ -643,9 +653,5 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingMouldCode;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDate;
         private System.Windows.Forms.DataGridViewTextBoxColumn DeliverTime;
-		private Basics.BaseControls.C_Label lblGoodsType;
-		private Controls.SearchBox.ScbGoodsType scbGoodsType;
-		private System.Windows.Forms.ToolStripButton tsbtnChangeOrderNoForPlate;
-		private System.Windows.Forms.ToolStripButton tsbtnTradeMark;
-	}
+    }
 }

DK.Client/PMModule/F_PM_2401.cs

@@ -208,7 +208,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 		/// <param name="e"></param>
 		private void F_PM_2401_Shown(object sender, EventArgs e)
 		{
-			this.tsbtnTradeMark.Visible = this.tsbtnFinishedHandover.Visible;
+			//this.tsbtnTradeMark.Visible = this.tsbtnFinishedHandover.Visible;
 			this.tsbtnChangeOrderNoForPlate.Visible = this.tsbtnChangeOrderNo.Visible;
 		}
 

DK.Client/PMModule/F_PM_2402.Designer.cs

@@ -157,6 +157,7 @@
             this.txtOrderNo.Name = "txtOrderNo";
             this.txtOrderNo.Size = new System.Drawing.Size(158, 21);
             this.txtOrderNo.TabIndex = 26;
+            this.txtOrderNo.Visible = false;
             this.txtOrderNo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtUserCode_KeyPress);
             // 
             // txtBarcode
@@ -214,6 +215,7 @@
             this.dgvProduction.DynamicColumnName = "";
             this.dgvProduction.EnableHeadersVisualStyles = false;
             this.dgvProduction.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvProduction.FormatQuantityColumns = null;
             this.dgvProduction.HorizontalMergeColumn = null;
             this.dgvProduction.IsAutoCountSum = true;
             this.dgvProduction.IsAutoResizeColumns = false;
@@ -365,6 +367,7 @@
             this.cmbLogo.Name = "cmbLogo";
             this.cmbLogo.Size = new System.Drawing.Size(158, 20);
             this.cmbLogo.TabIndex = 28;
+            this.cmbLogo.Visible = false;
             // 
             // F_PM_2402
             // 

DK.Client/PMModule/F_PM_2402.cs

@@ -363,13 +363,13 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
             try
             {
                 this.DataSourceTable.AcceptChanges();
-                if (this.cmbLogo.SelectedValue.ToString() == "-1")
-                {
-                    MessageBox.Show("请选择生产订单",
-                                  this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                    this.cmbLogo.Focus();
-                    return;
-                }
+                //if (this.cmbLogo.SelectedValue.ToString() == "-1")
+                //{
+                //    MessageBox.Show("请选择生产订单",
+                //                  this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                //    this.cmbLogo.Focus();
+                //    return;
+                //}
                 // 包装装板，产成品交接不限制
                 //if (this._maxPlateLimitNum > 0 && this._maxPlateLimitNum != this.DataSourceTable.Rows.Count)
                 //{

DK.Client/PMModule/F_PM_2402.resx

@@ -147,20 +147,18 @@
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="btnSave.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAACOSURBVGhD7dChEcQgFEDBaxCJjqMFLIqCUgG94Gji35y4
-        yUTDc09sA/sppYT29d5jjBFrrTD1EFMBpgJMBZgKMBVgKsBUgKkAUwGmAkwFmAp4pV7XFdrXWjP1NFMB
-        pgJqrU9qzjm075865zT1FFMBpgJMBZgKMBVgKsBUgKmAX+p936ae9EpNKYX2PakzvjyGRAUGdwqwAAAA
-        AElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="btnCancel.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAACOSURBVGhD7dChEcQgFEDBaxCJjqMFLIqCUgG94Gji35y4
-        yUTDc09sA/sppYT29d5jjBFrrTD1EFMBpgJMBZgKMBVgKsBUgKkAUwGmAkwFmAp4pV7XFdrXWjP1NFMB
-        pgJqrU9qzjm075865zT1FFMBpgJMBZgKMBVgKsBUgKmAX+p936ae9EpNKYX2PakzvjyGRAUGdwqwAAAA
-        AElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -20700,6 +20700,16 @@ updateuserid=:updateuserid where barcode=:barcode";
                 //    else if (dr["settingcode"] == "S_PM_013")
                 //        _isEnable_S_PM_013 = dr["settingcode"].ToString();
                 //}
+
+                string logid_bg = "0";
+                // 条码串
+                string fifter = " AND (bar.barcode = '";
+                foreach (DataRow row in dtData.Rows)
+                {
+                    fifter += row["barcode"] + "' OR bar.barcode = '";
+                }
+                fifter = fifter.Substring(0, fifter.Length - 18) + ")";
+
                 // 本批交接的批次号
                 string fhBatchNo = System.Guid.NewGuid().ToString();
                 for (int i = 0; i < dtData.Rows.Count; i++)
@@ -20806,7 +20816,7 @@ updateuserid=:updateuserid where barcode=:barcode";
                                 FHUserCode=:FHUserCode,
                                 FHBatchNo=:FHBatchNo,
                                 FHTime=sysdate,
-                                FHOrderID=:FHOrderID,
+                                FHOrderID=null,
                                 UpdateUserID=:UpdateUserID
                             where Barcode=:Barcode";
                     Paras = new OracleParameter[]{
@@ -20815,7 +20825,7 @@ updateuserid=:updateuserid where barcode=:barcode";
                                     new OracleParameter(":UpdateUserID",OracleDbType.Int32, sUserInfo.UserID,ParameterDirection.Input),
                                     new OracleParameter(":FHUserCode",OracleDbType.Varchar2, sUserInfo.UserCode,ParameterDirection.Input),
                                     new OracleParameter(":FHBatchNo",OracleDbType.Varchar2, fhBatchNo,ParameterDirection.Input),
-                                    new OracleParameter(":FHOrderID",OracleDbType.Int32, orderid,ParameterDirection.Input),
+                                    //new OracleParameter(":FHOrderID",OracleDbType.Int32, orderid,ParameterDirection.Input),
                                 };
                     oracleTrConn.ExecuteNonQuery(sql, Paras);
                     #endregion
@@ -20916,7 +20926,7 @@ updateuserid=:updateuserid where barcode=:barcode";
                 "  ,FHUserCode\n" +
                 "  ,FHBatchNo\n" +
                 "  ,FHTime\n" +
-                "  ,FHOrderID\n" +
+                "  --,FHOrderID\n" +
                 "  ,OnlyCode\n" +
                 "  ,FINISHEDLOADBATCHNO\n" +
                 "  ,AccountID\n" +
@@ -20927,7 +20937,7 @@ updateuserid=:updateuserid where barcode=:barcode";
                 "        ,t.fhusercode\n" +
                 "        ,t.fhbatchno\n" +
                 "        ,t.fhtime\n" +
-                "        ,t.FHOrderID\n" +
+                "        --,t.FHOrderID\n" +
                 "        ,t.onlycode\n" +
                 "        ,t.FINISHEDLOADBATCHNO\n" +
                 "        ,t.AccountID\n" +
@@ -20940,24 +20950,25 @@ updateuserid=:updateuserid where barcode=:barcode";
                 };
                 int resultRow = oracleTrConn.ExecuteNonQuery(sqlString, paras);
 
-                // SAP同步后再成品交接撤销的，记录撤销标识
-                string sapsql = "select count(*) from tsap_hegii_FinishedProduct t where t.barcode = :BarCode and rownum=1";
-                OracleParameter[] sapparas = new OracleParameter[]{
-                    new OracleParameter(":BarCode",OracleDbType.NVarchar2,barcode,ParameterDirection.Input),
-                };
-                int sapcount = Convert.ToInt32( oracleTrConn.GetSqlResultToObj(sapsql, sapparas));
-                if (sapcount > 0)
-                {
-                    sapsql = "update tp_pm_groutingdailydetail set SAPFHUndoFlag = '1' where barcode=:BarCode";
-                    oracleTrConn.ExecuteNonQuery(sapsql, sapparas);
-                }
+                //// SAP同步后再成品交接撤销的，记录撤销标识
+                //string sapsql = "select count(*) from tsap_hegii_FinishedProduct t where t.barcode = :BarCode and rownum=1";
+                //OracleParameter[] sapparas = new OracleParameter[]{
+                //    new OracleParameter(":BarCode",OracleDbType.NVarchar2,barcode,ParameterDirection.Input),
+                //};
+                //int sapcount = Convert.ToInt32( oracleTrConn.GetSqlResultToObj(sapsql, sapparas));
+                //if (sapcount > 0)
+                //{
+                //    sapsql = "update tp_pm_groutingdailydetail set SAPFHUndoFlag = '1' where barcode=:BarCode";
+                //    oracleTrConn.ExecuteNonQuery(sapsql, sapparas);
+                //}
 
                 sql = @"Update TP_PM_FinishedProduct 
                         set FHUserID=null,
                             FHUserCode=null,
                             FHBatchNo=null,
                             FHTime=null,
-                            FHOrderID=null,FINISHEDLOADBATCHNO=null,
+                            --FHOrderID=null,
+                            FINISHEDLOADBATCHNO=null,
                             UpdateUserID=:UpdateUserID
                             where BarCode=:BarCode";
                 resultRow = oracleTrConn.ExecuteNonQuery(sql, paras);

DK.Service/PMModuleService/PMModuleLogic.cs

@@ -2423,22 +2423,25 @@ 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() + ",");
+                        barcodes.Append("'"+row["BarCode"].ToString() + "',");
                     }
                 }
                 // todo 条码状态表
                 string checkBarcodeSql =
                     "SELECT UBC.BarCode FROM TP_PM_UsedBarCode UBC " +
                     " WHERE INSTR(:BarCodes, ',' || UBC.BarCode || ',') > 0";
+
+                checkBarcodeSql = "SELECT UBC.BarCode FROM TP_PM_UsedBarCode UBC " +
+                    " WHERE UBC.BarCode in ("+barcodes.ToString().TrimEnd(',') +")";
                 OracleParameter[] checkBarcodeParas = new OracleParameter[]
                 {
-                    new OracleParameter(":BarCodes", OracleDbType.NVarchar2, barcodes.ToString(), ParameterDirection.Input),
+                    //new OracleParameter(":BarCodes", OracleDbType.NVarchar2, barcodes.ToString(), ParameterDirection.Input),
                 };
                 DataTable barCodeDataTable = tran.GetSqlResultToDt(checkBarcodeSql, checkBarcodeParas);
                 if (barCodeDataTable != null && barCodeDataTable.Rows.Count > 0)