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"://工序流转派工
			@@ -316,6 +332,82 @@
			}
			#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)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 指引卡扫码获取信息
			[Route("MES_SampleRecordBill_PDA/SampleRecordBillHBarCode_KeyDown")]
			[HttpGet]
			@@ -367,7 +459,13 @@
			{
			if (oSystemParameter.omodel.WMS_CampanyName == "乔一")
			{ //系统参数是否为只显示当前登录用户关联的工序信息,N为否，Y为是
			ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 单据号= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
			if (HBillType == "7505")
			{
			ds = oCN.RunProcReturn("exec h_p_Sc_ProcessExchangeBill__ProcList '" + BillNo_PGD + "' ", "h_p_Sc_ProcessExchangeBill__ProcList");
			}
			else {
			ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 单据号= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
			}
			}
			else
			{
			@@ -1016,7 +1114,22 @@
			return objJsonResult;
			}

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

			string sql = "select * from h_v_QC_FirstPieceCheckBillMainList where 1=1 " + sWhere ;

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

			@@ -1101,8 +1214,9 @@
			long HProcExchEntryID = list[0].HProcExchEntryID;//流转卡子ID
			long HMainSourceInterID = list[0].HMainSourceInterID;//源单ID
			long HMainSourceEntryID = list[0].HMainSourceEntryID;//源单子ID
			string HMainSourceBillNo = list[0].HMainSourceBillNo;//流转卡子ID

			string HMainSourceBillNo = list[0].HMainSourceBillNo;//源单单号
			string HMainSourceBillType = list[0].HMainSourceBillType;//源单类型

			//表体数据
			List<Model.ClsQC_FirstPieceCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_FirstPieceCheckBillSub>>(msg_entry);
			for (int i = 0; i < subList.ToArray().Length; i++)
			@@ -1187,10 +1301,10 @@
			oCN.RunProc("Insert Into QC_FirstPieceCheckBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
			",HYear,HPeriod,HMaterID,HSourceID,HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchBillNo" +
			",HPRDORGID,HLastResult,HProcExchInterID,HProcExchEntryID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo)" +
			",HPRDORGID,HLastResult,HProcExchInterID,HProcExchEntryID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType)" +
			" values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
			"," + HYear + "," + HPeriod + ",'" + HMaterID + "','" + HSourceID + "'," + HICMOInterID + "," + HICMOEntryID + ",'" + HICMOBillNo + "','" + HProcExchBillNo + "'" +
			"," + HPRDORGID + ",'" + HLastResult + "'," + HProcExchInterID + "," + HProcExchEntryID + "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "'" + ") ");
			"," + HPRDORGID + ",'" + HLastResult + "'," + HProcExchInterID + "," + HProcExchEntryID + "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'" + ") ");

			//插入子表
			foreach (Model.ClsQC_FirstPieceCheckBillSub oSub in BillNew.DetailColl)
			@@ -1202,8 +1316,8 @@
			",HQCCheckItemID,HQCStd,HResult" +
			",HStatus,HUnitID,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult" +
			") values("
			+ HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + HICMOInterID.ToString() +
			"," + HICMOEntryID.ToString() + ",'" + HICMOBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
			+ HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + HMainSourceInterID.ToString() +
			"," + HMainSourceEntryID.ToString() + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
			"," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HResult + "'" +
			",'" + oSub.HStatus +
			"'," + oSub.HUnitID + "," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" +