~yxj/MES-WEB-API.git

			@@ -27,36 +27,26 @@
			/// </summary>
			[Route("Gy_Material/list")]
			[HttpGet]
			public object list(string sWhere)
			public object list(string sWhere, string Organization)
			{
			try
			{
			string sql1 = string.Format(@"select * from h_v_Gy_MaterialList where 组织名称='" + Organization + "'");
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_Gy_MaterialList " + sWhere, "h_v_Gy_MaterialList");
			ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_Gy_MaterialList");
			}
			else
			{
			string sql1 = "select * from h_v_Gy_MaterialList where 1 = 1 ";
			string sql = sql1 + sWhere;
			string sql = sql1 + sWhere + "order by HItemID desc";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_MaterialList");
			}
			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)
			{
			@@ -231,7 +221,7 @@
			objJsonResult.data = 1;
			return objJsonResult;
			}


			oItem.HShortNumber = sShortNumber;//短代码
			oItem.HEndFlag = true;//末级标志
			oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级
			@@ -359,7 +349,7 @@
			/// </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
			{
			@@ -373,12 +363,12 @@
			}
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere, "h_v_Gy_MouldFileList");
			ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere + "order by 日期 desc", "h_v_Gy_MouldFileList");
			}
			else
			{
			string sql1 = "select * from h_v_Gy_MouldFileList where 1 = 1 ";
			string sql = sql1 + sWhere;
			string sql = sql1 + sWhere + "order by 日期 desc";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_MouldFileList");
			}
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			@@ -425,12 +415,12 @@
			{
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_Gy_CheckToolsFileMainList " + sWhere, "h_v_Gy_CheckToolsFileMainList");
			ds = oCN.RunProcReturn("select * from h_v_Gy_CheckToolsFileMainList " + sWhere + "order by 日期 desc", "h_v_Gy_CheckToolsFileMainList");
			}
			else
			{
			string sql1 = "select * from h_v_Gy_CheckToolsFileMainList where 1 = 1 ";
			string sql = sql1 + sWhere;
			string sql = sql1 + sWhere + "order by 日期 desc";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_CheckToolsFileMainList");
			}
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			@@ -473,12 +463,12 @@
			{
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList " + sWhere, "h_v_IF_BarCodeBillList");
			ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList " + sWhere + "order by 日期 desc", "h_v_IF_BarCodeBillList");
			}
			else
			{
			string sql1 = "select * from h_v_IF_BarCodeBillList where 1 = 1 ";
			string sql = sql1 + sWhere;
			string sql = sql1 + sWhere + "order by 日期 desc";
			ds = oCN.RunProcReturn(sql, "h_v_IF_BarCodeBillList");
			}
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			@@ -599,6 +589,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 +607,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" +
			") " +
			" 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+"'"+
			") ");


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


			if (objJsonResult.code == "0")
			{
			objJsonResult.code = "0";
			@@ -692,7 +690,7 @@
			//反序列化
			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;//日期
			@@ -731,10 +729,13 @@
			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();
			@@ -768,6 +769,7 @@
			",HSupNumber='" + HSupNumber + "'" +
			",HPrintQty=" + HPrintQty.ToString() +
			",HMouldStatus='" + HMouldStatus + "'" +
			",HSaveLife='" + HSaveLife + "'" +
			",HWhID=" + HWHID.ToString() +
			",HRoutingID=" + HRoutingID.ToString() +
			",HBomID=" + HBOMID.ToString() +
			@@ -775,12 +777,18 @@
			",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() +
			" where HInterID=" + HInterID.ToString());


			//修改子项目代码
			//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
			//将上级为非末级
			@@ -856,24 +864,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 +895,65 @@
			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 = "初始化成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "初始化失败！";
			objJsonResult.data = null;
			}
			return objJsonResult;

			}

			#region [模具档案审核、反审核]
			/// <summary>