~yxj/MES-WEB-API.git

			@@ -268,12 +268,12 @@
			#region 报工平台开工单弹窗查找数据
			[Route("Sc_MESBeginWorkBill/GetMESBeginWorkFrom")]
			[HttpGet]
			public object GetMESBeginWorkFrom(string HSourceInterID,string HSourceEntryID,string HSourceBillNo,string HSourceBillType)
			public object GetMESBeginWorkFrom(string HSourceInterID, string HSourceEntryID, string HSourceBillNo, string HSourceBillType)
			{
			try
			{
			//根据选择资源ID获取当前生产工单、责任人
			ds = oCN.RunProcReturn("exec h_p_JIT_GetInfoByICMOStatusInterID @HSourceInterID=" + HSourceInterID + ",@HSourceEntryID="+ HSourceEntryID + ",@HSourceBillNo='"+ HSourceBillNo + "',@HSourceBillType='"+ HSourceBillType + "'", "h_p_JIT_GetInfoByICMOStatusInterID");
			ds = oCN.RunProcReturn("exec h_p_JIT_GetInfoByICMOStatusInterID @HSourceInterID=" + HSourceInterID + ",@HSourceEntryID=" + HSourceEntryID + ",@HSourceBillNo='" + HSourceBillNo + "',@HSourceBillType='" + HSourceBillType + "'", "h_p_JIT_GetInfoByICMOStatusInterID");
			if (ds.Tables[0].Rows.Count > 0)
			{

			@@ -417,8 +417,8 @@
			}

			public static DataSet Sc_GetMESProductReportBillList(string sWhere)
			{
			string sql = string.Format(@"select a.HBillNo,a.HDate,a.HBillType,a.HMaterID,m.HNumber HMaterCode,m.HName HMaterName,m.HModel HMaterSpec
			{
			string sql = string.Format(@"select a.HBillNo,a.HDate,a.HBillType,a.HMaterID,m.HNumber HMaterCode,m.HName HMaterName,m.HModel HMaterSpec
			,a.HSourceID,s.HNumber HSourceCode,s.HName HSourceName,a.HGroupID,g.HNumber HGroupCode,g.HName HGroupName
			,a.HWorkManID,e.HName HWorkManName,a.HMaker,a.HMakeDate, a.HReportType
			,a.HQty,a.HICMOBillNo,a.HICMOInterID,a.HICMOEntryID
			@@ -427,8 +427,105 @@
			left join Gy_Material m on a.HMaterID=m.hitemid
			left join Gy_Source s on a.HSourceID=s.HItemID
			left join Gy_Group g on a.HGroupID=g.HItemID
			left join Gy_Employee e on a.HWorkManID=e.HItemID "+sWhere+"");
			return new SQLHelper.ClsCN().RunProcReturn(sql, "Sc_ICMOBillWorkQtyStatus_Tmp");
			left join Gy_Employee e on a.HWorkManID=e.HItemID " + sWhere + "");
			return new SQLHelper.ClsCN().RunProcReturn(sql, "Sc_ICMOBillWorkQtyStatus_Tmp");
			}
			#endregion

			#region 报工平台报检申请保存
			[Route("Sc_MESBeginWorkBill/SaveGetMESProductReportBillList")]
			[HttpGet]
			public object SaveGetMESProductReportBillList([FromBody] JObject msg)
			{
			var _value = msg["msg"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();

			string UserName = "";

			ListModels oListModels = new ListModels();
			try
			{
			DLL.ClsSc_ICMOReportBill oBill = new DLL.ClsSc_ICMOReportBill();
			List<Models.ClsSc_ICMOReportBillMain> lsmain = new List<Models.ClsSc_ICMOReportBillMain>();
			msg2 = msg2.Replace("\\", "");
			msg2 = msg2.Replace("\n", ""); //\n
			lsmain = oListModels.getObjectByJson_Gy_ICMOReportBillMain(msg2);
			foreach (Models.ClsSc_ICMOReportBillMain oItem in lsmain)
			{

			//oItem.HMaker = "";
			UserName = oItem.HMaker; //制单人
			oItem.HBillType = "3711";
			oItem.HBillSubType = "3711";
			oItem.HBillStatus = 1; //单据状态（1未审，2审核通过，3关闭，4作废，5审核退回,6审核中,7已阅，8已回复，9结案，10验证,11下达，12开工,13申请审批,15申请检验，16 判定合格，17判定不合格）
			oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
			if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！没有单据日期，无法保存！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			oBill.omodel = oItem;
			}
			//子表体数据

			List<Models.ClsSc_ICMOReportBillSub> ls = new List<Models.ClsSc_ICMOReportBillSub>();
			ls = oListModels.getObjectByJson_Gy_ICMOReportBillSub(msg2);
			int i = 0;
			foreach (Models.ClsSc_ICMOReportBillSub oItemSub in ls)
			{

			i++;
			oItemSub.HEntryID = i;

			oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
			oItemSub.HCloseType = false; //关闭类型
			oBill.DetailColl.Add(oItemSub);

			}
			//保存
			//保存完毕后处理
			bool bResult;
			if (oBill.omodel.HInterID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			if (bResult)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + e.ToString();
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			#endregion

			@@ -515,7 +612,41 @@
			}
			#endregion



			#region 报工平台验证单据状态
			[Route("Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus")]
			[HttpGet]
			public object GetMESBeginWorkBillStaus(string sWhere)
			{
			try
			{
			ds=new SQLHelper.ClsCN().RunProcReturn("select * from Sc_ICMOBillStatus_Tmp" + sWhere, "Sc_ICMOBillStatus_Tmp");
			if (ds.Tables[0].Rows.Count > 0)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "工单暂未处理,可以操作！";
			objJsonResult.data = null;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "工单已处理,不允许操作！";
			objJsonResult.data = null;
			}

			}
			catch (Exception ex)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = ex.Message;
			objJsonResult.data = null;
			}
			return objJsonResult;
			}
			#endregion

			}
			}