~yxj/MES-WEB-API.git

			@@ -1,11 +1,14 @@
			using Newtonsoft.Json.Linq;
			using Newtonsoft.Json;
			using Newtonsoft.Json.Linq;
			using Pub_Class;
			using RestSharp;
			using System;
			using System.Collections;
			using System.Collections.Generic;
			using System.Data;
			using System.Data.SqlClient;
			using System.Web.Http;
			using System.Windows.Forms;
			using WebAPI.Models;
			using WebAPI.Service;

			@@ -20,6 +23,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。
			@@ -27,36 +60,45 @@
			/// </summary>
			[Route("Gy_Material/list")]
			[HttpGet]
			public object list(string sWhere)
			public object list(string sWhere, string user, string Organization)
			{
			try
			{
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_Gy_MaterialList " + sWhere, "h_v_Gy_MaterialList");
			}
			else
			{
			string sql1 = "select * from h_v_Gy_MaterialList where 1 = 1 ";
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "h_v_Gy_MaterialList");
			}
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			List<object> columnNameList = new List<object>();
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_Material", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "false！";
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			string sql1 = string.Format(@"select * from h_v_Gy_MaterialList where 组织名称='" + Organization + "'");
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn(sql1 + sWhere + " order by 物料代码 ", "h_v_Gy_MaterialList");
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			string sql = sql1 + sWhere + " order by 物料代码 ";
			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;
			}
			catch (Exception e)
			{
			@@ -90,12 +132,24 @@
			{
			DataSet ds;
			var _value = msg["msg"].ToString();
			string msg1 = _value.ToString();
			//string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			//string msg2 = sArray[0].ToString();
			//string msg3 = sArray[1].ToString();
			string msg3 = _value.ToString();
			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();

			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_Material_Edit", 1, false, msg2))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//获取最大ID值赋值
			DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_Material ", "Gy_Material");
			if (Maxds != null \|\| Maxds.Tables[0].Rows.Count > 0)
			@@ -106,6 +160,7 @@
			HItemID = maxid;
			}
			ListModels oListModels = new ListModels();

			try
			{
			DLL.ClsGy_Material_Ctl oBill = new DLL.ClsGy_Material_Ctl();
			@@ -139,32 +194,22 @@
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim()))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim()))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "保存失败！代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			// objJsonResult.data = 1;
			// return objJsonResult;
			//}
			//查询数据中是否存在重复代码
			ds = oCN.RunProcReturn("select * from Gy_Material where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_Material");
			if (oItem.HNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//新增时判断
			#region 父级校验方法（api调用先注释掉，）
			/*
			if (oItem.HItemID == 0)
			{
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{

			}
			else
			if (ds == null \|\| ds.Tables[0].Rows.Count > 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -220,6 +265,8 @@
			}
			}
			}
			*/
			#endregion
			//得到短代码
			string sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
			@@ -231,19 +278,18 @@
			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()); //等级
			oBill.oModel = oItem;
			}

			//保存
			//保存完毕后处理
			bool bResult;
			if (oBill.oModel.HItemID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			//bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddNew();
			}
			else
			@@ -252,7 +298,7 @@
			}
			if (bResult)
			{
			objJsonResult.code = "0";
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			@@ -278,7 +324,52 @@
			}
			}


			[Route("Gy_Material/SaveGy_MaterialListApi")]
			[HttpPost]
			public object SaveGy_MaterialListApi([FromBody] JObject msg)
			{
			var _value = msg["model"].ToString();
			string msg3 = _value.ToString();
			string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg1 = sArray[0].ToString();
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			ListModels oListModels = new ListModels();
			try
			{
			DLL.ClsGy_Material_Ctl oBill = new DLL.ClsGy_Material_Ctl();
			List<Models.ClsGy_Material_Model> lsmain = new List<Models.ClsGy_Material_Model>();
			msg1 = msg1.Replace("\\", "");
			msg1 = msg1.Replace("\n", ""); //\n
			lsmain = oListModels.getObjectByJson_Gy_Material(msg1);
			oBill.oModel = lsmain[0];
			//保存
			bool bResult = oBill.AddNewApi();
			if (bResult)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + e.ToString();
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}

			/// <summary>
			/// 物料设置删除功能
			@@ -286,23 +377,30 @@
			/// <returns></returns>
			[Route("Gy_Material/Delete")]
			[HttpGet]
			public object DeltetGy_Material(string HItemID)
			public object DeltetGy_Material(string HItemID, string user)
			{
			DataSet ds;
			//string ModRightNameCheck = "Sc_ProcessReport_check";
			try
			{
			//删除权限
			//if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "审核失败！无权限！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (user == "10000")//api同步方式
			{
			oCN.RunProc("delete from Gy_Material where HERPItemID=" + HItemID);
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "* 数据删除成功！";
			objJsonResult.data = null;
			return objJsonResult; ;
			}
			//删除权限
			if (!DBUtility.ClsPub.Security_Log("Gy_Material_Delete", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (string.IsNullOrWhiteSpace(HItemID))
			{
			objJsonResult.code = "0";
			@@ -332,7 +430,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;
			@@ -359,11 +457,11 @@
			/// </summary>
			[Route("Gy_Mould/list1")]
			[HttpGet]
			public object list1(string sWhere,string ModRightNameSelect, string user)
			public object list1(string sWhere, string ModRightNameSelect, string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, true, user))
			if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -373,7 +471,7 @@
			}
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere+ "order by 日期 desc", "h_v_Gy_MouldFileList");
			ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere + "order by 日期 desc", "h_v_Gy_MouldFileList");
			}
			else
			{
			@@ -381,22 +479,12 @@
			string sql = sql1 + sWhere + "order by 日期 desc";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_MouldFileList");
			}
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "false！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception e)
			{
			@@ -425,7 +513,7 @@
			{
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_Gy_CheckToolsFileMainList " + sWhere+ "order by 日期 desc", "h_v_Gy_CheckToolsFileMainList");
			ds = oCN.RunProcReturn("select * from h_v_Gy_CheckToolsFileMainList " + sWhere + "order by 日期 desc", "h_v_Gy_CheckToolsFileMainList");
			}
			else
			{
			@@ -467,36 +555,47 @@
			/// </summary>
			[Route("Gy_BarCodeBillList/GetBarCodeBillList")]
			[HttpGet]
			public object GetBarCodeBillList(string sWhere)
			public object GetBarCodeBillList(string sWhere, string user)
			{
			try
			{
			//判断是否有查询权限
			if (!DBUtility.ClsPub.Security_Log("Gy_BarCodeBill_Query", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无权限查询!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList " + sWhere+ "order by 日期 desc", "h_v_IF_BarCodeBillList");
			ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList order by hmainid desc", "h_v_IF_BarCodeBillList");
			}
			else
			{
			string sql1 = "select * from h_v_IF_BarCodeBillList where 1 = 1 ";
			string sql = sql1 + sWhere + "order by 日期 desc";
			string sql = sql1 + sWhere + "order by hmainid desc";
			ds = oCN.RunProcReturn(sql, "h_v_IF_BarCodeBillList");
			}
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "false！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}

			//if (ds.Tables[0].Rows.Count != 0 \|\| ds != null)
			//{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			//}
			//else
			//{
			//objJsonResult.code = "0";
			//objJsonResult.count = 0;
			//objJsonResult.Message = "无数据";
			//objJsonResult.data = null;
			//return objJsonResult;
			//}
			}
			catch (Exception e)
			{
			@@ -508,6 +607,74 @@
			}
			}

			#region [返回条码档案删除功能]
			/// <summary>
			/// 返回条码档案删除功能
			/// </summary>
			/// <returns></returns>
			[Route("Gy_MaterialController/DeltetBarCodeBill")]
			[HttpGet]
			public object DeltetBarCodeBill(string HInterID, string user)
			{
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log("Gy_BarCodeBillList_Edit", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			try
			{
			Int64 lngBillKey = 0;
			lngBillKey = DBUtility.ClsPub.isLong(HInterID);
			if (lngBillKey == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据ID为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			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();
			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
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据未找到";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = e.Message;
			objJsonResult.data = null;
			return objJsonResult;
			}

			}
			#endregion


			/// <summary>
			@@ -527,7 +694,7 @@
			string msg4 = sArray[2].ToString();//当前人

			oCN.BeginTran();
			if (!DBUtility.ClsPub.Security_Log(msg3, 1, true, msg4))
			if (!DBUtility.ClsPub.Security_Log(msg3, 1, false, msg4))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -567,6 +734,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;
			@@ -599,6 +767,14 @@
			string HMaterNumber = mainList[0].HMaterNumber;
			string HSupNumber = mainList[0].HSupNumber;
			long HPrintQty = mainList[0].HPrintQty;
			string HMouldOWNER = mainList[0].HMouldOWNER;
			string HSaveLife = mainList[0].HSaveLife;
			int HCaveQty = mainList[0].HCaveQty;
			int HMouldDotCheckRuleInterID = mainList[0].HMouldDotCheckRuleInterID;
			int HMouldMaintainRuleInterID = mainList[0].HMouldMaintainRuleInterID;
			int HNowSupID = mainList[0].HNowSupID;
			int HNowSupTypeID = mainList[0].HNowSupTypeID;



			//主表
			@@ -609,19 +785,19 @@
			",HSubjoin,HSubjoin2,HPICNo,HWorkMaterModel" +
			",HMaterID,HMaterNumber,HMouldType,HUnitID" +
			",HOutComDate,HOutComNo,HDeptID,HSupID,HSupNumber" +
			",HPrintQty,HMouldStatus,HWhID,HRoutingID" +
			",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife" +
			",HUseLife,HLeaveLife,HProdQty,HProdWeight" +
			",HPrintQty,HMouldStatus,HWhID,HRoutingID,HCaveQty" +
			",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife,HNowSupID,HNowSupTypeID" +
			",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID,HBarCode" +
			") " +
			" values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
			"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
			",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
			",'" + HSubjoin + "','" + HSubjoin2 + "','" + HPICNo + "','" + HWorkMaterModel + "'" +
			"," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
			"," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
			",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
			"," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID +
			"," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "'" +
			",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "'" +
			"," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + "," + HCaveQty +
			"," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID + "','" + HNowSupTypeID + "'" +
			",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'" +
			") ");


			@@ -633,7 +809,7 @@
			" values('" + HInterID + "',0,''" +
			",0,0,'','',0,0 " +
			") ");


			if (objJsonResult.code == "0")
			{
			objJsonResult.code = "0";
			@@ -677,7 +853,7 @@
			string msg4 = sArray[2].ToString();//当前人
			try
			{
			if (!DBUtility.ClsPub.Security_Log(msg3, 1, true, msg4))
			if (!DBUtility.ClsPub.Security_Log(msg3, 1, false, msg4))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -692,13 +868,14 @@
			//反序列化
			msg2 = "[" + msg2.ToString() + "]";
			List<Gy_Mould> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Mould>>(msg2);


			long HInterID = mainList[0].HInterID;//递入type得到的单据ID
			string HBillNo = mainList[0].HBillNo;//递入type得到的单据号
			DateTime HDate = mainList[0].HDate;//日期
			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;
			@@ -727,14 +904,17 @@
			Double HProdQty = mainList[0].HProdQty;
			Double HProdWeight = mainList[0].HProdWeight;
			string HRemark = mainList[0].HRemark;
			string HMaker = mainList[0].HMaker;
			string HUpDater = mainList[0].HUpDater;
			string HMaterNumber = mainList[0].HMaterNumber;
			string HSupNumber = mainList[0].HSupNumber;
			long HPrintQty = mainList[0].HPrintQty;




			string HMouldOWNER = mainList[0].HMouldOWNER;
			string HSaveLife = mainList[0].HSaveLife;
			int HCaveQty = mainList[0].HCaveQty;
			int HMouldDotCheckRuleInterID = mainList[0].HMouldDotCheckRuleInterID;
			int HMouldMaintainRuleInterID = mainList[0].HMouldMaintainRuleInterID;
			int HNowSupID = mainList[0].HNowSupID;
			int HNowSupTypeID = mainList[0].HNowSupTypeID;

			//若MAINDI重复则重新获取
			oCN.BeginTran();
			@@ -745,7 +925,7 @@
			",HYear='" + HYear.ToString() + "'" +
			",HPeriod='" + HPeriod.ToString() + "'" +
			",HRemark='" + HRemark + "'" +
			",HUpDater='" + HMaker + "'" +
			",HUpDater='" + HUpDater + "'" +
			",HUpDateDate=getdate()" +
			//========================================
			",HMouldNo='" + HMouldNo + "'" +
			@@ -768,6 +948,7 @@
			",HSupNumber='" + HSupNumber + "'" +
			",HPrintQty=" + HPrintQty.ToString() +
			",HMouldStatus='" + HMouldStatus + "'" +
			",HSaveLife='" + HSaveLife + "'" +
			",HWhID=" + HWHID.ToString() +
			",HRoutingID=" + HRoutingID.ToString() +
			",HBomID=" + HBOMID.ToString() +
			@@ -775,12 +956,19 @@
			",HSPGroupID=" + HSPGroupID.ToString() +
			",HSPID=" + HSPID.ToString() +
			",HDesignLife=" + HDesignLife.ToString() +
			",HCaveQty=" + HCaveQty.ToString() +
			",HUseLife=" + HUseLife.ToString() +
			",HLeaveLife=" + HLeaveLife.ToString() +
			",HProdQty=" + HProdQty.ToString() +
			",HMouldDotCheckRuleInterID=" + HMouldDotCheckRuleInterID.ToString() +
			",HMouldMaintainRuleInterID=" + HMouldMaintainRuleInterID.ToString() +
			",HMouldOWNER='" + HMouldOWNER + "'" +
			",HNowSupID=" + HNowSupID.ToString() +
			",HNowSupTypeID=" + HNowSupTypeID.ToString() +
			",HProdWeight=" + HProdWeight.ToString() +
			",HBarCode='" + HBarCode.ToString() + "'" +
			" where HInterID=" + HInterID.ToString());


			//修改子项目代码
			//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
			//将上级为非末级
			@@ -847,7 +1035,7 @@
			DAL.ClsGy_MouldFile oBill = new DAL.ClsGy_MouldFile();
			try
			{
			if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, user))
			if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -856,24 +1044,24 @@
			return objJsonResult;
			}
			if (oBill.DeleteBill(hmainid, ref DBUtility.ClsPub.sExeReturnInfo))
			{
			//写入日志
			ClsPub.Add_Log("", "删除项目，代码：" + oBill.omodel.HMouldNo + ",名称：" + oBill.omodel.HName, ClsPub.CurUserName);
			//更新上级为末级
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除成功";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败";
			objJsonResult.data = null;
			return objJsonResult;
			}
			{
			//写入日志
			ClsPub.Add_Log("", "删除项目，代码：" + oBill.omodel.HMouldNo + ",名称：" + oBill.omodel.HName, ClsPub.CurUserName);
			//更新上级为末级
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除成功";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//ds = oCN.RunProcReturn("delete from Gy_Department where HItemID = " + HItemID, "Gy_Department");

			}
			@@ -887,6 +1075,66 @@
			return objJsonResult;
			}

			/// <summary>
			/// 模具档案初始化按钮
			/// </summary>
			/// <param name="hmainid"></param>
			/// <param name="user"></param>
			/// <returns></returns>
			[Route("Gy_Material/InitializeProdInBill")]
			[HttpGet]
			public object InitializeProdInBill(long hmainid, string user, string userID)
			{
			DAL.ClsGy_MouldFile oBill = new DAL.ClsGy_MouldFile();
			try
			{
			string HBillNo = "";
			Int64 HInterID = 0;//显示的字段
			ds = oCN.RunProcReturn("select * from Gy_MouldFileMain where HInterID='" + hmainid + "'", "Gy_MouldFileMain");
			DataRow dr = ds.Tables[0].Rows[0];
			HInterID = DBUtility.ClsPub.CreateBillID("3801", ref DBUtility.ClsPub.sExeReturnInfo);
			HBillNo = DBUtility.ClsPub.CreateBillCode("3801", ref DBUtility.ClsPub.sExeReturnInfo, true);
			string sql = "Insert Into Sc_MouldStockBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
			",HMaker,HMakeDate" + /"HYear, HPeriod,"/
			",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
			",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
			") " +
			" values('3801','3801'," + HInterID + ",'" + HBillNo + "',getdate()" +
			", '" + user + "',getdate()" +
			", " + dr["HSupID"].ToString() + ", 1," + dr["HWhID"].ToString() + ",0,0,0,0" +
			", 0," + dr["HDeptID"].ToString() + ",' ',0" +

			") ";
			string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
			HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
			HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
			HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
			"0,0," + dr["HInterID"].ToString() + ",0,0,0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr["HProdQty"].ToString() + ",0," +
			"0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr["HWHID"].ToString() + ",0," + dr["HSPID"].ToString() + ",0,0"
			+ ",0,0," + userID + ",0,0,'')");
			//主表
			oCN.RunProc(sql);
			oCN.RunProc(sql1);

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "初始化成功，单据号为" + HBillNo;
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;

			}
			catch (Exception)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "初始化失败！";
			objJsonResult.data = null;
			}
			return objJsonResult;

			}

			#region [模具档案审核、反审核]
			/// <summary>
			@@ -905,7 +1153,7 @@
			try
			{
			//审核权限
			if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
			if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -1026,5 +1274,125 @@
			}
			}
			#endregion

			#region [模具档案批量生成]
			[Route("Gy_Mould/SaveBatchGen_MouldFile")]
			[HttpGet]
			public object SaveBatchGen_MouldFile(long HInterID, string StarNum, string EndNum)
			{
			int StarNum1 = int.Parse(StarNum);
			int EndNum1 = int.Parse(EndNum);
			string j;
			List<object> list = new List<object>();
			try
			{
			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["HBarCode"].ToString();
			string Num1 = Num.Substring(0, (Num.Length) - 5);
			oCN.BeginTran();
			for (int i = StarNum1; i <= EndNum1; i++)
			{
			if (i < 10)
			{
			j = "0000" + i;
			}
			else if (i < 100)
			{
			j = "000" + i;
			}
			else if (i < 1000)
			{
			j = "00" + i;
			}
			else if (i < 10000)
			{
			j = "0" + i;
			}
			else
			{
			j = "" + i;
			}
			DataSet ds1 = oCN.RunProcReturn("select * from Gy_MouldFileMain where hbillno='" + (Num1 + j) + "'", "Gy_MouldFileMain");
			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" +
			",HMouldNo,HName,HModel,HModel2,HDiameter" +
			",HSubjoin,HSubjoin2,HPICNo,HWorkMaterModel" +
			",HMaterID,HMaterNumber,HMouldType,HUnitID" +
			",HOutComDate,HOutComNo,HDeptID,HSupID,HSupNumber" +
			",HPrintQty,HMouldStatus,HWhID,HRoutingID,HCaveQty" +
			",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife,HNowSupID,HNowSupTypeID" +
			",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID" +
			") " +
			" values('3899','3899'," + HItemID + ",'" + Num1 + j + "',getdate()" +
			"," + dr["HYear"] + "," + dr["HPeriod"] + ",'" + dr["HRemark"] + "','" + dr["HMaker"] + "',getdate(),'" + Num1 + j +
			"','" + Num1 + j + "','" + dr["HName"] + "','" + dr["HModel"] + "','" + dr["HModel2"] + "','" + dr["HDiameter"] + "'" +
			",'" + dr["HSubjoin"] + "','" + dr["HSubjoin2"] + "','" + dr["HPICNo"] + "','" + dr["HWorkMaterModel"] + "'" +
			"," + dr["HMaterID"] + ",'" + dr["HMaterNumber"] + "',0," + dr["HUnitID"] +
			",'" + dr["HOutComDate"] + "','" + dr["HOutComNo"] + "'," + dr["HDeptID"] + "," + dr["HSupID"] + ",'" + dr["HSupNumber"] + "'" +
			"," + dr["HPrintQty"] + ",'" + dr["HMouldStatus"] + "'," + dr["HWHID"] + "," + dr["HRoutingID"] + ",'" + dr["HCaveQty"] +
			"'," + dr["HBOMID"] + ",'" + dr["HVersion"] + "'," + dr["HSPGroupID"] + "," + dr["HSPID"] + ",'" + dr["HDesignLife"] + "','" + dr["HNowSupID"] + "','" + dr["HNowSupTypeID"] + "'" +
			",'" + dr["HUseLife"] + "','" + dr["HLeaveLife"] + "','" + dr["HProdQty"] + "','" + dr["HProdWeight"] + "','" + dr["HMouldOWNER"] + "','" + dr["HSaveLife"] + "','" + dr["HMouldDotCheckRuleInterID"] + "','" + dr["HMouldMaintainRuleInterID"] + "'" +
			") ");
			oCN.RunProc(sql);

			//子表
			oCN.RunProc("Insert into Gy_MouldFileSub " +
			" (HInterID,HEntryID,HRemark" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
			") " +
			" values('" + HItemID + "',0,''" +
			",0,0,'','',0,0 " +
			") ");
			}
			else
			{
			list.Add(ds1.Tables[0].Rows[0]["HBillNo"].ToString());
			}
			}
			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "批量生成成功！";
			objJsonResult.list = list;
			return objJsonResult;
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "批量生成失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			public void cs(string msg)
			{
			var client = new RestSharp.RestClient("http://47.96.97.237/api/");
			var requestPost = new RestRequest("Gy_Material/SaveGy_MaterialList", Method.POST);
			Info info = new Info();
			info.msg = msg;
			var json = JsonConvert.SerializeObject(info);
			requestPost.AddParameter("application/json", json, ParameterType.RequestBody);
			IRestResponse responsePost = client.Execute(requestPost);
			var contentPost = responsePost.Content;
			Console.WriteLine("POST方式获取结果：" + contentPost);
			Console.Read();
			}

			public class Info
			{
			public string msg { get; set; } //末级标志

			}
			}
			}