~yxj/MES-WEB-API.git

			@@ -143,7 +143,7 @@
			string HBillNo = mainList[0].HBillNo;//递入type得到的单据号
			DateTime HDate = mainList[0].HDate;//日期
			int HYear = DateTime.Now.Year;
			double HPeriod = 1;
			double HPeriod = DateTime.Now.Month;
			string HRemark = mainList[0].HRemark;//备注
			string HMaker = mainList[0].HMaker;//制单人
			long HMaterID = mainList[0].HMaterID;//产品ID
			@@ -218,7 +218,7 @@
			",HProductNum='" + HProductNum + "',HVerNum='" + HVerNum + "' where HInterID='" + HInterID + "'");

			//删除子表
			oCN.RunProc("delete from Gy_RoutingBillSub where HInterID='" + HInterID + "' and HProcNo!='9999'");
			oCN.RunProc("delete from Gy_RoutingBillSub where HInterID='" + HInterID + "'");
			}
			//保存子表
			objJsonResult = AddBillSub(msg3, HInterID, OperationType);
			@@ -231,24 +231,46 @@
			return objJsonResult;
			}

			//string sErrMsg = "";
			//if (oSystemParameter.ShowBill(ref sErrMsg))
			//{
			// if (oSystemParameter.omodel.WMS_CampanyName == "瑞与祺")
			// {
			// if (oSystemParameter.omodel.Gy_RoutingBill_SaveAutoLastProc == "Y" && OperationType == 1)
			// {
			// //设置转工序
			// oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID);
			// }
			// }
			//}

			if (IsProNo == 1 && OperationType == 1)
			string sErrMsg = "";
			if (oSystemParameter.ShowBill(ref sErrMsg))
			{
			//设置转工序
			oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID);
			if (oSystemParameter.omodel.WMS_CampanyName == "瑞与祺")
			{
			if (oSystemParameter.omodel.Gy_RoutingBill_SaveAutoLastProc == "Y" && OperationType == 1)
			{
			ds = oCN.RunProcReturn("select * from Gy_Process Where HTProcessFlag = 1 and HNumber='9999' ", "Gy_Process");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "未设置转工序!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//设置转工序
			oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID);
			}
			}
			else if (IsProNo == 1 && OperationType == 1)
			{
			ds = oCN.RunProcReturn("select * from Gy_Process Where HTProcessFlag = 1 and HNumber='9999' ", "Gy_Process");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "未设置转工序!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//设置转工序
			oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID);
			}
			}


			//是否勾选默认工艺路线
			if (HStandard)
			@@ -315,34 +337,31 @@
			return objJsonResult;
			}

			if (oSub.HProcNo != "9999" \|\| OperationType == 2)
			{
			oCN.RunProc("Insert into Gy_RoutingBillSub " +
			"(HInterID,HEntryID,HProcID,HProcNO,HSupID,HSupFlag" +
			",HWorkQty,HCenterID,HTimeUnit,HUnitTime" +
			",HReadyTime,HQueueTime,HMoveTime" +
			",HCloseMan,HCloseType,HRemark,HProcType,HNextProcFlag,HFlowProc" +
			",HFixPrice,HProcPrice,HBadPrice,HWasterPrice,HStdFlag,HBeginDayQty,HBeginFixQty" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HAutoTrunFlag" +
			",HFixWorkDays,HTrunWorkDays,HReadyTimes,HICMOReadyTimes,HSubStdEmpQty,HSubCanUseSourceQty" +
			",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
			",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
			",HTechnologyParameter,HPicNum,HProcCheckNote" +
			",HOverRate,HProcWorkNum,HBadWHID,HWasterWHID, HWHID " +
			") values("
			+ HInterID + "," + i + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNo + "'," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
			"," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
			"," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() +
			",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HProcType + "'," + Convert.ToString(oSub.HNextProcFlag ? 1 : 0) + "," + Convert.ToString(oSub.HFlowProc ? 1 : 0) +
			"," + oSub.HFixPrice.ToString() + "," + oSub.HProcPrice.ToString() + "," + oSub.HBadPrice.ToString() + "," + oSub.HWasterPrice.ToString() + "," + Convert.ToString(oSub.HStdFlag ? 1 : 0) + "," + oSub.HBeginDayQty.ToString() + "," + oSub.HBeginFixQty.ToString() +
			"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + Convert.ToString(oSub.HAutoTrunFlag ? 1 : 0) +
			"," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() + "," + oSub.HICMOReadyTimes.ToString() + "," + oSub.HSubStdEmpQty.ToString() + "," + oSub.HSubCanUseSourceQty.ToString() +
			"," + oSub.HProcID_S.ToString() + "," + oSub.HCenterID_S.ToString() + "," + oSub.HWorkQty_S.ToString() + ", " + oSub.HSubStdEmpQty_S.ToString() + ",'" + oSub.HMouldNo + "'," + oSub.HChangeMould.ToString() +
			",'" + oSub.HPackStd + "','" + oSub.HPack + "','" + oSub.HPutArea + "'," + oSub.HMyWorkDays.ToString() + "," + oSub.HMyFixWorkDays.ToString() + "," + oSub.HPassRate.ToString() +
			",'" + oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
			"', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'," + oSub.HBadWHID.ToString()+"," + oSub.HWasterWHID.ToString()+"," + oSub.HWHID.ToString() +
			") ");
			}
			oCN.RunProc("Insert into Gy_RoutingBillSub " +
			"(HInterID,HEntryID,HProcID,HProcNO,HSupID,HSupFlag" +
			",HWorkQty,HCenterID,HTimeUnit,HUnitTime" +
			",HReadyTime,HQueueTime,HMoveTime" +
			",HCloseMan,HCloseType,HRemark,HProcType,HNextProcFlag,HFlowProc" +
			",HFixPrice,HProcPrice,HBadPrice,HWasterPrice,HStdFlag,HBeginDayQty,HBeginFixQty" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HAutoTrunFlag" +
			",HFixWorkDays,HTrunWorkDays,HReadyTimes,HICMOReadyTimes,HSubStdEmpQty,HSubCanUseSourceQty" +
			",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
			",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
			",HTechnologyParameter,HPicNum,HProcCheckNote" +
			",HOverRate,HProcWorkNum,HBadWHID,HWasterWHID, HWHID " +
			") values("
			+ HInterID + "," + i + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNo + "'," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
			"," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
			"," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() +
			",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HProcType + "'," + Convert.ToString(oSub.HNextProcFlag ? 1 : 0) + "," + Convert.ToString(oSub.HFlowProc ? 1 : 0) +
			"," + oSub.HFixPrice.ToString() + "," + oSub.HProcPrice.ToString() + "," + oSub.HBadPrice.ToString() + "," + oSub.HWasterPrice.ToString() + "," + Convert.ToString(oSub.HStdFlag ? 1 : 0) + "," + oSub.HBeginDayQty.ToString() + "," + oSub.HBeginFixQty.ToString() +
			"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + Convert.ToString(oSub.HAutoTrunFlag ? 1 : 0) +
			"," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() + "," + oSub.HICMOReadyTimes.ToString() + "," + oSub.HSubStdEmpQty.ToString() + "," + oSub.HSubCanUseSourceQty.ToString() +
			"," + oSub.HProcID_S.ToString() + "," + oSub.HCenterID_S.ToString() + "," + oSub.HWorkQty_S.ToString() + ", " + oSub.HSubStdEmpQty_S.ToString() + ",'" + oSub.HMouldNo + "'," + oSub.HChangeMould.ToString() +
			",'" + oSub.HPackStd + "','" + oSub.HPack + "','" + oSub.HPutArea + "'," + oSub.HMyWorkDays.ToString() + "," + oSub.HMyFixWorkDays.ToString() + "," + oSub.HPassRate.ToString() +
			",'" + oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
			"', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'," + oSub.HBadWHID.ToString() + "," + oSub.HWasterWHID.ToString() + "," + oSub.HWHID.ToString() +
			") ");
			}

			objJsonResult.code = "1";
			@@ -350,6 +369,39 @@
			objJsonResult.Message = null;
			objJsonResult.data = null;
			return objJsonResult;
			}

			#endregion

			#region 工艺路线列表查询系统参数
			/// <summary>
			/// 返回工艺路线列表
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("LEMS/MES_XT_List")]
			[HttpGet]
			public object MES_XT_List(string sWhere)
			{
			try
			{
			string sErrMsg = "";
			oSystemParameter.ShowBill(ref sErrMsg);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.data = oSystemParameter.omodel;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion
			@@ -846,5 +898,305 @@
			}
			}
			#endregion

			#region 工艺路线审核、反审核
			/// <summary>
			///
			/// </summary>
			/// <param name="HInterID">单据ID</param>
			/// <param name="IsAudit">审核(0),反审核(1)</param>
			/// <param name="CurUserName">审核人</param>
			/// <returns></returns>
			[Route("Gy_RoutingBill/AuditGy_RoutingBill")]
			[HttpGet]
			public object AuditGy_RoutingBill(string HInterID, int IsAudit, string CurUserName)
			{
			try
			{
			//审核权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_RoutingBill_Check", 1, false, CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核失败！无权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			var ds = oCN.RunProcReturn("select * from Gy_RoutingBillMain where HInterID=" + HInterID, "Gy_RoutingBillMain");
			if (ds.Tables[0].Rows.Count > 0)
			{
			if (IsAudit == 0) //审核判断
			{
			if (ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已审核!不能再次审核！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			if (IsAudit == 1) //反审核判断
			{
			if (ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据未审核!不需要反审核!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据不存在!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCN.BeginTran();

			if (IsAudit == 0) //审核判断
			{
			oCN.RunProc("update Gy_RoutingBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate() where HInterID=" + HInterID);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "审核成功";
			objJsonResult.data = null;
			}
			if (IsAudit == 1) //反审核判断
			{
			oCN.RunProc("update Gy_RoutingBillMain set HChecker='',HCheckDate=null where HInterID=" + HInterID);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "反审核成功";
			objJsonResult.data = null;
			}
			oCN.Commit();

			return objJsonResult;
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核失败或者反审核失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 工艺路线关闭、反关闭
			/// <summary>
			///
			/// </summary>
			/// <param name="HInterID">单据ID</param>
			/// <param name="IsAudit">审核(0),反审核(1)</param>
			/// <param name="CurUserName">审核人</param>
			/// <returns></returns>
			[Route("Gy_RoutingBill/CloseGy_RoutingBill")]
			[HttpGet]
			public object CloseGy_RoutingBill(string HInterID, int IsAudit, string CurUserName)
			{
			try
			{
			//审核权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_RoutingBill_Close", 1, false, CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核失败！无权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			var ds = oCN.RunProcReturn("select * from Gy_RoutingBillMain where HInterID=" + HInterID, "Gy_RoutingBillMain");
			if (ds.Tables[0].Rows.Count > 0)
			{
			if (IsAudit == 0) //关闭判断
			{
			if (ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已关闭!不能再次关闭！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			if (IsAudit == 1) //反关闭判断
			{
			if (ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据未关闭!不需要反关闭!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据不存在!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCN.BeginTran();

			if (IsAudit == 0) //关闭判断
			{
			oCN.RunProc("update Gy_RoutingBillMain set HCloseMan='" + CurUserName + "',HCloseDate=getdate() where HInterID=" + HInterID);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "关闭成功";
			objJsonResult.data = null;
			}
			if (IsAudit == 1) //反关闭判断
			{
			oCN.RunProc("update Gy_RoutingBillMain set HCloseMan='',HCloseDate=null where HInterID=" + HInterID);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "反关闭成功";
			objJsonResult.data = null;
			}
			oCN.Commit();

			return objJsonResult;
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "关闭失败或者反关闭失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 工艺路线列表主表
			/// <summary>
			/// 返回工艺路线列表
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Gy_RoutingBill/Gy_RoutingBillQuery")]
			[HttpGet]
			public object Gy_RoutingBillQuery(string sWhere, string user)
			{
			DataSet ds;
			try
			{
			//判断是否有查询权限
			//if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Query", 1, false, user))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "无权限查询!";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql1 = "select top 1000 * from h_v_Gy_RoutingBillQuery where 1 = 1 ";
			string sql = sql1 + sWhere + " order by hmainid desc";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillQuery");
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			return GetObjectJson(ds);
			}

			#endregion

			#region 工艺路线列表子表
			/// <summary>
			/// 返回工艺路线列表
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Gy_RoutingBill/Gy_RoutingBillQuerySub")]
			[HttpGet]
			public object Gy_RoutingBillQuerySub(string sWhere)
			{
			DataSet ds;
			try
			{

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql1 = "select top 1000 * from h_v_Gy_RoutingBillQuerySub where 1 = 1 and hmainid=" + sWhere;
			string sql = sql1 + " order by hmainid desc,cast(工序号 as int)";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillQuerySub");
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			return GetObjectJson(ds);
			}

			#endregion

			///<summary>
			///封装状态码及返回信息的公用方法。
			///参数：DataSet。
			///返回值：json。
			///</summary>
			public object GetObjectJson(DataSet ds)
			{
			try
			{
			List<object> columnNameList = new List<object>();

			//添加列名
			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 = "没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			}
			}