MES-WEB-API.git

			@@ -77,6 +77,7 @@
			long HMainInterID = 0;
			HMainInterID = list[0].HMainInterID;
			string eventType = list[0].eventType;
			string HDate = list[0].HDate;
			string BillType = "3791";
			string HBillSubType = "3791";
			long HInterID = list[0].HInterID;//递入type得到的单据ID
			@@ -408,7 +409,7 @@
			",HmaterOutqty,HProcPriceRate,HTemporaryAreaID,HWasterQty_Work,HWasterQty_Mater,HBackWorkQty,HShiftsID" +
			",HToCheckQty,HLossQty,HBackWorkByMaterQty,HMouldID" +
			") " +
			" values('" + BillType + "','" + (OperationType == "5" ? "SUB" : HBillSubType) + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" +
			" values('" + BillType + "','" + (OperationType == "5" ? "SUB" : HBillSubType) + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",'"+ HDate + "','" + HMaker + "',getdate(),'" + HMouldNum + "'" +
			"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL +
			"," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
			",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID + "," + HPayProcID +
			@@ -463,6 +464,7 @@
			",HShiftsID=" + HShiftsID +
			",HBackWorkByMaterQty=" + HBackWorkByMaterQty +
			",HMouldID=" + HMouldID +
			",HGroupID=" + HGroupID +
			" where HInterID=" + HInterID);

			LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",修改工序出站单据:" + HBillNo);
			@@ -603,6 +605,10 @@
			string sReturn = "";
			if (oSystemParameter.ShowBill(ref sReturn) == true)
			{
			if (oSystemParameter.omodel.MES_StationOutBill_AutoCheck == "Y") //系统参数自动审核
			{
			object objResult = set_CheckBill(HInterID.ToString(), user, HBillSubType);
			}
			if (oSystemParameter.omodel.MES_StationOutBill_SaveAutoAddnew == "Y") //系统参数页面保存自动变成新增状态
			{
			objJsonResult.Verify = "Y";
			@@ -1716,31 +1722,74 @@
			}
			#endregion

			#region 工序出站汇报单列表
			[Route("Cj_StationOutBill/page")]
			#region 返回工序出站汇报单列表-分页
			[Route("Cj_StationOutBill/get_Display_byPage")]
			[HttpGet]
			public json page(string sWhere, string user, int page, int size)
			public object get_Display_byPage(string sWhere, string user, string Organization, int page, int size, string HBillSubType)
			{
			json res = new json();
			try
			{
			List<object> columnNameList = new List<object>();
			//判断是否有查询权限
			if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
			{
			res.code = "0";
			res.count = 0;
			res.Message = "出站单无查询权限!";
			res.data = null;
			return res;
			}
			if (sWhere == null \|\| sWhere.Equals(""))
			if (HBillSubType == "SUB")
			{
			ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",''", "h_p_MES_StationOutBillList");
			//判断是否有查询权限
			if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Sub_Query", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "完工单无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_MES_StationOutBillList");
			//判断是否有查询权限
			if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "出站单无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}


			//获取系统参数
			string Ret = "";
			if (oSystemParameter.ShowBill(ref Ret))
			{
			//判断客户为龙山汽配
			if (oSystemParameter.omodel.WMS_CampanyName == "龙山汽配")
			{
			//获取需要拼接的字符串
			string sql_splice = DBUtility.ClsPub.SpliceSQL(user, "工序汇报单列表");

			if (sql_splice == "没有查询到相关用户信息")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有查询到相关用户信息!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			sWhere += sql_splice;
			}
			}
			}

			//sWhere = sWhere.Replace("'", "''");

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_MES_StationOutBillList");
			}
			else
			{
			ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_MES_StationOutBillList");
			}

			//添加列名
			@@ -1751,23 +1800,24 @@
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			res.code = CodeConstant.SUCCEED;
			res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
			res.Message = "Sucess！";
			res.list = columnNameList;
			res.data = ds.Tables[0];
			return res;
			objJsonResult.code = "1";
			objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
			objJsonResult.Message = "Sucess！";
			objJsonResult.list = columnNameList;
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception e)
			{
			res.code = CodeConstant.FAIL;
			res.count = CountConstant.FAIL;
			res.Message = "Exception！" + e.ToString();
			res.data = null;
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 工序出站汇报单子表查询
			[Route("Cj_StationOutBill/get_SubDisplay")]
			[HttpGet]
			@@ -3780,5 +3830,53 @@
			}
			}
			#endregion

			#region 下推质量汇报单时返回工序出站汇报单信息
			[Route("Cj_StationOutBill/PushDownBackInfo")]
			[HttpGet]
			public object PushDownBackInfo(string linterid, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();

			ds = oCN.RunProcReturn("select * from h_v_Sc_StationOutBill_PushDownBackInfo where hmainid in (" + linterid + ")", "h_v_Sc_StationOutBill_PushDownBackInfo");

			if (ds.Tables[0].Rows.Count > 0 && ds != null)
			{
			//添加列名
			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列对象的列名
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.list = columnNameList;
			objJsonResult.data = ds.Tables[0];
			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 = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			}
			}