~yxj/MES-WEB-API.git

			@@ -530,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>
			@@ -971,12 +1044,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;
			@@ -1125,5 +1199,78 @@
			}
			}
			#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);
			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["HBillNo"].ToString();
			string Num1 = Num.Substring(0,(Num.Length)-3);
			oCN.BeginTran();
			for (int i = StarNum1; i <= EndNum1; i++)
			{
			DataSet ds1= oCN.RunProcReturn("select * from Gy_MouldFileMain where hbillno='" + (Num1 + i)+"'", "Gy_MouldFileMain");
			if (ds1.Tables[0].Rows.Count == 0 \|\| ds1 == null)
			{
			long HItemID = DBUtility.ClsPub.CreateBillID("3899", ref DBUtility.ClsPub.sExeReturnInfo);
			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,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 + i + "',getdate()" +
			"," + dr["HYear"] + "," + dr["HPeriod"] + ",'" + dr["HRemark"] + "','" + dr["HMaker"] + "',getdate(),'" + Num1 + i +
			"','" + dr["HMouldNo"] + "','" + dr["HName"] + "','" + dr["HModel"] + "','" + dr["HModel2"] + "','" + dr["HDiameter"] + "'" +
			",'" + dr["HSubjoin"] + "','" + dr["HSubjoin2"] + "','" + dr["HPICNo"] + "','" + dr["HWorkMaterModel"] + "'" +
			"," + dr["HMaterID"] + ",'" + dr["HMaterNumber"] + "'," + 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 " +
			") ");
			}
			}
			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "批量生成成功！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "批量生成失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			}
			}