~yxj/MES-WEB-API.git

			@@ -27,18 +27,27 @@
			/// </summary>
			[Route("Gy_Material/list")]
			[HttpGet]
			public object list(string sWhere, string Organization)
			public object list(string sWhere,string user, string Organization)
			{
			try
			{
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_Material", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			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 HItemID desc", "h_v_Gy_MaterialList");
			ds = oCN.RunProcReturn(sql1 + sWhere + " order by 物料代码 ", "h_v_Gy_MaterialList");
			}
			else
			{
			string sql = sql1 + sWhere + "order by HItemID desc";
			string sql = sql1 + sWhere + " order by 物料代码 ";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_MaterialList");
			}

			@@ -80,12 +89,23 @@
			{
			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();
			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)
			@@ -96,6 +116,7 @@
			HItemID = maxid;
			}
			ListModels oListModels = new ListModels();

			try
			{
			DLL.ClsGy_Material_Ctl oBill = new DLL.ClsGy_Material_Ctl();
			@@ -276,21 +297,20 @@
			/// <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;
			//}
			if (!DBUtility.ClsPub.Security_Log("Gy_Material_Delete", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限";
			objJsonResult.data = null;
			return objJsonResult;
			}

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (string.IsNullOrWhiteSpace(HItemID))
			@@ -353,7 +373,7 @@
			{
			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;
			@@ -371,22 +391,23 @@
			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;
			}

			//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)
			{
			@@ -457,36 +478,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)
			{
			@@ -498,6 +530,79 @@
			}
			}

			#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, Ds2;
			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 = "删除失败";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据未找到";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = e.Message;
			objJsonResult.data = null;
			return objJsonResult;
			}

			}
			#endregion


			/// <summary>
			@@ -517,7 +622,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;
			@@ -557,6 +662,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;
			@@ -609,7 +715,7 @@
			",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" +
			",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID,HBarCode" +
			") " +
			" values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
			"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
			@@ -619,7 +725,7 @@
			",'" + 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+"'"+
			",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID+"','"+ HMouldMaintainRuleInterID+"','"+ HBarCode+"'"+
			") ");


			@@ -675,7 +781,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;
			@@ -697,6 +803,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;
			@@ -777,16 +884,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());

			//修改子项目代码
			@@ -855,7 +963,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;
			@@ -939,12 +1047,13 @@

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

			}
			catch (Exception e)
			catch (Exception)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -972,7 +1081,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;
			@@ -1093,5 +1202,105 @@
			}
			}
			#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
			}
			}