MES-WEB-API.git

			@@ -87,12 +87,12 @@

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList order by hmainid desc", "h_v_IF_SeOrderBillList");
			ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList order by hmainid desc,hsubid asc", "h_v_IF_SeOrderBillList");
			}
			else
			{
			string sql1 = "select * from h_v_IF_SeOrderBillList where 1 = 1 ";
			string sql = sql1 + sWhere+ " order by hmainid desc";
			string sql = sql1 + sWhere+ " order by hmainid desc,hsubid asc";
			ds = oCN.RunProcReturn(sql, "h_v_IF_SeOrderBillList");
			}

			@@ -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;
			@@ -1268,7 +1279,7 @@
			try
			{

			ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList where hmainid =" + HInterID, "h_v_IF_SeOrderBillList");
			ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList where hmainid =" + HInterID + " order by hsubid asc", "h_v_IF_SeOrderBillList");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			@@ -1365,10 +1376,36 @@
			}
			//==================================================================================

			//进行会计期间结账的判断和控制
			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();

			oCN.RunProc("delete from Xs_SeOrderBillMain where HInterID = " + HInterID);
			oCN.RunProc("delete from Xs_SeOrderBillSub where HInterID='" + HInterID + "'");


			//写入日志
			string Operation = "删除";
			string ComputerName = System.Net.Dns.GetHostName(); //设备名称
			string WorkList = Operation + "单据，单据号：" + BillOld.omodel.HBillNo;
			string MvarReportTitle = BillOld.MvarReportTitle; //模块
			string SystemName = "LMES-" + MvarReportTitle + "模块";
			string IPAddress = "";
			//string IPAddress = Dns.GetHostEntry(Dns.GetHostName()).AddressList[0].ToString(); //IP地址
			//string IPAddress = System.Web.HttpContext.Current.Request.UserHostAddress;

			oCN.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
			"(getdate(),'" + user + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','" + IPAddress + "','" + Operation + "')"
			);


			//删除后控制==================================================================================
			string sql2 = "exec h_p_Xs_SeOrderBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
			@@ -1554,6 +1591,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 +1641,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 +1791,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 +1833,8 @@
			}
			else
			{
			oBill.oCn.RollBack();

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "关闭失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			@@ -1918,7 +2010,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;
			@@ -2518,5 +2610,50 @@
			}
			}
			#endregion

			#region 销售订单获取排序后的数据
			[Route("Xs_SeOrderBill/sortList")]
			[HttpGet]
			public object sortList(string sWhere, string user)
			{
			try
			{
			//判断查询权限
			if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBillQuery", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无权限查询!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList order by hmainid desc", "h_v_IF_SeOrderBillList");
			}
			else
			{
			string sql1 = "select * from h_v_IF_SeOrderBillList where 1 = 1 ";
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "h_v_IF_SeOrderBillList");
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			}
			}