MES-WEB-API.git

			@@ -313,7 +313,7 @@
			//保存
			//保存完毕后处理
			bool bResult;
			if (oBill.omodel.HInterID == 0)
			if (refSav == "Add")
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			@@ -493,7 +493,22 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			ds = oCN.RunProcReturn("select * from Sc_ICMOReportBillMain where HInterID=" + lngBillKey, "Sc_ICMOReportBillMain");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有数据，无法删除！";
			objJsonResult.data = null;
			return objJsonResult; ;
			}

			oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + "" + "','" + "删除生产汇报单单据：" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + "','LMES-生产汇报单模块','" + DBUtility.ClsPub.IPAddress + "','删除单据'", ref DBUtility.ClsPub.sExeReturnInfo);


			bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);


			if (IsDete)
			{
			objJsonResult.code = "0";
			@@ -1103,5 +1118,70 @@
			}
			#endregion

			#region 生产汇报单获取源单产量汇报单临时表信息
			/// <summary>
			/// 生产汇报单获取源单产量汇报单临时表信息
			/// </summary>
			/// <returns></returns>
			[Route("Sc_ICMOReportBill/GetProdReportBillList")]
			[HttpGet]
			public object GetProdReportBillList(string HInterID, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();

			if (HInterID == null \|\| HInterID.Equals(""))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "产量汇报单内码为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{

			string sql = "exec h_p_Sc_ICMOBillWorkQtyStatus_TmpList '" + HInterID + "'";
			ds = oCN.RunProcReturn(sql, "h_p_Sc_ICMOBillWorkQtyStatus_TmpList");
			}

			//添加列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			//if (ds.Tables[0].Rows.Count != 0 \|\| ds != null)
			//{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds;
			objJsonResult.list = columnNameList;
			return objJsonResult;
			//}
			//else
			//{
			//objJsonResult.code = "0";
			//objJsonResult.count = 0;
			//objJsonResult.Message = "无数据";
			//objJsonResult.data = null;
			//return objJsonResult;
			//}
			}
			catch (Exception ex)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + ex.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			}
			}