MES-WEB-API.git

			@@ -15,6 +15,7 @@
			{
			private json objJsonResult = new json();
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
			DataSet ds;

			#region 工序单品不良采集用户查询关联字段
			@@ -29,7 +30,7 @@
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.Message = "[0000-1-038]Sucess！";
			objJsonResult.data = new DataTable();
			return objJsonResult;
			}
			@@ -38,7 +39,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.Message = "[0000-1-037]Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			@@ -46,7 +47,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -183,14 +184,31 @@

			if (ds.Tables[0].Rows.Count == 0)//新增
			{
			//主表
			oCN.RunProc(@"Insert Into Sc_QualityReportBillMain
			(HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate
			,HYear,HPeriod,HRemark,HMaker,HMakeDate
			,HEmpID,HGroupID,HDeptID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo)
			if (HResult== "微瑕品")
			{
			//主表
			oCN.RunProc(@"Insert Into Sc_QualityReportBillMain
			(HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate
			,HYear,HPeriod,HRemark,HMaker,HMakeDate
			,HEmpID,HGroupID,HDeptID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo)
			values('3717','3717-1',1," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
			"," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" +
			",'" + HEmpID + "'," + HGroupID + "," + HDeptID + "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "') ");
			//重新给HResult赋值
			HResult = "";
			}
			else
			{
			//主表
			oCN.RunProc(@"Insert Into Sc_QualityReportBillMain
			(HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate
			,HYear,HPeriod,HRemark,HMaker,HMakeDate
			,HEmpID,HGroupID,HDeptID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo)
			values('3717','3717',1," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
			"," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" +
			",'" + HEmpID + "'," + HGroupID + "," + HDeptID + "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "') ");
			"," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" +
			",'" + HEmpID + "'," + HGroupID + "," + HDeptID + "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "') ");
			}


			}

			@@ -280,18 +298,32 @@
			(HInterID,HENTRYID,HBillNo_bak,HEmpID,HBarCode,HBadReasonID,HAddr,HMaker,HMakeDate
			,HMaterID,HUnitID,HRemark,HSourceID,HICMOInterID,HICMOEntryID,HICMOBillNo,HReportType
			,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney
			,HQty,HResult,HProcExchInterID,HProcExchEntryID,HProcExchBillNo)
			,HQty,HResult,HProcExchInterID,HProcExchEntryID,HProcExchBillNo,HProcID)
			values({HInterID},1,'{oSub.HBillNo_bak}',{oSub.HEmpID},'{oSub.HBarCode}',{oSub.HBadReasonID},'','{oSub.HMaker}','{oSub.HMakeDate}'
			,{oSub.HMaterID},{oSub.HUnitID},'{oSub.HRemark}',{oSub.HSourceID},{oSub.HICMOInterID},{oSub.HICMOEntryID},'{oSub.HICMOBillNo}',{oSub.HReportType}
			,0,0,'','',0,0
			,0,'{HResult}',{oSub.HProcExchInterID},{oSub.HProcExchEntryID},'{oSub.HProcExchBillNo}')");
			,1,'{HResult}',{oSub.HProcExchInterID},{oSub.HProcExchEntryID},'{oSub.HProcExchBillNo}',{oSub.HProcID})");

			//修改条码表的状态
			oCN.RunProc("update Gy_BarCodeBill set HStatus='"+ HResult + "' where HBarCode='"+ oSub.HBarCode + "'");

			//修改出站单的不良报废数量
			if (HResult == "不良") {
			oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1 where HProcExchBillNo='" + oSub.HProcExchBillNo + "' and HProcID=" + oSub.HProcID + " and HInterID=" + linterid);
			if (HResult == "不良")
			{
			LogService.Write("类型:" + oSub.HBadTypeID);
			//工废
			if (oSub.HBadTypeID == 3)
			{
			oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1,HWasterQty_Work+=1 where HProcExchBillNo='" + oSub.HProcExchBillNo + "' and HProcID=" + oSub.HProcID + " and HInterID=" + linterid);
			}//料废
			else if (oSub.HBadTypeID == 4)
			{
			oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1,HWasterQty_Mater+=1 where HProcExchBillNo='" + oSub.HProcExchBillNo + "' and HProcID=" + oSub.HProcID + " and HInterID=" + linterid);
			}//返工
			else if (oSub.HBadTypeID == 6)
			{
			oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1,HBackWorkQty+=1 where HProcExchBillNo='" + oSub.HProcExchBillNo + "' and HProcID=" + oSub.HProcID + " and HInterID=" + linterid);
			}
			}
			else if (HResult == "报废")
			{
			@@ -318,7 +350,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限!";
			objJsonResult.Message = "[0000-1-068]无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -329,16 +361,27 @@
			HProcID = ds.Tables[0].Rows[0]["HProcID"].ToString();
			}

			//判断当前流转卡是否是开工
			ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceBillNo='" + HBarCode + "' and HICMOStatus<>'0'", "Sc_ICMOBillStatus_Tmp");
			if (ds.Tables[0].Rows.Count == 0)


			//客户制定
			string sErr = "";
			if (oSystemParameter.ShowBill(ref sErr))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "卡号:" + HBarCode + ",流转卡未开工!";
			objJsonResult.data = null;
			return objJsonResult;
			if (oSystemParameter.omodel.WMS_CampanyName == "杭州斯莫尔")
			{
			//判断当前流转卡是否是开工
			ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceBillNo='" + HBarCode + "' and HICMOStatus<>'0'", "Sc_ICMOBillStatus_Tmp");
			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "[3791-2-018]卡号:" + 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)
			@@ -349,7 +392,7 @@
			{
			objJsonResult.code = "2";
			objJsonResult.count = 2;
			objJsonResult.Message = "";
			objJsonResult.Message = "[0000-1-037]";
			objJsonResult.data = dataSet.Tables[0];
			return objJsonResult;
			}
			@@ -357,7 +400,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "配件清单查无数据！,可能是当前用户工序不正确或者流转卡输入错误!";
			objJsonResult.Message = "[3791-2-019]配件清单查无数据！,可能是当前用户工序不正确或者流转卡输入错误!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -366,7 +409,7 @@
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.Message = "[0000-1-037]";
			objJsonResult.data = ds.Tables[0];
			}

			@@ -377,7 +420,7 @@

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.Message = "[0000-1-010]没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -406,7 +449,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限!";
			objJsonResult.Message = "[0000-2-038]无保存权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -419,7 +462,7 @@
			if (tempList.Count == 0) {
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无配件数据!";
			objJsonResult.Message = "[3791-2-026]无配件数据!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -450,7 +493,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功!";
			objJsonResult.Message = "[0000-1-050]保存成功!";
			objJsonResult.data = null;
			return objJsonResult;

			@@ -460,7 +503,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.Message = "[0000-1-051]没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -486,7 +529,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限!";
			objJsonResult.Message = "[0000-2-038]无保存权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -506,7 +549,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "查无数据!";
			objJsonResult.Message = "[0000-1-045]查无数据!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -514,7 +557,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "！";
			objJsonResult.Message = "[0000-1-051]" + ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -526,7 +569,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码:" + omodel.HBarCode_P + ",已存在!";
			objJsonResult.Message = "[0000-2-039]条码:" + omodel.HBarCode_P + ",已存在!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -545,7 +588,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "配件代码:" + HMaterNamePJ + ",数量为0!";
			objJsonResult.Message = "[3791-2-020]配件代码:" + HMaterNamePJ + ",数量为0!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -585,7 +628,7 @@
			sMainStr = "[" + sMainStr + "]";
			List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(sMainStr);

			ds = oCN.RunProcReturn("select HCenterID from Sc_ProcessExchangeBillSub WITH(NOLOCK) where HInterID=" + list[0].HProcExchInterID + " and HEntryID=" + list[0].HProcExchEntryID, "Sc_ProcessExchangeBillSub");
			ds = oCN.RunProcReturn("select HCenterID from Sc_ProcessExchangeBillSub WITH(NOLOCK) where HInterID=" + list[0].HProcExchInterID + " and HEntryID=" + list[0].HProcExchEntryID, "Sc_ProcessExchangeBillSub");
			if (ds.Tables[0].Rows.Count > 0)
			{
			list[0].HCenterID = long.Parse(ds.Tables[0].Rows[0]["HCenterID"].ToString());
			@@ -659,7 +702,13 @@
			double HmaterOutqty = 0;//白坯发布
			double HProcPriceRate = 0;//工价系数
			int HTemporaryAreaID = 0;//暂放区
			int HShiftsID = 0;

			DataSet set = oCN.RunProcReturn("exec h_p_Gy_GetWorkShiftInfo " + HDeptID + "," + HCenterID, "h_p_Gy_GetWorkShiftInfo");
			if (set.Tables[0].Rows.Count > 0)
			{
			HShiftsID = int.Parse(set.Tables[0].Rows[0]["HInterID"].ToString());
			}
			ds = oCN.RunProcReturn("select * from Sc_StationOutBillMain a WITH(NOLOCK) left join Sc_StationOutBillSub_SN sn WITH(NOLOCK) on a.HInterID=sn.HInterID where a.HInterID=" + HInterID + " and HBillNo='" + HBillNo + "' and CONVERT(varchar(10),HDate,20) ='" + DateTime.Now.ToString("yyyy-MM-dd") + "' ", "Sc_StationOutBillMain");

			if (ds.Tables[0].Rows.Count == 0)
			@@ -676,9 +725,9 @@
			",HSupID,HQty,HPrice,HMoney,HBadCount,HCenterID,HProcNo,HOrderProcNO,HSourceNameList" +
			",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HLastSubProc" +
			",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID,HMainInterID,HPRDOrgID" +
			",HmaterOutqty,HProcPriceRate,HTemporaryAreaID" +
			",HmaterOutqty,HProcPriceRate,HTemporaryAreaID,HShiftsID" +
			") " +
			" values('" + BillType + "','"+ HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" +
			" values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" +
			"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL +
			"," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
			",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID + "," + HPayProcID +
			@@ -686,7 +735,7 @@
			"," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HBadCount + "," + HCenterID + "," + HProcNo + ",'" + HOrderProcNO + "'" + ",'" + HSourceNameList + "'" +
			"," + HMainSourceInterID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + Convert.ToString(HLastSubProc ? 1 : 0) +
			"," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID + "," + HMainInterID + "," + HPRDOrgID +
			"," + HmaterOutqty + "," + HProcPriceRate + "," + HTemporaryAreaID + ") ");
			"," + HmaterOutqty + "," + HProcPriceRate + "," + HTemporaryAreaID + "," + HShiftsID + ") ");
			}


			@@ -712,7 +761,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "出站数量超过流转卡数量!";
			objJsonResult.Message = "[3791-2-028]出站数量超过流转卡数量!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -721,7 +770,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功!";
			objJsonResult.Message = "[0000-1-050]保存成功!";
			objJsonResult.data = null;
			return objJsonResult;

			@@ -731,7 +780,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.Message = "[0000-1-051]没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -788,7 +837,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码与流转卡不存在对应关系!";
			objJsonResult.Message = "[3791-2-016]条码与流转卡不存在对应关系!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -820,7 +869,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码与流转卡不存在对应关系!";
			objJsonResult.Message = "[3791-2-016]条码与流转卡不存在对应关系!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -835,7 +884,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码格式不正确!";
			objJsonResult.Message = "[0000-2-036]条码格式不正确!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -864,7 +913,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码与流转卡不存在对应关系!";
			objJsonResult.Message = "[3791-2-016]条码与流转卡不存在对应关系!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -884,7 +933,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码与流转卡不存在对应关系!";
			objJsonResult.Message = "[3791-2-016]条码与流转卡不存在对应关系!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -894,7 +943,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "当前条码的状态为:" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "！";
			objJsonResult.Message = "[0000-2-037]当前条码的状态为:" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -902,7 +951,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.Message = "[0000-1-037]";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			@@ -911,7 +960,7 @@

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.Message = "[0000-1-010]没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -934,7 +983,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条形码不能为空，不能生成条码！";
			objJsonResult.Message = "[0000-2-019]条形码不能为空，不能生成条码！";
			return objJsonResult;
			}

			@@ -1005,7 +1054,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.Message = "[0000-1-037]";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1014,7 +1063,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.Message = "[0000-1-010]没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1033,7 +1082,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限!";
			objJsonResult.Message = "[0000-1-068]无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1043,7 +1092,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "SN码查无数据！";
			objJsonResult.Message = "[3791-2-023]SN码查无数据！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1052,7 +1101,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "当前条码的状态为:"+ ds.Tables[0].Rows[0]["HStatus"].ToString() + "！";
			objJsonResult.Message = "[0000-2-037]当前条码的状态为:" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1063,7 +1112,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "配件条码判断失败！";
			objJsonResult.Message = "[3791-2-024]配件条码判断失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1071,14 +1120,14 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.isStrNull(dataSet.Tables[0].Rows[0]["HBackRemark"]);
			objJsonResult.Message = "[0000-1-010]" + DBUtility.ClsPub.isStrNull(dataSet.Tables[0].Rows[0]["HBackRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.Message = "[0000-1-037]";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			@@ -1087,7 +1136,7 @@

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.Message = "[0000-1-010]没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1106,7 +1155,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限!";
			objJsonResult.Message = "[0000-1-068]无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1120,7 +1169,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码查无数据！";
			objJsonResult.Message = "[0000-1-045]条码查无数据！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1136,7 +1185,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "当前条码与当前工序不匹配!";
			objJsonResult.Message = "[3791-2-017]当前条码与当前工序不匹配!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1144,14 +1193,14 @@
			if (ds.Tables[0].Rows[0]["HStatus"].ToString() != "正常") {
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "当前条码状态为"+ ds.Tables[0].Rows[0]["HStatus"].ToString() + "!";
			objJsonResult.Message = "[0000-2-037]当前条码状态为" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.Message = "[0000-1-037]";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			@@ -1160,7 +1209,7 @@

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.Message = "[0000-1-010]没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1179,7 +1228,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限!";
			objJsonResult.Message = "[0000-1-068]无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1188,7 +1237,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.Message = "[0000-1-037]";
			objJsonResult.data = ds;
			return objJsonResult;
			}
			@@ -1197,7 +1246,7 @@

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.Message = "[0000-1-010]没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1216,7 +1265,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限!";
			objJsonResult.Message = "[0000-1-068]无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1225,7 +1274,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.Message = "[0000-1-037]";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			@@ -1234,7 +1283,7 @@

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.Message = "[0000-1-010]没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1253,7 +1302,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限!";
			objJsonResult.Message = "[0000-1-058]无删除权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1264,7 +1313,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "查无数据！";
			objJsonResult.Message = "[0000-1-045]查无数据！";
			objJsonResult.data = null;
			}
			string HProcExchInterID = ds.Tables[0].Rows[0]["HProcExchInterID"].ToString();
			@@ -1297,7 +1346,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.Message = "[0000-1-037]Sucess！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1306,7 +1355,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1325,7 +1374,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限!";
			objJsonResult.Message = "[0000-1-058]无删除权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1338,7 +1387,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "查无数据！";
			objJsonResult.Message = "[0000-1-045]查无数据！";
			objJsonResult.data = null;
			}

			@@ -1367,7 +1416,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.Message = "[0000-1-037]Sucess！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1376,7 +1425,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.Message = "[0000-1-010]Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1395,7 +1444,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限!";
			objJsonResult.Message = "[0000-1-068]无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1409,7 +1458,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码查无数据！";
			objJsonResult.Message = "[0000-2-020]条码查无数据！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1426,7 +1475,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "当前条码与当前工序不匹配!";
			objJsonResult.Message = "[3791-2-017]当前条码与当前工序不匹配!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1435,7 +1484,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "当前条码状态为" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "!";
			objJsonResult.Message = "[0000-2-037]当前条码状态为" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1443,7 +1492,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.Message = "[0000-1-037]";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			@@ -1452,7 +1501,7 @@

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.Message = "[0000-1-010]没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1519,7 +1568,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限!";
			objJsonResult.Message = "[0000-1-068]无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1539,7 +1588,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.Message = "[0000-1-037]Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			@@ -1548,7 +1597,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.Message = "[0000-1-010]Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1575,7 +1624,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限!";
			objJsonResult.Message = "[0000-2-038]无保存权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1651,15 +1700,27 @@
			if (dataSet.Tables[0].Rows.Count > 0)
			{
			string HOutInterID = dataSet.Tables[0].Rows[0][0].ToString();

			oCN.RunProc("update Sc_StationOutBillMain set HBadCount-=1 where HInterID='" + HOutInterID + "'");
			//斯莫尔的情况分工废料废返工
			//工废
			if (subLsit[0].HBadTypeID == 3)
			{
			oCN.RunProc("update Sc_StationOutBillMain set HBadCount-=1,HWasterQty_Work-=1 where HInterID='" + HOutInterID + "'");
			}//料废
			else if (subLsit[0].HBadTypeID == 4)
			{
			oCN.RunProc("update Sc_StationOutBillMain set HBadCount-=1,HWasterQty_Mater-=1 where HInterID='" + HOutInterID + "'");
			}//返工
			else if (subLsit[0].HBadTypeID == 6)
			{
			oCN.RunProc("update Sc_StationOutBillMain set HBadCount-=1,HBackWorkQty-=1 where HInterID='" + HOutInterID + "'");
			}
			}
			else
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败,当前流转卡当前工序的出站单没有不良数量!";
			objJsonResult.Message = "[3748-2-005]保存失败,当前流转卡当前工序的出站单没有不良数量!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1669,7 +1730,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败,无结果！";
			objJsonResult.Message = "[0000-1-051]保存失败,无结果！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1679,7 +1740,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.Message = "[0000-1-050]Sucess！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1688,7 +1749,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.Message = "[0000-1-051]Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1707,7 +1768,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限!";
			objJsonResult.Message = "[0000-1-058]无删除权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1717,7 +1778,7 @@
			if (ds.Tables[0].Rows.Count == 0) {
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "查无数据！";
			objJsonResult.Message = "[0000-1-045]查无数据！";
			objJsonResult.data = null;
			}

			@@ -1756,7 +1817,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.Message = "[0000-1-010]Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1828,7 +1889,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限!";
			objJsonResult.Message = "[0000-1-068]无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1838,7 +1899,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.Message = "[0000-1-037]Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			@@ -1846,7 +1907,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1916,7 +1977,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.Message = "[0000-1-037]Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			@@ -1926,7 +1987,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1956,7 +2017,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.Message = "[0000-1-037]Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			@@ -1966,7 +2027,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1996,7 +2057,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.Message = "[0000-1-037]Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			@@ -2006,7 +2067,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -2036,7 +2097,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.Message = "[0000-1-037]Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			@@ -2045,7 +2106,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -2075,7 +2136,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.Message = "[0000-1-037]Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			@@ -2085,7 +2146,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -2115,7 +2176,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.Message = "[0000-1-037]Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			@@ -2125,7 +2186,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -2155,7 +2216,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.Message = "[0000-1-037]Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			@@ -2165,7 +2226,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}