MES-WEB-API.git

			@@ -7,6 +7,7 @@
			using System.Data;
			using System.Data.SqlClient;
			using System.Web.Http;
			using System.Windows.Forms;
			using WebAPI.Models;

			namespace WebAPI.Controllers
			@@ -21,6 +22,7 @@

			private json objJsonResult = new json();
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			public DAL.ClsSc_ICMOBill BillOld = new DAL.ClsSc_ICMOBill();
			DataSet ds;
			DataSet ds1;

			@@ -37,6 +39,7 @@
			//委外工序发出反序列化
			string msg2 = "[" + sArray[0].ToString() + "]";
			string user = sArray[1].ToString();
			string HComputerName = SystemInformation.ComputerName; //设备名称

			//判断是否有编辑权限
			if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Edit", 1, false, user))
			@@ -134,6 +137,23 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			string sReturn = "";
			if (oSystemParameter.ShowBill(ref sReturn) == true)
			{
			if (oSystemParameter.omodel.WMS_CampanyName == "乔一") //系统参数判断客户
			{
			//判断生产资源
			if (HSourceID <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "生产资源没有选择！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}

			if (HCenterID <= 0)
			{
			objJsonResult.code = "0";
			@@ -204,6 +224,7 @@
			","+ HmaterOutqty + ") ");

			LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",新增工序进站单据:" + HBillNo);
			oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "新增工序进站单据：" + HBillNo + "','LMES-工序进站模块','" + DBUtility.ClsPub.IPAddress + "','新增单据'", ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else if ("Modify".Equals(eventType))
			{
			@@ -248,6 +269,7 @@
			" where HInterID=" + HInterID);

			LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",修改工序进站单据:" + HBillNo);
			oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "修改工序进站单据：" + HBillNo + "','LMES-工序进站模块','" + DBUtility.ClsPub.IPAddress + "','修改单据'", ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			@@ -301,7 +323,7 @@

			}
			oCN.Commit();
			string sReturn = "";

			if (oSystemParameter.ShowBill(ref sReturn) == true)
			{
			if (oSystemParameter.omodel.MES_StationInBill_SaveAutoAddnew == "Y") //系统参数自动审核
			@@ -916,6 +938,112 @@
			}
			#endregion

			#region 工序进站关闭/反关闭功能
			[Route("Cj_StationInBill/CloseCj_StationInBill")]
			[HttpGet]
			public object CloseSc_StationInBill(string HInterID, int Type, string user)
			{
			try
			{
			//判断是否有删除权限
			if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Close", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无权限关闭!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (string.IsNullOrWhiteSpace(HInterID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HInterID为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ClsPub.CurUserName = user;
			BillOld.MvarItemKey = "Sc_StationInBillMain";
			oCN.BeginTran();//开始事务

			//Type 1 关闭 2 反关闭
			if (Type == 1)
			{
			//判断单据是否已经关闭
			DataSet ds;
			string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
			ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已关闭!不需要再关闭!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//关闭单据
			if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "关闭失败!原因:" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			//判断单据是否已经反关闭
			DataSet ds;
			string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
			ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HCloseMan"] == null \|\| ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已反关闭!不需要再反关闭!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//反关闭单据
			if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "反关闭失败!原因:" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			oCN.Commit();//提交事务

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "执行成功！";
			objJsonResult.data = null;
			return objJsonResult; ;

			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "执行失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			//批量进站
			#region 批量进站模块返回明细信息列表
			[Route("Cj_StationInBill/get_BarCodeDetail")]
			@@ -969,6 +1097,7 @@
			{
			try
			{
			string HComputerName = SystemInformation.ComputerName; //设备名称
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Drop", 1, false, HDeleteMan))
			{
			@@ -1050,7 +1179,8 @@
			else
			{
			//写入删除日志
			LogService.Write("用户:" + HDeleteMan + ",日期:" + DateTime.Now + ",删除工序流进站单据:" + oBill.omodel.HBillNo);
			LogService.Write("用户:" + HDeleteMan + ",日期:" + DateTime.Now + ",删除工序进站单据:" + oBill.omodel.HBillNo);
			oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + HDeleteMan + "','" + HComputerName + "','" + "删除工序进站单据：" + oBill.omodel.HBillNo + "','LMES-工序进站模块','" + DBUtility.ClsPub.IPAddress + "','删除单据'", ref DBUtility.ClsPub.sExeReturnInfo);

			objJsonResult.code = "1";
			objJsonResult.count = 1;