~yxj/MES-WEB-API.git

			@@ -283,7 +283,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;
			@@ -353,7 +353,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;
			@@ -517,7 +517,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;
			@@ -591,6 +591,13 @@
			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;



			//主表
			oCN.RunProc("Insert Into Gy_MouldFileMain " +
			@@ -600,9 +607,9 @@
			",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,HMouldOWNER,HSaveLife" +
			",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()" +
			@@ -610,9 +617,9 @@
			",'" + HSubjoin + "','" + HSubjoin2 + "','" + HPICNo + "','" + HWorkMaterModel + "'" +
			"," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
			",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
			"," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID +
			"," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "'" +
			",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "'," + "','" + HSaveLife + "'," +
			"," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID +","+ HCaveQty+
			"," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID+"','"+ HNowSupTypeID+"'"+
			",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID+"','"+ HMouldMaintainRuleInterID+"'"+
			") ");


			@@ -668,7 +675,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;
			@@ -724,8 +731,11 @@
			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();
			@@ -767,10 +777,15 @@
			",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());

			@@ -840,7 +855,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;
			@@ -888,7 +903,7 @@
			/// <returns></returns>
			[Route("Gy_Material/InitializeProdInBill")]
			[HttpGet]
			public object InitializeProdInBill(long hmainid, string user)
			public object InitializeProdInBill(long hmainid, string user,string userID)
			{
			DAL.ClsGy_MouldFile oBill = new DAL.ClsGy_MouldFile();
			try
			@@ -905,14 +920,22 @@
			",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
			",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
			") " +
			" values('3801','3801'," + HInterID + ",'" + HBillNo + "',' getdate()'" +
			" 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;
			@@ -929,6 +952,7 @@
			objJsonResult.data = null;
			}
			return objJsonResult;

			}

			#region [模具档案审核、反审核]
			@@ -948,7 +972,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;