MES-WEB-API.git

			@@ -32,13 +32,73 @@
			}

			#endregion èªå®ä¹æ¹æ³

			//ä¿ååæ§å¶
			public bool BeforeSave(Int64 HInterID, string HBillNo, Int64 OperationType, ref string sReturn)
			{
			try
			{
			DataSet Ds = oCn.RunProcReturn("Exec h_p_Pay_GroupBalBill_BeforeSaveCtrl " + HInterID.ToString() + ",'" + HBillNo + "'," + OperationType.ToString(), "h_p_Pay_GroupBalBill_BeforeSaveCtrl");
			if (Ds == null \|\| Ds.Tables[0].Rows.Count == 0)
			{
			sReturn = "ä¿ååå¤æå¤±è´¥ï¼";
			return false;
			}
			else
			{
			if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBack"]) == 1)
			{
			sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
			return false;
			}
			}
			return true;
			}
			catch (Exception e)
			{
			throw (e);
			}
			}

			//ä¿ååæ§å¶
			public bool AfterSave(Int64 HInterID, string HBillNo, Int64 OperationType, ref string sReturn)
			{
			try
			{
			DataSet Ds = oCn.RunProcReturn("Exec h_p_Pay_GroupBalBill_AfterSaveCtrl " + HInterID.ToString() + ",'" + HBillNo + "'," + OperationType.ToString(), "h_p_Pay_GroupBalBill_AfterSaveCtrl");
			if (Ds == null \|\| Ds.Tables[0].Rows.Count == 0)
			{
			sReturn = "ä¿ååå¤æå¤±è´¥ï¼";
			return false;
			}
			else
			{
			if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBack"]) == 1)
			{
			sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
			return false;
			}
			}
			return true;
			}
			catch (Exception e)
			{
			throw (e);
			}
			}

			//ä¿®æ¹åæ®
			public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
			{
			try
			{
			//
			oCn.BeginTran();
			//ä¿ååæ§å¶
			if (!BeforeSave(lngBillKey, omodel.HBillNo, 2, ref sReturn))
			{
			oCn.RollBack();
			return false;
			}
			//æ´æ°ä¸»è¡¨
			oCn.RunProc("UpDate Pay_GroupBalBillMain set " +
			" HBillNo='" + omodel.HBillNo + "'" + //åºå®èµå¼===============
			@@ -51,13 +111,14 @@
			//========================================
			",HGroupID=" + omodel.HGroupID.ToString() +
			",HDeptID=" + omodel.HDeptID.ToString() +
			",HPayType=" + omodel.HPayType.ToString() +
			",HOtherSubsidy=" + omodel.HOtherSubsidy.ToString() +
			",HOtherDeduct=" + omodel.HOtherDeduct.ToString() +
			",HSumMoney=" + omodel.HSumMoney.ToString() +
			",HPayMoney=" + omodel.HPayMoney.ToString() +
			",HPayType=" + omodel.HPayType.ToString() +
			",HExplanation='" + omodel.HExplanation + "'" +
			",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
			",HStockOrgID=" + omodel.HSTOCKORGID.ToString() +
			" where HInterID=" + lngBillKey.ToString());
			//å é¤å³è
			DeleteRelation(ref sReturn, lngBillKey);
			@@ -69,17 +130,19 @@
			foreach (Model.ClsPay_GroupBalBillSub oSub in DetailColl)
			{
			oCn.RunProc("Insert into Pay_GroupBalBillSub " +
			" (HInterID,HEntryID,HRemark" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
			",HMaterID,HUnitID,HProcID,HTimes,HQty,HPrice,HSourceID" +
			",HMoney,HICMOInterID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" +
			",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HSqty" +
			" (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
			",HMaterID,HUnitID,HProcID,HSourceID" +
			",HTimes,HQty,HPrice,HMoney,HSqty" +
			",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" +
			",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo" +
			") values("
			+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'" +
			"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
			"," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HTimes.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HSourceID.ToString() +
			"," + oSub.HMoney.ToString() + "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HProcReportInterID.ToString() + "," + oSub.HProcReportEntryID.ToString() + ",'" + oSub.HProcReportBillNo + "'" +
			"," + oSub.HProcPlanInterID.ToString() + "," + oSub.HProcPlanEntryID.ToString() + ",'" + oSub.HProcPlanBillNo + "'," + oSub.HSqty.ToString() +
			+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
			"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
			"," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HSourceID.ToString() +
			"," + oSub.HTimes.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HSqty.ToString() +
			"," + oSub.HICMOInterID.ToString() + "," + oSub.HICMOEntryID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HProcReportInterID.ToString() + "," + oSub.HProcReportEntryID.ToString() + ",'" + oSub.HProcReportBillNo + "'" +
			"," + oSub.HProcPlanInterID.ToString() + "," + oSub.HProcPlanEntryID.ToString() + ",'" + oSub.HProcPlanBillNo + "'" +
			") ");
			}
			//
			@@ -87,33 +150,26 @@
			foreach (Model.ClsPay_GroupBalBillEmp oSubSec in DetailEmpColl)
			{
			oCn.RunProc("Insert into Pay_GroupBalBillEmp " +
			" (HInterID,HEntryID,HRemark" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
			",HEmpID,HEmpRate" +
			",HBaseTimes,HOverTimes,HLeaveTimes,HCTPrjID" +
			",HBaseDays,HOverDays,HLeaveDays,HYf" +
			",HMoney,HOtherSubsidy,HOtherDeduct,HIsPay,HAvgFlag" +
			")" +
			" values("
			+ omodel.HInterID.ToString() + "," + oSubSec.HEntryID.ToString() + ",'" + oSubSec.HRemark + "'" +
			"," + oSubSec.HSourceInterID.ToString() + "," + oSubSec.HSourceEntryID.ToString() + ",'" + oSubSec.HSourceBillNo + "','" + oSubSec.HSourceBillType + "'," + oSubSec.HRelationQty.ToString() + "," + oSubSec.HRelationMoney.ToString() +
			"," + oSubSec.HEmpID.ToString() + "," + oSubSec.HEmpRate.ToString() +
			"," + oSubSec.HBaseTimes.ToString() + "," + oSubSec.HOverTimes.ToString() + "," + oSubSec.HLeaveTimes.ToString() + "," + oSubSec.HCTPrjID.ToString() +
			"," + oSubSec.HBaseDays.ToString() + "," + oSubSec.HOverDays.ToString() + "," + oSubSec.HLeaveDays.ToString() + "," + oSubSec.HYf.ToString() +
			"," + oSubSec.HMoney.ToString() + "," + oSubSec.HOtherSubsidy.ToString() + "," + oSubSec.HOtherDeduct.ToString() + "," + Convert.ToString(oSubSec.HIsPay ? 1 : 0) + "," + Convert.ToString(oSubSec.HAvgFlag ? 1 : 0) + ") ");
			" (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
			",HEmpID,HEmpRate,HCTPrjID,HMoney,HOtherSubsidy,HOtherDeduct" +
			",HBaseDays,HBaseTimes,HOverDays,HOverTimes,HLeaveDays,HLeaveTimes" +
			",HIsPay,HAvgFlag,HYF" +
			") values("
			+ omodel.HInterID.ToString() + "," + oSubSec.HEntryID.ToString() + ",'" + oSubSec.HRemark + "'," + oSubSec.HRelationQty.ToString() + "," + oSubSec.HRelationMoney.ToString() +
			"," + oSubSec.HSourceInterID.ToString() + "," + oSubSec.HSourceEntryID.ToString() + ",'" + oSubSec.HSourceBillNo + "','" + oSubSec.HSourceBillType + "'" +
			"," + oSubSec.HEmpID.ToString() + "," + oSubSec.HEmpRate.ToString() + "," + oSubSec.HCTPrjID.ToString() + "," + oSubSec.HMoney.ToString() + "," + oSubSec.HOtherSubsidy.ToString() + "," + oSubSec.HOtherDeduct.ToString() +
			"," + oSubSec.HBaseDays.ToString() + "," + oSubSec.HBaseTimes.ToString() + "," + oSubSec.HOverDays.ToString() + "," + oSubSec.HOverTimes.ToString() + "," + oSubSec.HLeaveDays.ToString() + "," + oSubSec.HLeaveTimes.ToString() +
			"," + Convert.ToString(oSubSec.HIsPay ? 1 : 0) + "," + Convert.ToString(oSubSec.HAvgFlag ? 1 : 0) + "," + oSubSec.HYf.ToString() +
			") ");
			}
			//foreach (Model.ClsPay_GroupBalBillSub oSub in DetailColl)
			//{
			// Ds = oCn.RunProcReturn("exec h_p_Pay_GroupBalBill_Qty " + oSub.HICMOInterID, "");
			// if (Ds.Tables[0].Rows.Count == 0)
			// return;
			// if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBool"]) == "Y")
			// {
			// sReturn = "æ±æ¥æ°éè¶è¿è®¡åæ°éï¼ä¸åè®¸ä¿å";
			// return false;
			// }
			//}
			sReturn = "ä¿®æ¹åæ®æåï¼";
			//ä¿ååæ§å¶
			if (!AfterSave(lngBillKey, omodel.HBillNo, 2, ref sReturn))
			{
			oCn.RollBack();
			return false;
			}
			sReturn = "åæ®å·ï¼" + omodel.HBillNo + " ä¿®æ¹æåï¼";
			oCn.Commit();
			return true;
			}
			@@ -124,6 +180,7 @@
			throw (e);
			}
			}

			//æ°å¢åæ®
			public override bool AddBill(ref string sReturn)
			{
			@@ -133,36 +190,43 @@
			omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
			//è¥MAINDIéå¤åéæ°è·å
			oCn.BeginTran();
			//ä¿ååæ§å¶
			if (!BeforeSave(omodel.HInterID, omodel.HBillNo, 1, ref sReturn))
			{
			oCn.RollBack();
			return false;
			}
			//ä¸»è¡¨
			oCn.RunProc("Insert Into Pay_GroupBalBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
			",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
			",HGroupID,HDeptID,HPayType,HOtherSubsidy" +
			",HOtherDeduct,HSumMoney,HPayMoney" +
			",HExplanation,HInnerBillNo" +
			",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
			",HGroupID,HDeptID,HPayType,HOtherSubsidy,HOtherDeduct" +
			",HSumMoney,HPayMoney,HExplanation,HInnerBillNo,HStockOrgID" +
			") " +
			" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
			" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate.ToShortDateString() + "'" +
			", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
			", " + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HPayType.ToString() + "," + omodel.HOtherSubsidy.ToString() +
			"," + omodel.HOtherDeduct.ToString() + "," + omodel.HSumMoney.ToString() + "," + omodel.HPayMoney.ToString() +
			",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'" +
			"," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'" +
			"," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HPayType.ToString() + "," + omodel.HOtherSubsidy.ToString() + "," + omodel.HOtherDeduct.ToString() +
			"," + omodel.HSumMoney.ToString() + "," + omodel.HPayMoney.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + omodel.HSTOCKORGID.ToString() +
			") ");
			//
			//æå¥åè¡¨
			foreach (Model.ClsPay_GroupBalBillSub oSub in DetailColl)
			{
			oCn.RunProc("Insert into Pay_GroupBalBillSub " +
			" (HInterID,HEntryID,HRemark" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
			",HMaterID,HUnitID,HProcID,HTimes,HQty,HPrice,HSourceID" +
			",HMoney,HICMOInterID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" +
			",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HSqty" +
			" (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
			",HMaterID,HUnitID,HProcID,HSourceID" +
			",HTimes,HQty,HPrice,HMoney,HSqty" +
			",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" +
			",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo" +
			") values("
			+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'" +
			"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
			"," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HTimes.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HSourceID.ToString() +
			"," + oSub.HMoney.ToString() + "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HProcReportInterID.ToString() + "," + oSub.HProcReportEntryID.ToString() + ",'" + oSub.HProcReportBillNo + "'" +
			"," + oSub.HProcPlanInterID.ToString() + "," + oSub.HProcPlanEntryID.ToString() + ",'" + oSub.HProcPlanBillNo + "'," + oSub.HSqty.ToString() +
			+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
			"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
			"," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HSourceID.ToString() +
			"," + oSub.HTimes.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HSqty.ToString() +
			"," + oSub.HICMOInterID.ToString() + "," + oSub.HICMOEntryID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HProcReportInterID.ToString() + "," + oSub.HProcReportEntryID.ToString() + ",'" + oSub.HProcReportBillNo + "'" +
			"," + oSub.HProcPlanInterID.ToString() + "," + oSub.HProcPlanEntryID.ToString() + ",'" + oSub.HProcPlanBillNo + "'" +
			") ");
			}
			//
			@@ -170,35 +234,26 @@
			foreach (Model.ClsPay_GroupBalBillEmp oSubSec in DetailEmpColl)
			{
			oCn.RunProc("Insert into Pay_GroupBalBillEmp " +
			" (HInterID,HEntryID,HRemark" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
			",HEmpID,HEmpRate" +
			",HBaseTimes,HOverTimes,HLeaveTimes,HCTPrjID" +
			",HBaseDays,HOverDays,HLeaveDays,HYf" +
			",HMoney,HOtherSubsidy,HOtherDeduct,HIsPay,HAvgFlag" +
			")" +
			" values("
			+ omodel.HInterID.ToString() + "," + oSubSec.HEntryID.ToString() + ",'" + oSubSec.HRemark + "'" +
			"," + oSubSec.HSourceInterID.ToString() + "," + oSubSec.HSourceEntryID.ToString() + ",'" + oSubSec.HSourceBillNo + "','" + oSubSec.HSourceBillType + "'," + oSubSec.HRelationQty.ToString() + "," + oSubSec.HRelationMoney.ToString() +
			"," + oSubSec.HEmpID.ToString() + "," + oSubSec.HEmpRate.ToString() +
			"," + oSubSec.HBaseTimes.ToString() + "," + oSubSec.HOverTimes.ToString() + "," + oSubSec.HLeaveTimes.ToString() + "," + oSubSec.HCTPrjID.ToString() +
			"," + oSubSec.HBaseDays.ToString() + "," + oSubSec.HOverDays.ToString() + "," + oSubSec.HLeaveDays.ToString() + "," + oSubSec.HYf.ToString() +
			"," + oSubSec.HMoney.ToString() + "," + oSubSec.HOtherSubsidy.ToString() + "," + oSubSec.HOtherDeduct.ToString() + "," + Convert.ToString(oSubSec.HIsPay ? 1 : 0) + "," + Convert.ToString(oSubSec.HAvgFlag ? 1 : 0) + ") ");
			" (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
			",HEmpID,HEmpRate,HCTPrjID,HMoney,HOtherSubsidy,HOtherDeduct" +
			",HBaseDays,HBaseTimes,HOverDays,HOverTimes,HLeaveDays,HLeaveTimes" +
			",HIsPay,HAvgFlag,HYF" +
			") values("
			+ omodel.HInterID.ToString() + "," + oSubSec.HEntryID.ToString() + ",'" + oSubSec.HRemark + "'," + oSubSec.HRelationQty.ToString() + "," + oSubSec.HRelationMoney.ToString() +
			"," + oSubSec.HSourceInterID.ToString() + "," + oSubSec.HSourceEntryID.ToString() + ",'" + oSubSec.HSourceBillNo + "','" + oSubSec.HSourceBillType + "'" +
			"," + oSubSec.HEmpID.ToString() + "," + oSubSec.HEmpRate.ToString() + "," + oSubSec.HCTPrjID.ToString() + "," + oSubSec.HMoney.ToString() + "," + oSubSec.HOtherSubsidy.ToString() + "," + oSubSec.HOtherDeduct.ToString() +
			"," + oSubSec.HBaseDays.ToString() + "," + oSubSec.HBaseTimes.ToString() + "," + oSubSec.HOverDays.ToString() + "," + oSubSec.HOverTimes.ToString() + "," + oSubSec.HLeaveDays.ToString() + "," + oSubSec.HLeaveTimes.ToString() +
			"," + Convert.ToString(oSubSec.HIsPay ? 1 : 0) + "," + Convert.ToString(oSubSec.HAvgFlag ? 1 : 0) + "," + oSubSec.HYf.ToString() +
			") ");
			}
			//
			//foreach (Model.ClsPay_GroupBalBillSub oSub in DetailColl)
			//{
			// Ds = oCn.RunProcReturn("exec h_p_Pay_GroupBalBill_Qty " + oSub.HICMOInterID, "");
			// if (Ds.Tables[0].Rows.Count == 0)
			// return;
			// if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBool"]) == "Y")
			// {
			// sReturn = "æ±æ¥æ°éè¶è¿è®¡åæ°éï¼ä¸åè®¸ä¿å";
			// return false;
			// }
			//}
			//
			sReturn = "æ°å¢åæ®æåï¼";
			//ä¿ååæ§å¶
			if (!AfterSave(omodel.HInterID, omodel.HBillNo, 1, ref sReturn))
			{
			oCn.RollBack();
			return false;
			}
			sReturn = "åæ®å·ï¼" + omodel.HBillNo + " æ°å¢æåï¼";
			oCn.Commit();
			return true;
			}
			@@ -209,6 +264,7 @@
			throw (e);
			}
			}

			//æ¾ç¤ºåæ®
			public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
			{