MES-WEB-API.git

			@@ -174,12 +174,28 @@
			entryid_PGD = arr[1];
			}

			//截取条码类型前两位
			string BillNoType1 = BillNo_PGD.Substring(0, Math.Min(2, BillNo_PGD.Length));
			//截取条码类型前三位
			string BillNoType = BillNo_PGD.Substring(0, Math.Min(3, BillNo_PGD.Length));
			//截取条码类型2 前四位
			string BillNoType2 = BillNo_PGD.Substring(0, Math.Min(4, BillNo_PGD.Length));
			//截取内码
			string BillNo = BillNo_PGD.Substring(3, Math.Min(BillNo_PGD.Length - 3, BillNo_PGD.Length));
			switch (BillNoType1)
			{
			case "20"://流转卡
			string sErr = "";
			if (oSystemParameter.ShowBill(ref sErr))
			{
			if (oSystemParameter.omodel.WMS_CampanyName == "杭州斯莫尔")
			{
			ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 单据号= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
			}
			}
			break;
			}

			switch (BillNoType2)
			{
			case "GXLZ"://工序流转派工
			@@ -303,6 +319,82 @@
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 工序进站扫配件码
			[Route("Cj_StationBill/txtHBarCode_Mater_KeyDown")]
			[HttpGet]
			public object txtHBarCode_Mater_KeyDown(string HBarCode, string HInterID)
			{
			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_MES_StationInBillSub_BindBarCode " + HInterID.ToString() + " ,'" + HBarCode + "'", "h_p_MES_StationInBillSub_BindBarCode");
			//写入信息
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "未查询到条形码信息！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 2)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "错误！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
			objJsonResult.data = null;
			return objJsonResult;
			}


			DataSet Dsplay = oCN.RunProcReturn("exec h_p_MES_StationInBillSub_BindDisplay " + HInterID.ToString() + " ", "h_p_MES_StationInBillSub_BindDisplay");

			//写入信息
			if (Dsplay == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "刷新失败,无数据显示！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else if (Dsplay.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "查无数据!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "绑定成功！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			@@ -1023,14 +1115,21 @@
			}

			ds = oCN.RunProcReturn("select ManagerFlag from gy_czygl where czymc='" + user.Trim() + "'", "gy_czygl");
			if (!(bool)ds.Tables[0].Rows[0]["ManagerFlag"]) //是否管理员
			string sErr = "";
			oSystemParameter.ShowBill(ref sErr);
			if (oSystemParameter.omodel.WMS_CampanyName == "乔一")
			{
			//不是管理员
			sWhere += " and 制单人 = '" + user + "'";
			}
			else
			{
			if (!(bool)ds.Tables[0].Rows[0]["ManagerFlag"]) //是否管理员
			{
			//不是管理员
			sWhere += " and 制单人 = '" + user + "'";
			}
			}


			string sql = "select * from h_v_QC_FirstPieceCheckBillMainList where 1=1 " + sWhere + " order by 日期 ";
			string sql = "select * from h_v_QC_FirstPieceCheckBillMainList where 1=1 " + sWhere ;

			ds = oCN.RunProcReturn(sql, "h_v_QC_FirstPieceCheckBillMainList");