WFormSynchronizeData_SMR.git

			@@ -26,6 +26,8 @@
			this.cmbJYSelect.SelectedIndex = 0;
			this.cmbJYSelect.DropDownStyle = ComboBoxStyle.DropDownList;



			//批次码只读
			this.txtPcm.ReadOnly = true;

			@@ -174,15 +176,17 @@
			if (nums == 1)
			{
			dr["Characteristic"] = "FAI 3-16-3-" + (i + 1);
			dr["Actual"] = dt2.Rows[0][dt2.Columns[j]].ToString();
			}
			else
			{
			dr["Characteristic"] = "FAI 3-16-1-" + (i + 1);
			dr["Actual"] = dt2.Rows[0][dt2.Columns[j]].ToString();
			}
			dr["Actual"] = dt2.Rows[i][dt2.Columns[j]].ToString();

			dt.Rows.Add(dr);
			if (dt2.Rows[i][dt2.Columns[j]].ToString() != "") {
			dt.Rows.Add(dr);
			}

			nums++;

			if (nums == 2)
			@@ -328,6 +332,7 @@

			//把数据显示在页面上
			public void ShowData(DataSet ds,string HNumber) {
			string HProcID = this.cmbPro.SelectedValue.ToString();
			//清空网格内容
			ListData.Items.Clear();
			//清空表格内容
			@@ -353,7 +358,7 @@
			inner join Gy_InspectInstruMent men with(nolock) on b.HInspectInstruMentID=men.HItemID and men.HNumber='"+ HNumber + @"'
			left join Gy_Material m with(nolock) on a.HMaterID=m.HItemID
			left join Gy_QCCheckItem ch with(nolock) on b.HQCCheckItemID=ch.HItemID
			where pr.HBillNo='" + this.txtLzk.Text + "'", "Gy_QCCheckProjectMain");
			where pr.HBillNo='" + this.txtLzk.Text + "' and a.HProcID="+ HProcID, "Gy_QCCheckProjectMain");

			if (dataSet.Tables[0].Rows.Count == 0)
			{
			@@ -523,7 +528,7 @@
			"," + DateTime.Now.Year + "," + DateTime.Now.Month + ",''" +
			"," + HSourceID + "," + HICMOInterID + ",'" + HICMOBillNo + "'," + HPlanQty + "," + HProcExchInterID + "," + HProcExchEntryID +
			",'" + HProcExchBillNo + "'," + HQty + "," + HMaterID + ",'"+this.labHMakerID.Text + "', " + HLastResults +
			"," + HProcExchInterID + "," + HProcExchEntryID + ",'" + HProcExchBillNo + "',''," + HICMOEntryID + "," + HQCSchemeID + ",0,''" +
			"," + HProcExchInterID + "," + HProcExchEntryID + ",'" + HProcExchBillNo + "',''," + HICMOEntryID + "," + HQCSchemeID + "," + this.HShiftsID.Text + ",''" +
			"," + this.HTakeSampleCheckBillID.Text + ",'" + this.HTakeSampleCheckBillNo.Text + "'," + HProcID + "" +
			",'" + this.txtPcm.Text + "') ");

			@@ -628,7 +633,7 @@
			"," + DateTime.Now.Year + "," + DateTime.Now.Month + ",''" +
			"," + HSourceID + "," + HICMOInterID + ",'" + HICMOBillNo + "'," + HPlanQty + "," + HProcExchInterID + "," + HProcExchEntryID +
			",'" + HProcExchBillNo + "'," + HQty + "," + HMaterID + ",'" + this.labHMakerID.Text + "', " + HLastResults +
			"," + HProcExchInterID + "," + HProcExchEntryID + ",'" + HProcExchBillNo + "',''," + HICMOEntryID + "," + HQCSchemeID + ",0,''" +
			"," + HProcExchInterID + "," + HProcExchEntryID + ",'" + HProcExchBillNo + "',''," + HICMOEntryID + "," + HQCSchemeID + "," + this.HShiftsID.Text + ",''" +
			"," + this.HTakeSampleCheckBillID.Text + ",'" + this.HTakeSampleCheckBillNo.Text + "',"+ HProcID + ",'" + this.txtPcm.Text + "') ");

			oCN.Commit();
			@@ -735,14 +740,14 @@
			",HProcExchQty,HShiftsID,HErrTreatment" +
			",HTakeSampleCheckBillID,HTakeSampleCheckBillNo" +
			",HBatchNo,HCheckerResult) " +
			" values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "',1,'"+ HMakeDate + "','" + this.txtHMaker.Text + "',getdate()" +
			" values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "',1,'" + HMakeDate + "','" + this.txtHMaker.Text + "',getdate()" +
			"," + DateTime.Now.Year + "," + DateTime.Now.Month + ",''" +
			"," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID + ",'" + HProcExchBillNo + "'" +
			"," + HMaterID + "," + HProcID + "," + HSourceID + ",0,0,0,0,0," + this.labHMakerID.Text + ",'" + HLastResults + "'" +
			",'','',0,'',''" +
			",0,0,'',0,0,0,0,'',0," + HProcExchInterID + "," + HProcExchEntryID + ",'" + HProcExchBillNo + "',''," + HICMOEntryID + "," + HQCSchemeID + "," + HPlanQty + "," + HQty + ",0,''" +
			",0,0,'',0,0,0,0,'',0," + HProcExchInterID + "," + HProcExchEntryID + ",'" + HProcExchBillNo + "',''," + HICMOEntryID + "," + HQCSchemeID + "," + HPlanQty + "," + HQty + "," + this.HShiftsID.Text + ",''" +
			"," + this.HTakeSampleCheckBillID.Text + ",'" + this.HTakeSampleCheckBillNo.Text + "'" +
			",'" + this.txtPcm.Text + "','"+ HLastResults + "') ");
			",'" + this.txtPcm.Text + "','" + HLastResults + "') ");


			oCN.Commit();
			@@ -792,6 +797,7 @@
			this.txtLzk.Text = ds.Tables[0].Rows[0]["工序流转卡号"].ToString();
			this.HTakeSampleCheckBillID.Text = ds.Tables[0].Rows[0]["hmainid"].ToString();
			this.HTakeSampleCheckBillNo.Text = ds.Tables[0].Rows[0]["单据号"].ToString();
			this.HShiftsID.Text = ds.Tables[0].Rows[0]["HShiftsID"].ToString();
			this.txtLzk.ReadOnly = true;
			this.label2.Text = "流转卡:";
			}