MES-WEB-API.git

			@@ -1215,6 +1215,17 @@
			oBill.DetailColl.Add(oItemSub);
			}
			}

			//进行会计期间结账的判断和控制
			int sYear = 0;
			int sPeriod = 0;
			DateTime HDate = DateTime.Now;
			if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
			{
			objJsonResult.Message = s;
			return objJsonResult;
			}

			//保存
			//保存完毕后处理
			bool bResult;
			@@ -1364,6 +1375,16 @@
			return objJsonResult;
			}
			//==================================================================================

			//进行会计期间结账的判断和控制
			int sYear = 0;
			int sPeriod = 0;
			DateTime HDate = DateTime.Now;
			if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
			{
			objJsonResult.Message = s;
			return objJsonResult;
			}

			oCN.BeginTran();

			@@ -1554,6 +1575,17 @@
			}
			//==================================================================================

			//进行会计期间结账的判断和控制
			string s = "";
			int sYear = 0;
			int sPeriod = 0;
			DateTime HDate = DateTime.Now;
			if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
			{
			objJsonResult.Message = s;
			return objJsonResult;
			}

			//审核提交
			if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Xs_SeOrderBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			@@ -1593,6 +1625,17 @@
			return objJsonResult;
			}
			//=========================================================

			//进行会计期间结账的判断和控制
			string s = "";
			int sYear = 0;
			int sPeriod = 0;
			DateTime HDate = DateTime.Now;
			if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
			{
			objJsonResult.Message = s;
			return objJsonResult;
			}

			//反审核提交AbandonCheck
			if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Xs_SeOrderBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			@@ -1732,9 +1775,40 @@
			//进行需要进行的关闭/反关闭操作
			if (IsAudit == 0) //关闭提交
			{
			oBill.oCn.BeginTran();
			//关闭提交
			if (oBill.CloseBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			//关闭后控制=========================================
			string sql_afterClose = "exec h_p_Xs_SeOrderBill_AfterCloseCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
			DataSet ds_afterClose = oBill.oCn.RunProcReturn(sql_afterClose, "h_p_Xs_SeOrderBill_AfterCloseCtrl");
			if (ds_afterClose == null \|\| ds_afterClose.Tables[0].Rows.Count <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "关闭失败，原因：关闭后控制错误，请联系网络管理人员！";
			objJsonResult.data = null;
			oBill.oCn.RollBack();

			return objJsonResult;
			}
			else
			{
			if (ds_afterClose.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "关闭失败，原因：" + ds_afterClose.Tables[0].Rows[0]["HRemark"].ToString();
			objJsonResult.data = null;
			oBill.oCn.RollBack();

			return objJsonResult;
			}
			}
			//=========================================

			oBill.oCn.Commit();

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "关闭成功";
			@@ -1743,6 +1817,8 @@
			}
			else
			{
			oBill.oCn.RollBack();

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "关闭失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			@@ -1918,7 +1994,7 @@
			if (IsAudit == 0) //行关闭提交
			{
			//行关闭提交
			if (oBill.CloseRow(lngBillKey,HEntryID,oBill.omodel.HBillNo,CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			if (oBill.CloseRow(lngBillKey,HEntryID,oBill.omodel.HBillNo,CurUserName, "h_p_Xs_SeOrderBill_AfterEntryCloseCtrl", ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;