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]
			@@ -349,14 +441,206 @@
			entryid_PGD = arr[1];
			}


			//截取条码类型前三位
			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));

			string sErr = "";

			switch (BillNoType2)
			{
			case "GXLX"://流转卡
			string sErr = "";

			string sql = "";
			if (oSystemParameter.ShowBill(ref sErr))
			{
			if (oSystemParameter.omodel.WMS_CampanyName == "乔一")
			{ //系统参数是否为只显示当前登录用户关联的工序信息,N为否，Y为是
			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
			{
			if (oSystemParameter.ShowBill(ref sErr))
			{
			switch (oSystemParameter.omodel.QC_FirstPieceCheckBill_QCSchemeSource)
			{
			case "工序":
			sql = "exec h_p_QC_FirstPieceCheck_GetProcessExchangeBillList " + "'工序','" + BillNo_PGD + "'";
			ds = oCN.RunProcReturn(sql, "h_p_QC_FirstPieceCheck_GetProcessExchangeBillList");
			break;
			case "物料":
			sql = "exec h_p_QC_FirstPieceCheck_GetProcessExchangeBillList " + "'物料','" + BillNo_PGD + "'";
			ds = oCN.RunProcReturn(sql, "h_p_QC_FirstPieceCheck_GetProcessExchangeBillList");
			break;
			case "工艺路线":
			sql = "exec h_p_QC_FirstPieceCheck_GetProcessExchangeBillList " + "'工艺路线','" + BillNo_PGD + "'";
			ds = oCN.RunProcReturn(sql, "h_p_QC_FirstPieceCheck_GetProcessExchangeBillList");
			break;
			}

			}
			}
			}
			break;
			case "GXJZ":
			//截取条码类型前三位
			string HBillNo = HBarCode.Substring(4, HBarCode.Length - 4);
			ds = oCN.RunProcReturn("select * from Sc_StationInBillMain where HBillNo = '" + HBillNo + "'", "Sc_StationInBillMain");
			Int64 HStationInInterID = 0;

			if (ds != null \|\| ds.Tables[0].Rows.Count > 0)
			{
			HStationInInterID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HInterID"]);
			}

			if (oSystemParameter.ShowBill(ref sErr))
			{
			switch (oSystemParameter.omodel.QC_FirstPieceCheckBill_QCSchemeSource)
			{
			case "工序":
			sql = "exec h_p_QC_FirstPiece_GetStationInBillList " + "'工序','" + HStationInInterID + "'";
			ds = oCN.RunProcReturn(sql, "h_p_QC_FirstPiece_GetStationInBillList");
			break;
			case "物料":
			sql = "exec h_p_QC_FirstPiece_GetStationInBillList " + "'物料','" + HStationInInterID + "'";
			ds = oCN.RunProcReturn(sql, "h_p_QC_FirstPiece_GetStationInBillList");
			break;
			case "工艺路线":
			sql = "exec h_p_QC_FirstPiece_GetStationInBillList " + "'工艺路线','" + HStationInInterID + "'";
			ds = oCN.RunProcReturn(sql, "h_p_QC_FirstPiece_GetStationInBillList");
			break;
			}

			}
			break;
			case "MO00":
			if (oSystemParameter.ShowBill(ref sErr))
			{
			switch (oSystemParameter.omodel.QC_FirstPieceCheckBill_QCSchemeSource)
			{
			case "工序":
			sql = "exec h_p_QC_ProcessCheck_GetICMOList " + "'工序','" + HBarCode + "'";
			ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetICMOList");
			break;
			case "物料":
			sql = "exec h_p_QC_ProcessCheck_GetICMOList " + "'物料','" + HBarCode + "'";
			ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetICMOList");
			break;
			case "工艺路线":
			sql = "exec h_p_QC_ProcessCheck_GetICMOList " + "'工艺路线','" + HBarCode + "'";
			ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetICMOList");
			break;
			}

			}
			break;
			default:
			if (oSystemParameter.omodel.WMS_CampanyName == "乔一")
			{ //系统参数是否为只显示当前登录用户关联的工序信息,N为否，Y为是
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码错误!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			break;
			}
			}

			switch (BillNoType)
			//得到信息
			{
			case "HCX"://生产资源码
			ds = oCN.RunProcReturn("select * from h_v_Gy_SourceList where 条码编号 = '" + BillNo + "'", "h_v_Gy_SourceList");
			break;
			}

			if (ds != null)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回数据，条码前缀错误。";
			objJsonResult.data = "";
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region PDA工序检验单扫码获取信息
			[Route("MES_ProcessBill_PDA/HBarCode_KeyDown")]
			[HttpGet]
			public object HBarCode_KeyDown(string HBarCode, string HInterID, string UserID, string HBillType)
			{
			try
			{
			if (HBarCode == null \|\| HBarCode.Equals(""))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "空白码,条形码不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//拆分条形码
			string sBillBarCode = HBarCode.Trim();
			string[] NewBarCode;
			if (sBillBarCode.CompareTo("#") > 0)
			{
			NewBarCode = sBillBarCode.Split(Convert.ToChar("#"));
			sBillBarCode = NewBarCode[0];
			}
			string sBillNo = sBillBarCode; //条形码

			string[] arr = sBillNo.Split('&'); //以符号‘&’分割条形码
			string BillNo_PGD = arr[0]; //单据号
			string entryid_PGD = "";//子id
			if (arr.Length > 1)
			{
			entryid_PGD = arr[1];
			}

			//截取条码类型前三位
			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));

			string sErr = "";

			switch (BillNoType2)
			{
			case "GXLX"://流转卡

			string sql = "";
			if (oSystemParameter.ShowBill(ref sErr))
			{
			if (oSystemParameter.omodel.WMS_CampanyName == "乔一")
			@@ -365,24 +649,117 @@
			}
			else
			{
			ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 单据号= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
			if (oSystemParameter.ShowBill(ref sErr))
			{
			switch (oSystemParameter.omodel.QC_ProcessCheckBill_QCSchemeSource)
			{
			case "工序":
			sql = "exec h_p_QC_ProcessCheck_GetProcessExchangeBillList " + "'工序','" + BillNo_PGD + "'";
			ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetProcessExchangeBillList");
			break;
			case "物料":
			sql = "exec h_p_QC_ProcessCheck_GetProcessExchangeBillList " + "'物料','" + BillNo_PGD + "'";
			ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetProcessExchangeBillList");
			break;
			case "工艺路线":
			sql = "exec h_p_QC_ProcessCheck_GetProcessExchangeBillList " + "'工艺路线','" + BillNo_PGD + "'";
			ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetProcessExchangeBillList");
			break;
			}

			}
			}
			}
			break;
			case "GXCZ":
			ds = oCN.RunProcReturn("select * from Sc_StationOutBillMain where HBillNo = '" + HBarCode + "'", "Sc_StationOutBillMain");
			Int64 HStationOutInterID = 0;

			if (ds != null \|\| ds.Tables[0].Rows.Count > 0)
			{
			HStationOutInterID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HInterID"]);
			}

			if (oSystemParameter.ShowBill(ref sErr))
			{
			switch (oSystemParameter.omodel.QC_ProcessCheckBill_QCSchemeSource)
			{
			case "工序":
			sql = "exec h_p_QC_ProcessCheck_GetStationOutBillList " + "'工序','" + HStationOutInterID + "'";
			ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetStationOutBillList");
			break;
			case "物料":
			sql = "exec h_p_QC_ProcessCheck_GetStationOutBillList " + "'物料','" + HStationOutInterID + "'";
			ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetStationOutBillList");
			break;
			case "工艺路线":
			sql = "exec h_p_QC_ProcessCheck_GetStationOutBillList " + "'工艺路线','" + HStationOutInterID + "'";
			ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetStationOutBillList");
			break;
			}

			}
			break;
			case "MO00":
			if (oSystemParameter.ShowBill(ref sErr))
			{
			switch (oSystemParameter.omodel.QC_ProcessCheckBill_QCSchemeSource)
			{
			case "工序":
			sql = "exec h_p_QC_ProcessCheck_GetICMOList " + "'工序','" + HBarCode + "'";
			ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetICMOList");
			break;
			case "物料":
			sql = "exec h_p_QC_ProcessCheck_GetICMOList " + "'物料','" + HBarCode + "'";
			ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetICMOList");
			break;
			case "工艺路线":
			sql = "exec h_p_QC_ProcessCheck_GetICMOList " + "'工艺路线','" + HBarCode + "'";
			ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetICMOList");
			break;
			}

			}
			break;
			default:
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码错误!";
			objJsonResult.data = null;
			return objJsonResult;
			if (oSystemParameter.omodel.WMS_CampanyName == "乔一")
			{ //系统参数是否为只显示当前登录用户关联的工序信息,N为否，Y为是
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码错误!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			break;
			}
			}


			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;

			switch (BillNoType)
			//得到信息
			{
			case "HCX"://生产资源码
			ds = oCN.RunProcReturn("select * from h_v_Gy_SourceList where 条码编号 = '" + BillNo + "'", "h_v_Gy_SourceList");
			break;
			}

			if (ds != null)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回数据，条码前缀错误。";
			objJsonResult.data = "";
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			@@ -737,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");

			@@ -785,6 +1177,7 @@
			string msg2 = "[" + sArray[0].ToString() + "]";
			string user = sArray[1].ToString();//用户名
			string OperationType = sArray[2].ToString();//类型
			string msg_entry = sArray[3].ToString(); //明细行信息

			//判断是否有编辑权限
			if (!DBUtility.ClsPub.Security_Log("QC_FirstPieceCheckBill_Edit", 1, false, user))
			@@ -795,6 +1188,8 @@
			objJsonResult.data = null;
			return objJsonResult;
			}

			DAL.ClsQC_FirstPieceCheckBill BillNew = new DAL.ClsQC_FirstPieceCheckBill();

			List<Model.ClsQC_FirstPieceCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_FirstPieceCheckBillMain>>(msg2);
			string BillType = "7505";
			@@ -807,6 +1202,7 @@
			double HPeriod = DateTime.Now.Month;
			long HSourceID = list[0].HSourceID;//生产资源
			long HICMOInterID = list[0].HICMOInterID;//任务单ID
			long HICMOEntryID = list[0].HICMOEntryID;//任务单子ID
			string HICMOBillNo = list[0].HICMOBillNo;//任务单
			string HProcExchBillNo = list[0].HProcExchBillNo;//指引卡
			long HMaterID = list[0].HMaterID;//产品ID
			@@ -814,9 +1210,78 @@
			long HProcID = list[0].HProcID;//工序ID
			long HPRDORGID = list[0].HPRDORGID;//组织ID
			bool HLastResult = list[0].HLastResult;//试样结论
			long HQCSchemeID = list[0].HQCSchemeID;//检验方案
			long HProcExchInterID = list[0].HProcExchInterID;//流转卡ID
			long HProcExchEntryID = list[0].HProcExchEntryID;//流转卡子ID
			string HBatchNo = list[0].HBatchNo;//流转卡批次号
			long HMainSourceInterID = list[0].HMainSourceInterID;//源单ID
			long HMainSourceEntryID = list[0].HMainSourceEntryID;//源单子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++)
			{
			if (subList.ToArray().Length >= 0)
			{
			Model.ClsQC_FirstPieceCheckBillSub oSub = new Model.ClsQC_FirstPieceCheckBillSub();
			oSub.HEntryID = i + 1;
			oSub.HRemark = ClsPub.isStrNull(subList[i].HRemark);
			oSub.HSourceInterID = ClsPub.isLong(subList[i].HSourceInterID);
			oSub.HSourceEntryID = ClsPub.isLong(subList[i].HSourceEntryID);
			oSub.HSourceBillType = ClsPub.isStrNull(subList[i].HSourceBillType);
			oSub.HSourceBillNo = ClsPub.isStrNull(subList[i].HSourceBillNo);
			oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[i].HRelationQty);
			oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[i].HRelationMoney);
			oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[i].HCloseMan);
			oSub.HCloseType = DBUtility.ClsPub.isBool(subList[i].HCloseType);
			oSub.HQCCheckItemID = DBUtility.ClsPub.isLong(subList[i].HQCCheckItemID);
			oSub.HQCStd = DBUtility.ClsPub.isStrNull(subList[i].HQCStd);
			oSub.HResult = DBUtility.ClsPub.isStrNull(subList[i].HResult);
			//oSub.HProcCheckTime = HDate;
			//oSub.HBillNo_bak = DBUtility.ClsPub.isStrNull(mainList[0].HBillNo);
			//oSub.HProcCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp);
			oSub.HSampleSchemeID = DBUtility.ClsPub.isLong(subList[i].HSampleSchemeID);
			oSub.HSampleQty = DBUtility.ClsPub.isLong(subList[i].HSampleQty);
			oSub.HSampleDamageQty = DBUtility.ClsPub.isDoule(subList[i].HSampleDamageQty);
			oSub.HAcceptQty = DBUtility.ClsPub.isLong(subList[i].HAcceptQty);
			oSub.HRejectQty = DBUtility.ClsPub.isLong(subList[i].HRejectQty);
			oSub.HSampleUnRightQty = DBUtility.ClsPub.isDoule(subList[i].HSampleUnRightQty);
			oSub.HStatus = DBUtility.ClsPub.isStrNull(subList[i].HStatus);
			oSub.HUnitID = DBUtility.ClsPub.isLong(subList[i].HUnitID);
			oSub.HInspectVal = DBUtility.ClsPub.isStrNull(subList[i].HInspectVal);
			oSub.HTargetVal = DBUtility.ClsPub.isStrNull(subList[i].HTargetVal);
			oSub.HUpLimit = DBUtility.ClsPub.isStrNull(subList[i].HUpLimit);
			oSub.HDownLimit = DBUtility.ClsPub.isStrNull(subList[i].HDownLimit);
			oSub.HUpOffSet = DBUtility.ClsPub.isStrNull(subList[i].HUpOffSet);
			oSub.HDownOffSet = DBUtility.ClsPub.isStrNull(subList[i].HDownOffSet);
			oSub.HAnalysisMethod = DBUtility.ClsPub.isStrNull(subList[i].HAnalysisMethod);
			oSub.HKeyInspect = DBUtility.ClsPub.isLong(subList[i].HKeyInspect);
			oSub.HInspectInstruMentID = DBUtility.ClsPub.isLong(subList[i].HInspectInstruMentID);
			oSub.HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult == "True" ? 1 : 0);

			oSub.HQCNote = DBUtility.ClsPub.isStrNull(subList[i].HQCNote);//检验记录
			oSub.HMax = DBUtility.ClsPub.isStrNull(subList[i].HMax);
			oSub.HMin = DBUtility.ClsPub.isStrNull(subList[i].HMin);
			oSub.HAvg = DBUtility.ClsPub.isStrNull(subList[i].HAvg);



			BillNew.DetailColl.Add(oSub);
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无明细行信息!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			//单据完整性判断
			if (HProcExchBillNo == "")
			if (HProcExchBillNo == "" && HMainSourceBillNo.Substring(0, Math.Min(2, HMainSourceBillNo.Length)) != "MO" )
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -844,11 +1309,47 @@
			}
			oCN.RunProc("Insert Into QC_FirstPieceCheckBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
			",HYear,HPeriod,HMaterID,HSourceID,HICMOInterID,HICMOBillNo,HProcExchBillNo" +
			",HPRDORGID,HLastResult)" +
			",HYear,HPeriod,HMaterID,HSourceID,HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchBillNo" +
			",HPRDORGID,HLastResult,HProcID,HQCSchemeID,HBatchNo," +
			"HProcExchInterID,HProcExchEntryID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType)" +
			" values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
			"," + HYear + "," + HPeriod + ",'" + HMaterID + "','" + HSourceID + "'," + HICMOInterID + ",'" + HICMOBillNo + "','" + HProcExchBillNo + "'" +
			"," + HPRDORGID + ",'" + HLastResult + "') ");
			"," + HYear + "," + HPeriod + ",'" + HMaterID + "','" + HSourceID + "'," + HICMOInterID + "," + HICMOEntryID + ",'" + HICMOBillNo + "','" + HProcExchBillNo + "'" +
			"," + HPRDORGID + ",'" + HLastResult + "','" + HProcID + "','" + HQCSchemeID + "','" + HBatchNo + "'," +
			"" + HProcExchInterID + "," + HProcExchEntryID + "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'" + ") ");

			//插入子表
			foreach (Model.ClsQC_FirstPieceCheckBillSub oSub in BillNew.DetailColl)
			{
			string sql = "Insert into QC_FirstPieceCheckBillSub " +
			" (HInterID,HBillNo_bak,HEntryID" +
			",HRemark,HSourceInterID" +
			",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
			",HQCCheckItemID,HQCStd,HResult" +
			",HStatus,HUnitID,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult," +
			"HQCNote,HMax,HMin,HAvg" +
			") values("
			+ 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 + "'" +
			",'" + oSub.HQCNote + "','" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "'" +
			")";

			oCN.RunProc("Insert into QC_FirstPieceCheckBillSub " +
			" (HInterID,HBillNo_bak,HEntryID" +
			",HRemark,HSourceInterID" +
			",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
			",HQCCheckItemID,HQCStd,HResult" +
			",HStatus,HUnitID,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult," +
			"HQCNote,HMax,HMin,HAvg" +
			") values("
			+ 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 + "'" +
			",'" + oSub.HQCNote + "','" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "'" +
			") ");
			}
			}
			else
			{
			@@ -1166,6 +1667,99 @@
			}


			}
			#endregion

			#region 指引卡变更单新增保存
			[Route("MES_Sc_ProcessExchangeBillMain_Note_PDA/ProcessExchangeBillMain_NoteAddBill")]
			[HttpPost]
			public object ProcessExchangeBillMain_NoteAddBill([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			try
			{
			//反序列化
			string msg2 = "[" + sArray[0].ToString() + "]";
			string user = sArray[1].ToString();//用户名
			string OperationType = sArray[2].ToString();//类型

			//判断是否有编辑权限
			if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Change", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无变更权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			List<Model.Sc_ProcessExchangeBillMain_Note> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.Sc_ProcessExchangeBillMain_Note>>(msg2);

			long HSouceID_Original = list[0].HSouceID_Original;
			long HSouceID_Now = list[0].HSouceID_Now;
			long HOrgID = list[0].HOrgID;//组织ID
			String HICMOBillNo = list[0].HICMOBillNo;//任务单
			long HICMOInterID = list[0].HICMOInterID;//任务单ID
			long HProcExchInterID = list[0].HProcExchInterID;
			long HProcExchEntryID = list[0].HProcExchEntryID;
			String HProcExchBillNo = list[0].HProcExchBillNo;
			String HBillNo_Note = list[0].HBillNo_Note;//指引卡
			long HMaterID = list[0].HMaterID;//产品ID
			long HUnitID = list[0].HUnitID;//计量单位
			long HProcID = list[0].HProcID;//工序ID
			string HMaker = user;//制单人
			string HMakeDate = list[0].HMakeDate;//制单日期

			//单据完整性判断
			if (HProcExchBillNo == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "流转卡没有选择！请扫描条形码或输入条形码后回车";
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCN.BeginTran();
			if (OperationType == "1")
			{
			oCN.RunProc("Insert Into Sc_ProcessExchangeBillMain_Note " +
			"(HBillNo_Note,HSouceID_Original,HSouceID_Now,HOrgID,HICMOInterID,HICMOBillNo,HProcExchBillNo,HProcExchInterID" +
			",HProcExchEntryID,HMaterID,HUnitID,HProcID,HMaker,HMakeDate)" +
			" values('" + HBillNo_Note + "','" + HSouceID_Original + "'," + HSouceID_Now + ",'" + HOrgID + "'," + HICMOInterID + ",'"+ HICMOBillNo + "','" + HProcExchBillNo + "' ," + HProcExchInterID +
			"," + HProcExchEntryID + ",'" + HMaterID + "','" + HUnitID + "'," + HProcID + ",'" + HMaker + "','" + HMakeDate + "')" );

			oCN.RunProc("update Sc_ProcessExchangeBillSub set HSourceID=" + HSouceID_Now + " where HInterID=" + HProcExchInterID + " and HEntryID=" + HProcExchEntryID);
			}
			else
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "操作类型无效！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCN.Commit();

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "新增单据成功！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			@@ -2064,6 +2658,6 @@
			}
			}
			#endregion
			//
			//
			}
			}