MES-WEB-API.git

			@@ -322,9 +322,23 @@
			objJsonResult.data = null;
			return objJsonResult;
			}

			string HProcID = "0";
			ds = oCN.RunProcReturn("select * from gy_czygl WITH(NOLOCK) where czymc='" + user + "'", "gy_czygl");
			string HProcID = ds.Tables[0].Rows[0]["HProcID"].ToString();
			if (ds.Tables[0].Rows.Count > 0)
			{
			HProcID = ds.Tables[0].Rows[0]["HProcID"].ToString();
			}

			//判断当前流转卡是否是开工
			ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceBillNo='" + HBarCode + "' and HICMOStatus='1'", "Sc_ICMOBillStatus_Tmp");
			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "卡号:" + HBarCode + ",流转卡未开工!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn(@"exec h_p_Gy_BarCodeBillBomList '" + HBarCode + "'," + HProcID, "h_p_Gy_BarCodeBillBomList");
			if (ds.Tables[0].Rows.Count == 0)
			@@ -732,8 +746,26 @@
			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位无尘车间
			if (HBarCode.Length == 29)
			{
			string str1 = HBarCode.Substring(18, 8);
			@@ -741,7 +773,7 @@
			DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 物料代码,o.HNumber 组织代码 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
			left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
			left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
			where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID="+ HOrgID, "Sc_ProcessExchangeBillMain");
			where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");

			if (dataSet.Tables[0].Rows.Count == 0)
			{
			@@ -767,7 +799,33 @@
			return get_HBardBillSave(HProcExchBillNo, HBarCode);
			}
			}
			else {
			else
			{
			ClsPub.CurUserName = user;
			//条码生成
			return get_HBardBillSave(HProcExchBillNo, HBarCode);
			}
			}
			//判断长度是否为50位 15车间
			else if (HBarCode.Length == 50)
			{
			string str1 = HBarCode.Substring(42, 8);

			DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 物料代码,o.HNumber 组织代码 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
			left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
			left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
			where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");

			if (dataSet.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码与流转卡不存在对应关系!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			ClsPub.CurUserName = user;
			//条码生成
			return get_HBardBillSave(HProcExchBillNo, HBarCode);
			@@ -783,19 +841,41 @@
			}
			}
			else {

			string str1 = HBarCode.Substring(18, 8);
			//判断长度是否为29位无尘车间
			if (HBarCode.Length == 29)
			{
			string str1 = HBarCode.Substring(18, 8);

			DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 物料代码,o.HNumber 组织代码 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
			DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 物料代码,o.HNumber 组织代码 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
			left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
			left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
			where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");

			if (dataSet.Tables[0].Rows.Count == 0)
			{
			str1 = HBarCode.Substring(23, 3);
			if (dataSet.Tables[0].Rows.Count == 0)
			{
			str1 = HBarCode.Substring(23, 3);

			dataSet = oCN.RunProcReturn(@"select m.HNumber 物料代码,o.HNumber 组织代码 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
			dataSet = oCN.RunProcReturn(@"select m.HNumber 物料代码,o.HNumber 组织代码 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
			left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
			left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
			where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");

			if (dataSet.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码与流转卡不存在对应关系!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			//判断长度是否为50位 15车间
			else if (HBarCode.Length == 50)
			{
			string str1 = HBarCode.Substring(42, 8);

			DataSet dataSet = oCN.RunProcReturn(@"select m.HNumber 物料代码,o.HNumber 组织代码 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
			left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
			left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
			where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");
			@@ -944,7 +1024,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
			{
			@@ -977,6 +1057,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 = "";