MES-WEB-API.git

			@@ -165,7 +165,10 @@
			public string ERPMode = ""; //ERPæ¨¡å¼ï¼WISEãCLOUDï¼
			public string CampanyName = ""; //å®¢æ·å®å¶ååç§°
			public string SourceQtyCtl = ""; //è¶æºåæ°éæ§å¶
			//-------------------------------------------------------------------------
			public long PrintQty = 0; //åè®¸æ¡ç æå°æ¬¡æ°
			public string PrintQtyCtl = ""; //æ¡ç æå°æ¬¡æ°æ§å¶
			public string UpdatePrintQtyCtl = ""; //æ¡ç æå°æ¬¡æ°æ´æ°
			//-------------------------------------------------------------------------
			#region åºå®ä»£ç

			//æ¸ç©ºçé¢
			@@ -405,6 +408,9 @@
			ERPMode = oSystemParameter.omodel.WMS_WMSStockCtl_ERPMode;
			CampanyName = oSystemParameter.omodel.WMS_CampanyName;
			SourceQtyCtl = oSystemParameter.omodel.BarCode_SourceQtyCtl;
			PrintQty = oSystemParameter.omodel.BarCode_PrintQty;
			PrintQtyCtl = oSystemParameter.omodel.BarCode_PrintQtyCtl;
			UpdatePrintQtyCtl = oSystemParameter.omodel.BarCode_UpdatePrintQtyCtl;
			}

			cmbHWorksNumber.Items.Clear();
			@@ -679,10 +685,10 @@
			string HMaterNumber = ""; //ç©æä»£ç
			double HSumQty = 0; //äº§åæ°é
			double HMinQty = 0; //æå°åè£æ°
			int HBQty = 0; //ç®±æ°
			Int64 HBQty = 0; //ç®±æ°
			double HQty = 0; //æ°é
			string WeiShu = ""; //å°¾æ°
			int LSH = 0; //æµæ°´å·
			Int64 LSH = 0; //æµæ°´å·
			string LSH2 = ""; //æµæ°´å·è½¬æ¢æåç¬¦
			string sDate = ""; //æ¥æ
			string sYear = ""; //å¹´
			@@ -695,7 +701,7 @@
			string HBarCodeBatchNo = ""; //æ¡ç æ¹æ¬¡å·
			string HBarCodeDate = ""; //æ¡ç æ¥æ
			int k = 0;
			int n = 0; //åä¸æ¹çææ¡ç ä¸çç¬¬å æ¡
			Int64 n = 0; //åä¸æ¹çææ¡ç ä¸çç¬¬å æ¡
			string sTMNumber = ""; //æ¡ç èªå®ä¹åç¼
			DataSet Ds;
			//Ds = oCn.RunProcReturn("exec GetLSH '" + ClsPub.GetServerDate(0) + "'", "GetLSH");
			@@ -742,7 +748,7 @@
			sTMNumber = 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]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			else if (CampanyName == "é£é¾")
			{
			@@ -757,7 +763,7 @@
			sTMNumber = HWorksNumber + 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]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			else //éç¨æ¹æ³
			{
			@@ -765,7 +771,7 @@
			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]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			}
			else if (cmbHBarCodeType.Text == "åç§æ¡ç ")
			@@ -789,7 +795,7 @@
			sTMNumber = HMaterNumber + 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]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			LSHlen = 4;
			}
			else if (cmbHBarCodeType.Text == "ä»ªå¨æåæ¡ç è§å") //å¦å¤å¤çäº
			@@ -798,7 +804,7 @@
			//sTMNumber = HMaterNumber + 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]);
			//LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			else if (cmbHBarCodeType.Text == "è¯åæåæ¡ç è§å")
			{
			@@ -806,7 +812,7 @@
			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]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			LSHlen = 6;
			}
			else if (cmbHBarCodeType.Text == "åéæºæ¡ç ")
			@@ -816,7 +822,7 @@
			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]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			LSHlen = 5;
			if (sTMNumber.Length != 16)
			{
			@@ -831,7 +837,7 @@
			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]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			LSHlen = 5;
			if (sTMNumber.Length != 18)
			{
			@@ -845,7 +851,7 @@
			sTMNumber = HICMOBillNo;
			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]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			LSHlen = 5;
			}
			//else if (cmbHBarCodeType.Text == "æçæ¡ç ")
			@@ -858,7 +864,7 @@
			return;
			}

			HBQty = HBQty + ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value);
			HBQty = HBQty + ClsPub.isLong(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;
			@@ -1067,7 +1073,7 @@
			",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
			",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
			",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
			",HGiveAwayFlag,HSeOrderSEQ " +
			",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " +
			",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
			") values ("
			+ "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
			@@ -1076,7 +1082,7 @@
			+ ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
			+ ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + sDate + "'"
			+ ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString() + ""
			+ ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag) + "," + HSeOrderSEQ.ToString()
			+ ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag) + "," + HSeOrderSEQ.ToString() + "," + HSourceEntryID.ToString()
			+ ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");


			@@ -1159,7 +1165,7 @@
			string HMaterNumber = ""; //ç©æä»£ç
			double HSumQty = 0; //äº§åæ°é
			double HMinQty = 0; //æå°åè£æ°
			int HBQty = 0; //ç®±æ°
			Int64 HBQty = 0; //ç®±æ°
			double HQty = 0; //æ°é
			string WeiShu = ""; //å°¾æ°
			//int LSH = 0; //æµæ°´å·
			@@ -1210,7 +1216,7 @@
			// return;
			//}

			HBQty = HBQty + ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value);
			HBQty = HBQty + ClsPub.isLong(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;
			@@ -2707,9 +2713,10 @@
			#region //æå°è®¾ç½®

			GridppReport Report;
			int CurRows = 0;
			string sBarCodeItemID = ""; //æ¡ç èªå¢å

			//é¢è§
			int CurRows = 0;
			private void yl_Click(object sender, EventArgs e)
			{
			//å¤ææ¯å¦å·²ç»çææ¡ç
			@@ -2738,32 +2745,68 @@
			}
			}

			//æå°åå¤ææ¡ç æ¯å¦å·²æå°è¿
			//æå°
			private void dy_Click(object sender, EventArgs e)
			{
			//å¤ææ¯å¦å·²ç»çææ¡ç
			if (DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value) == "")
			{
			MessageBox.Show("æ¡ç æªçæï¼è¯·åçææ¡ç ååæå°ï¼");
			return;
			}

			//æå°åå¤ææ¡ç æ¯å¦å·²æå°è¿
			if (ReportPrintBegin())
			{
			return;
			}

			//éæ©æå°æ¨¡æ¿
			BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
			oFrm.sBillName = ModName;
			oFrm.sBillModel = ModCaption;
			oFrm.ShowDialog();
			if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
			{
			//å¾ªç¯éä¸è¡
			Sub_SetReport(oFrm.sOpenTmp);
			Report.Print(true);
			Thread.Sleep(1000);
			}
			}

			////æå°åå¤ææ¡ç æ¯å¦å·²æå°è¿
			//private bool ReportPrintBegin()
			//{
			// string sRelQty = "";

			// if (oBar.Set_BPrintQty(DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value), ref sRelQty))
			// {
			// MessageBox.Show("æ¡ç å·²ç»æå°è¿ï¼ä¸å¯éå¤æå°ï¼");
			// return true;
			// }
			// else
			// {
			// return false;
			// }
			//}

			//æå°åå¤ææ¡ç æ¯å¦è¶è¿åè®¸å¯æå°æ¬¡æ°
			private bool ReportPrintBegin()
			{
			string sRelQty = "";

			if (oBar.Set_BPrintQty(DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value), ref sRelQty))
			string sHRemark = "";
			if (PrintQtyCtl == "Y")
			{
			MessageBox.Show("æ¡ç å·²ç»æå°è¿ï¼ä¸å¯éå¤æå°ï¼");
			return true;
			if (oBar.Set_CheckPrintQty_SD(HInterID, PrintQty, ref sHRemark))
			{
			MessageBox.Show(sHRemark);
			return true;
			}
			return false;
			}
			else
			{
			return false;
			}
			}

			//æå°ç»æååå¡«æ¡ç æå°æ¬¡æ°
			private void ReportPrintEnd()
			{
			try
			{
			oCn.RunProc("update Gy_BarCodeBill set HPrintQty=isnull(HPrintQty,0)+1 where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			catch (Exception e)
			{
			MessageBox.Show("æå°å¤±è´¥!æå°ç»æ ï¼" + e.Message);
			}
			}

			@@ -2773,26 +2816,6 @@
			for (int i = 0; i < grdList.Rows.Count; i++)
			{
			grdList.Rows[i].Cells[0].Value = "*";
			}
			//
			Report = new GridppReport();
			Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
			Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
			Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
			Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd);
			}


			private void Sub_SetReportView(string sOpenTmp)
			{
			//å¤æè¡æ°
			for (int i = 0; i < grdList.Rows.Count; i++)
			{
			grdList.Rows[i].Cells[0].Value = "";
			}
			for (int i = 0; i < grdList.SelectedRows.Count; i++)
			{
			grdList.Rows[grdList.SelectedRows[i].Index].Cells[0].Value = "*";
			}
			//
			Report = new GridppReport();
			@@ -2824,11 +2847,7 @@
			}
			}

			private Int32 Fun_GetCol(string sCol)
			{
			return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdList);
			}

			//å¡«å¥åæ®è¡¨ä½ä¿¡æ¯
			private void ReportFetchRecordByDataTable()
			{
			try
			@@ -2842,17 +2861,40 @@
			}
			}

			private void dy_Click(object sender, EventArgs e)
			////æå°ç»æååå¡«æ¡ç æå°æ¬¡æ°
			//private void ReportPrintEnd()
			//{
			// try
			// {
			// oCn.RunProc("update Gy_BarCodeBill set HPrintQty=isnull(HPrintQty,0)+1 where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			// }
			// catch (Exception e)
			// {
			// MessageBox.Show("æå°å¤±è´¥!æå°ç»æ ï¼" + e.Message);
			// }
			//}

			//æå°ç»æååå¡«æ¡ç æå°æ¬¡æ°
			private void ReportPrintEnd()
			{
			if (UpdatePrintQtyCtl == "Y")
			{
			oBar.Set_UpdatePrintQty_SD(HInterID);
			}
			}

			//è¯æå°
			private void sdy_Click(object sender, EventArgs e)
			{
			//å¤ææ¯å¦å·²ç»çææ¡ç
			if (DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value) == "")
			{
			MessageBox.Show("æ¡ç æªçæï¼è¯·åçææ¡ç ååæå°ï¼");
			MessageBox.Show("æ¡ç æªçæï¼è¯·åçææ¡ç ååé¢è§ï¼");
			return;
			}

			//æå°åå¤ææ¡ç æ¯å¦å·²æå°è¿
			if (ReportPrintBegin())
			if (ReportPrintBegin_SDY())
			{
			return;
			}
			@@ -2864,12 +2906,71 @@
			oFrm.ShowDialog();
			if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
			{
			//å¾ªç¯éä¸è¡
			Sub_SetReport(oFrm.sOpenTmp);
			Report.Print(true);
			Sub_SetReportView(oFrm.sOpenTmp);
			Report.PrintPreview(false);
			Thread.Sleep(1000);
			}
			}

			//æå°åå¤ææ¡ç æ¯å¦è¶è¿åè®¸å¯æå°æ¬¡æ°
			private bool ReportPrintBegin_SDY()
			{
			string sHRemark = "";
			sBarCodeItemID = "";
			for (int i = 0; i < grdList.SelectedRows.Count; i++)
			{
			sBarCodeItemID = sBarCodeItemID + "," + DBUtility.ClsPub.isLong(grdList.Rows[grdList.SelectedRows[i].Index].Cells[Fun_GetCol("HItemID")].Value).ToString();
			}
			sBarCodeItemID = sBarCodeItemID.Remove(0, 1);

			if (PrintQtyCtl == "Y")
			{
			if (oBar.Set_CheckPrintQty(sBarCodeItemID, PrintQty, ref sHRemark))
			{
			MessageBox.Show(sHRemark);
			return true;
			}
			return false;
			}
			else
			{
			return false;
			}
			}

			private void Sub_SetReportView(string sOpenTmp)
			{
			//å¤æè¡æ°
			for (int i = 0; i < grdList.Rows.Count; i++)
			{
			grdList.Rows[i].Cells[0].Value = "";
			}
			for (int i = 0; i < grdList.SelectedRows.Count; i++)
			{
			grdList.Rows[grdList.SelectedRows[i].Index].Cells[0].Value = "*";
			}
			//
			Report = new GridppReport();
			Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
			Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
			Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
			Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd_SDY);
			}

			//æå°ç»æååå¡«æ¡ç æå°æ¬¡æ°
			private void ReportPrintEnd_SDY()
			{
			if (UpdatePrintQtyCtl == "Y")
			{
			oBar.Set_UpdatePrintQty(sBarCodeItemID);
			}
			}

			private Int32 Fun_GetCol(string sCol)
			{
			return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdList);
			}


			#endregion

			@@ -2913,7 +3014,7 @@
			}
			sWhere = " and HOrgID =" + sHOrgID.ToString();
			BLL.Cls_S_KF_ICInventoryList_IF oadd = new BLL.Cls_S_KF_ICInventoryList_IF();
			if (oadd.Refresh("")) //éæ©åå
			if (oadd.Refresh(sWhere)) //éæ©åå
			//if (oadd.Refresh(" and HErpClsID in (1,2,3) ")) //éæ©åå
			{
			FillSelectData(oadd.oBillSelectColl);
			@@ -3012,6 +3113,12 @@
			grdMain.Rows[row + r].Cells[HMTONoCol].Value = grdMain.Rows[row].Cells[HMTONoCol].Value;
			grdMain.Rows[row + r].Cells[HInnerBillNoCol].Value = grdMain.Rows[row].Cells[HInnerBillNoCol].Value;
			grdMain.Rows[row + r].Cells[HMakerCol].Value = grdMain.Rows[row].Cells[HMakerCol].Value;
			//ç½æ ¼æå¾
			DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
			oCell.ThreeState = false;
			oCell.Value = grdMain.Rows[row].Cells[HGiveAwayFlagCol].Value;
			oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
			grdMain.Rows[row + r].Cells[HGiveAwayFlagCol] = oCell;

			}
			DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
			@@ -3200,33 +3307,6 @@
			}
			}

			private void sdy_Click(object sender, EventArgs e)
			{
			//å¤ææ¯å¦å·²ç»çææ¡ç
			if (DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value) == "")
			{
			MessageBox.Show("æ¡ç æªçæï¼è¯·åçææ¡ç ååé¢è§ï¼");
			return;
			}

			//æå°åå¤ææ¡ç æ¯å¦å·²æå°è¿
			if (ReportPrintBegin())
			{
			return;
			}

			//éæ©æå°æ¨¡æ¿
			BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
			oFrm.sBillName = ModName;
			oFrm.sBillModel = ModCaption;
			oFrm.ShowDialog();
			if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
			{
			Sub_SetReportView(oFrm.sOpenTmp);
			Report.PrintPreview(false);
			Thread.Sleep(1000);
			}
			}

			//çæå¤ç®±ç
			private void wxm_Click(object sender, EventArgs e)