MES-WEB-API.git

			@@ -682,6 +682,9 @@
			oCN.RunProc($@"insert into Sc_StationOutBillSub_SN(HInterID,HBillNo_bak,HEntryID,HBarCode,HBarCodeQty,HMakeTime,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney)
			values({HInterID}, '{HBillNo}', {(ds.Tables[0].Rows.Count == 0 ? 1 : int.Parse(ds.Tables[0].Rows[0]["HEntryID"].ToString()) + 1)}, '{omodel.HBarCode_P}', 1, GETDATE(), '', " + HProcExchInterID + ","+ HProcExchEntryID + ", '"+ HProcExchBillNo + "', '', 0, 0)");

			//把条码写入日志里面
			LogService.CustomWriteLog("条码:" + omodel.HBarCode_P + ",工序:"+ HProcID + ",出站时间:" + DateTime.Now, "TM" + DateTime.Now.ToString("yyyy-MM-dd"));

			//反写工序出站单的合格数量
			oCN.RunProc("update Sc_StationOutBillMain set HQty+=1 where HProcExchInterID='" + HProcExchInterID + "' and HProcExchEntryID=" + HProcExchEntryID+ " and HInterID=" + HInterID);

			@@ -733,7 +736,7 @@
			{
			if (HBarCode.Length == 29)
			{
			string str1 = HBarCode.Substring(23, 3);
			string str1 = HBarCode.Substring(18, 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
			@@ -742,11 +745,27 @@

			if (dataSet.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码与流转卡不存在对应关系!";
			objJsonResult.data = null;
			return objJsonResult;
			str1 = HBarCode.Substring(23, 3);

			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);
			}
			}
			else {
			ClsPub.CurUserName = user;
			@@ -765,7 +784,7 @@
			}
			else {

			string str1 = HBarCode.Substring(23, 3);
			string str1 = HBarCode.Substring(18, 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
			@@ -774,11 +793,21 @@

			if (dataSet.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码与流转卡不存在对应关系!";
			objJsonResult.data = null;
			return objJsonResult;
			str1 = HBarCode.Substring(23, 3);

			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;
			}
			}

			if (ds.Tables[0].Rows[0]["HStatus"].ToString() != "")