~yxj/MES-WEB-API.git

			@@ -98,11 +98,13 @@
			bool bResult;
			if (msg5 == "xz")
			{
			LogService.Write("用户:" + msg4 + ",日期:" + DateTime.Now + ",新增工序流转卡单据:" + oBill.omodel.HBillNo);
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			LogService.Write("用户:" + msg4 + ",日期:" + DateTime.Now + ",修改工序流转卡单据:" + oBill.omodel.HBillNo);
			bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			if (bResult)
			@@ -449,8 +451,17 @@
			oBill.omodel.HQty = HPlanQty;
			}

			for (int j = 0; j < oBill.DetailColl.Count; j++)
			{
			oBill.DetailColl[j].HRelationQty_In = 0;
			oBill.DetailColl[j].HRelationQty_Out = 0;
			oBill.DetailColl[j].HRelationQty_Bad = 0;
			}

			//保存完毕后处理
			bool bResult;

			LogService.Write("用户:" + msg4 + ",日期:" + DateTime.Now + ",新增工序流转卡单据:" + oBill.omodel.HBillNo);

			bResult = oBill.AddBill(ref sReturn);
			if (bResult)
			@@ -571,6 +582,8 @@
			bool bResult=false;
			if (msg5 == "2")
			{
			LogService.Write("用户:" + msg6 + ",日期:" + DateTime.Now + ",新增工序流转卡单据:" + oBill.omodel.HBillNo);

			bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			oBill.DetailColl.Clear();
			@@ -821,6 +834,8 @@

			string[] HBillNo = HInterID.Split(',');

			string HBillNo_S = "";

			foreach (var item in HBillNo)
			{
			Int64 lngBillKey = 0;
			@@ -859,7 +874,7 @@
			{
			if (oSystemParameter.omodel.Sc_ProcessExchangeBill_DeleterAndMakerMustSame == "Y")
			{
			if (oBill.omodel.HMaker != user)
			if (oBill.omodel.HMaker != user && (user != "admin" && user != "Admin"))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -879,6 +894,7 @@
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (oBill.omodel.HChecker != "")
			{
			objJsonResult.code = "0";
			@@ -887,6 +903,7 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			HBillNo_S += oBill.omodel.HBillNo + ",";
			}
			else
			{
			@@ -897,6 +914,10 @@
			return objJsonResult;
			}
			}

			HBillNo_S = HBillNo_S.Substring(0, HBillNo_S.Length - 1);
			LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",删除工序流转卡单据:" + HBillNo_S);

			foreach (var item in HBillNo)
			{
			bool IsDete = oBill.DeleteBill(long.Parse(item), ref DBUtility.ClsPub.sExeReturnInfo);
			@@ -1223,5 +1244,92 @@
			}

			#endregion


			#region 单据变更页面初始化
			[Route("Sc_ProcessExchangeBill/GetProcessExchangeBillMain_Change_init")]
			[HttpGet]
			public object GetProcessExchangeBillMain_Change_init(string HInterID)
			{
			try
			{
			if (string.IsNullOrEmpty(HInterID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！HInterID不能为空";
			objJsonResult.data = null;
			return objJsonResult;
			}
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

			ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillQuery where hmainid = " + HInterID + " ", "h_v_Sc_ProcessExchangeBillQuery");

			if (ds==null\|\|ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！不存在工序流转卡";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			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

			#region 单据变更保存
			[Route("Sc_ProcessExchangeBill/GetProcessExchangeBillMain_Change_save")]
			[HttpGet]
			public object GetProcessExchangeBillMain_Change_save(string HInterID,string HMaterModel2)
			{
			try
			{
			if (string.IsNullOrEmpty(HInterID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！HInterID不能为空";
			objJsonResult.data = null;
			return objJsonResult;
			}
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

			oCN.BeginTran();
			oCN.RunProc("update Sc_ProcessExchangeBillMain set HMaterModel2 = '" + HMaterModel2 + "' where HInterID = " + HInterID + "");
			oCN.Commit();

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

			}
			}