MES-WEB-API.git

			@@ -347,12 +347,18 @@
			//æªæ»¡æçæ æé® ç¹å»äºä»¶
			private void button_produceByHand_Click(object sender, EventArgs e)
			{
			if (HQty == 0)
			try
			{
			MessageBox.Show("è¯·æ«ç åæ¡ç !");
			return;
			if (HQty == 0)
			{
			MessageBox.Show("è¯·æ«ç åæ¡ç !");
			return;
			}
			this.Sub_SaveBill();
			}catch(Exception ex)
			{
			MessageBox.Show(ex.Message);
			}
			this.Sub_SaveBill();
			}

			//èªå¨ç»æ
			@@ -379,6 +385,8 @@
			comboBox_SourceNameParams.Enabled = false;

			button_saveParams.Enabled = false;

			textBox_HBarCode.Focus();
			}

			//åæ¢ç»æ
			@@ -406,22 +414,28 @@
			{
			if(isStartListen == 1)
			{
			if(HQty == DBUtility.ClsPub.isDoule(textBox_PackQty.Text))
			try
			{
			this.Sub_SaveBill();

			//è®¾ç½®æå°æ¨¡æ¿ï¼æå°
			grdSub.Rows[0].Cells[0].Value = "*";
			Report = new GridppReport();
			Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + textBox_PrintModelParams.Text + ".grf"); //here .
			Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
			Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
			Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd);
			if (comboBox_PrinterParams.Text != "")
			if (HQty == DBUtility.ClsPub.isDoule(textBox_PackQty.Text))
			{
			Report.Printer.PrinterName = comboBox_PrinterParams.Text.Replace("(é»è®¤)", "");
			this.Sub_SaveBill();

			//è®¾ç½®æå°æ¨¡æ¿ï¼æå°
			grdSub.Rows[0].Cells[0].Value = "*";
			Report = new GridppReport();
			Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + textBox_PrintModelParams.Text + ".grf"); //here .
			Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
			Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
			Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd);
			if (comboBox_PrinterParams.Text != "")
			{
			Report.Printer.PrinterName = comboBox_PrinterParams.Text.Replace("(é»è®¤)", "");
			}
			Report.Print(false);
			}
			Report.Print(false);
			}catch(Exception ex)
			{
			MessageBox.Show(ex.Message);
			}
			}
			}
			@@ -430,25 +444,29 @@
			//çææçæ¡ç
			private bool Sub_SaveBill()
			{
			//è·åç»ç»ä¿¡æ¯
			HOrgID = get_ORGANIZATIONSIDByName(cmbHOrgID.Text);
			HOrgNumber = get_ORGANIZATIONSNOByName(cmbHOrgID.Text);

			if (HOrgID == -1)
			try
			{
			MessageBox.Show("éæ©ç»ç»æéè¯¯ï¼");
			return false;
			}
			//è·åç»ç»ä¿¡æ¯
			HOrgID = get_ORGANIZATIONSIDByName(cmbHOrgID.Text);
			HOrgNumber = get_ORGANIZATIONSNOByName(cmbHOrgID.Text);

			if (HOrgID == -1)
			{
			throw new Exception("éæ©ç»ç»æéè¯¯ï¼");
			}

			if (!Sub_AllowSave())//åæ®å®æ´æ§å¤æ
			if (!Sub_AllowSave())//åæ®å®æ´æ§å¤æ
			{
			throw new Exception("åæ®å®æ´æ§å¤æå¤±è´¥ï¼");
			}

			SaveBarCode();
			return true;
			}catch(Exception ex)
			{
			return false;
			throw new Exception(ex.Message);
			}


			SaveBarCode();
			return true;

			}

			//åæ®å®æ´æ§å¤æ æªå®æ
			@@ -506,6 +524,15 @@

			sSQLMul[1] = " exec h_p_WMS_SetMaxNo_QTY '" + sTMNumber + "'," + HQty.ToString() + " ";

			//å¤æå½åæçæ¡ç æ¯å¦å·²ç»éè¿ä¸´æ¶ç»æå¨æ¡ç æ¡£æ¡ä¸çæäºï¼è¥å·²ç»çæäºåä¸éè¦å¨æå¥
			ds = oCn.RunProcReturn("select * from Gy_BarCodeBill where HBarCode = '" + textBox_HPackBarCode.Text + "' and HSTOCKORGID = " + HOrgID, "Gy_BarCodeBill");
			if (ds != null && ds.Tables[0].Rows.Count > 0)
			{
			sSQLMul[0] = "";
			}

			oCn.BeginTran();

			if (getRunProcByMul_Back(sSQLMul, ref DBUtility.ClsPub.sExeReturnInfo))
			{
			//MessageBox.Show("æ¡ç çæå®æ¯ï¼");
			@@ -517,15 +544,21 @@
			setPackBarCodeBillData();

			getDisplay_GrdMain();

			oCn.Commit();
			}
			else
			{
			//MessageBox.Show("æ¡ç çæå¤±è´¥ï¼" + DBUtility.ClsPub.sExeReturnInfo);
			oCn.RollBack();
			}

			//oCn.Commit();
			}
			catch (Exception e)
			{
			//MessageBox.Show("æ¡ç çæå¤±è´¥ï¼" + e.Message);
			oCn.RollBack();
			throw new Exception(e.Message);
			}
			}

			@@ -540,27 +573,30 @@
			{
			for (int i = 0; i < 1; i++)
			{
			oCn.RunProc(sSQL[i]);
			if (sSQL[i].Length > 0)
			{
			oCn.RunProc(sSQL[i]);
			}
			}



			//ä¸ä¼ ç»æä¿¡æ¯å°æå¡å¨
			send();
			oCn.Commit();
			}
			else
			{
			sErrMsg = "æ²¡ææ°æ®ï¼";
			oCn.Commit();
			return false;
			sErrMsg = "æ²¡ææ°æ®ï¼";
			throw new Exception(sErrMsg);
			}
			oCn.Commit();
			//oCn.Commit();
			return true;
			}
			catch (Exception e)
			{
			sErrMsg = e.Message;
			oCn.RollBack();
			return false;
			sErrMsg = e.Message;
			throw new Exception(sErrMsg);
			}
			}
			#endregion
			@@ -570,16 +606,22 @@
			private void send()
			{
			string err = "";
			if (!CheckModRight(ModRightNamePackUnion, DBUtility.ClsPub.CurUserName, ref err))
			{
			MessageBox.Show(err);
			return;
			}
			//if (!CheckModRight(ModRightNamePackUnion, DBUtility.ClsPub.CurUserName, ref err))
			//{
			// MessageBox.Show(err);
			// return;
			//}
			//if (MessageBox.Show("ç¡®å®è¦ä¸ä¼ ï¼", "æç¤º", MessageBoxButtons.OKCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Cancel)
			//{
			// return;
			//}
			LoadData();
			try
			{
			LoadData();
			}catch(Exception ex)
			{
			throw new Exception(ex.Message);
			}
			}

			//å¤æç¨æ·æé
			@@ -608,7 +650,7 @@
			//å¤ææ¯å¦æ°æ®å®æ´
			if (AllowLoadData() == false)
			{
			return;
			throw new Exception("æ°æ®å®æ´æ§å¤æå¤±è´¥ï¼");
			}
			try
			{
			@@ -626,14 +668,14 @@
			}
			else
			{
			MessageBox.Show("çæå¤±è´¥ï¼åå :" + err);
			return;
			string error = "çæå¤±è´¥ï¼åå :" + err;
			throw new Exception(error);
			}
			}
			catch (Exception e)
			{
			MessageBox.Show("åæ®å·ï¼" + textBox_sBillID.Text + "ï¼åæ®IDï¼" + textBox_sBillID.Text + "ï¼ä¸ä¼ å¤±è´¥ï¼" + e.Message);
			return;
			string error = "åæ®å·ï¼" + textBox_sBillID.Text + "ï¼åæ®IDï¼" + textBox_sBillID.Text + "ï¼ä¸ä¼ å¤±è´¥ï¼" + e.Message;
			throw new Exception(error);
			}
			}

			@@ -657,37 +699,37 @@
			public bool set_SavePackUnionBill_Add(Int64 HInterID, string HBillType, string HBillNo, string HBarCode_Pack, string HMaker, Int64 HStockOrgID, ref string sErrMsg)
			{
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			oCn.BeginTran();
			try
			{
			oCn.BeginTran();
			DataSet ds = oCn.RunProcReturn("exec h_p_Sc_PackUnionBill_Insert_New " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBarCode_Pack + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_Sc_PackUnionBill_Insert_New");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			sErrMsg = "åæ®å·ï¼" + HBillNo + "ï¼åæ®IDï¼" + HInterID + "ï¼ä¸ä¼ å¤±è´¥ï¼";
			oCn.RollBack();
			return false;
			sErrMsg = "åæ®å·ï¼" + HBillNo + "ï¼åæ®IDï¼" + HInterID + "ï¼ä¸ä¼ å¤±è´¥ï¼";
			throw new Exception(sErrMsg);
			}
			else
			{
			if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 1)
			{
			sErrMsg = "ä¸ä¼ å¤±è´¥ï¼åæ®å·ï¼" + HBillNo + "ï¼åæ®IDï¼" + HInterID + "ï¼" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			oCn.RollBack();
			return false;
			sErrMsg = "ä¸ä¼ å¤±è´¥ï¼åæ®å·ï¼" + HBillNo + "ï¼åæ®IDï¼" + HInterID + "ï¼" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			throw new Exception(sErrMsg);
			}
			else
			{
			//sErrMsg = "çæçäº§ç»æåæåï¼åæ®å·ä¸ºï¼" + HBillNo;
			oCn.Commit();
			//sErrMsg = "çæçäº§ç»æåæåï¼åæ®å·ä¸ºï¼" + HBillNo;
			return true;
			}
			}
			}
			catch (Exception e)
			{
			sErrMsg = "çæçäº§ç»æåå¤±è´¥ï¼" + e.Message;
			oCn.RollBack();
			return false;
			sErrMsg = "çæçäº§ç»æåå¤±è´¥ï¼" + e.Message;
			throw new Exception(sErrMsg);
			}
			}

			@@ -713,11 +755,9 @@
			}
			catch (Exception e2)
			{
			//if (DBUtility.ClsPub.bSound)
			//{
			// DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
			//}
			MessageBox.Show("åçç½ç»å¼å¸¸ï¼è¯·ç¨ååè¯ï¼");
			textBox_HBarCode.Text = "";
			textBox_HBarCode.Focus();
			MessageBox.Show(e2.Message);
			}
			}
			//å°æ¡ç ä¿¡æ¯åå¥æ¡ç åºå¥åºä¸´æ¶è¡¨
			@@ -741,13 +781,13 @@
			}
			else
			{
			MessageBox.Show(err);
			return;
			throw new Exception(err);
			}
			}
			catch (Exception e)
			{
			MessageBox.Show("æ«æåæ¡ç ï¼åå¥ä¸´æ¶è¡¨ä¿¡æ¯å¤±è´¥ï¼" + e.Message + err);
			string sError = "æ«æåæ¡ç ï¼åå¥ä¸´æ¶è¡¨ä¿¡æ¯å¤±è´¥ï¼" + e.Message + err;
			throw new Exception(sError);
			}
			}

			@@ -1161,9 +1201,196 @@
			}
			}


			#endregion



			#region ä¸´æ¶ç»æ
			#region ä¸´æ¶ç»æ æé®ç¹å»äºä»¶
			private void button_produceTemp_Click(object sender, EventArgs e)
			{
			if (HQty == 0)
			{
			MessageBox.Show("è¯·æ«ç åæ¡ç !");
			return;
			}
			this.produceTemp();

			//è®¾ç½®æå°æ¨¡æ¿ï¼æå°
			grdSub.Rows[0].Cells[0].Value = "*";
			Report = new GridppReport();
			Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + textBox_PrintModelParams.Text + "_Temp" + ".grf"); //here .
			Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
			Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
			Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd);
			if (comboBox_PrinterParams.Text != "")
			{
			Report.Printer.PrinterName = comboBox_PrinterParams.Text.Replace("(é»è®¤)", "");
			}
			Report.Print(false);
			}
			#endregion

			#region ä¸´æ¶ç»æ
			private void produceTemp()
			{
			//å¤ææ¡ç æ¡£æ¡ä¸æ¯å¦å·²ç»åå¨è¯¥ææ¡ç ï¼è¥åå¨ï¼åä¸éè¦ååå»ºãéæ°å è½½çé¢å³å¯ã
			DataSet ds_getPackBarCode;
			string sql_getPackBarCode = "select * from Gy_BarCodeBill where HBarCode = '" + textBox_HPackBarCode.Text + "'";
			ds_getPackBarCode = oCn.RunProcReturn(sql_getPackBarCode, "Gy_BarCodeBill");
			if (ds_getPackBarCode != null && ds_getPackBarCode.Tables[0].Rows.Count > 0)
			{
			//éæ°å è½½çé¢
			getDisplay_grdSub();

			setPackBarCodeBillData();

			getDisplay_GrdMain();
			return;
			}


			//è·åç»ç»ä¿¡æ¯
			HOrgID = get_ORGANIZATIONSIDByName(cmbHOrgID.Text);
			HOrgNumber = get_ORGANIZATIONSNOByName(cmbHOrgID.Text);

			//éªè¯ç»ç»
			if (HOrgID == -1)
			{
			MessageBox.Show("éæ©ç»ç»æéè¯¯ï¼");
			return;
			}

			//åæ®å®æ´æ§å¤æ
			if (!Sub_AllowSave())
			{
			return;
			}

			//è·åå½åäº§çº¿åäº§çº¿åç
			long HSourceID = 0;
			string sql = "select * from Gy_Source where HName = '" + comboBox_SourceNameParams.Text + "' ";
			DataSet ds = oCn.RunProcReturn(sql, "Gy_Source");
			if (ds != null && ds.Tables[0].Rows.Count > 0)
			{
			HSourceID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HItemID"].ToString());
			}

			//æ¼æ¥ä¸´æ¶ç»ææ¶ï¼ææ¡ç ççæè¯å¥
			sSQLMul = new string[2];
			sSQLMul[0] = "insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
			",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
			",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
			",HCusID,HCusType,HEndDate,HWorkLineName,HJiaYe " +
			",HPressModel,HCusModel,HMaterialModel,HColor,HBarCodeDate " +
			",HLogo,HPackageSize,HMaterialJQty,HMaterialMQty,HCustomBatchNo " +
			",HSTOCKORGID,HOWNERID,HBeginDate,HSeOrderBillNo,HGBBarCode " +
			",POOrderBillNo,HInterID,HInitSourceEntryID,HBarCode_Pack " +
			",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo " +
			",HCustomQty1,HLayerNumber,HCusBarCode,HBarCodeStatus,HSourceID " +
			") values ("
			+ "'" + textBox_HPackBarCode.Text + "','" + HBarCodeType + "',0,0,1"
			+ ",'',0,0,'" + ClsPub.CurUserName + "',getdate(),0,1"
			+ ",0,0,'','',''"
			+ "," + HQty.ToString() + ",1,0,0,0,''"
			+ ",0,'','','',''"
			+ ",'','','','','" + sDate + "'"
			+ ",'','',0,0,''"
			+ "," + HOrgID.ToString() + "," + HOrgID.ToString() + ",'','',''"
			+ ",''," + HInterID.ToString() + ",0,'" + textBox_HPackBarCode.Text + "'"
			+ ",'','','',0,''"
			+ ",0,0,'',''," + HSourceID +
			")";
			//æ¼æ¥ æ´æ° ææ¡ç æµæ°´å· çsqlè¯å¥
			sSQLMul[1] = " exec h_p_WMS_SetMaxNo_QTY '" + sTMNumber + "'," + HQty.ToString() + " ";

			if (sSQLMul.Length > 0)
			{
			//æ§è¡ææ¡ç ççæè¯å¥ä¸ææ¡ç æµæ°´å·çæ´æ°è¯å¥
			for (int i = 0; i < 1; i++)
			{
			oCn.RunProc(sSQLMul[i]);
			}

			//éæ°å è½½çé¢
			getDisplay_grdSub();

			setPackBarCodeBillData();

			getDisplay_GrdMain();
			}
			else
			{
			MessageBox.Show("æ²¡ææ°æ®ï¼");
			return;
			}
			}
			#endregion

			#region ææ¡ç æ«ç
			private void textBox_HPackBarCode__KeyPress(object sender, KeyPressEventArgs e)
			{
			if (e.KeyChar == (char)Keys.Return)
			{
			//è·åæ«æçææ¡ç
			string HPackBarCode = textBox_HPackBarCode.Text;
			//æ¡ç ç±»å
			HBarCodeType = ClsPub.isStrNull(cmbHBarCodeType.Text);
			//è·åç»ç»ä¿¡æ¯
			HOrgID = get_ORGANIZATIONSIDByName(cmbHOrgID.Text);
			HOrgNumber = get_ORGANIZATIONSNOByName(cmbHOrgID.Text);

			//å£°æç¨äºæ°æ®åºæ¥è¯¢çåé
			string sql = "";
			DataSet ds;

			//å¤æ ææ¡ç æ¯å¦å·²ç»çæç»æå
			sql = "select * from Sc_PackUnionBillMain where HBarCode_Pack = '" + HPackBarCode + "'";
			ds = oCn.RunProcReturn(sql, "Sc_PackUnionBillMain");
			if (ds != null && ds.Tables[0].Rows.Count > 0)
			{
			MessageBox.Show("ææ¡ç [" + HPackBarCode + "]å·²ç»ç»æï¼");
			return;
			}


			//è·åå½åäº§çº¿
			long HSourceID = 0;
			sql = "select * from Gy_Source where HName = '" + comboBox_SourceNameParams.Text + "'";
			ds = oCn.RunProcReturn(sql, "Gy_Source");
			if (ds != null && ds.Tables[0].Rows.Count > 0)
			{
			HSourceID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HItemID"].ToString());
			}


			//è·åç¼ååè¡¨ä¸ ææ¡ç å¯¹åºç ç»æè®°å½
			sql = "select top(1) a.* from Sc_PackUnionBill_Temp as a inner join Gy_BarCodeBill as b on a.HBarCode = b.HBarCode where a.HBarCode_Pack = '" + HPackBarCode + "' and b.HSourceID = " + HSourceID + " and a.HStockorgID = " + HOrgID;
			ds = oCn.RunProcReturn(sql, "Sc_PackUnionBill_Temp");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			MessageBox.Show("ç¼ååè¡¨ä¸æªæ¥è¯¢å°è¯¥ææ¡ç ä¸åæ¡ç çç»æè®°å½ï¼");
			return;
			}
			else
			{
			string HBarCode_Pack = ds.Tables[0].Rows[0]["HBarCode_Pack"].ToString();
			long HBillID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HInterID"].ToString());
			string HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();

			textBox_HPackBarCode.Text = HBarCode_Pack;
			textBox_sBillID.Text = HBillID.ToString();
			textBox_sBillNo.Text = HBillNo;

			getDisplay_GrdMain();
			}
			}
			}
			#endregion
			#endregion


			}
			}