MES-WEB-API.git

			@@ -785,7 +785,7 @@
			LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
			LSHlen = 4;
			}
			else if (cmbHBarCodeType.Text == "ä»ªå¨æåæ¡ç è§å")
			else if (cmbHBarCodeType.Text == "ä»ªå¨æåæ¡ç è§å") //å¦å¤å¤çäº
			{
			//ç©æç¼ç +åºåå·+çäº§æ¥æ
			//sTMNumber = HMaterNumber + sYear + sPeriod + sDay;
			@@ -806,7 +806,7 @@
			{
			//å¶é æ¬é¨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;
			sTMNumber = "1" + HModelName + sYear + Sub_PeriodChange(sPeriod) + sDay + 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]);
			@@ -875,7 +875,16 @@
			//æ¡ç ç¼å· = æ¡ç åç¼ + æµæ°´å·
			TM = sTMNumber + LSH2;
			}

			else if(cmbHBarCodeType.Text == "ä»ªå¨å¤è´ä»¶æ¡ç æ®éè§å" \|\| cmbHBarCodeType.Text == "è¯åæåæ¡ç è§å"
			\|\| cmbHBarCodeType.Text == "åæåæ¡ç " \|\| cmbHBarCodeType.Text == "å¤éæºæ¡ç ")
			{
			TM = sTMNumber + LSH2;
			}
			else if (cmbHBarCodeType.Text == "åéæºæ¡ç ")
			{
			TM = sTMNumber + LSH2 + "0";
			}
			//
			if (i + 1 > grdSub.Rows.Count)
			{
			grdSub.RowCount = grdSub.RowCount + 1;
			@@ -1113,7 +1122,8 @@
			}


			//çææ¡ç åæ¥ //ç©æç¼ç +åºåå·+çäº§æ¥æ
			//çææ¡ç åæ¥
			//ç©æç¼ç +åºåå·+çäº§æ¥æ
			private void SaveBarCode_bori()
			{
			grdSub.Rows.Clear();
			@@ -1127,7 +1137,7 @@
			int HBQty = 0; //ç®±æ°
			double HQty = 0; //æ°é
			string WeiShu = ""; //å°¾æ°
			int LSH = 0; //æµæ°´å·
			//int LSH = 0; //æµæ°´å·
			string LSH2 = ""; //æµæ°´å·è½¬æ¢æåç¬¦
			string sDate = ""; //æ¥æ
			string sYear = ""; //å¹´
			@@ -1161,25 +1171,36 @@
			sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
			sDay = sDay.Substring(sDay.Length - 2, 2);
			//==================================
			if (cmbHBarCodeType.Text == "å¯ä¸æ¡ç ")
			{
			//æ¡ç åç¼ = ç»ç»ä»£ç + ç©æä»£ç + å¹´ + æ + æ¥
			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]);
			}
			else
			{
			MessageBox.Show("éè¯¯çæ¡ç ç±»åï¼ä¸è½çææ¡ç ï¼");
			return;
			}
			//if (cmbHBarCodeType.Text == "è¯åæåæ¡ç è§å")
			//{
			// //æ¡ç åç¼ = ç»ç»ä»£ç + ç©æä»£ç + å¹´ + æ + æ¥
			//sTMNumber = HMaterNumber + 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]);
			//}
			//else
			//{
			// MessageBox.Show("éè¯¯çæ¡ç ç±»åï¼ä¸è½çææ¡ç ï¼");
			// return;
			//}

			HBQty = HBQty + ClsPub.isInt(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;
			for (int i = k; i < HBQty; i++)
			//ä»éè¶åºåå·è¡¨è·ååºåå·
			DataSet DSet = oCn.RunProcReturn("exec h_p_CLD_GetBarCodeSno "+ ClsPub.isStrNull(grdMain.Rows[j].Cells[HMainIDCol].Value) + "," + ClsPub.isStrNull(grdMain.Rows[j].Cells[HSubIDCol].Value) + " ", "h_p_CLD_GetBarCodeSno", ref DBUtility.ClsPub.sExeReturnInfo);
			//çæé¦è¡æ é¢
			if (DSet == null)
			{
			MessageBox.Show("æ²¡æè¿åä»»ä½ç»æ,éè¶äºåºåå·ä¸åå¨ï¼" + DBUtility.ClsPub.sExeReturnInfo);
			continue;
			}
			//

			for (int i = k; i < DSet.Tables[0].Rows.Count; i++)
			//for (int i = k; i < HBQty; i++)
			{
			if (HSumQty - HMinQty > 0)
			{
			@@ -1199,17 +1220,17 @@
			HMinQty = HSumQty;
			}
			//
			LSH = LSH + 1;
			LSH2 = LSH.ToString();
			while (LSH2.Length < LSHlen) //å¦ææµæ°´å·å°äº6ä½æ°åé¢è¡¥0
			{
			LSH2 = "0" + LSH2;
			}
			if (cmbHBarCodeType.Text == "å¯ä¸æ¡ç ")
			{
			//LSH = LSH + 1;
			LSH2 =DBUtility.ClsPub.isStrNull(DSet.Tables[0].Rows[n]["SHNO"]);
			//while (LSH2.Length < LSHlen) //å¦ææµæ°´å·å°äº6ä½æ°åé¢è¡¥0
			//{
			// LSH2 = "0" + LSH2;
			//}
			//if (cmbHBarCodeType.Text == "å¯ä¸æ¡ç ")
			//{
			//æ¡ç ç¼å· = æ¡ç åç¼ + æµæ°´å·
			TM = sTMNumber + LSH2;
			}
			TM = HMaterNumber + LSH2 + sYear + sPeriod + sDay ;
			//}

			if (i + 1 > grdSub.Rows.Count)
			{
			@@ -1283,7 +1304,7 @@
			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 + "'");
			}
			}
			}