MES-WEB-API.git

			@@ -27,7 +27,7 @@
			public const Int16 HMaterIDCol = 6;
			public const Int16 HMaterNumberCol = 7;
			public const Int16 HMaterNameCol = 8;
			public const Int16 HPinfanCol = 9;
			public const Int16 HSubjoin2Col = 9;
			public const Int16 HMaterModelCol = 10;
			public const Int16 HAuxPropIDCol = 11;
			public const Int16 HAuxPropNumberCol = 12;
			@@ -77,6 +77,8 @@
			public const Int16 HInnerBillNoCol = 56;
			public const Int16 HEndDateCol = 57;
			public const Int16 HSourceBillQtyCol = 58;
			public const Int16 HPinfanCol = 59;

			//
			public string ModName = "85";
			public string ModCaption = "æ¡ç çæ";
			@@ -259,8 +261,6 @@
			this.lblCaption.Text = ModCaption;
			//å è½½ç»ç»ä¿¡æ¯
			Sub_AddOrdList();
			//å è½½æºåç±»å
			Sub_AddHSourceBillTypeList();

			//è·åç³»ç»åæ°
			ClsXt_SystemParameter oSystemParameter = new ClsXt_SystemParameter();
			@@ -307,25 +307,7 @@
			cmbHOrgID.DisplayMember = "HName";
			cmbHOrgID.ValueMember = "HItemID";
			}

			//å è½½æºåç±»å
			private void Sub_AddHSourceBillTypeList()
			{
			DataSet ds = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_SourceBillType " + HOrgID.ToString(), "h_p_Gy_BarCodeBill_SourceBillType");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			cmbSourceBillType.DataSource = null;
			cmbSourceBillType.Items.Clear();
			MessageBox.Show("è·åæºåç±»åå¤±è´¥");
			return;
			}
			cmbSourceBillType.DataSource = null;
			cmbSourceBillType.Items.Clear();
			cmbSourceBillType.DataSource = ds.Tables[0];
			cmbSourceBillType.DisplayMember = "HName";
			cmbSourceBillType.ValueMember = "HItemID";
			}


			//çªä½å°ºå¯¸ååæ¶
			private void Gy_BarCodeBill_Rework_Resize(object sender, EventArgs e)
			{
			@@ -567,7 +549,6 @@
			int HSumBQty = 0; //åä¸æ¹çææ¡ç æ»ç®±æ°
			int n = 0; //åä¸æ¹çææ¡ç ä¸çç¬¬å æ¡
			DataSet Ds;
			pb1.Value = 0;

			Int64 HEntryID = 0; //åID
			string HBarCode = ""; //æ¡å½¢ç
			@@ -622,7 +603,6 @@
			if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
			{
			HSumBQty = HSumBQty + ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value);
			pb1.Maximum = HSumBQty;
			}
			}
			for (int j = 0; j < grdMain.Rows.Count; j++)
			@@ -642,39 +622,13 @@
			//==================================
			if (HBarCodeType == "å¯ä¸æ¡ç ")
			{
			if (CampanyName == "ä¸æ§")
			{
			HSourceBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBillNoCol].Value);
			sSourceEntryID = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HSubIDCol].Value);
			if (HSourceBillNo == "")
			{
			//æ¡ç åç¼ = ç»ç»ä»£ç + ç©æä»£ç + å¹´ + æ + æ¥
			sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
			Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			else
			{
			//æ¡ç = æºååå· + ç©æID + è¡å·
			sTMNumber = HSourceBillNo + sMaterID + sSourceEntryID;
			}
			}
			else //éç¨æ¹æ³
			{
			//æ¡ç åç¼ = ç»ç»ä»£ç + ç©æä»£ç + å¹´ + æ + æ¥
			sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
			Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			}
			else if (HBarCodeType == "åç§æ¡ç ")
			{
			TM = HOrgNumber + sMaterID;
			}
			else if (HBarCodeType == "æ¹æ¬¡æ¡ç ")
			{
			TM = HOrgNumber + sMaterID + HBatchNo;
			}
			//æ¡ç åç¼ = ç»ç»ä»£ç + ç©æä»£ç + å¹´ + æ + æ¥
			//sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
			sTMNumber = sYear + sPeriod + sDay;

			Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo_ReWorkBar '" + sTMNumber + "'", "h_p_WMS_GetMaxNo_ReWorkBar"); //è·åæå¤§æµæ°´å·
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			else
			{
			MessageBox.Show("éè¯¯çæ¡ç ç±»åï¼ä¸è½çææ¡ç ï¼");
			@@ -716,31 +670,11 @@
			}
			if (HBarCodeType == "å¯ä¸æ¡ç ")
			{
			if (CampanyName == "ä¸æ§")
			{
			if (HSourceBillNo == "")
			{
			//æ¡ç ç¼å· = æ¡ç åç¼ + æµæ°´å·
			TM = sTMNumber + LSH2;
			}
			else
			{
			if (HBQty > 1)
			{
			MessageBox.Show("çäº§æ±æ¥åãæ¶æéç¥åçææ¡ç æ¶ï¼ç®±æ°ä¸è½å¤§äº1ï¼");
			bc.Enabled = true;
			oCn.RollBack();
			return;
			}
			//æ¡ç ç¼å· = æ¡ç åç¼
			TM = sTMNumber;
			}
			}
			else
			{
			//æ¡ç ç¼å· = æ¡ç åç¼ + æµæ°´å·
			TM = sTMNumber + LSH2;
			}
			Int32 HModelLen = grdMain.Rows[j].Cells[HMaterModelCol].Value.ToString().Length;
			string HModelLeft = HModelLen >= 4 ? grdMain.Rows[j].Cells[HMaterModelCol].Value.ToString() : "";
			string HSubjoin2 = grdMain.Rows[j].Cells[HSubjoin2Col].Value.ToString();
			//æ¡ç ç¼å· = å·¥åä»£ç ï¼1ï¼ + è½¦é´ä»£ç ï¼060113ï¼+ æºåå· + å¹´ + æ + æ¥ + æµæ°´å·
			TM = "1" + 060113.ToString() + HSubjoin2 + sYear + sPeriod + sDay + LSH.ToString("D5");
			}

			HEntryID = j + 1;
			@@ -815,7 +749,6 @@
			+ ", " + HCusID.ToString() + ",'" + HCusType + "','" + HSeOrderBillNo + "'," + HSeOrderSEQ.ToString() + ",'" + HInnerBillNo + "','" + HWorkLineName + "'"
			+ ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "','" + HEndDate.ToShortDateString() + "','" + ClsPub.CurUserName + "',getdate()" +
			")");
			pb1.Value = n + 1;
			n = n + 1;
			nn = nn + 1;
			}
			@@ -875,7 +808,7 @@
			private void initGrid()
			{
			grdMain.RowCount = 0;
			grdMain.ColumnCount = 59; //æ»åæ°
			grdMain.ColumnCount = 60; //æ»åæ°
			DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
			grdMain.Columns[HSnoCol].HeaderText = "åºå·";
			grdMain.Columns[HMainIDCol].HeaderText = "æºåä¸»ID";
			@@ -886,6 +819,7 @@
			grdMain.Columns[HMaterNumberCol].HeaderText = "ç©æä»£ç ";
			grdMain.Columns[HMaterNameCol].HeaderText = "ç©æåç§°";
			grdMain.Columns[HMaterModelCol].HeaderText = "è§æ ¼åå·";
			grdMain.Columns[HSubjoin2Col].HeaderText = "æºåç ";
			grdMain.Columns[HPinfanCol].HeaderText = "åçª";
			grdMain.Columns[HUnitIDCol].HeaderText = "è®¡éåä½ID";
			grdMain.Columns[HUnitNumberCol].HeaderText = "è®¡éåä½ä»£ç ";
			@@ -936,6 +870,7 @@
			grdMain.Columns[HInnerBillNoCol].HeaderText = "åé¨éè´è®¢åå·";
			grdMain.Columns[HEndDateCol].HeaderText = "è®¡åå®å·¥æ¥æ";


			//æ ¼å¼å éèå
			grdMain.Columns[HTagCol].Visible = false;
			grdMain.Columns[HMainIDCol].Visible = false;
			@@ -977,6 +912,9 @@
			grdMain.Columns[HSeOrderSEQCol].Visible = false;
			grdMain.Columns[HInnerBillNoCol].Visible = false;
			grdMain.Columns[HEndDateCol].Visible = false;
			grdMain.Columns[HBillNoCol].Visible = false;
			grdMain.Columns[HAuxPropNumberCol].Visible = false;
			grdMain.Columns[HAuxPropNameCol].Visible = false;

			//è®¾ç½®å¯ç¼è¾å
			string sAllowCol = HQtyCol.ToString() +
			@@ -1016,17 +954,9 @@
			grdMain.Rows[i].Cells[HGiveAwayFlagCol] = oCell3;
			//ç½æ ¼ä¸æéæ©æ¡
			DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
			if (CampanyName == "ä¸æ§")
			{
			column.Items.Add("æ¹æ¬¡æ¡ç ");
			column.Items.Add("åç§æ¡ç ");
			}
			else
			{
			column.Items.Add("å¯ä¸æ¡ç ");
			column.Items.Add("æ¹æ¬¡æ¡ç ");
			column.Items.Add("åç§æ¡ç ");
			}

			column.Items.Add("å¯ä¸æ¡ç ");

			grdMain.Rows[i].Cells[HBarCodeTypeCol] = column;
			}

			@@ -1125,7 +1055,8 @@
			grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = oMater.omodel.HAuxPropName;
			grdMain.Rows[sRow].Cells[HBatchManagerCol].Value = oMater.omodel.HBatchManager;
			grdMain.Rows[sRow].Cells[HISKFPERIODCol].Value = oMater.omodel.HISKFPERIOD;
			grdMain.Rows[sRow].Cells[HBarCodeTypeCol].Value = oMater.omodel.HBarCodeType;
			grdMain.Rows[sRow].Cells[HSubjoin2Col].Value = oMater.omodel.HSubjoin2;
			grdMain.Rows[sRow].Cells[HBarCodeTypeCol].Value = "å¯ä¸æ¡ç ";
			//å¯ç¨æ¹æ¬¡
			if (oMater.omodel.HBatchManager)
			{
			@@ -1150,12 +1081,7 @@
			grdMain.Rows[sRow].Cells[HProduceDateCol].Value = "";
			grdMain.Rows[sRow].Cells[HExpiryDateCol].Value = "";
			}

			if (CampanyName == "ä¸æ§")
			{
			grdMain.Rows[sRow].Cells[HQtyCol].Value = oMater.omodel.HQtyMin;
			grdMain.Rows[sRow].Cells[HBQtyCol].Value = 1;
			}

			oEdit.Text = oMater.omodel.HNumber;
			}
			else
			@@ -1375,154 +1301,7 @@
			}

			#endregion


			#region éæºåè¿åä¿¡æ¯ ææ¾å¤§éå¾æ è¿å

			private void cmdSourceBillNo_Click(object sender, EventArgs e)
			{
			if (cmbSourceBillType.Text.Trim() == "çäº§è®¢å")
			{
			string sWhere = "";
			//ç³»ç»åæ°ï¼çææ¡ç æ°éå¯å¦è¶æºåæ°éæ§å¶ï¼Nä¸ºä¸å¯è¶æºåæ°éï¼
			if (SourceQtyCtl == "N")
			{
			sWhere = " and HOrgID =" + HOrgID.ToString() + " and ä»»å¡æ°é>0";
			}
			else
			{
			sWhere = " and HOrgID =" + HOrgID.ToString();
			}

			DAL.Cls_S_IFCLD_ICMOList oIFCLD_ICMOList = new DAL.Cls_S_IFCLD_ICMOList();
			if (oIFCLD_ICMOList.Refresh(sWhere)) //éæ©åå
			{
			FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
			}
			}
			else if (cmbSourceBillType.Text.Trim() == "çäº§æ±æ¥å")
			{
			string sWhere = " and HOrgID =" + HOrgID.ToString();
			DAL.Cls_S_IF_ICMOReportBillList oIF_ICMOReportBillList = new DAL.Cls_S_IF_ICMOReportBillList();
			if (oIF_ICMOReportBillList.Refresh(sWhere)) //éæ©åå
			{
			FillSelectData(oIF_ICMOReportBillList.oBillSelectColl);
			}
			}
			else if (cmbSourceBillType.Text.Trim() == "æ¶æéç¥å")
			{
			string sWhere = " and HOrgID =" + HOrgID.ToString();
			DAL.Cls_S_IF_POInStockBillList oIF_POInStockBillList = new DAL.Cls_S_IF_POInStockBillList();
			if (oIF_POInStockBillList.Refresh(sWhere)) //éæ©åå
			{
			FillSelectData(oIF_POInStockBillList.oBillSelectColl);
			}
			}
			else if (cmbSourceBillType.Text.Trim() == "éè´è®¢å")
			{
			string sWhere = " and HOrgID =" + HOrgID.ToString();
			DAL.Cls_S_IF_POOrderBillList oIF_POOrderBillList = new DAL.Cls_S_IF_POOrderBillList();
			if (oIF_POOrderBillList.Refresh(sWhere)) //éæ©åå
			{
			FillSelectData(oIF_POOrderBillList.oBillSelectColl);
			}
			}
			else if (cmbSourceBillType.Text.Trim() == "å§å¤è®¢å")
			{
			string sWhere = " and HOrgID =" + HOrgID.ToString();
			DAL.Cls_S_IF_EntrustOrderBillList oIF_EntrustOrderBillList = new DAL.Cls_S_IF_EntrustOrderBillList();
			if (oIF_EntrustOrderBillList.Refresh(sWhere)) //éæ©åå
			{
			FillSelectData(oIF_EntrustOrderBillList.oBillSelectColl);
			}
			}
			else if (cmbSourceBillType.Text.Trim() == "éè´å¥åºå")
			{
			string sWhere = "";
			DAL.Cls_S_IF_POStockInBillList oIF_POStockInBillList = new DAL.Cls_S_IF_POStockInBillList();
			if (oIF_POStockInBillList.Refresh(sWhere)) //éæ©åå
			{
			FillSelectData(oIF_POStockInBillList.oBillSelectColl);
			}
			}
			else if (cmbSourceBillType.Text.Trim() == "éè´§éç¥å")
			{
			string sWhere = "";
			DAL.Cls_S_IF_SeOutStockBackBillList oIF_SeOutStockBackBillList = new DAL.Cls_S_IF_SeOutStockBackBillList();
			if (oIF_SeOutStockBackBillList.Refresh(sWhere)) //éæ©åå
			{
			FillSelectData(oIF_SeOutStockBackBillList.oBillSelectColl);
			}
			}
			else if (cmbSourceBillType.Text.Trim() == "å¶ä»å¥åºå")
			{
			string sWhere = " and HOrgID =" + HOrgID.ToString();
			DAL.Cls_S_IF_OtherInBillList oIF_OtherInBillList = new DAL.Cls_S_IF_OtherInBillList();
			if (oIF_OtherInBillList.Refresh(sWhere)) //éæ©åå
			{
			FillSelectData(oIF_OtherInBillList.oBillSelectColl);
			}
			}
			else if (cmbSourceBillType.Text.Trim() == "ç´æ¥è°æ¨å")
			{
			string sWhere = " and HOrgID =" + HOrgID.ToString();
			DAL.Cls_S_IF_MoveStockBillList oIF_MoveStockBillList = new DAL.Cls_S_IF_MoveStockBillList();
			if (oIF_MoveStockBillList.Refresh(sWhere)) //éæ©åå
			{
			FillSelectData(oIF_MoveStockBillList.oBillSelectColl);
			}
			}
			else if (cmbSourceBillType.Text.Trim() == "éè´éæå")
			{
			string sWhere = " and HOrgID =" + HOrgID.ToString();
			DAL.Cls_S_IF_POStockInBackBillList oIF_POStockInBackBillList = new DAL.Cls_S_IF_POStockInBackBillList();
			if (oIF_POStockInBackBillList.Refresh(sWhere)) //éæ©åå
			{
			FillSelectData(oIF_POStockInBackBillList.oBillSelectColl);
			}
			}
			else if (cmbSourceBillType.Text.Trim() == "çäº§éæå")
			{
			string sWhere = " and HOrgID =" + HOrgID.ToString();
			DAL.Cls_S_IF_MateOutBackBillList oIF_MateOutBackBillList = new DAL.Cls_S_IF_MateOutBackBillList();
			if (oIF_MateOutBackBillList.Refresh(sWhere)) //éæ©åå
			{
			FillSelectData(oIF_MateOutBackBillList.oBillSelectColl);
			}
			}
			else if (cmbSourceBillType.Text.Trim() == "ç»è£æå¸å")
			{
			string sWhere = " and HOrgID =" + HOrgID.ToString();
			DAL.Cls_S_IF_PackageDismantleBillList oIF_PackageDismantleBillList = new DAL.Cls_S_IF_PackageDismantleBillList();
			if (oIF_PackageDismantleBillList.Refresh(sWhere)) //éæ©åå
			{
			FillSelectData(oIF_PackageDismantleBillList.oBillSelectColl);
			}
			}
			else if (cmbSourceBillType.Text.Trim() == "å·¥åºæµè½¬å¡")
			{
			string sWhere = " and HOrgID =" + HOrgID.ToString();
			DAL.Cls_S_IF_ProcessExchangeBillList oIF_ProcessExchangeBillList = new DAL.Cls_S_IF_ProcessExchangeBillList();
			if (oIF_ProcessExchangeBillList.Refresh(sWhere)) //éæ©åå
			{
			FillSelectData(oIF_ProcessExchangeBillList.oBillSelectColl);
			}
			}
			else if (cmbSourceBillType.Text.Trim() == "å·¥åºæ±æ¥å")
			{
			string sWhere = " and HOrgID =" + HOrgID.ToString();
			DAL.Cls_S_IF_ProcessReportBillList oIF_ProcessReportBillList = new DAL.Cls_S_IF_ProcessReportBillList();
			if (oIF_ProcessReportBillList.Refresh(sWhere)) //éæ©åå
			{
			FillSelectData(oIF_ProcessReportBillList.oBillSelectColl);
			}
			}
			else
			{

			}
			}


			private void FillSelectData(List<DBUtility.BillSelect> oList)
			{
			DataSet Ds;
			@@ -1838,51 +1617,8 @@
			grdMain.Rows[i].Cells[HExpiryDateCol].Value = "";
			}

			if (CampanyName == "ä¸æ§")
			{
			grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["æªçææ¡ç æ°é"]);
			}
			else
			{
			grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["æå°åè£æ°"].ToString();
			}
			if (cmbSourceBillType.Text.Trim() == "æ¶æéç¥å" \|\| cmbSourceBillType.Text.Trim() == "éè´è®¢å"
			\|\| cmbSourceBillType.Text.Trim() == "å§å¤è®¢å" \|\| cmbSourceBillType.Text.Trim() == "éè´å¥åºå")
			{
			grdMain.Rows[i].Cells[HInnerBillNoCol].Value = oTable.Rows[0]["åé¨éè´è®¢åå·"].ToString();
			grdMain.Rows[i].Cells[HSupIDCol].Value = oTable.Rows[0]["hsupid"].ToString();
			grdMain.Rows[i].Cells[HSupNumberCol].Value = oTable.Rows[0]["ä¾åºåä»£ç "].ToString();
			grdMain.Rows[i].Cells[HSupNameCol].Value = oTable.Rows[0]["ä¾åºå"].ToString();
			if (cmbSourceBillType.Text.Trim() == "æ¶æéç¥å")
			{
			if (oTable.Rows[0]["æ¯å¦èµ å"].ToString() == "æ¯")
			{
			grdMain.Rows[i].Cells[HGiveAwayFlagCol].Value = 1;
			}
			else
			{
			grdMain.Rows[i].Cells[HGiveAwayFlagCol].Value = 0;
			}
			grdMain.Rows[i].Cells[HSeOrderBillNoCol].Value = oTable.Rows[0]["éå®è®¢åå·"].ToString();
			grdMain.Rows[i].Cells[HSeOrderSEQCol].Value = oTable.Rows[0]["éå®è®¢åè¡å·"].ToString();
			}
			grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["æå°åè£æ°"].ToString();

			}
			if (cmbSourceBillType.Text.Trim() == "éè´§éç¥å")
			{
			grdMain.Rows[i].Cells[HCusIDCol].Value = oTable.Rows[0]["HCusID"].ToString();
			grdMain.Rows[i].Cells[HCusNumberCol].Value = oTable.Rows[0]["å®¢æ·ä»£ç "].ToString();
			grdMain.Rows[i].Cells[HCusNameCol].Value = oTable.Rows[0]["å®¢æ·"].ToString();
			}
			if (cmbSourceBillType.Text.Trim() == "å¶ä»å¥åºå")
			{
			grdMain.Rows[i].Cells[HWhIDCol].Value = oTable.Rows[0]["HWhID"].ToString();
			grdMain.Rows[i].Cells[HWhNumberCol].Value = oTable.Rows[0]["ä»åºä»£ç "].ToString();
			grdMain.Rows[i].Cells[HWhNameCol].Value = oTable.Rows[0]["ä»åº"].ToString();
			grdMain.Rows[i].Cells[HSPIDCol].Value = oTable.Rows[0]["HSPID"].ToString();
			grdMain.Rows[i].Cells[HSPNumberCol].Value = oTable.Rows[0]["ä»ä½ä»£ç "].ToString();
			grdMain.Rows[i].Cells[HSPNameCol].Value = oTable.Rows[0]["ä»ä½"].ToString();
			}
			//--
			//è®¾ç½®å¯ç¼è¾å
			string sAllowCol = HQtyCol.ToString() +
			@@ -1952,10 +1688,6 @@
			grdMain.Rows[i].Cells[HExpiryDateCol].Value = "";
			}

			if (CampanyName == "ä¸æ§")
			{
			grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["æ°é"]);
			}
			//--
			//è®¾ç½®å¯ç¼è¾å
			string sAllowCol = HQtyCol.ToString() +
			@@ -1972,117 +1704,9 @@
			RowCount(i, 0);
			}

			#endregion


			#region éæºåè¿åä¿¡æ¯ æåè½¦é®è¿å
			private void txtHSourceBillNo_KeyPress(object sender, KeyPressEventArgs e)
			{
			if (e.KeyChar == (char)Keys.Return)//åè½¦å¸¦åºæºåä¿¡æ¯
			{
			if (txtHSourceBillNo.Text.Length < 4)
			{
			MessageBox.Show("è¯·è¾å¥4ä½ä»¥ä¸æ°æ®ï¼");
			return;
			}
			//æ ¹æ®æºåç±»å åæºåå· è·åä¿¡æ¯
			if (cmbSourceBillType.Text.Trim() == "çäº§è®¢å")
			{
			DAL.Cls_S_IFCLD_ICMOList oIFCLD_ICMOList = new DAL.Cls_S_IFCLD_ICMOList();
			//ç³»ç»åæ°ï¼çææ¡ç æ°éå¯å¦è¶æºåæ°éæ§å¶ï¼Nä¸ºä¸å¯è¶æºåæ°éï¼
			if (SourceQtyCtl == "N")
			{
			if (oIFCLD_ICMOList.RefreshBySourceBillNo(" Where åæ®å· like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString() + " and ä»»å¡æ°é>0")) //éæ©åå
			{
			FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
			txtHSourceBillNo.Text = "";
			}
			else
			{
			MessageBox.Show("æªæ¥è¯¢å°ä»»å¡æ°æ®ï¼è¯·ç¡®è®¤æéç»ç»ãæºåç±»åä¸æºååå·æ¯å¦æ£ç¡®ï¼");
			return;
			}
			}
			else
			{
			if (oIFCLD_ICMOList.RefreshBySourceBillNo(" Where åæ®å· like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString())) //éæ©åå
			{
			FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
			txtHSourceBillNo.Text = "";
			}
			else
			{
			MessageBox.Show("æªæ¥è¯¢å°ä»»å¡æ°æ®ï¼è¯·ç¡®è®¤æéç»ç»ãæºåç±»åä¸æºååå·æ¯å¦æ£ç¡®ï¼");
			return;
			}
			}
			}
			else if (cmbSourceBillType.Text.Trim() == "çäº§æ±æ¥å")
			{
			DAL.Cls_S_IF_ICMOReportBillList oIF_ICMOReportBillList = new DAL.Cls_S_IF_ICMOReportBillList();
			if (oIF_ICMOReportBillList.RefreshBySourceBillNo(" Where åæ®å· like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString())) //éæ©åå
			{
			FillSelectData(oIF_ICMOReportBillList.oBillSelectColl);
			txtHSourceBillNo.Text = "";
			}
			else
			{
			MessageBox.Show("æªæ¥è¯¢å°ä»»å¡æ°æ®ï¼è¯·ç¡®è®¤æéç»ç»ãæºåç±»åä¸æºååå·æ¯å¦æ£ç¡®ï¼");
			return;
			}
			}
			else if (cmbSourceBillType.Text.Trim() == "æ¶æéç¥å")
			{
			DAL.Cls_S_IF_POInStockBillList oIF_POInStockBillList = new DAL.Cls_S_IF_POInStockBillList();
			if (oIF_POInStockBillList.RefreshBySourceBillNo(" Where åæ®å· like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString())) //éæ©åå
			{
			FillSelectData(oIF_POInStockBillList.oBillSelectColl);
			txtHSourceBillNo.Text = "";
			}
			else
			{
			MessageBox.Show("æªæ¥è¯¢å°ä»»å¡æ°æ®ï¼è¯·ç¡®è®¤æéç»ç»ãæºåç±»åä¸æºååå·æ¯å¦æ£ç¡®ï¼");
			return;
			}
			}
			else if (cmbSourceBillType.Text.Trim() == "éè´è®¢å")
			{
			DAL.Cls_S_IF_POOrderBillList oIF_POOrderBillList = new DAL.Cls_S_IF_POOrderBillList();
			if (oIF_POOrderBillList.RefreshBySourceBillNo(" Where åæ®å· like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString())) //éæ©åå
			{
			FillSelectData(oIF_POOrderBillList.oBillSelectColl);
			txtHSourceBillNo.Text = "";
			}
			else
			{
			MessageBox.Show("æªæ¥è¯¢å°ä»»å¡æ°æ®ï¼è¯·ç¡®è®¤æéç»ç»ãæºåç±»åä¸æºååå·æ¯å¦æ£ç¡®ï¼");
			return;
			}
			}
			else if (cmbSourceBillType.Text.Trim() == "å§å¤è®¢å")
			{
			DAL.Cls_S_IF_EntrustOrderBillList oIF_EntrustOrderBillList = new DAL.Cls_S_IF_EntrustOrderBillList();
			if (oIF_EntrustOrderBillList.RefreshBySourceBillNo(" Where åæ®å· like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString())) //éæ©åå
			{
			FillSelectData(oIF_EntrustOrderBillList.oBillSelectColl);
			txtHSourceBillNo.Text = "";
			}
			else
			{
			MessageBox.Show("æªæ¥è¯¢å°ä»»å¡æ°æ®ï¼è¯·ç¡®è®¤æéç»ç»ãæºåç±»åä¸æºååå·æ¯å¦æ£ç¡®ï¼");
			return;
			}
			}
			else
			{
			MessageBox.Show("æéæºåç±»åï¼ä¸æ¯ææ¤åè½ï¼");
			return;
			}
			}
			}

			#endregion



			#region //æå°è®¾ç½®

			@@ -2328,28 +1952,28 @@
			#region éæ©æ¥æ
			private void dtpHDate_ValueChanged(object sender, EventArgs e)
			{
			if (chkUpdateSubDate.Checked == true)
			{
			for (int j = 0; j < grdMain.Rows.Count; j++)
			{
			long HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value); // ç©æåç
			if (HMaterID != 0 && DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HRemarkCol].Value) != "æåºåçæ")
			{
			//è·åçäº§æ¥æãæææè³
			DateTime HProduceDate = dtpHDate.Value; //çäº§æ¥æ
			string HEXPUNIT = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HEXPUNITCol].Value); //ä¿è´¨æåä½
			int HEXPPERIOD = DBUtility.ClsPub.isInt(grdMain.Rows[j].Cells[HEXPPERIODCol].Value); //ä¿è´¨æ
			//çäº§æ¥æ
			grdMain.Rows[j].Cells[HProduceDateCol].Value = dtpHDate.Value.ToShortDateString();
			//if (chkUpdateSubDate.Checked == true)
			//{
			// for (int j = 0; j < grdMain.Rows.Count; j++)
			// {
			// long HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value); // ç©æåç
			// if (HMaterID != 0 && DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HRemarkCol].Value) != "æåºåçæ")
			// {
			// //è·åçäº§æ¥æãæææè³
			// DateTime HProduceDate = dtpHDate.Value; //çäº§æ¥æ
			// string HEXPUNIT = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HEXPUNITCol].Value); //ä¿è´¨æåä½
			// int HEXPPERIOD = DBUtility.ClsPub.isInt(grdMain.Rows[j].Cells[HEXPPERIODCol].Value); //ä¿è´¨æ
			// //çäº§æ¥æ
			// grdMain.Rows[j].Cells[HProduceDateCol].Value = dtpHDate.Value.ToShortDateString();

			if (GetExpiryDate(HProduceDate, HEXPUNIT, HEXPPERIOD, ref sReturn, ref HExpiryDate))
			{
			//æææè³
			grdMain.Rows[j].Cells[HExpiryDateCol].Value = HExpiryDate;
			}
			}
			}
			}
			// if (GetExpiryDate(HProduceDate, HEXPUNIT, HEXPPERIOD, ref sReturn, ref HExpiryDate))
			// {
			// //æææè³
			// grdMain.Rows[j].Cells[HExpiryDateCol].Value = HExpiryDate;
			// }
			// }
			// }
			//}
			}

			#endregion
			@@ -2480,17 +2104,9 @@
			grdMain.Rows[row + r].Cells[HGiveAwayFlagCol] = oCell3;
			//ç½æ ¼ä¸æéæ©æ¡
			DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
			if (CampanyName == "ä¸æ§")
			{
			column.Items.Add("æ¹æ¬¡æ¡ç ");
			column.Items.Add("åç§æ¡ç ");
			}
			else
			{
			column.Items.Add("å¯ä¸æ¡ç ");
			column.Items.Add("æ¹æ¬¡æ¡ç ");
			column.Items.Add("åç§æ¡ç ");
			}

			column.Items.Add("å¯ä¸æ¡ç ");

			grdMain.Rows[row + r].Cells[HBarCodeTypeCol] = column;
			}
			DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);