~yxj/MES-WEB-API.git

			@@ -14,6 +14,7 @@
			public class Cj_StationEntrustInBillController : ApiController
			{
			public DBUtility.ClsPub.Enum_BillStatus BillStatus;
			Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

			private json objJsonResult = new json();
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			@@ -23,36 +24,47 @@
			#region 返回委外工序发出单列表
			[Route("Cj_StationEntrustInBill/list")]
			[HttpGet]
			public object list(string sWhere)
			public object list(string sWhere,string user)
			{
			try
			{
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustInBillList " + sWhere+ " order by 发出时间 desc", "h_v_MES_StationEntrustInBillList");
			}
			else
			{
			string sql1 = "select * from h_v_MES_StationEntrustInBillList where 1 = 1 order by 发出时间 desc";
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "h_v_MES_StationEntrustInBillList");
			}
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			//判断是否有查询权限
			if (!DBUtility.ClsPub.Security_Log("MES_StationEntrustInBill_Query", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "false！";
			objJsonResult.Message = "无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustInBillList order by hmainid desc", "h_v_MES_StationEntrustInBillList");
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			string sql1 = "select * from h_v_MES_StationEntrustInBillList where 1 = 1 ";
			string sql = sql1 + sWhere+ " order by hmainid desc";
			ds = oCN.RunProcReturn(sql, "h_v_MES_StationEntrustInBillList");
			}

			//if (ds.Tables[0].Rows.Count != 0 \|\| ds != null)
			//{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			//}
			//else
			//{
			//objJsonResult.code = "0";
			//objJsonResult.count = 0;
			//objJsonResult.Message = "无数据";
			//objJsonResult.data = null;
			//return objJsonResult;
			//}
			}
			catch (Exception e)
			{
			@@ -124,11 +136,26 @@
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			try
			{
			//委外工序发出反序列化
			msg1 = "[" + msg1.ToString() + "]";
			List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg1);
			string msg2 = "[" + sArray[0].ToString() + "]";
			string user = sArray[1].ToString();

			//判断是否有编辑权限
			if (!DBUtility.ClsPub.Security_Log("MES_StationEntrustInBill_Edit", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无编辑权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg2);
			long HMainInterID = 0;
			HMainInterID = list[0].HMainInterID;
			string eventType = list[0].eventType;
			long HInterID = list[0].HInterID;//递入type得到的单据ID
			int HYear = 2021;
			@@ -255,7 +282,7 @@
			",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationInTime,HSourceID" +
			",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
			",HSupID,HTaxRate,HQty,HPrice,HMoney,HPieceQty" +
			",HProcNo,HOrderProcNO,HWWWorkOrderBillNo,HWWWorkOrderInterID,HWWWorkOrderEntryID" +
			",HProcNo,HOrderProcNO,HWWWorkOrderBillNo,HWWWorkOrderInterID,HWWWorkOrderEntryID,HMainInterID" +
			") " +
			" values('3792','3792'," + HInterID.ToString() + ",'" + HBillNo + "','" + HBillStatus.ToString() + "',getdate(),'" + HMaker + "',getdate()" +
			",'" + HYear.ToString() + "','" + HPeriod.ToString() + "','" + HRemark + "','" + HInnerBillNo + "'" +
			@@ -263,7 +290,7 @@
			",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID +
			"," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" +
			"," + HSupID + "," + HTaxRate + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty +
			",'" + HProcNo + "','" + HOrderProcNO + "'" + ",'" + HWWWorkOrderBillNo + "'" + "," + HWWWorkOrderInterID + "" + "," + HWWWorkOrderEntryID + "" +
			",'" + HProcNo + "','" + HOrderProcNO + "'" + ",'" + HWWWorkOrderBillNo + "'" + "," + HWWWorkOrderInterID + "" + "," + HWWWorkOrderEntryID + "," + HMainInterID +
			") ");
			}
			else if ("Modify".Equals(eventType))
			@@ -332,6 +359,18 @@
			oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_In " + HInterID.ToString() + ",1");
			oCN.RunProc("exec h_p_WW_EntrustWorkOrderRelationQty_In " + HInterID.ToString() + ",1");
			oCN.Commit();
			string sReturn = "";
			if (oSystemParameter.ShowBill(ref sReturn) == true)
			{
			if (oSystemParameter.omodel.MES_StationEntrustInBill_SaveAutoAddnew == "Y") //系统参数自动审核
			{
			objJsonResult.Verify = "Y";
			}
			else
			{
			objJsonResult.Verify = "N";
			}
			}
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "新增单据成功！";
			@@ -466,7 +505,7 @@
			//}

			//判断权限
			if (!ClsPub.Security_Log("MES_StationEntrustInBill_Edit", 1, true, CurUserName))
			if (!ClsPub.Security_Log_second("MES_StationEntrustInBill_Edit", 1, false, CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -531,14 +570,15 @@
			try
			{
			//审核权限
			//if (!DBUtility.ClsPub.Security_Log("MES_StationEntrustInBill_Check", 1, true, CurUserName))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "审核失败！无权限！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			if (!DBUtility.ClsPub.Security_Log("MES_StationEntrustInBill_Check", 1, false, CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核失败！无权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (HInterID == 0)
			{
			objJsonResult.code = "0";
			@@ -634,6 +674,16 @@
			{
			try
			{
			//审核权限
			if (!DBUtility.ClsPub.Security_Log("MES_StationEntrustInBill_Check", 1, false, CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "反审核失败！无权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (HInterID == 0)
			{
			objJsonResult.code = "0";
			@@ -730,7 +780,7 @@
			{

			//编辑权限
			if (!DBUtility.ClsPub.Security_Log("MES_StationEntrustInBill_Delete", 1, true, HDeleteMan))
			if (!DBUtility.ClsPub.Security_Log_second("MES_StationEntrustInBill_Delete", 1, false, HDeleteMan))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -738,7 +788,7 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			DAL.ClsSc_StationInBill oBill = new DAL.ClsSc_StationInBill();
			DAL.ClsSc_StationEntrustInBill oBill = new DAL.ClsSc_StationEntrustInBill();
			if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
			{
			if (oBill.omodel.HMaker != HDeleteMan && (HDeleteMan != "admin" && HDeleteMan != "Admin"))