~yxj/MES-WEB-API.git

			@@ -190,7 +190,8 @@
			cmdBF.Enabled = true;
			cmdXG.Enabled = true;
			cmdCancel.Enabled = true;
			cmdChecker.Enabled = true;
			cmdChecker.Enabled = true;
			cmdBFChecker.Enabled = true;
			txtHBarCode.Enabled = false;
			Sub_LrtextStatus(false);
			break;
			@@ -202,6 +203,7 @@
			cmdXG.Enabled = false;
			cmdCancel.Enabled = true;
			cmdChecker.Enabled = false;
			cmdBFChecker.Enabled = false;
			Sub_LrtextStatus(true);
			break;
			case DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify:
			@@ -212,6 +214,7 @@
			cmdXG.Enabled = false;
			cmdCancel.Enabled = true;
			cmdChecker.Enabled = false;
			cmdBFChecker.Enabled = false;
			Sub_LrtextStatus(true);
			break;
			}
			@@ -1563,6 +1566,7 @@
			oBF.HMainSourceInterID = BillOld.omodel.HInterID;
			oBF.HProcExchInterID = lngBillKey;
			oBF.HProcExchEntryID = lngBillSubKey;
			oBF.HBillSubType = "涓嶈壇璇勫";
			oBF.txtHLotNo.Text = txtHProcExchBillNo.Text;
			oBF.txtHOrderProcNo.Text = txtHOrderProcNO.Text;
			oBF.txtHMaterID.Text = txtHMaterName.Text;
			@@ -1584,7 +1588,40 @@
			if (oBF.BillChange)
			{
			this.Sub_ShowBill();
			}
			}
			}

			//鎶ュ簾鍝佽川纭鎸夐挳
			private void cmdBFChecker_Click(object sender, EventArgs e)
			{
			QC_NoPassProdCheckBill oBF = new QC_NoPassProdCheckBill();
			oBF.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
			oBF.HMainSourceInterID = BillOld.omodel.HInterID;
			oBF.HProcExchInterID = lngBillKey;
			oBF.HProcExchEntryID = lngBillSubKey;
			oBF.HBillSubType = "鎶ュ簾璇勫";
			oBF.txtHLotNo.Text = txtHProcExchBillNo.Text;
			oBF.txtHOrderProcNo.Text = txtHOrderProcNO.Text;
			oBF.txtHMaterID.Text = txtHMaterName.Text;
			oBF.txtHMaterNumber.Text = txtHMaterID.Text;
			oBF.txtHModel.Text = txtHMaterModel.Text;
			oBF.txtHMaterID.Tag = txtHMaterID.Tag;
			oBF.txtHProcID.Tag = txtHProcID.Tag;
			oBF.txtHProcID.Text = txtHProcID.Text;
			oBF.txtHWorkCenterID.Text = txtHCenterID.Text;
			oBF.txtHWorkCenterID.Tag = txtHCenterID.Tag;
			oBF.txtHICMOInterID.Text = Pub_Class.ClsPub.isStrNull(txtHICMOBillNo.Tag);
			oBF.txtHICMOBillNo.Text = txtHICMOBillNo.Text;
			oBF.txtHProcExchQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHPlanQty.Text));
			oBF.txtHPlanQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadCount.Text));
			oBF.txtHPlanPNL.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadPNL.Text));
			oBF.txtHBadPNL.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadPNL.Text));
			oBF.txtHBadQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHWasterQty.Text));
			oBF.ShowDialog();
			if (oBF.BillChange)
			{
			this.Sub_ShowBill();
			}
			}

			private void label20_Click(object sender, EventArgs e)