~yxj/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
			@@ -37,6 +38,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 +136,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";
			@@ -202,6 +221,9 @@
			"," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID +
			",'" + HProcNo + "','" + HOrderProcNO + "','" + HMainInterID + "'," + HPRDOrgID +
			","+ 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))
			{
			@@ -244,6 +266,9 @@
			",HProcNo='" + HProcNo + "'" +
			",HOrderProcNO='" + HOrderProcNO + "'" +
			" 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
			{
			@@ -297,7 +322,7 @@

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

			if (oSystemParameter.ShowBill(ref sReturn) == true)
			{
			if (oSystemParameter.omodel.MES_StationInBill_SaveAutoAddnew == "Y") //系统参数自动审核
			@@ -965,6 +990,7 @@
			{
			try
			{
			string HComputerName = SystemInformation.ComputerName; //设备名称
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Drop", 1, false, HDeleteMan))
			{
			@@ -977,14 +1003,22 @@
			DAL.ClsSc_StationInBill oBill = new DAL.ClsSc_StationInBill();
			if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
			{
			if (oBill.omodel.HMaker != HDeleteMan && (HDeleteMan != "admin" && HDeleteMan != "Admin"))
			string sReturn = "";
			if (oSystemParameter.ShowBill(ref sReturn))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "只能删除本人的单据！";
			objJsonResult.data = null;
			return objJsonResult;
			if (oSystemParameter.omodel.MES_StationInBill_DeleteCtl == "Y")
			{
			if (oBill.omodel.HMaker != HDeleteMan && (HDeleteMan != "admin" && HDeleteMan != "Admin"))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "只能删除本人的单据！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}


			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			DataSet ds;
			@@ -1026,8 +1060,7 @@
			return objJsonResult;
			}

			//写入删除日志
			string WorkList = "删除进站单：" + oBill.omodel.HBillNo;

			if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HProcExchInterID, oBill.omodel.HProcExchEntryID, ref DBUtility.ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			@@ -1038,6 +1071,10 @@
			}
			else
			{
			//写入删除日志
			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;
			objJsonResult.Message = "删除成功！";