MES-WEB-API.git

			@@ -634,6 +634,92 @@
			}
			#endregion

			#region 报工平台开工单保存前系统验证
			[Route("Sc_MESBeginWorkBill/Xt_AllowLoadData")]
			[HttpGet]
			public object Xt_AllowLoadData(string HKey)
			{
			try
			{
			ClsXt_SystemParameter oClsXt_SystemParameter = new ClsXt_SystemParameter();
			string Key = "N";
			string sCapName = oClsXt_SystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
			if (sCapName.Contains("杭州斯莫尔"))
			{
			Key = oClsXt_SystemParameter.GetSingleSystemParameter(HKey, ref DBUtility.ClsPub.sExeReturnInfo);
			}

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


			#region 报工平台开工单流水号回车获取条码信息
			[Route("Sc_MESBeginWorkBill/txtHBarCode_KeyDown")]
			[HttpGet]
			public object txtHBarCode_KeyDown(string HBarCode, string HSourceInterID)
			{
			try
			{
			if (HBarCode == null \|\| HBarCode.Equals(""))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "空白码,条形码不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("exec h_p_Sc_MESBeginWorkBill_AllowLoadData '"+ HBarCode + "',"+ HSourceInterID, "h_p_Sc_MESBeginWorkBill_AllowLoadData");

			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "未查询到条码信息！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			else if (ds.Tables.Count ==1)
			{
			objJsonResult.code = ds.Tables[0].Rows[0][0].ToString();
			objJsonResult.count = 0;
			objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString();
			objJsonResult.data = ds;
			return objJsonResult;
			}

			objJsonResult.code = ds.Tables[0].Rows[0][0].ToString();
			objJsonResult.count = 1;
			objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString();
			objJsonResult.data = ds;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 报工平台开工单保存/编辑
			/// <summary>
			/// 开工单
			@@ -892,17 +978,17 @@

			public static DataSet Sc_GetMESProductReportBillList(string sWhere)
			{
			string sql = string.Format(@"select a.HInterID, a.HBillNo,a.HDate,a.HBillType,a.HBillStatus,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
			,a.HSourceInterID,a.HSourceEntryID,a.HSourceBillNo, a.HSourceBillType
			from Sc_ICMOBillWorkQtyStatus_Tmp a
			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 + " and HRelationInterID='0'");
			return new SQLHelper.ClsCN().RunProcReturn(sql, "Sc_ICMOBillWorkQtyStatus_Tmp");
			string sql = "";
			if (sWhere != null && sWhere != "")
			{
			sql = "select * from h_v_Sc_ICMOBillWorkQtyTmpList_ReportingPlatform " + sWhere;
			}
			else
			{
			sql = "select * from h_v_Sc_ICMOBillWorkQtyTmpList_ReportingPlatform " ;
			}

			return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_ICMOBillWorkQtyTmpList_ReportingPlatform");
			}
			#endregion

			@@ -1077,7 +1163,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！";
			objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = 1;
			return objJsonResult;
			}