~yxj/MES-WEB-API.git

			@@ -67,19 +67,20 @@
			public const Int16 HInstructNoCol = 46;
			public const Int16 HSeOrderBillIDCol = 47;
			public const Int16 HSeOrderBillNoCol = 48;
			public const Int16 HWhIDCol = 49;
			public const Int16 HWhNumberCol = 50;
			public const Int16 HWhNameCol = 51;
			public const Int16 HSPIDCol = 52;
			public const Int16 HSPNumberCol = 53;
			public const Int16 HSPNameCol = 54;
			public const Int16 HinitQtyCol = 55;
			public const Int16 HRemarkCol = 56;
			public const Int16 HPinfanBarCodeCol = 57;
			public const Int16 HMTONoCol = 58;
			public const Int16 HShowDateCol = 59;
			public const Int16 HInnerBillNoCol = 60;
			public const Int16 HMakerCol = 61;
			public const Int16 HSeOrderSEQCol = 49;
			public const Int16 HWhIDCol = 50;
			public const Int16 HWhNumberCol = 51;
			public const Int16 HWhNameCol = 52;
			public const Int16 HSPIDCol = 53;
			public const Int16 HSPNumberCol = 54;
			public const Int16 HSPNameCol = 55;
			public const Int16 HinitQtyCol = 56;
			public const Int16 HRemarkCol = 57;
			public const Int16 HPinfanBarCodeCol = 58;
			public const Int16 HMTONoCol = 59;
			public const Int16 HShowDateCol = 60;
			public const Int16 HInnerBillNoCol = 61;
			public const Int16 HMakerCol = 62;

			public Int16 HSelectCol = 0;
			public Int16 HSno2Col = 1;
			@@ -127,19 +128,20 @@
			public Int16 HInstructNo2Col = 43;
			public Int16 HSeOrderBillID2Col = 44;
			public Int16 HSeOrderBillNo2Col = 45;
			public Int16 HWhID2Col = 46;
			public Int16 HWhNumber2Col = 47;
			public Int16 HWhName2Col = 48;
			public Int16 HSPID2Col = 49;
			public Int16 HSPNumber2Col = 50;
			public Int16 HSPName2Col = 51;
			public Int16 HRemark2Col = 52;
			public Int16 HPinfanBarCode2Col = 53;
			public Int16 HMTONo2Col = 54;
			public Int16 HShowDate2Col = 55;
			public Int16 HInnerBillNo2Col = 56;
			public Int16 HMaker2Col = 57;
			public Int16 HEntryID2Col = 58;
			public Int16 HSeOrderSEQ2Col = 46;
			public Int16 HWhID2Col = 47;
			public Int16 HWhNumber2Col = 48;
			public Int16 HWhName2Col = 49;
			public Int16 HSPID2Col = 50;
			public Int16 HSPNumber2Col = 51;
			public Int16 HSPName2Col = 52;
			public Int16 HRemark2Col = 53;
			public Int16 HPinfanBarCode2Col = 54;
			public Int16 HMTONo2Col = 55;
			public Int16 HShowDate2Col = 56;
			public Int16 HInnerBillNo2Col = 57;
			public Int16 HMaker2Col = 58;
			public Int16 HEntryID2Col = 59;
			//
			public string ModName = "85";
			public string ModCaption = "æ¡ç çæ";
			@@ -163,7 +165,10 @@
			public string ERPMode = ""; //ERPæ¨¡å¼ï¼WISEãCLOUDï¼
			public string CampanyName = ""; //å®¢æ·å®å¶ååç§°
			public string SourceQtyCtl = ""; //è¶æºåæ°éæ§å¶
			//-------------------------------------------------------------------------
			public long PrintQty = 0; //åè®¸æ¡ç æå°æ¬¡æ°
			public string PrintQtyCtl = ""; //æ¡ç æå°æ¬¡æ°æ§å¶
			public string UpdatePrintQtyCtl = ""; //æ¡ç æå°æ¬¡æ°æ´æ°
			//-------------------------------------------------------------------------
			#region åºå®ä»£ç

			//æ¸ç©ºçé¢
			@@ -206,6 +211,8 @@
			cmbSourceBillType.Items.Add("éè´è®¢å");
			cmbSourceBillType.Items.Add("æ¶æéç¥å");
			cmbSourceBillType.Items.Add("å§å¤è®¢å");
			cmbSourceBillType.Items.Add("å·¥åºæ±æ¥å");
			cmbSourceBillType.Items.Add("å·¥åºæµè½¬å¡");
			cmbSourceBillType.Items.Add("éè´§éç¥å");
			cmbSourceBillType.Items.Add("å¶ä»å¥åºå");
			cmbSourceBillType.Items.Add("ç´æ¥è°æ¨å");
			@@ -403,6 +410,9 @@
			ERPMode = oSystemParameter.omodel.WMS_WMSStockCtl_ERPMode;
			CampanyName = oSystemParameter.omodel.WMS_CampanyName;
			SourceQtyCtl = oSystemParameter.omodel.BarCode_SourceQtyCtl;
			PrintQty = oSystemParameter.omodel.BarCode_PrintQty;
			PrintQtyCtl = oSystemParameter.omodel.BarCode_PrintQtyCtl;
			UpdatePrintQtyCtl = oSystemParameter.omodel.BarCode_UpdatePrintQtyCtl;
			}

			cmbHWorksNumber.Items.Clear();
			@@ -677,10 +687,10 @@
			string HMaterNumber = ""; //ç©æä»£ç
			double HSumQty = 0; //äº§åæ°é
			double HMinQty = 0; //æå°åè£æ°
			int HBQty = 0; //ç®±æ°
			Int64 HBQty = 0; //ç®±æ°
			double HQty = 0; //æ°é
			string WeiShu = ""; //å°¾æ°
			int LSH = 0; //æµæ°´å·
			Int64 LSH = 0; //æµæ°´å·
			string LSH2 = ""; //æµæ°´å·è½¬æ¢æåç¬¦
			string sDate = ""; //æ¥æ
			string sYear = ""; //å¹´
			@@ -693,7 +703,7 @@
			string HBarCodeBatchNo = ""; //æ¡ç æ¹æ¬¡å·
			string HBarCodeDate = ""; //æ¡ç æ¥æ
			int k = 0;
			int n = 0; //åä¸æ¹çææ¡ç ä¸çç¬¬å æ¡
			Int64 n = 0; //åä¸æ¹çææ¡ç ä¸çç¬¬å æ¡
			string sTMNumber = ""; //æ¡ç èªå®ä¹åç¼
			DataSet Ds;
			//Ds = oCn.RunProcReturn("exec GetLSH '" + ClsPub.GetServerDate(0) + "'", "GetLSH");
			@@ -740,7 +750,7 @@
			sTMNumber = HNumber + sYear + sPeriod + sDay;
			Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
			LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			else if (CampanyName == "é£é¾")
			{
			@@ -755,7 +765,7 @@
			sTMNumber = HWorksNumber + HNumber + sYear + sPeriod + sDay;
			Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
			LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			else //éç¨æ¹æ³
			{
			@@ -763,7 +773,7 @@
			sTMNumber = HOrgNumber + HNumber + sYear + sPeriod + sDay;
			Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
			LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			}
			else if (cmbHBarCodeType.Text == "åç§æ¡ç ")
			@@ -781,13 +791,22 @@
			{
			TM = HOrgNumber + HNumber + HBatchNo;
			}//åæ¥ç¹æ®å¤ç
			else if (cmbHBarCodeType.Text == "åºåç ")
			{
			//æ¡ç è§åï¼ GX+ç©æåç +å¹´å¹´æææ¥æ¥+5ä½æµæ°´å·
			LSHlen = 5;
			//æ¡ç åç¼ = GX+ç©æåç +å¹´å¹´æææ¥æ¥
			sTMNumber = "GX" + HNumber + 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(cmbHBarCodeType.Text == "ä»ªå¨å¤è´ä»¶æ¡ç æ®éè§å" \|\| cmbHBarCodeType.Text == "ä»ªå¨å¤è´ä»¶æ¡ç å®¹å¨è§å")
			{
			//ç©æç¼ç +åæ®æ¥æï¼YYMMDDï¼+æµæ°´4ä½
			sTMNumber = HMaterNumber + sYear + sPeriod + sDay;
			Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
			LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			LSHlen = 4;
			}
			else if (cmbHBarCodeType.Text == "ä»ªå¨æåæ¡ç è§å") //å¦å¤å¤çäº
			@@ -796,7 +815,7 @@
			//sTMNumber = HMaterNumber + sYear + sPeriod + sDay;
			//Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			// //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
			//LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
			//LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			else if (cmbHBarCodeType.Text == "è¯åæåæ¡ç è§å")
			{
			@@ -804,7 +823,7 @@
			sTMNumber = HMaterNumber + HBatchNo ;
			Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
			LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			LSHlen = 6;
			}
			else if (cmbHBarCodeType.Text == "åéæºæ¡ç ")
			@@ -814,11 +833,11 @@
			sTMNumber = "1" + HModelName + HBarCodeDate + HBarCodeBatchNo + HYasuoji + "00" ;
			Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
			LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
			LSHlen = 5;
			if (sTMNumber.Length != 16)
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			LSHlen = 4;
			if (sTMNumber.Length != 16 && sTMNumber.Length != 15)
			{
			MessageBox.Show("æ¡ç é¿åº¦ä¸å¤16ä½ï¼æ¯å¦æ°æ®ä¸å¨ï¼å¶é æ¬é¨1ä½:[0] + æºåä»£ç 5ä½:[" + HModelName + "] + å¹´ææ¥5ä½:["+ HBarCodeDate + "] + æ¹æ¬¡å·2ä½:[" + HBarCodeBatchNo + "]+ åç¼©æº1ä½:["+ HYasuoji + "]+00 ; ");
			MessageBox.Show("æ¡ç é¿åº¦ä¸å¤15æ16ä½ï¼æ¯å¦æ°æ®ä¸å¨ï¼å¶é æ¬é¨1ä½:[0] + æºåä»£ç 5ä½:[" + HModelName + "] + å¹´ææ¥4æ5ä½:["+ HBarCodeDate + "] + æ¹æ¬¡å·2ä½:[" + HBarCodeBatchNo + "]+ åç¼©æº1ä½:["+ HYasuoji + "]+00 ; ");
			return;
			}
			}
			@@ -829,11 +848,11 @@
			sTMNumber = HMaterNumber.Replace( "." , "" ) + HBarCodeDate + HBarCodeBatchNo;
			Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
			LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
			LSHlen = 5;
			if (sTMNumber.Length != 18)
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			LSHlen = 4;
			if (sTMNumber.Length != 18 && sTMNumber.Length != 17)
			{
			MessageBox.Show("æ¡ç é¿åº¦ä¸å¤18ä½ï¼æ¯å¦æ°æ®ä¸å¨ï¼ç©æä»£ç 11ä½:["+ HMaterNumber.Replace(".", "") + "]+å¹´ææ¥5ä½:["+ HBarCodeDate + "]+æ¹æ¬¡å·2ä½:[" + HBarCodeBatchNo + "];");
			MessageBox.Show("æ¡ç é¿åº¦ä¸å¤17æ18ä½ï¼æ¯å¦æ°æ®ä¸å¨ï¼ç©æä»£ç 11ä½:["+ HMaterNumber.Replace(".", "") + "]+å¹´ææ¥4æ5ä½:["+ HBarCodeDate + "]+æ¹æ¬¡å·2ä½:[" + HBarCodeBatchNo + "];");
			return;
			}
			}
			@@ -843,7 +862,7 @@
			sTMNumber = HICMOBillNo;
			Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
			LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			LSHlen = 5;
			}
			//else if (cmbHBarCodeType.Text == "æçæ¡ç ")
			@@ -856,10 +875,11 @@
			return;
			}

			HBQty = HBQty + ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value);
			HBQty = HBQty + ClsPub.isLong(grdMain.Rows[j].Cells[HBQtyCol].Value);
			HMinQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value);
			HSumQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HQtyCol].Value);
			n = 0;
			int nn = 0;
			for (int i = k; i < HBQty; i++)
			{
			if (HSumQty - HMinQty > 0)
			@@ -887,6 +907,11 @@
			LSH2 = "0" + LSH2;
			}
			if (cmbHBarCodeType.Text == "å¯ä¸æ¡ç ")
			{
			//æ¡ç ç¼å· = æ¡ç åç¼ + æµæ°´å·
			TM = sTMNumber + LSH2;
			}
			else if (cmbHBarCodeType.Text == "åºåç ")
			{
			//æ¡ç ç¼å· = æ¡ç åç¼ + æµæ°´å·
			TM = sTMNumber + LSH2;
			@@ -964,6 +989,7 @@
			grdSub.Rows[i].Cells[HSourceName2Col].Value = grdMain.Rows[j].Cells[HSourceNameCol].Value;
			grdSub.Rows[i].Cells[HEndDate2Col].Value = grdMain.Rows[j].Cells[HEndDateCol].Value;
			grdSub.Rows[i].Cells[HSeOrderBillNo2Col].Value = grdMain.Rows[j].Cells[HSeOrderBillNoCol].Value;
			grdSub.Rows[i].Cells[HSeOrderSEQ2Col].Value = grdMain.Rows[j].Cells[HSeOrderSEQCol].Value;
			grdSub.Rows[i].Cells[HInnerBillNo2Col].Value = grdMain.Rows[j].Cells[HInnerBillNoCol].Value;
			grdSub.Rows[i].Cells[HMaker2Col].Value = grdMain.Rows[j].Cells[HMakerCol].Value;
			grdSub.Rows[i].Cells[HGiveAwayFlag2Col].Value = grdMain.Rows[j].Cells[HGiveAwayFlagCol].Value;
			@@ -975,8 +1001,11 @@
			grdSub.Rows[i].Cells[HGiveAwayFlag2Col] = oCell;
			k = k + 1;
			n = n + 1;
			oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
			//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
			nn = nn + 1;
			}
			//åå°æ¹éæ§è¡è¯å¥
			oCn.RunProc("exec h_p_WMS_SetMaxNo_QTY '" + sTMNumber + "'," + nn.ToString() + " ");
			}
			}
			string HWei = ""; //å°¾æ°
			@@ -1009,6 +1038,7 @@
			DateTime HEndDate;
			string HWorkLineName = "";
			string HSeOrderBillNo = "";
			Int64 HSeOrderSEQ = 0;
			string HInnerBillNo = "";
			bool HGiveAwayFlag = false;
			Int64 HEntryID = 0;
			@@ -1054,6 +1084,7 @@
			HEndDate = ClsPub.isDate(grdSub.Rows[i].Cells[HEndDate2Col].Value);
			HWorkLineName = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSourceName2Col].Value);
			HSeOrderBillNo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSeOrderBillNo2Col].Value);
			HSeOrderSEQ = ClsPub.isLong(grdSub.Rows[i].Cells[HSeOrderSEQ2Col].Value);
			HInnerBillNo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HInnerBillNo2Col].Value);
			HGiveAwayFlag = ClsPub.isBool(grdSub.Rows[i].Cells[HGiveAwayFlag2Col].Value);
			oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
			@@ -1062,7 +1093,7 @@
			",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
			",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
			",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
			",HGiveAwayFlag " +
			",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " +
			",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
			") values ("
			+ "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
			@@ -1071,7 +1102,7 @@
			+ ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
			+ ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + sDate + "'"
			+ ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString() + ""
			+ ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)
			+ ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag) + "," + HSeOrderSEQ.ToString() + "," + HSourceEntryID.ToString()
			+ ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");


			@@ -1154,7 +1185,7 @@
			string HMaterNumber = ""; //ç©æä»£ç
			double HSumQty = 0; //äº§åæ°é
			double HMinQty = 0; //æå°åè£æ°
			int HBQty = 0; //ç®±æ°
			Int64 HBQty = 0; //ç®±æ°
			double HQty = 0; //æ°é
			string WeiShu = ""; //å°¾æ°
			//int LSH = 0; //æµæ°´å·
			@@ -1205,7 +1236,7 @@
			// return;
			//}

			HBQty = HBQty + ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value);
			HBQty = HBQty + ClsPub.isLong(grdMain.Rows[j].Cells[HBQtyCol].Value);
			HMinQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value);
			HSumQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HQtyCol].Value);
			n = 0;
			@@ -1478,7 +1509,7 @@
			//
			grdMain.RowCount = 0;
			grdSub.RowCount = 0;
			grdMain.ColumnCount = 62; //æ»åæ°
			grdMain.ColumnCount = 63; //æ»åæ°
			DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
			grdMain.Columns[HSnoCol].HeaderText = "åºå·";
			grdMain.Columns[HMainIDCol].HeaderText = "æºåä¸»ID";
			@@ -1520,6 +1551,7 @@
			grdMain.Columns[HSPNameCol].HeaderText = "ä»ä½";
			grdMain.Columns[HInstructNoCol].HeaderText = "æä»¤åå·";
			grdMain.Columns[HSeOrderBillNoCol].HeaderText = "éå®è®¢åå·";
			grdMain.Columns[HSeOrderSEQCol].HeaderText = "éå®è®¢åè¡å·";
			grdMain.Columns[HDateCol].HeaderText = "è¿ææ¥æ";
			grdMain.Columns[HRemarkCol].HeaderText = "å¤æ³¨";
			grdMain.Columns[HMTONoCol].HeaderText = "è®¡åè·è¸ªå·";
			@@ -1611,7 +1643,7 @@
			DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol,oSumGrid);
			//----------------------------

			grdSub.ColumnCount = 59; //æ»åæ°
			grdSub.ColumnCount = 60; //æ»åæ°
			DBUtility.Xt_BaseBillFun.initGridFst(grdSub, this.Name);
			grdSub.Columns[HSelectCol].HeaderText = "éæ©";
			grdSub.Columns[HTMCol].HeaderText = "æ¡ç ç¼å·";
			@@ -1640,6 +1672,7 @@
			grdSub.Columns[HSourceBillNo2Col].HeaderText = "æºååå·";
			grdSub.Columns[HSourceBillType2Col].HeaderText = "æºåç±»å";
			grdSub.Columns[HSeOrderBillNo2Col].HeaderText = "éå®è®¢åå·";
			grdSub.Columns[HSeOrderSEQ2Col].HeaderText = "éå®è®¢åè¡å·";
			grdSub.Columns[HBarcodeNoCol].HeaderText = "æå·";
			grdSub.Columns[HBarcodeQtysCol].HeaderText = "æ»ææ°";
			grdSub.Columns[HSupID2Col].HeaderText = "ä¾åºåID";
			@@ -2160,6 +2193,24 @@
			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
			{

			@@ -2302,6 +2353,26 @@
			grdMain.Rows[i].Cells[HTagCol].Value = "*";
			//å¾å°ä¿¡æ¯
			Ds = oCn.RunProcReturn("select * from h_v_IF_PackageDismantleList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_PackageDismantleList");
			//åå¥ä¿¡æ¯
			Sub_WriteInForm1(Ds.Tables[0], i);
			}
			//å·¥åºæµè½¬å¡
			if (oSelectRow.BillType == "3772")
			{
			grdMain.Rows.Add();
			grdMain.Rows[i].Cells[HTagCol].Value = "*";
			//å¾å°ä¿¡æ¯
			Ds = oCn.RunProcReturn("select * from h_v_IF_ProcessExchangeList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_ProcessExchangeList");
			//åå¥ä¿¡æ¯
			Sub_WriteInForm1(Ds.Tables[0], i);
			}
			//çäº§æ±æ¥å
			if (oSelectRow.BillType == "3714")
			{
			grdMain.Rows.Add();
			grdMain.Rows[i].Cells[HTagCol].Value = "*";
			//å¾å°ä¿¡æ¯
			Ds = oCn.RunProcReturn("select * from h_v_IF_ProcessReportList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_ProcessReportList");
			//åå¥ä¿¡æ¯
			Sub_WriteInForm1(Ds.Tables[0], i);
			}
			@@ -2459,6 +2530,8 @@
			{
			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();
			}

			}
			@@ -2698,9 +2771,10 @@
			#region //æå°è®¾ç½®

			GridppReport Report;
			int CurRows = 0;
			string sBarCodeItemID = ""; //æ¡ç èªå¢å

			//é¢è§
			int CurRows = 0;
			private void yl_Click(object sender, EventArgs e)
			{
			//å¤ææ¯å¦å·²ç»çææ¡ç
			@@ -2729,32 +2803,68 @@
			}
			}

			//æå°åå¤ææ¡ç æ¯å¦å·²æå°è¿
			//æå°
			private void dy_Click(object sender, EventArgs e)
			{
			//å¤ææ¯å¦å·²ç»çææ¡ç
			if (DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value) == "")
			{
			MessageBox.Show("æ¡ç æªçæï¼è¯·åçææ¡ç ååæå°ï¼");
			return;
			}

			//æå°åå¤ææ¡ç æ¯å¦å·²æå°è¿
			if (ReportPrintBegin())
			{
			return;
			}

			//éæ©æå°æ¨¡æ¿
			BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
			oFrm.sBillName = ModName;
			oFrm.sBillModel = ModCaption;
			oFrm.ShowDialog();
			if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
			{
			//å¾ªç¯éä¸è¡
			Sub_SetReport(oFrm.sOpenTmp);
			Report.Print(true);
			Thread.Sleep(1000);
			}
			}

			////æå°åå¤ææ¡ç æ¯å¦å·²æå°è¿
			//private bool ReportPrintBegin()
			//{
			// string sRelQty = "";

			// if (oBar.Set_BPrintQty(DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value), ref sRelQty))
			// {
			// MessageBox.Show("æ¡ç å·²ç»æå°è¿ï¼ä¸å¯éå¤æå°ï¼");
			// return true;
			// }
			// else
			// {
			// return false;
			// }
			//}

			//æå°åå¤ææ¡ç æ¯å¦è¶è¿åè®¸å¯æå°æ¬¡æ°
			private bool ReportPrintBegin()
			{
			string sRelQty = "";

			if (oBar.Set_BPrintQty(DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value), ref sRelQty))
			string sHRemark = "";
			if (PrintQtyCtl == "Y")
			{
			MessageBox.Show("æ¡ç å·²ç»æå°è¿ï¼ä¸å¯éå¤æå°ï¼");
			return true;
			if (oBar.Set_CheckPrintQty_SD(HInterID, PrintQty, ref sHRemark))
			{
			MessageBox.Show(sHRemark);
			return true;
			}
			return false;
			}
			else
			{
			return false;
			}
			}

			//æå°ç»æååå¡«æ¡ç æå°æ¬¡æ°
			private void ReportPrintEnd()
			{
			try
			{
			oCn.RunProc("update Gy_BarCodeBill set HPrintQty=isnull(HPrintQty,0)+1 where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			catch (Exception e)
			{
			MessageBox.Show("æå°å¤±è´¥!æå°ç»æ ï¼" + e.Message);
			}
			}

			@@ -2764,26 +2874,6 @@
			for (int i = 0; i < grdList.Rows.Count; i++)
			{
			grdList.Rows[i].Cells[0].Value = "*";
			}
			//
			Report = new GridppReport();
			Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
			Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
			Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
			Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd);
			}


			private void Sub_SetReportView(string sOpenTmp)
			{
			//å¤æè¡æ°
			for (int i = 0; i < grdList.Rows.Count; i++)
			{
			grdList.Rows[i].Cells[0].Value = "";
			}
			for (int i = 0; i < grdList.SelectedRows.Count; i++)
			{
			grdList.Rows[grdList.SelectedRows[i].Index].Cells[0].Value = "*";
			}
			//
			Report = new GridppReport();
			@@ -2815,11 +2905,7 @@
			}
			}

			private Int32 Fun_GetCol(string sCol)
			{
			return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdList);
			}

			//å¡«å¥åæ®è¡¨ä½ä¿¡æ¯
			private void ReportFetchRecordByDataTable()
			{
			try
			@@ -2833,17 +2919,40 @@
			}
			}

			private void dy_Click(object sender, EventArgs e)
			////æå°ç»æååå¡«æ¡ç æå°æ¬¡æ°
			//private void ReportPrintEnd()
			//{
			// try
			// {
			// oCn.RunProc("update Gy_BarCodeBill set HPrintQty=isnull(HPrintQty,0)+1 where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			// }
			// catch (Exception e)
			// {
			// MessageBox.Show("æå°å¤±è´¥!æå°ç»æ ï¼" + e.Message);
			// }
			//}

			//æå°ç»æååå¡«æ¡ç æå°æ¬¡æ°
			private void ReportPrintEnd()
			{
			if (UpdatePrintQtyCtl == "Y")
			{
			oBar.Set_UpdatePrintQty_SD(HInterID);
			}
			}

			//è¯æå°
			private void sdy_Click(object sender, EventArgs e)
			{
			//å¤ææ¯å¦å·²ç»çææ¡ç
			if (DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value) == "")
			{
			MessageBox.Show("æ¡ç æªçæï¼è¯·åçææ¡ç ååæå°ï¼");
			MessageBox.Show("æ¡ç æªçæï¼è¯·åçææ¡ç ååé¢è§ï¼");
			return;
			}

			//æå°åå¤ææ¡ç æ¯å¦å·²æå°è¿
			if (ReportPrintBegin())
			if (ReportPrintBegin_SDY())
			{
			return;
			}
			@@ -2855,12 +2964,71 @@
			oFrm.ShowDialog();
			if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
			{
			//å¾ªç¯éä¸è¡
			Sub_SetReport(oFrm.sOpenTmp);
			Report.Print(true);
			Sub_SetReportView(oFrm.sOpenTmp);
			Report.PrintPreview(false);
			Thread.Sleep(1000);
			}
			}

			//æå°åå¤ææ¡ç æ¯å¦è¶è¿åè®¸å¯æå°æ¬¡æ°
			private bool ReportPrintBegin_SDY()
			{
			string sHRemark = "";
			sBarCodeItemID = "";
			for (int i = 0; i < grdList.SelectedRows.Count; i++)
			{
			sBarCodeItemID = sBarCodeItemID + "," + DBUtility.ClsPub.isLong(grdList.Rows[grdList.SelectedRows[i].Index].Cells[Fun_GetCol("HItemID")].Value).ToString();
			}
			sBarCodeItemID = sBarCodeItemID.Remove(0, 1);

			if (PrintQtyCtl == "Y")
			{
			if (oBar.Set_CheckPrintQty(sBarCodeItemID, PrintQty, ref sHRemark))
			{
			MessageBox.Show(sHRemark);
			return true;
			}
			return false;
			}
			else
			{
			return false;
			}
			}

			private void Sub_SetReportView(string sOpenTmp)
			{
			//å¤æè¡æ°
			for (int i = 0; i < grdList.Rows.Count; i++)
			{
			grdList.Rows[i].Cells[0].Value = "";
			}
			for (int i = 0; i < grdList.SelectedRows.Count; i++)
			{
			grdList.Rows[grdList.SelectedRows[i].Index].Cells[0].Value = "*";
			}
			//
			Report = new GridppReport();
			Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
			Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
			Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
			Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd_SDY);
			}

			//æå°ç»æååå¡«æ¡ç æå°æ¬¡æ°
			private void ReportPrintEnd_SDY()
			{
			if (UpdatePrintQtyCtl == "Y")
			{
			oBar.Set_UpdatePrintQty(sBarCodeItemID);
			}
			}

			private Int32 Fun_GetCol(string sCol)
			{
			return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdList);
			}


			#endregion

			@@ -2904,7 +3072,7 @@
			}
			sWhere = " and HOrgID =" + sHOrgID.ToString();
			BLL.Cls_S_KF_ICInventoryList_IF oadd = new BLL.Cls_S_KF_ICInventoryList_IF();
			if (oadd.Refresh("")) //éæ©åå
			if (oadd.Refresh(sWhere)) //éæ©åå
			//if (oadd.Refresh(" and HErpClsID in (1,2,3) ")) //éæ©åå
			{
			FillSelectData(oadd.oBillSelectColl);
			@@ -3003,6 +3171,12 @@
			grdMain.Rows[row + r].Cells[HMTONoCol].Value = grdMain.Rows[row].Cells[HMTONoCol].Value;
			grdMain.Rows[row + r].Cells[HInnerBillNoCol].Value = grdMain.Rows[row].Cells[HInnerBillNoCol].Value;
			grdMain.Rows[row + r].Cells[HMakerCol].Value = grdMain.Rows[row].Cells[HMakerCol].Value;
			//ç½æ ¼æå¾
			DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
			oCell.ThreeState = false;
			oCell.Value = grdMain.Rows[row].Cells[HGiveAwayFlagCol].Value;
			oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
			grdMain.Rows[row + r].Cells[HGiveAwayFlagCol] = oCell;

			}
			DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
			@@ -3191,33 +3365,6 @@
			}
			}

			private void sdy_Click(object sender, EventArgs e)
			{
			//å¤ææ¯å¦å·²ç»çææ¡ç
			if (DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value) == "")
			{
			MessageBox.Show("æ¡ç æªçæï¼è¯·åçææ¡ç ååé¢è§ï¼");
			return;
			}

			//æå°åå¤ææ¡ç æ¯å¦å·²æå°è¿
			if (ReportPrintBegin())
			{
			return;
			}

			//éæ©æå°æ¨¡æ¿
			BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
			oFrm.sBillName = ModName;
			oFrm.sBillModel = ModCaption;
			oFrm.ShowDialog();
			if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
			{
			Sub_SetReportView(oFrm.sOpenTmp);
			Report.PrintPreview(false);
			Thread.Sleep(1000);
			}
			}

			//çæå¤ç®±ç
			private void wxm_Click(object sender, EventArgs e)
			@@ -3339,5 +3486,23 @@
			MessageBox.Show("çæç®±ç å¤±è´¥ï¼" + e1.Message );
			}
			}

			private void cmbSourceBillType_TextChanged(object sender, EventArgs e)
			{
			if (cmbSourceBillType.Text == "å·¥åºæµè½¬å¡")
			{
			cmbHBarCodeType.Items.Clear();
			cmbHBarCodeType.Items.Add("åºåç ");
			this.cmbHBarCodeType.SelectedIndex = 0;
			}
			else
			{
			cmbHBarCodeType.Items.Clear();
			cmbHBarCodeType.Items.Add("å¯ä¸æ¡ç ");
			cmbHBarCodeType.Items.Add("åç§æ¡ç ");
			cmbHBarCodeType.Items.Add("æ¹æ¬¡æ¡ç ");
			this.cmbHBarCodeType.SelectedIndex = 0;
			}
			}
			}
			}