~yxj/MES-WEB-API.git

			@@ -119,7 +119,7 @@
			//æå½ååæ®ID åå°ä¸ä¸ªæé®éé¢ å·æ°æ¶æ¯æ¬¡åä¸é
			if (DSet.Tables[0].Rows.Count > 0)
			{
			txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
			txtHMaterID.Tag = DBUtility.ClsPub.isLong(grdMain.Rows[0].Cells["HInterID"].Value);
			txtHMiniQty.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["æ åè£ç®±"].Value);
			//txtHMaterID.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["ç©æç¼ç "].Value);
			txtHMaterModel.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["è§æ ¼åå·"].Value);
			@@ -143,7 +143,7 @@
			// }
			//}
			//å»ç»
			//int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
			//int FrCol = DBUtility.ClsPub.isLong(frmCondition.txtFrozenCol.Text);
			//string s = frmCondition.cmbHComplete.Text;
			//DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s,FrCol);
			//ç»çº¿
			@@ -229,7 +229,7 @@
			string HUserName = "";
			HUserName = ClsPub.isStrNull(DBUtility.ClsPub.CurUserName);
			Int64 HUserID = 0;
			HUserID = ClsPub.isInt(DBUtility.ClsPub.CurUserID);
			HUserID = ClsPub.isLong(DBUtility.ClsPub.CurUserID);

			DataSet DSet;

			@@ -781,7 +781,7 @@
			string HTMNumber = "";
			string HOrgNumber = "";
			DataSet Ds;
			int LSH = 0; //æµæ°´å·
			Int64 LSH = 0; //æµæ°´å·
			string LSH2 = ""; //æµæ°´å·è½¬æ¢æåç¬¦


			@@ -802,7 +802,7 @@
			//ç®±å·
			string HXH = "";
			//ç®±å·æµæ°´å·
			int LSH3 = 0; //æµæ°´å·
			Int64 LSH3 = 0; //æµæ°´å·
			string LSH4 = ""; //æµæ°´å·è½¬æ¢æåç¬¦
			//æºå°
			string HJT = "";
			@@ -888,7 +888,7 @@
			a = a + 1;
			}
			DataSet DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å· //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
			Int64 TTM_LSH = ClsPub.isInt(DsTM.Tables[0].Rows[0][0]) + 1;
			Int64 TTM_LSH = ClsPub.isLong(DsTM.Tables[0].Rows[0][0]) + 1;


			sPackBarCode = sPackStr + TTM_LSH.ToString();
			@@ -923,7 +923,7 @@
			// HTMaterID = ClsPub.isLong(grdMain.Rows[0].Cells[Fun_GetCol("HMaterID")].Value);
			// string sPackStr = "ZXM" + HYear + HPeriod + HDay + HTMaterID; //å¤ç®±ç åç¼
			// DataSet DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å· //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
			// Int64 TTM_LSH = ClsPub.isInt(DsTM.Tables[0].Rows[0][0]) + 1;
			// Int64 TTM_LSH = ClsPub.isLong(DsTM.Tables[0].Rows[0][0]) + 1;
			// sPackBarCode = sPackStr + TTM_LSH.ToString();
			// oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
			// }
			@@ -943,7 +943,7 @@
			// HTMaterID = ClsPub.isLong(grdMain.Rows[0].Cells[Fun_GetCol("HMaterID")].Value);
			// string sPackStr = "ZXM" + HYear + HPeriod + HDay + HTMaterID; //å¤ç®±ç åç¼
			// DataSet DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å· //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
			// Int64 TTM_LSH = ClsPub.isInt(DsTM.Tables[0].Rows[0][0]) + 1;
			// Int64 TTM_LSH = ClsPub.isLong(DsTM.Tables[0].Rows[0][0]) + 1;
			// sPackBarCode = sPackStr + TTM_LSH.ToString() + "+" ;
			// oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
			// }
			@@ -964,7 +964,7 @@
			//HTMaterID = ClsPub.isLong(grdMain.Rows[0].Cells[Fun_GetCol("HMaterID")].Value);
			//string sPackStr = "ZXM" + HYear + HPeriod + HDay + HTMaterID; //å¤ç®±ç åç¼
			//DataSet DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å· //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
			//Int64 TTM_LSH = ClsPub.isInt(DsTM.Tables[0].Rows[0][0]) + 1;
			//Int64 TTM_LSH = ClsPub.isLong(DsTM.Tables[0].Rows[0][0]) + 1;
			//string sPackBarCode = sPackStr + TTM_LSH.ToString();
			//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");

			@@ -995,19 +995,19 @@
			HJT = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("è®¾å¤")].Value);
			HXH = HYear + HPeriod + HDay + HBC + HJT + HMaterNumber;
			Ds99 = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HXH + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			LSH3 = ClsPub.isInt(Ds99.Tables[0].Rows[0][0]) + 1;
			LSH3 = ClsPub.isLong(Ds99.Tables[0].Rows[0][0]) + 1;
			LSH4 = LSH3.ToString();



			//HBQty = HBQty + ClsPub.isInt(txtHBQty.Text);
			//HBQty = HBQty + ClsPub.isLong(txtHBQty.Text);
			HZXQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("æ¬æ¬¡æ°é")].Value);
			HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("çäº§è®¢åæ°é")].Value);
			HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("çäº§è®¢åå·")].Value);

			HTMNumber = HOrgNumber + HMaterNumber + HYear + HPeriod + HDay;
			Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			n = 0;
			LSH2 = LSH.ToString();
			while (LSH2.Length < LSHlen) //å¦ææµæ°´å·å°äº6ä½æ°åé¢è¡¥0
			@@ -1086,7 +1086,7 @@
			HWorkLineName = "";
			HSeOrderBillNo = "";
			HInnerBillNo = sPackBarCode;
			HSourceID = ClsPub.isInt(txtHSourceID.Tag);
			HSourceID = ClsPub.isLong(txtHSourceID.Tag);
			oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HMaterialMQty" +
			",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
			@@ -1327,7 +1327,7 @@
			string HTMNumber = "";
			string HOrgNumber = "";
			DataSet Ds;
			int LSH = 0; //æµæ°´å·
			Int64 LSH = 0; //æµæ°´å·
			string LSH2 = ""; //æµæ°´å·è½¬æ¢æåç¬¦
			double HZXQty = 0; //è£ç®±æ°é
			double HDDQty = 0; //è®¢åæ°é
			@@ -1350,7 +1350,7 @@
			HOrgNumber = ClsPub.HOrgNumber;


			//HBQty = HBQty + ClsPub.isInt(txtHBQty.Text);
			//HBQty = HBQty + ClsPub.isLong(txtHBQty.Text);
			HZXQty = ClsPub.isDoule(txtHZXQty.Text);
			HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("è®¢åæ°é")].Value);

			@@ -1359,7 +1359,7 @@
			{
			HTMNumber = HOrgNumber + HMaterNumber + HYear + HPeriod + HDay;
			Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			else if (cmbHBarCodeType.Text == "æ¹æ¬¡æ¡ç ")
			{
			@@ -1490,7 +1490,7 @@
			string HTMNumber = "";
			string HOrgNumber = "";
			DataSet Ds;
			int LSH = 0; //æµæ°´å·
			Int64 LSH = 0; //æµæ°´å·
			string LSH2 = ""; //æµæ°´å·è½¬æ¢æåç¬¦
			double HZXQty = 0; //è£ç®±æ°é
			double HDDQty = 0; //è®¢åæ°é
			@@ -1513,7 +1513,7 @@
			HOrgNumber = ClsPub.HOrgNumber;


			//HBQty = HBQty + ClsPub.isInt(txtHBQty.Text);
			//HBQty = HBQty + ClsPub.isLong(txtHBQty.Text);
			HZXQty = ClsPub.isDoule(txtHZXQty.Text);
			HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("è®¢åæ°é")].Value);
			HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("çäº§è®¢åå·")].Value);
			@@ -1522,7 +1522,7 @@
			{
			HTMNumber = HOrgNumber + HMaterNumber + HYear + HPeriod + HDay;
			Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			else if (cmbHBarCodeType.Text == "æ¹æ¬¡æ¡ç ")
			{
			@@ -1552,7 +1552,7 @@
			HDay = HDay.Substring(HDay.Length - 2, 2);
			HTMNumber = HOrgNumber + HMaterNumber + HYear + HPeriod + HDay;
			Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			TM = HTMNumber + LSH2;
			}
			else
			@@ -1565,7 +1565,7 @@
			HDay = HDay.Substring(HDay.Length - 2, 2);
			HTMNumber = HOrgNumber + HMaterNumber + HYear + HPeriod + HDay;
			Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			TM = HTMNumber + LSH2 + "+";
			}
			//HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
			@@ -1575,7 +1575,7 @@
			//HDay = HDay.Substring(HDay.Length - 2, 2);
			//HTMNumber = HOrgNumber + HMaterNumber + HYear + HPeriod + HDay;
			//Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			//LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
			//LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			//if (cmbHBarCodeType.Text == "å¯ä¸æ¡ç ")
			//{
			@@ -1701,7 +1701,7 @@

			private void DisplayTM()
			{
			//HInterID = DBUtility.ClsPub.isInt(txtHMaterID.Tag);
			//HInterID = DBUtility.ClsPub.isLong(txtHMaterID.Tag);
			DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList_test Where HinterID=" + HInterID.ToString() + " and æ¡ç ç±»å = 'æçæ¡ç ' order by HItemID", "h_v_IF_BarCodeBillList_test", ref DBUtility.ClsPub.sExeReturnInfo);
			//çæé¦è¡æ é¢
			if (DSet == null)
			@@ -1861,7 +1861,7 @@
			//
			grdSub.DataSource = DSet.Tables[0].DefaultView;
			//å»ç»
			//int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
			//int FrCol = DBUtility.ClsPub.isLong(frmCondition.txtFrozenCol.Text);
			//string s = frmCondition.cmbHComplete.Text;
			//DBUtility.Xt_BaseBillFun.DisplayGrid(grdSub, this.Name, s, FrCol);
			//ç»çº¿
			@@ -2109,13 +2109,13 @@
			{
			//è·åç½æ ¼ç¬¬ä¸è¡HInterIDçå¼
			Int64 HInterID = 0;
			HInterID = DBUtility.ClsPub.isInt(txtHMaterID.Tag);
			HInterID = DBUtility.ClsPub.isLong(txtHMaterID.Tag);
			DataSet DSBefore;
			DSBefore = SubCn.RunProcReturn("exec h_p_PreviousMater "+ HInterID, "h_p_PreviousMater", ref DBUtility.ClsPub.sExeReturnInfo);
			grdMain.DataSource = DSBefore.Tables[0].DefaultView;
			//if (DSBefore.Tables[0].Rows.Count > 0)
			//{
			// txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
			// txtHMaterID.Tag = DBUtility.ClsPub.isLong(grdMain.Rows[0].Cells["HInterID"].Value);
			//}
			//else
			//{
			@@ -2130,7 +2130,7 @@
			else
			{
			grdMain.DataSource = DSBefore.Tables[0].DefaultView;
			txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
			txtHMaterID.Tag = DBUtility.ClsPub.isLong(grdMain.Rows[0].Cells["HInterID"].Value);
			txtHMiniQty.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["æ åè£ç®±"].Value);
			txtHMaterModel.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["è§æ ¼åå·"].Value);
			txtHMaterName.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["ç©æåç§°"].Value);
			@@ -2144,8 +2144,8 @@
			{
			//æ ¹æ®
			Int64 HInterID = 0;
			//HInterID = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells[Fun_GetCol("HInterID")].Value);
			HInterID = DBUtility.ClsPub.isInt(txtHMaterID.Tag);
			//HInterID = DBUtility.ClsPub.isLong(grdMain.Rows[0].Cells[Fun_GetCol("HInterID")].Value);
			HInterID = DBUtility.ClsPub.isLong(txtHMaterID.Tag);
			DataSet DSBefore;
			DSBefore = SubCn.RunProcReturn("exec h_p_NextMater " + HInterID, "h_p_NextMater", ref DBUtility.ClsPub.sExeReturnInfo);
			if (DSBefore == null \|\| DSBefore.Tables[0].Rows.Count == 0)
			@@ -2157,7 +2157,7 @@
			else
			{
			grdMain.DataSource = DSBefore.Tables[0].DefaultView;
			txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
			txtHMaterID.Tag = DBUtility.ClsPub.isLong(grdMain.Rows[0].Cells["HInterID"].Value);
			txtHMiniQty.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["æ åè£ç®±"].Value);
			txtHMaterModel.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["è§æ ¼åå·"].Value);
			txtHMaterName.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["ç©æåç§°"].Value);