~yxj/MES-WEB-API.git

			@@ -688,6 +688,7 @@
			string HModelName = ""; //æºå
			string HICMOBillNo = ""; //æºåå·
			string HBarCodeBatchNo = ""; //æ¡ç æ¹æ¬¡å·
			string HBarCodeDate = ""; //æ¡ç æ¥æ
			int k = 0;
			int n = 0; //åä¸æ¹çææ¡ç ä¸çç¬¬å æ¡
			string sTMNumber = ""; //æ¡ç èªå®ä¹åç¼
			@@ -704,7 +705,7 @@
			//æ¥æè·åæ¹å¼
			sDate = dtpHDate.Value.ToShortDateString();
			//
			if (cmbHBarCodeType.Text == "ä»ªå¨å¤è´ä»¶æ¡ç æ®éè§å") //åæ®æ¥æ(æ¶æéç¥å)
			if (cmbHBarCodeType.Text == "ä»ªå¨å¤è´ä»¶æ¡ç æ®éè§å" \|\| cmbHBarCodeType.Text == "ä»ªå¨å¤è´ä»¶æ¡ç å®¹å¨è§å") //åæ®æ¥æ(æ¶æéç¥å)
			{
			sDate = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HDateCol].Value);
			}
			@@ -712,14 +713,15 @@
			{
			sDate = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HEndDateCol].Value);
			}
			else if (CompanyName=="å¤å®çµå¨")// æ¥æï¼çäº§è®¢å æ¡ç æ¥æ
			else if (CampanyName == "å¤å®çµå¨")// æ¥æï¼çäº§è®¢å æ¡ç æ¥æ
			{
			sDate = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HDateCol].Value);
			}
			HYasuoji= DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HPinfanCol].Value); //åç¼©æºä»£ç ï¼å¤å®çµå¨ï¼
			HModelName= DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterModelCol].Value); //æºåï¼å¤å®çµå¨ï¼
			HModelName= DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusTypeCol].Value); //æºåï¼å¤å®çµå¨ï¼
			HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HSourceBillNoCol].Value); //çäº§è®¢åå·ï¼å¤å®çµå¨ï¼
			HBarCodeBatchNo= DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HPinfanBarCodeCol].Value); //æ¡ç æ¹æ¬¡å·ï¼å¤å®çµå¨ï¼
			HBarCodeDate= DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HSupNumberCol].Value); //æ¡ç æ¥æï¼å¤å®çµå¨ï¼
			//
			sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
			sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
			@@ -776,7 +778,7 @@
			{
			TM = HOrgNumber + HNumber + HBatchNo;
			}//åæ¥ç¹æ®å¤ç
			else if(cmbHBarCodeType.Text == "ä»ªå¨å¤è´ä»¶æ¡ç æ®éè§å")
			else if(cmbHBarCodeType.Text == "ä»ªå¨å¤è´ä»¶æ¡ç æ®éè§å" \|\| cmbHBarCodeType.Text == "ä»ªå¨å¤è´ä»¶æ¡ç å®¹å¨è§å")
			{
			//ç©æç¼ç +åæ®æ¥æï¼YYMMDDï¼+æµæ°´4ä½
			sTMNumber = HMaterNumber + sYear + sPeriod + sDay;
			@@ -795,8 +797,8 @@
			}
			else if (cmbHBarCodeType.Text == "è¯åæåæ¡ç è§å")
			{
			//ç©æç¼ç +çäº§æ¹å·+å¤±ææ¥æï¼YYMMDDï¼+æµæ°´å·6ä½-
			sTMNumber = HMaterNumber + HBatchNo + sYear + sPeriod + sDay;
			//ç©æç¼ç +çäº§æ¹å·+æµæ°´å·6ä½-
			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]);
			@@ -806,20 +808,31 @@
			{
			//å¶é æ¬é¨1ä½ï¼é»è®¤1ï¼+æºåä»£ç 5ä½ï¼ï¼+å¹´2ä½+æ1ä½ï¼AãBãCä»£æ¿10æä»½ï¼
			//+æ¥2ä½+æ¡ç æ¹æ¬¡ç 2ä½+åç¼©æºä»£ç 1ä½+00+æµæ°´å·4ä½+æ ¡éªç ï¼é»è®¤0ï¼
			sTMNumber = "1" + HModelName + sYear + Sub_PeriodChange(sPeriod) + sDay + HBarCodeBatchNo + HYasuoji + "00" ;
			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 = 4;
			if (sTMNumber.Length != 16)
			{
			MessageBox.Show("æ¡ç é¿åº¦ä¸å¤16ä½ï¼æ¯å¦æ°æ®ä¸å¨ï¼å¶é æ¬é¨1ä½:[0] + æºåä»£ç 5ä½:[" + HModelName + "] + å¹´ææ¥5ä½:["+ HBarCodeDate + "] + æ¹æ¬¡å·2ä½:[" + HBarCodeBatchNo + "]+ åç¼©æº1ä½:["+ HYasuoji + "]+00 ; ");
			return;
			}
			}
			else if (cmbHBarCodeType.Text == "å¤éæºæ¡ç ")
			{
			//ç©æä»£ç 11ä½+å¹´2ä½+æ1ä½ï¼AãBãCä»£æ¿10æä»½ï¼+æ¥2ä½+æ¹æ¬¡2ä½+æµæ°´å·4ä½
			sTMNumber = HMaterNumber + sYear + Sub_PeriodChange(sPeriod) + sDay + HBarCodeBatchNo ;
			//sTMNumber = HMaterNumber.Replace(Convert.ToChar("."),Convert.ToChar("")) + HBarCodeDate + HBarCodeBatchNo;
			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 = 4;
			if (sTMNumber.Length != 18)
			{
			MessageBox.Show("æ¡ç é¿åº¦ä¸å¤18ä½ï¼æ¯å¦æ°æ®ä¸å¨ï¼ç©æä»£ç 11ä½:["+ HMaterNumber.Replace(".", "") + "]+å¹´ææ¥5ä½:["+ HBarCodeDate + "]+æ¹æ¬¡å·2ä½:[" + HBarCodeBatchNo + "];");
			return;
			}
			}
			else if (cmbHBarCodeType.Text == "åæåæ¡ç ")
			{
			@@ -875,10 +888,11 @@
			//æ¡ç ç¼å· = æ¡ç åç¼ + æµæ°´å·
			TM = sTMNumber + LSH2;
			}
			else if(cmbHBarCodeType.Text == "ä»ªå¨å¤è´ä»¶æ¡ç æ®éè§å" \|\| cmbHBarCodeType.Text == "è¯åæåæ¡ç è§å"
			else if(cmbHBarCodeType.Text == "ä»ªå¨å¤è´ä»¶æ¡ç æ®éè§å" \|\| cmbHBarCodeType.Text == "ä»ªå¨å¤è´ä»¶æ¡ç å®¹å¨è§å" \|\| cmbHBarCodeType.Text == "è¯åæåæ¡ç è§å"
			\|\| cmbHBarCodeType.Text == "åæåæ¡ç " \|\| cmbHBarCodeType.Text == "å¤éæºæ¡ç ")
			{
			TM = sTMNumber + LSH2;

			}
			else if (cmbHBarCodeType.Text == "åéæºæ¡ç ")
			{
			@@ -1100,26 +1114,26 @@
			}
			}

			//æä»½è½¬å
			private string Sub_PeriodChange(string sPeriod)
			{
			if(sPeriod=="10")
			{
			return "A";
			}
			else if (sPeriod == "11")
			{
			return "B";
			}
			else if (sPeriod == "12")
			{
			return "C";
			}
			else
			{
			return sPeriod.Substring(2, 1);
			}
			}
			////æä»½è½¬å
			//private string Sub_PeriodChange(string sPeriod)
			//{
			// if(sPeriod=="10")
			// {
			// return "A";
			// }
			// else if (sPeriod == "11")
			// {
			// return "B";
			// }
			// else if (sPeriod == "12")
			// {
			// return "C";
			// }
			// else
			// {
			// return sPeriod.Substring(1, 1);
			// }
			//}


			//çææ¡ç åæ¥
			@@ -1229,7 +1243,8 @@
			//if (cmbHBarCodeType.Text == "å¯ä¸æ¡ç ")
			//{
			//æ¡ç ç¼å· = æ¡ç åç¼ + æµæ°´å·
			TM = HMaterNumber + LSH2 + sYear + sPeriod + sDay ;
			//T/M/ = HMaterNumber + LSH2 + sYear + sPeriod + sDay;
			TM = LSH2 + sYear + sPeriod + sDay;
			//}

			if (i + 1 > grdSub.Rows.Count)
			@@ -2310,6 +2325,7 @@
			grdMain.Rows[i].Cells[HMainIDCol].Value = oTable.Rows[0]["hmainid"].ToString();
			grdMain.Rows[i].Cells[HSubIDCol].Value = oTable.Rows[0]["hsubid"].ToString();
			grdMain.Rows[i].Cells[HBillNoCol].Value = oTable.Rows[0]["åæ®å·"].ToString();
			grdMain.Rows[i].Cells[HSourceBillNoCol].Value = oTable.Rows[0]["åæ®å·"].ToString();
			grdMain.Rows[i].Cells[HBillTypeCol].Value = oTable.Rows[0]["HBillType"].ToString();
			grdMain.Rows[i].Cells[HDateCol].Value = oTable.Rows[0]["æ¥æ"].ToString(); //åæ¥ æ¶æåæ®æ¥æ
			grdMain.Rows[i].Cells[HShowDateCol].Value = dtpHDate.Value.ToShortDateString();
			@@ -2334,15 +2350,19 @@
			grdMain.Rows[i].Cells[HCusNumberCol].Value = oTable.Rows[0]["å®¢æ·ä»£ç "].ToString();
			grdMain.Rows[i].Cells[HCusNameCol].Value = oTable.Rows[0]["å®¢æ·"].ToString();
			grdMain.Rows[i].Cells[HCusTypeCol].Value = oTable.Rows[0]["å®¢æ·åå·"].ToString();
			grdMain.Rows[i].Cells[HPinfanBarCodeCol].Value = oTable.Rows[0]["HPinfanBarCode"].ToString();
			grdMain.Rows[i].Cells[HPinfanCol].Value = oTable.Rows[0]["HPinfan"].ToString();
			//grdMain.Rows[i].Cells[HSourceIDCol].Value = oTable.Rows[0]["HSourceID"].ToString();
			//grdMain.Rows[i].Cells[HSourceNumberCol].Value = oTable.Rows[0]["çäº§çº¿ä»£ç "].ToString();
			grdMain.Rows[i].Cells[HSourceNameCol].Value = oTable.Rows[0]["çäº§çº¿"].ToString();
			grdMain.Rows[i].Cells[HEndDateCol].Value = oTable.Rows[0]["è®¡åå®å·¥æ¥æ"].ToString();//åæ¥ çäº§è®¢å å¤±ææ¥æ
			if (cmbHBarCodeType.Text == "ä»ªå¨å¤è´ä»¶æ¡ç å®¹å¨è§å" && CampanyName == "åæ¥ç§æ")
			if (cmbHBarCodeType.Text == "ä»ªå¨å¤è´ä»¶æ¡ç å®¹å¨è§å" )
			{
			grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["æªçææ¡ç æ°é"]);
			}
			else if (cmbHBarCodeType.Text == "ä»ªå¨å¤è´ä»¶æ¡ç æ®éè§å" && CampanyName == "åæ¥ç§æ")
			else if (cmbHBarCodeType.Text == "ä»ªå¨å¤è´ä»¶æ¡ç æ®éè§å"
			\|\| cmbHBarCodeType.Text == "ä»ªå¨æåæ¡ç è§å"
			\|\| cmbHBarCodeType.Text == "è¯åæåæ¡ç è§å")
			{
			grdMain.Rows[i].Cells[HMinQtyCol].Value = "1";
			}
			@@ -2399,10 +2419,14 @@
			grdMain.Rows[i].Cells[HUnitNameCol].Value = oTable.Rows[0]["è®¡éåä½"].ToString();
			grdMain.Rows[i].Cells[HRemarkCol].Value = oTable.Rows[0]["å¤æ³¨"].ToString();
			grdMain.Rows[i].Cells[HMTONoCol].Value = oTable.Rows[0]["è®¡åè·è¸ªå·"].ToString();
			if (cmbHBarCodeType.Text == "æ¹æ¬¡æ¡ç " && CampanyName == "åæ¥ç§æ")
			if (cmbHBarCodeType.Text == "ä»ªå¨å¤è´ä»¶æ¡ç å®¹å¨è§å")
			{
			grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["æªçææ¡ç æ°é"]);
			}
			else if (cmbHBarCodeType.Text == "ä»ªå¨å¤è´ä»¶æ¡ç æ®éè§å")
			{
			grdMain.Rows[i].Cells[HMinQtyCol].Value = "1";
			}
			else
			{
			grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["æå°åè£æ°"].ToString();