MES-WEB-API.git

			@@ -632,6 +632,15 @@
			objJsonResult.Verify = "N";
			}
			}
			//判断是否是新增
			if ("Add".Equals(eventType))
			{
			//判断客户为海诚同步金蝶工序汇报单
			if (oSystemParameter.omodel.WMS_CampanyName == "海诚")
			{
			object objResult = set_SaveStationOutBill_CLD_Json(HInterID, HBillNo, user);
			}
			}
			sw.Stop();//结束计时
			LogService.Write($"11.参数查询结束,新增结束，用时" + sw.Elapsed);
			LogService.Write("END--出站单据保存结束，出站单号：" + HBillNo);
			@@ -1718,6 +1727,113 @@
			string sql1 = "select * from h_v_MES_StationOutBillList where 1 = 1 ";
			string sql = sql1 + sWhere+ " order by hmainid desc";
			ds = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList");
			}

			//添加列名
			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 = "[0000-1-037]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 = "[0000-1-038]Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 返回工序出站汇报单列表
			[Route("Cj_StationOutBill/get_Display_Eng")]
			[HttpGet]
			public object get_Display_Eng(string sWhere, string user, string HBillSubType)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			if (HBillSubType == "SUB")
			{
			//判断是否有查询权限
			if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Sub_Query", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "[0000-1-068]完工单无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			//判断是否有查询权限
			if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "[0000-1-068]出站单无查询权限!";
			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 = "[0000-1-069]没有查询到相关用户信息!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			sWhere += sql_splice;
			}
			}
			}

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_Eng where 1 = 1" + sWhere + "order by hmainid desc", "h_v_MES_StationOutBillList");
			}
			else
			{
			string sql1 = "select * from h_v_MES_StationOutBillList_Eng where 1 = 1 ";
			string sql = sql1 + sWhere + " order by hmainid desc";
			ds = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList_Eng");
			}

			//添加列名
			@@ -4359,6 +4475,25 @@
			{
			try
			{
			//同步前控制=========================================
			ds = oCN.RunProcReturn("Exec h_p_Sc_StationOutBill_BeforeSyncCtrl " + HInterID.ToString() + ", '" + HBillNo + "','" + HMaker + "'", " h_p_Sc_StationOutBill_BeforeSyncCtrl ");
			if (ds == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "[0000-2-012]保存前判断失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "[0000-1-051]同步失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			//=========================================================
			if (oWebs.set_SaveStationOutBill_CLD(HInterID, HBillNo, HMaker, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";