~yxj/MES-WEB-API.git

			@@ -57,6 +57,9 @@
			//}
			string HICMOBillNo = "";
			HICMOBillNo = txtHICMOBillNo.Text.Trim().ToString();
			//éå®è®¢åå·
			string HSeOrderBillNo = "";
			HICMOBillNo = txtHSeOrderBillNo.Text.Trim().ToString();
			//ç©æ
			//if (txtHMaterID.Text.Trim() != "")
			//{
			@@ -98,7 +101,7 @@
			//è¿æ»¤æ¡ä»¶

			//
			DSet = SubCn.RunProcReturn("exec h_p_KSTMSC '" + HICMOBillNo + "' , '" + HMaterName + "' , '" + HSourceName + "' ,'" + HEmpName + "' ,'" + HBeginDate + "', '" + HEndDate + "'", "h_p_KSTMSC", ref DBUtility.ClsPub.sExeReturnInfo);
			DSet = SubCn.RunProcReturn("exec h_p_KSTMSC '" + HSeOrderBillNo + "' ,'" + HICMOBillNo + "' , '" + HMaterName + "' , '" + HSourceName + "' ,'" + HEmpName + "' ,'" + HBeginDate + "', '" + HEndDate + "'", "h_p_KSTMSC", ref DBUtility.ClsPub.sExeReturnInfo);
			//çæé¦è¡æ é¢
			if (DSet == null)
			{
			@@ -757,6 +760,97 @@

			private void button4_Click(object sender, EventArgs e)
			{
			//1.è·åçé¢ä¸é¢æ´ç®±æ°éæ¡è¾å¥çæ°é èµå¼ç»åé å¹¶å·æ°ç½æ ¼
			double HBarCodeQty = 0;
			double HZXQty = 0;
			HZXQty = ClsPub.isDoule(txtHZXQty.Text);
			if (HZXQty ==0)
			{
			MessageBox.Show("è¯·è¾å¥æ´ç®±æ°éï¼");
			return;
			}
			Display();
			//2.è·åç½æ ¼éä¸è¡ç©æID
			int a = grdMain.CurrentRow.Index;
			long HMaterID = 0;
			HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[a].Cells[Fun_GetCol("HMaterID")].Value);
			if (HMaterID == 0)
			{
			MessageBox.Show("æ²¡æéä¸ä»»ä½è®°å½ï¼");
			return;
			}
			//3.å®ä¹æ¯å¦ç»æçåé
			int Mul = 0;
			//4.æ ¹æ®åæ®ç±»åè·åæ¬æ¬¡æ¡ç ä¸»åç HInterID
			HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
			//5.ä»ç½æ ¼ç¬¬ä¸è¡å¾ªç¯è³æåä¸è¡ å¤æIè¡çç©æåç ä¸Mæ¯å¦ä¸è´ï¼å¦æä¸ä¸è´åå¾ªç¯ä¸ä¸è¡ï¼
			for (int i = 0; i < grdMain.Rows.Count; i++)
			{
			long HGrdMaterID = 0;
			HGrdMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("HMaterID")].Value);
			if (HMaterID == HGrdMaterID)
			{
			double HDDQty = 0;
			HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("è®¢åæ°é")].Value);
			if (HDDQty >= HZXQty)
			{
			HBarCodeQty = HZXQty;
			this.Sub_SaveBill();
			Display();
			Mul = Mul + 1;
			break;
			}
			else if(HDDQty < HZXQty)
			{
			HBarCodeQty = HDDQty;
			HZXQty = HZXQty - HDDQty;
			this.Sub_SaveBill();
			Mul = Mul + 1;
			}
			}
			}


			//3.åå¤æç©ææ¯å¦ä¸è´ å¦æä¸è´å¼å§å¾ªç¯ç½æ ¼
			for (int i = 0; i < grdMain.Rows.Count; i++)
			{
			//long HGrdMaterID = 0;
			//HGrdMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("HMaterID")].Value);
			//if (HGrdMaterID == HMaterID)
			//{
			// double HDDQty = 0;
			// HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("è®¢åæ°é")].Value);
			// //å¦æå¾ªç¯çè¯¥è¡è®°å½çè®¢åæ°éå·²ç»å¤§äºçäºæ¬æ¬¡è£ç®±æ°é åç´æ¥çæå¯ä¸ç å¹¶ä¸å·æ°ç½æ ¼ å·æ°æ¡ç ä¿¡æ¯é¡µ
			// if (HDDQty >= HZXQty)
			// {
			// double HBarCodeQty = 0;
			// HBarCodeQty = HZXQty;
			// this.Sub_SaveBill();
			// Display();
			// }
			// //å¦ææ¹è¡è®°å½è®¢åæ°éå°äºæ¬æ¬¡è£ç®±æ°é åç»§ç»å¾ªç¯ èµ°çæææ¡ç æ¹æ³
			// else
			// {
			// //æ¥åºç¬¦åæ¡ä»¶çéä¸è¿æ¡æ°éè·è£ç®±æ°éçå·®å¼å¼
			// double HCYQty = 0;
			// HCYQty = HZXQty - DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("è®¢åæ°é")].Value);

			// }

			//}
			//else
			//{

			//}
			}




			}

			private void Sub_SaveBill()
			{
			HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
			string HMaterNumber = "";
			string HBatchNo = "";
			@@ -769,8 +863,8 @@
			DataSet Ds;
			int LSH = 0; //æµæ°´å·
			string LSH2 = ""; //æµæ°´å·è½¬æ¢æåç¬¦
			double HSumQty = 0; //äº§åæ°é
			double HMinQty = 0; //æå°åè£æ°
			double HZXQty = 0; //è£ç®±æ°é
			double HDDQty = 0; //è®¢åæ°é
			double HBQty = 0; //ç®±æ°
			int k = 0;
			int n = 0; //åä¸æ¹çææ¡ç ä¸çç¬¬å æ¡
			@@ -788,23 +882,11 @@
			HDay = "0" + ClsPub.isDate(HDate).Day.ToString();
			HDay = HDay.Substring(HDay.Length - 2, 2);
			HOrgNumber = ClsPub.HOrgNumber;
			//ç®±æ°å=æ°é/æå°åè£æ°
			//double sMoney = 0;
			//if ((DBUtility.ClsPub.isLong(grdMain.SelectedRows[j].Cells[Fun_GetCol("HMiniQty")].Value) == 0))
			//{
			// sMoney = 0;
			//}
			//else
			//{
			// sMoney = ClsPub.isDoule(grdMain.SelectedRows[j].Cells[Fun_GetCol("HQty")].Value) / ClsPub.isDoule(grdMain.SelectedRows[j].Cells[Fun_GetCol("HMiniQty")].Value);
			//}
			//sMoney = Math.Ceiling(sMoney);
			//grdMain.SelectedRows[j].Cells[Fun_GetCol("HBQty")].Value = sMoney;


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


			if (cmbHBarCodeType.Text == "å¯ä¸æ¡ç ")
			@@ -818,27 +900,7 @@
			TM = HOrgNumber + HMaterNumber + HBatchNo;
			}
			n = 0;
			for (int i = k; i < HBQty; i++)
			{
			if (HSumQty - HMinQty > 0)
			{
			WeiShu = "";
			HSumQty = HSumQty - HMinQty;
			}
			else
			{
			if (HSumQty == HMinQty)
			{
			WeiShu = "";
			}
			else
			{
			WeiShu = "å°¾æ°";
			}
			HMinQty = HSumQty;
			}
			//
			LSH = LSH + 1;

			LSH2 = LSH.ToString();
			while (LSH2.Length < LSHlen) //å¦ææµæ°´å·å°äº6ä½æ°åé¢è¡¥0
			{
			@@ -857,7 +919,7 @@
			string HWei = ""; //å°¾æ°
			string HBarCode = "";
			string HBarCodeType = "";
			Int64 HMaterID = 0;
			Int64 HMaterID1 = 0;
			Int64 HAuxPropID = 0;
			Int64 HUnitID = 0;
			double HQty2 = 0;
			@@ -891,10 +953,10 @@
			HWei = WeiShu;
			HBarCode = TM;
			HBarCodeType = ClsPub.isStrNull(cmbHBarCodeType.Text);
			HMaterID = ClsPub.isLong(grdMain.SelectedRows[j].Cells[Fun_GetCol("HMaterID")].Value);
			HMaterID1 = ClsPub.isLong(grdMain.SelectedRows[j].Cells[Fun_GetCol("HMaterID")].Value);
			HAuxPropID = 0;
			HUnitID = 0;
			HQty2 = HMinQty;
			HQty2 = HZXQty;
			HBatchNo2 = ClsPub.isStrNull(grdMain.SelectedRows[j].Cells[Fun_GetCol("æ¹æ¬¡")].Value);
			HSourceInterID = 0;
			HSourceEntryID = 0;
			@@ -925,7 +987,7 @@
			",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID " +
			",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
			") values ("
			+ "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
			+ "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID1.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
			+ ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
			+ ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'"
			+ ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
			@@ -943,10 +1005,9 @@
			oCn.RollBack();
			MessageBox.Show("æ¡ç çæå¤±è´¥ï¼" + e1.Message);
			}

			}
			}
			}



			private void DisplayTM()
			@@ -1197,9 +1258,9 @@

			for (int i = 0; i < grdMain.SelectedRows.Count; i++)
			{
			txtHICMOQty.Text = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("è®¢åæ°é")].Value);
			txtHZXQty.Text = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("è®¢åæ°é")].Value);
			}
			HICMOQty = DBUtility.ClsPub.isDoule(txtHICMOQty.Text.Trim());
			HICMOQty = DBUtility.ClsPub.isDoule(txtHZXQty.Text.Trim());
			HMiniQty = DBUtility.ClsPub.isDoule(txtHMiniQty.Text.Trim());
			if (HMiniQty == 0)
			{
			@@ -1293,7 +1354,7 @@
			txtHEmpID.Text = "";
			txtHICMOBillNo.Text = "";
			txtHICMOBillNo1.Text = "";
			txtHICMOQty.Text = "";
			txtHZXQty.Text = "";
			txtHMaterID.Text = "";
			txtHMaterID1.Text = "";
			txtHMiniQty.Text = "";