MES-WEB-API.git

			@@ -732,6 +732,23 @@
			try
			{
			ds = oCN.RunProcReturn(@"select * from h_v_Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBarCode + "'", "h_v_Gy_BarCodeBill");

			//判断条码是否存在条码档案
			if (ds.Tables[0].Rows.Count > 0)
			{
			string HSourceBillNo = ds.Tables[0].Rows[0]["HSourceBillNo"].ToString();
			DataSet dataTable = oCN.RunProcReturn(@"select * from Sc_ProcessExchangeBillMain where HBillNo='" + HSourceBillNo + "'", "Sc_ProcessExchangeBillMain");
			//判断条码的源单流转卡是否被删除
			if (dataTable.Tables[0].Rows.Count == 0)
			{
			//如果源单已经删除则条码也删除重新生成
			oCN.RunProc("delete from Gy_BarCodeBill where HBarCode='" + HBarCode + "'");

			//重新查询条码档案进入新增方法
			ds = oCN.RunProcReturn(@"select * from Gy_BarCodeBill where HBarCode='" + HBarCode + "'", "Gy_BarCodeBill");
			}
			}

			if (ds.Tables[0].Rows.Count == 0)
			{
			//判断长度是否为29位无尘车间
			@@ -993,7 +1010,7 @@
			#region 工序单品过站配件码查询
			[Route("Cj_SingleStation/HBardCodeAccessoryList")]
			[HttpGet]
			public object HBardCodeAccessoryList(string HBarCode, string user)
			public object HBardCodeAccessoryList(string HBarCode, string HProcExchBillNo, string user,string HBillType)
			{
			try
			{
			@@ -1026,6 +1043,25 @@
			return objJsonResult;
			}

			DataSet dataSet = oCN.RunProcReturn(@"exec h_p_CJ_SNBarCodeBillMouldBathSelect '" + HBarCode + "','" + HProcExchBillNo + "','"+ HBillType + "'", "h_p_CJ_SNBarCodeBillMouldBathSelect");

			if (dataSet.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "配件条码判断失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ClsPub.isStrNull(dataSet.Tables[0].Rows[0]["HBack"]) == "2")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.isStrNull(dataSet.Tables[0].Rows[0]["HBackRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";