~yxj/MES-WEB-API.git

			@@ -120,7 +120,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "未查询到流转卡信息！";
			objJsonResult.Message = "未查询到流水号信息！工序号错误或者当前工序号不允许进站，请添加！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -138,6 +138,76 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 根据登录用户获取工序
			[Route("Sc_StationInBill/autoGetProcNo")]
			[HttpGet]
			public object autoGetProcNo(string HUserName,string HInterID)
			{
			string sReturn = "";
			if (oSystemParameter.ShowBill(ref sReturn) == true)
			{
			//系统参数是否为自动匹配流水号,N为手动输入，Y为自动匹配
			if (oSystemParameter.omodel.MES_StationBill_ProcNo == "Y")
			{
			try
			{
			if (HUserName == null \|\| HUserName.Equals(""))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "用户名不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//得到信息
			ds = oCN.RunProcReturn("select * from h_v_Sc_StationBill_autoGetProcNo where HInterID = '" + HInterID + "' and 用户名称 ='" + HUserName + "'", "h_v_Sc_StationBill_autoGetProcNo");
			//写入信息
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "未查询到工序信息！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			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;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "手动输入模式";
			objJsonResult.data = "";
			return objJsonResult;
			}

			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "系统参数异常";
			objJsonResult.data = "";
			return objJsonResult;
			}


			}
			#endregion

			@@ -212,7 +282,8 @@
			return objJsonResult;
			}

			List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg2);
			List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg2);
			DBUtility.ClsPub.CurUserName = user;
			long HMainInterID = 0;
			HMainInterID = list[0].HMainInterID;
			string eventType = list[0].eventType;
			@@ -375,6 +446,7 @@
			",HTaxRate=" + HTaxRate +
			",HMaterID=" + HMaterID +
			",HProcID=" + HProcID +
			",HEmpID=" + HEmpID +
			",HProcNo=" + HProcNo +
			",HOrderProcNO='" + HOrderProcNO + "'" +
			" where HInterID=" + HInterID);
			@@ -433,7 +505,7 @@
			}
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "新增单据成功！";
			objJsonResult.Message = "操作单据成功！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}