MES-WEB-API.git

			@@ -68,6 +68,46 @@
			}
			#endregion

			#region 工序返工申请单列表_编辑页面初始化
			[Route("Sc_ProcExchWorkBackBill/Sc_ProcExchWorkBackBillList_Edit")]
			[HttpGet]
			public object Sc_ProcExchWorkBackBillList_Edit(string sWhere, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();

			string sql1 = "select * from h_v_Sc_ProcExchWorkBackBillList where 1 = 1 ";
			string sql = sql1 + sWhere + " order by hmainid desc";
			ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcExchWorkBackBillList");

			//添加列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}


			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.list = columnNameList;
			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_ProcExchWorkBackBill/GetProcessExchangeBillSub")]
			[HttpGet]
			@@ -373,7 +413,7 @@


			//审核
			if (Cj_StationInBillCheckBill(HInterID, int.Parse(Ds.Tables[0].Rows[0]["HProcExchInterID"].ToString()), CurUserName, ref DBUtility.ClsPub.sExeReturnInfo))
			if (Cj_StationInBillCheckBill(HInterID, int.Parse(Ds.Tables[0].Rows[0]["HProcExchInterID"].ToString()), CurUserName, Ds.Tables[0].Rows[0]["HBillOperationType"].ToString(), ref DBUtility.ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -411,37 +451,81 @@
			}

			//审核
			public bool Cj_StationInBillCheckBill(Int64 HInterID, int HProcExchInterID, string CurUserName, ref string sReturn)
			public bool Cj_StationInBillCheckBill(Int64 HInterID, int HProcExchInterID, string CurUserName,string HBillOperationType, ref string sReturn)
			{
			try
			{
			oCN.BeginTran();
			oCN.RunProc(" Update Sc_ProcExchWorkBackBillMain set HChecker='" + CurUserName + "',HBillStatus=2,HCheckDate=getdate() Where HInterID=" + HInterID.ToString());
			//回填工序流转卡
			oCN.RunProc("exec h_p_ProcExchWorkBackBill_Check_In " + HInterID.ToString());
			oCN.RunProc("exec h_p_Sc_ProcessExchangeBill_SetRemark " + HProcExchInterID.ToString()); //设置备注为工艺流
			oCN.RunProc("exec h_p_Sc_ProcessExchangeBill_SetUpdate " + HProcExchInterID.ToString()); //设置末道首道转等信息器具清单工艺参数清单；
			DataSet ds = new DataSet();
			//设置条码号回填领料批次
			ds = oCN.RunProcReturn("exec h_p_Mes_ProcessExchangeBackBarCode " + HProcExchInterID.ToString(), "h_p_Mes_ProcessExchangeBackBarCode");
			if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) != 0)
			if (HBillOperationType == "1")
			{
			sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]).ToString();
			oCN.RollBack();
			return false;
			}
			//回填工序流转卡
			oCN.RunProc("exec h_p_ProcExchWorkBackBill_Check_In " + HInterID.ToString());
			oCN.RunProc("exec h_p_Sc_ProcessExchangeBill_SetRemark " + HProcExchInterID.ToString()); //设置备注为工艺流
			oCN.RunProc("exec h_p_Sc_ProcessExchangeBill_SetUpdate " + HProcExchInterID.ToString()); //设置末道首道转等信息器具清单工艺参数清单；
			DataSet ds = new DataSet();
			//设置条码号回填领料批次
			ds = oCN.RunProcReturn("exec h_p_Mes_ProcessExchangeBackBarCode " + HProcExchInterID.ToString(), "h_p_Mes_ProcessExchangeBackBarCode");
			if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) != 0)
			{
			sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]).ToString();
			oCN.RollBack();
			return false;
			}

			//控制关联数量
			ds = null;
			ds = oCN.RunProcReturn("exec h_p_Sc_ProcessExchangeBill_Checkqty " + HProcExchInterID.ToString(), "h_p_Sc_ProcessExchangeBill_Checkqty");
			if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) != 0)
			//控制关联数量
			ds = null;
			ds = oCN.RunProcReturn("exec h_p_Sc_ProcessExchangeBill_Checkqty " + HProcExchInterID.ToString(), "h_p_Sc_ProcessExchangeBill_Checkqty");
			if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) != 0)
			{
			sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]).ToString();
			oCN.RollBack();
			return false;
			}
			oCN.Commit();
			return true;
			}
			else if(HBillOperationType == "2")
			{
			sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]).ToString();
			//回填工序流转卡
			DataSet ds0 = oCN.RunProcReturn("exec h_p_ProcExchWorkBackBill_Check_In_Delete " + HInterID.ToString(), "h_p_ProcExchWorkBackBill_Check_In_Delete");
			if (ds0.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			sReturn = ds0.Tables[0].Rows[0]["HBackRemark"].ToString();
			oCN.RollBack();
			return false;
			}

			oCN.RunProc("exec h_p_Sc_ProcessExchangeBill_SetRemark " + HProcExchInterID.ToString()); //设置备注为工艺流
			oCN.RunProc("exec h_p_Sc_ProcessExchangeBill_SetUpdate " + HProcExchInterID.ToString()); //设置末道首道转等信息器具清单工艺参数清单；
			DataSet ds = new DataSet();
			//设置条码号回填领料批次
			ds = oCN.RunProcReturn("exec h_p_Mes_ProcessExchangeBackBarCode " + HProcExchInterID.ToString(), "h_p_Mes_ProcessExchangeBackBarCode");
			if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) != 0)
			{
			sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]).ToString();
			oCN.RollBack();
			return false;
			}

			//控制关联数量
			ds = null;
			ds = oCN.RunProcReturn("exec h_p_Sc_ProcessExchangeBill_Checkqty " + HProcExchInterID.ToString(), "h_p_Sc_ProcessExchangeBill_Checkqty");
			if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) != 0)
			{
			sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]).ToString();
			oCN.RollBack();
			return false;
			}
			oCN.Commit();
			return true;
			}
			else
			{
			sReturn = "未设置可识别的操作类型!";
			oCN.RollBack();
			return false;
			}
			oCN.Commit();
			return true;
			}
			catch (Exception e)
			{