~yxj/MES-WEB-API.git

			@@ -18,6 +18,7 @@
			}

			public int HMaterNumberCol = 0; //äº§åä»£ç
			public int HProcNoCol = 0; //å·¥åºåºå·
			public int HProcNameCol = 0; //å·¥åº
			public int HWorkCenterNameCol = 0; //å·¥ä½ä¸å¿
			public int HWorkQtyCol = 0; //äº§è½
			@@ -25,10 +26,17 @@
			public int HBeginFixQtyCol = 7; //å¼å·¥ä½é
			public int HFixPriceCol = 8; //å®é¢ å°æ¶å·¥èµ
			public int HProcPriceCol = 9; //å·¥ä»·
			public int HProcNoCol = 0; //å·¥åºåºå·
			public int HTechnologyParameterCol = 0; //å·¥èºåæ°
			public int HPicNumCol = 0; //å¾çº¸ç¼å·
			public int HProcCheckNoteCol = 0; //æ¬å·¥åºç¡®è®¤è®°å½

			public int HPicNumVerCol = 0; //å¾å·çæ¬
			public int HPicNumAssembleCol = 0; //æ»è£å¾å·
			public int HMaterTextureCol = 0; //æè´¨
			public int HProductNumCol = 0; //æåç¼å·
			public int HVerNumCol = 0; //çæ¬
			public int HMouldNoCol = 0; //æ¨¡å·ç¼å·
			public int HProcWorkNumCol = 0; //ç¨åºå·
			//
			public const int HBeginRow = 2; //æææ°æ®ï¼å¼å§è¡æ°
			//
			@@ -76,18 +84,25 @@
			string HBillNo = "";
			//
			HMaterNumberCol = DBUtility.Gy_BaseFun.Fun_GetCol("äº§åä»£ç ", grdMain);
			HProcNoCol = DBUtility.Gy_BaseFun.Fun_GetCol("å·¥åºåºå·", grdMain);
			HProcNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("å·¥åº", grdMain);
			HWorkCenterNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("å·¥ä½ä¸å¿", grdMain);
			HWorkQtyCol = DBUtility.Gy_BaseFun.Fun_GetCol("äº§è½", grdMain);
			HPicNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("å¾çº¸ç¼å·", grdMain);
			HTechnologyParameterCol = DBUtility.Gy_BaseFun.Fun_GetCol("å·¥èºåæ°", grdMain);
			HProcCheckNoteCol = DBUtility.Gy_BaseFun.Fun_GetCol("æ¬å·¥åºç¡®è®¤è®°å½", grdMain);
			HPicNumVerCol = DBUtility.Gy_BaseFun.Fun_GetCol("å¾å·çæ¬", grdMain);
			HPicNumAssembleCol = DBUtility.Gy_BaseFun.Fun_GetCol("æ»è£å¾å·", grdMain);
			HMaterTextureCol = DBUtility.Gy_BaseFun.Fun_GetCol("æè´¨", grdMain);
			HProductNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("æåç¼å·", grdMain);
			HVerNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("çæ¬", grdMain);
			HMouldNoCol = DBUtility.Gy_BaseFun.Fun_GetCol("æ¨¡å·ç¼å·", grdMain);
			HProcWorkNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("ç¨åºå·", grdMain);
			HBeginFixQtyCol = DBUtility.Gy_BaseFun.Fun_GetCol("å¼å·¥ä½é", grdMain);
			HBeginDayQtyCol = DBUtility.Gy_BaseFun.Fun_GetCol("å¼å·¥åºå¤©", grdMain);
			HFixPriceCol = DBUtility.Gy_BaseFun.Fun_GetCol("å°æ¶å·¥èµ", grdMain);
			HProcPriceCol = DBUtility.Gy_BaseFun.Fun_GetCol("åä¸ªå·¥ä»·", grdMain);

			HProcNoCol = DBUtility.Gy_BaseFun.Fun_GetCol("å·¥åºåºå·", grdMain);
			HTechnologyParameterCol = DBUtility.Gy_BaseFun.Fun_GetCol("å·¥èºåæ°", grdMain);
			HPicNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("å¾çº¸ç¼å·", grdMain);
			HProcCheckNoteCol = DBUtility.Gy_BaseFun.Fun_GetCol("æ¬å·¥åºç¡®è®¤è®°å½", grdMain);
			//æ²¡ææ¾å°å
			if (HMaterNumberCol == -1)
			{
			@@ -149,6 +164,41 @@
			MessageBox.Show("æ²¡ææ¾å°ãæ¬å·¥åºç¡®è®¤è®°å½ãçæ é¢", "æç¤º");
			return;
			}
			if (HPicNumVerCol == -1)
			{
			MessageBox.Show("æ²¡ææ¾å°ãå¾å·çæ¬ãçæ é¢", "æç¤º");
			return;
			}
			if (HPicNumAssembleCol == -1)
			{
			MessageBox.Show("æ²¡ææ¾å°ãæ»è£å¾å·ãçæ é¢", "æç¤º");
			return;
			}
			if (HMaterTextureCol == -1)
			{
			MessageBox.Show("æ²¡ææ¾å°ãæè´¨ãçæ é¢", "æç¤º");
			return;
			}
			if (HProductNumCol == -1)
			{
			MessageBox.Show("æ²¡ææ¾å°ãæåç¼å·ãçæ é¢", "æç¤º");
			return;
			}
			if (HVerNumCol == -1)
			{
			MessageBox.Show("æ²¡ææ¾å°ãçæ¬ãçæ é¢", "æç¤º");
			return;
			}
			if (HMouldNoCol == -1)
			{
			MessageBox.Show("æ²¡ææ¾å°ãæ¨¡å·ç¼å·ãçæ é¢", "æç¤º");
			return;
			}
			if (HProcWorkNumCol == -1)
			{
			MessageBox.Show("æ²¡ææ¾å°ãç¨åºå·ãçæ é¢", "æç¤º");
			return;
			}
			//
			if (!Checkdata())
			{
			@@ -164,10 +214,20 @@
			BillNew.omodel.HPeriod = 1;
			BillNew.omodel.HBillNo = HBillNo;
			BillNew.omodel.HDate = DateTime.Today.Date;
			BillNew.omodel.HPicNumVer = "";
			BillNew.omodel.HPicNumAssemble = "";
			BillNew.omodel.HMaterTexture = "";
			BillNew.omodel.HProductNum = "";
			BillNew.omodel.HVerNum = "";
			BillNew.DetailColl.Clear();
			}
			for (int i = 0; i <= grdMain.Rows.Count - 1; i++)
			{
			BillNew.omodel.HPicNumVer = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HPicNumVerCol].Value);
			BillNew.omodel.HPicNumAssemble = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HPicNumAssembleCol].Value);
			BillNew.omodel.HMaterTexture = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterTextureCol].Value);
			BillNew.omodel.HProductNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProductNumCol].Value);
			BillNew.omodel.HVerNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HVerNumCol].Value);
			string sHNumber = "";
			if (DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value) != "" )
			{
			@@ -366,6 +426,8 @@
			oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HTechnologyParameterCol].Value);
			oSub.HPicNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HPicNumCol].Value);
			oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HProcCheckNoteCol].Value);
			oSub.HMouldNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HMouldNoCol].Value);
			oSub.HProcWorkNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HProcWorkNumCol].Value);
			BillNew.DetailColl.Add(oSub);
			return true;
			}