~yxj/MES-WEB-API.git

			@@ -7,6 +7,7 @@
			using System.Collections.Generic;
			using System.Data;
			using System.Data.SqlClient;
			using System.Diagnostics;
			using System.IO;
			using System.Web;
			using System.Web.Http;
			@@ -20,7 +21,7 @@
			{
			public DBUtility.ClsPub.Enum_BillStatus BillStatus;
			Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

			public DAL.ClsSc_ICMOBill BillOld = new DAL.ClsSc_ICMOBill();
			private json objJsonResult = new json();
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			DataSet ds;
			@@ -52,6 +53,8 @@
			return objJsonResult;
			}

			Stopwatch sw = new Stopwatch();
			sw.Start();//开始计时

			List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg2);
			long HMainInterID = 0;
			@@ -121,6 +124,9 @@
			long HQCCheckID = list[0].HQCCheckID;//检验员ID
			long HPRDOrgID = list[0].HPRDOrgID;//组织ID
			double HmaterOutqty = list[0].HmaterOutqty;//白坯发布

			LogService.Write($"1.字段赋值，用时" + sw.Elapsed );

			//单据完整性判断
			if (HProcExchInterID <= 0)
			{
			@@ -292,7 +298,11 @@
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			LogService.Write($"2.条件判断，用时" + sw.Elapsed);

			var num = 0;
			LogService.Write($"3.事务开始，用时" + sw.Elapsed);

			//若MAINDI重复则重新获取
			oCN.BeginTran();
			@@ -308,6 +318,7 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			LogService.Write($"3.1，用时" + sw.Elapsed);
			oCN.RunProc("Insert Into Sc_StationOutBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate,HMouldNum" +
			",HYear,HPeriod,HRemark,HSourceName,HPieceQty,HWasterQty,HPlanPieceQty,HBadPNL" +
			@@ -327,8 +338,9 @@
			"," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HBadCount + "," + HCenterID + "," + HProcNo + ",'" + HOrderProcNO + "'" + ",'" + HSourceNameList + "'" +
			"," + HMainSourceInterID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + Convert.ToString(HLastSubProc ? 1 : 0) +
			"," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID + "," + HMainInterID + "," + HPRDOrgID +
			","+ HmaterOutqty + ") ");
			","+ HmaterOutqty + ") ");

			LogService.Write($"4.新增结束，用时" + sw.Elapsed);
			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);
			}
			@@ -378,6 +390,7 @@
			}
			//主表

			LogService.Write($"5.系统控制查询判断，用时" + sw.Elapsed);
			ds = oCN.RunProcReturn("exec h_p_MES_StationOutBill_QtyCtrl " + HInterID + "", "h_p_MES_StationOutBill_QtyCtrl");
			if (ds == null)
			{
			@@ -388,6 +401,7 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			LogService.Write($"5.1，用时" + sw.Elapsed);
			if (ds.Tables[0].Rows.Count == 0)
			{
			oCN.RollBack();
			@@ -397,6 +411,7 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			LogService.Write($"5.2，用时" + sw.Elapsed);
			if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
			{
			oCN.RollBack();
			@@ -406,9 +421,13 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			LogService.Write($"6.判断结束，用时" + sw.Elapsed);
			oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + HInterID + ","+ num + "");
			LogService.Write($"6.1，用时" + sw.Elapsed);
			oCN.RunProc("exec h_p_Mes_ProcessExchangeChangeStatus " + HInterID + " ");
			LogService.Write($"6.2，用时" + sw.Elapsed);
			oCN.RunProc("exec h_p_Mes_StationOutBillBackBarCode " + HInterID + " ");
			LogService.Write($"7.存储过程结束，用时" + sw.Elapsed);
			//判断是否是末道工序
			ds1 = oCN.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a " +
			" inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID " +
			@@ -426,8 +445,10 @@
			//判断末道生产汇报汇报是否勾选
			if (oSystemParameter.omodel.MES_StationOutBill_LastAutoICMOReport == "Y") //系统参数
			{
			LogService.Write($"7.1，用时" + sw.Elapsed);
			//同步生产汇报单
			objJsonResult= (json)SaveICMOReportBill(HInterID.ToString(), user, HBillNo, HPRDOrgID.ToString());
			objJsonResult = (json)SaveICMOReportBill(HInterID.ToString(), user, HBillNo, HPRDOrgID.ToString());
			LogService.Write($"7.2，用时" + sw.Elapsed);
			if (objJsonResult.count == 0)
			{
			oCN.RollBack();
			@@ -437,12 +458,15 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			LogService.Write($"8.生产汇报结束，用时" + sw.Elapsed);
			}
			//判断末道生产入库是否勾选
			else if (oSystemParameter.omodel.MES_StationOutBill_AutoStockIn == "Y") //系统参数
			{
			LogService.Write($"8.1，用时" + sw.Elapsed);
			//同步生产入库单
			objJsonResult=(json)SaveProcdutInBill(HBillNo);
			objJsonResult =(json)SaveProcdutInBill(HBillNo);
			LogService.Write($"8.2，用时" + sw.Elapsed);
			if (objJsonResult.count == 0)
			{
			oCN.RollBack();
			@@ -452,14 +476,15 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			LogService.Write($"9.生产入库结束，用时" + sw.Elapsed);
			}

			}
			}
			}




			LogService.Write($"10.事务结束，用时" + sw.Elapsed);
			oCN.Commit();
			string sReturn = "";
			if (oSystemParameter.ShowBill(ref sReturn) == true)
			@@ -473,6 +498,8 @@
			objJsonResult.Verify = "N";
			}
			}
			sw.Stop();//结束计时
			LogService.Write($"11.参数查询结束,新增结束，用时" + sw.Elapsed);
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "新增单据成功！";
			@@ -2416,6 +2443,115 @@
			}
			}


			#region 工序出站关闭/反关闭功能
			[Route("Cj_StationOutBill/CloseCj_StationOutBill")]
			[HttpGet]
			public object CloseCj_StationOutBill(string HInterID, int Type, string user)
			{
			try
			{
			//判断是否有删除权限
			if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_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_StationOutBillMain";
			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



			//是否被关联
			public bool Cj_StationInBillisUse(Int64 lngBillKey, ref string sReturn)
			{