~yxj/MES-WEB-API.git

			@@ -205,7 +205,7 @@
			{
			DBUtility.ClsPub.CurUserName = UserName;
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log("MES_MESBeginWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
			if (!DBUtility.ClsPub.Security_Log_second("MES_MESBeginWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -292,7 +292,7 @@
			try
			{
			//审核权限
			if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
			if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -476,7 +476,7 @@
			string refSav = sArray[2].ToString();
			DBUtility.ClsPub.CurUserName = UserName;
			//保存权限
			if (!DBUtility.ClsPub.Security_Log("MES_MESBeginWorkBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
			if (!DBUtility.ClsPub.Security_Log_second("MES_MESBeginWorkBill_Edit", 1, false, DBUtility.ClsPub.CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -722,7 +722,7 @@
			{
			try
			{
			ds = new SQLHelper.ClsCN().RunProcReturn("select isnull(sum(HQty),0) HQty,isnull(sum(HBadQty),0) HBadQty,isnull(sum(HWasterQty),0) HWasterQty from Sc_ICMOBillWorkQtyStatus_Tmp with (nolock)" + sWhere, "Sc_ICMOBillWorkQtyStatus_Tmp");
			ds = new SQLHelper.ClsCN().RunProcReturn("select isnull(sum(HQty),0) HQty,isnull(sum(HBadCount),0) HBadQty,isnull(sum(HWasterQty),0) HWasterQty from Sc_ICMOBillWorkQtyStatus_Tmp with (nolock)" + sWhere, "Sc_ICMOBillWorkQtyStatus_Tmp");
			if (ds.Tables[0].Rows.Count > 0)
			{
			objJsonResult.code = "1";
			@@ -915,7 +915,7 @@
			{
			string StrMessage = "";
			//审核权限
			if (!WebClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName,ref StrMessage))
			if (!WebClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName,ref StrMessage))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -1045,12 +1045,19 @@
			try
			{
			oCN.BeginTran();
			//查询产量汇报临时表数量
			ds = oCN.RunProcReturn("select isnull(HQty,0) HQty,isnull(HWasterQty,0) HWasterQty,isnull(HBadQty,0) HBadQty from Sc_ICMOBillWorkQtyStatus_Tmp where HInterID='" + HInterID + "' and HICMOInterID='" + HICMOInterID + "' and HICMOEntryID='" + HICMOEntryID + "'", "Sc_ICMOBillWorkQtyStatus_Tmp");
			double HQty =double.Parse(ds.Tables[0].Rows[0]["HQty"].ToString());
			double HWasterQty = double.Parse(ds.Tables[0].Rows[0]["HWasterQty"].ToString());
			double HBadQty = double.Parse(ds.Tables[0].Rows[0]["HBadQty"].ToString());
			double sumqty = HQty + HBadQty + HWasterQty; //汇报数量+不良+报废
			//更新产量装量临时表已汇报数量
			string sql1 = string.Format(@"update Sc_ICMOBillStatus_Tmp set HICMOStatus='1',HFinishFlag='0', HRelationInterID=0,HSplitRelationQty=HSplitRelationQty-" + sumqty + ",HDateFinishQty=HDateFinishQty-"+ sumqty + " where HICMOInterID='"+ HICMOInterID + "' and HICMOEntryID='"+ HICMOEntryID + "'");
			oCN.RunProc(sql1);
			//更新切换状态值
			string sql = string.Format(@"delete Sc_ICMOBillWorkQtyStatus_Tmp where HInterID='" + HInterID + "'");
			oCN.RunProc(sql);
			//更新产量装量临时表已汇报数量
			string sql1 = string.Format(@"update Sc_ICMOBillStatus_Tmp set HRelationInterID=0,HSplitRelationQty=0 where HInterID='" + HInterID + "' and HICMOInterID='"+ HICMOInterID + "' and HICMOEntryID='"+ HICMOEntryID + "'");
			oCN.RunProc(sql);

			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -1079,6 +1086,29 @@
			ListModels oListModels = new ListModels();
			try
			{
			//系统参数生成生产汇报单前判断是否首检
			//string sReturn = "";
			//if (oSystemParameter.ShowBill(ref sReturn) == true)
			//{
			// if (oSystemParameter.omodel.Sc_ICMOReportBill_FirstCheckOut == "Y") //系统参数必须首件检验通过才能保存单据
			// {
			// //系统参数审核,则根据生产订单号，关联首检检验单中源单号查找检验单数据，判断单据状态是否合格
			// ds = oCN.RunProcReturn("select * from QC_FirstPieceCheckBillMain where HICMOInterID='" + HICMOInterID + "' and HICMOEntryID='" + HICMOEntryID + "'", "QC_FirstPieceCheckBillMain");
			// if (ds.Tables[0].Rows.Count > 0) //有首检检验单
			// {
			// int rows = ds.Tables[0].AsEnumerable().Where(item => item["HLastResult"].ToString().Equals("True")).Count(); //判断当前数据(一条或多条)中最终判定是否有合格
			// if (rows <= 0)
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "当前工单首检检验判定不合格,无法生成汇报单！";
			// objJsonResult.data = null;
			// return objJsonResult;
			// }
			// }
			// }
			//}

			string sHSourceType = HSourceBillType;
			string BillType = "3711"; //单据类型 (生产汇报单)
			//得到mainid