~yxj/MES-WEB-API.git

			@@ -1,4 +1,5 @@
			using Newtonsoft.Json.Linq;
			using Newtonsoft.Json;
			using Newtonsoft.Json.Linq;
			using Pub_Class;
			using System;
			using System.Collections;
			@@ -6,6 +7,7 @@
			using System.Data;
			using System.Data.SqlClient;
			using System.Web.Http;
			using System.Windows.Forms;
			using WebAPI.Models;
			using WebAPI.Service;

			@@ -20,6 +22,36 @@
			DataSet ds;



			////检测当前选中行的项目状态
			//[Route("Gy_Material/CheckUseStatus")]
			//[HttpGet]
			//public void Sub_CheckUseStatus(int grd, int IDCol, string sProcName)
			//{
			// SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			// Int64 sItemID;
			// try
			// {
			// //循环当前网格选中项目
			// for (int i = 0; i < grd.SelectedRows.Count; i++)
			// {
			// //得到内码
			// sItemID = DBUtility.ClsPub.isLong(grd.Rows[grd.SelectedRows[i].Index].Cells[IDCol].Value);
			// //调用储存过程 h_p_Gy_CheckUseDept
			// oCn.RunProc("exec " + sProcName + " " + sItemID.ToString(), ref ClsPub.sExeReturnInfo);
			// }
			// }
			// catch (Exception e)
			// {
			// MessageBox.Show("检测错误！原因：" + ClsPub.sExeReturnInfo);
			// //objJsonResult.code = "0";
			// //objJsonResult.count = 0;
			// //objJsonResult.Message = "检测错误！原因：" + ClsPub.sExeReturnInfo;
			// //objJsonResult.data = null;
			// //return objJsonResult;
			// }
			//}

			/// <summary>
			/// 返回物料列表
			///参数：string sql。
			@@ -31,6 +63,7 @@
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_Material", 1, false, user))
			{
			@@ -51,9 +84,18 @@
			ds = oCN.RunProcReturn(sql, "h_v_Gy_MaterialList");
			}

			//添加列名
			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;
			}
			@@ -93,6 +135,7 @@
			string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg1 = sArray[0].ToString();
			string msg2 = sArray[1].ToString();
			string msg_HUSEORGID = sArray[2].ToString();
			Int64 HItemID = 0;
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

			@@ -242,7 +285,7 @@
			objJsonResult.data = 1;
			return objJsonResult;
			}

			oItem.HUSEORGID = Convert.ToInt32(msg_HUSEORGID); //组织id
			oItem.HShortNumber = sShortNumber;//短代码
			oItem.HEndFlag = true;//末级标志
			oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级
			@@ -342,7 +385,7 @@
			return objJsonResult;
			}

			oCN.RunProc("update Gy_Material set HStopflag=1 where HItemID=" + HItemID);
			oCN.RunProc("delete from Gy_Material where HItemID=" + HItemID);
			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -561,27 +604,21 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			DataSet Ds, Ds2;
			DataSet Ds;
			Ds = oCN.RunProcReturn("Select * from h_v_IF_BarCodeBillList Where HItemID=" + lngBillKey.ToString(), "h_v_IF_BarCodeBillList");
			if (Ds.Tables[0].Rows.Count != 0)
			{
			oCN.BeginTran();
			Ds2 = oCN.RunProcReturn("Delete from Gy_BarCodeBill Where HItemID=" + lngBillKey.ToString(), "Gy_BarCodeBill");
			if (Ds2.Tables[0].Rows.Count != 0)
			{
			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除成功";
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败";
			oCN.BeginTran();
			oCN.RunProc("Delete from Gy_BarCodeBill Where HItemID=" + lngBillKey.ToString());

			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除成功";
			objJsonResult.data = null;
			return objJsonResult;


			}
			else
			{
			@@ -594,6 +631,7 @@
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = e.Message;
			@@ -803,6 +841,7 @@
			int HYear = DBUtility.ClsPub.isInt(DateTime.Now.Year);
			double HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
			string HMouldNo = mainList[0].HMouldNo;
			string HBarCode = mainList[0].HBarCode;
			string HName = mainList[0].HName;
			string HModel = mainList[0].HModel;
			string HModel2 = mainList[0].HModel2;
			@@ -883,16 +922,17 @@
			",HSPGroupID=" + HSPGroupID.ToString() +
			",HSPID=" + HSPID.ToString() +
			",HDesignLife=" + HDesignLife.ToString() +
			",HCaveQty="+ HCaveQty.ToString()+
			",HCaveQty=" + HCaveQty.ToString() +
			",HUseLife=" + HUseLife.ToString() +
			",HLeaveLife=" + HLeaveLife.ToString() +
			",HProdQty=" + HProdQty.ToString() +
			",HMouldDotCheckRuleInterID="+ HMouldDotCheckRuleInterID.ToString()+
			",HMouldDotCheckRuleInterID=" + HMouldDotCheckRuleInterID.ToString() +
			",HMouldMaintainRuleInterID=" + HMouldMaintainRuleInterID.ToString() +
			",HMouldOWNER='" + HMouldOWNER + "'" +
			",HNowSupID="+HNowSupID.ToString()+
			",HNowSupTypeID="+HNowSupTypeID.ToString()+
			",HNowSupID=" + HNowSupID.ToString() +
			",HNowSupTypeID=" + HNowSupTypeID.ToString() +
			",HProdWeight=" + HProdWeight.ToString() +
			",HBarCode="+ HBarCode.ToString()+
			" where HInterID=" + HInterID.ToString());

			//修改子项目代码
			@@ -1215,7 +1255,7 @@
			DataSet ds = new DataSet();
			ds = oCN.RunProcReturn("select * from Gy_MouldFileMain where HInterID=" + HInterID, "Gy_MouldFileMain");
			DataRow dr = ds.Tables[0].Rows[0];
			string Num = dr["HBillNo"].ToString();
			string Num = dr["HBarCode"].ToString();
			string Num1 = Num.Substring(0,(Num.Length)-5);
			oCN.BeginTran();
			for (int i = StarNum1; i <= EndNum1; i++)
			@@ -1244,6 +1284,7 @@
			if (ds1.Tables[0].Rows.Count == 0 \|\| ds1 == null)
			{
			long HItemID = DBUtility.ClsPub.CreateBillID("3899", ref DBUtility.ClsPub.sExeReturnInfo);
			//string HBillNo = DBUtility.ClsPub.CreateBillCode("3899", ref DBUtility.ClsPub.sExeReturnInfo, true);
			string sql = string.Format(@"Insert Into Gy_MouldFileMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
			",HYear,HPeriod,HRemark,HMaker,HMakeDate,HBarCode" +