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;
			}
			@@ -170,6 +171,7 @@
			long HMainSourceEntryID = mainList[0].HICMOEntryID;
			string HMainSourceBillNo = mainList[0].HICMOBillNo;

			//判断生产质量汇报单是否存在
			ds = oCN.RunProcReturn("select * from Sc_QualityReportBillMain WITH(NOLOCK) where HInterID=" + HInterID + " and HBillNo='" + HBillNo + "'", "Sc_QualityReportBillMain");
			if (ds.Tables[0].Rows.Count != 0) {
			objJsonResult.code = "0";
			@@ -183,14 +185,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 +299,33 @@
			(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 + "'");

			LogService.Write("类型:" + oSub.HBadTypeID + ",制单人:" + oSub.HMaker + ",制单日期:" + oSub.HMakeDate);
			//修改出站单的不良报废数量
			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 +352,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限!";
			objJsonResult.Message = "[0000-1-068]无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -329,16 +363,33 @@
			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)
			{
			//判断当前流转卡是否墨西哥的
			ds = oCN.RunProcReturn("select HPRDORGID from Sc_ProcessExchangeBillMain with(nolock) where HBillNo = '" + HBarCode + "' ", "Sc_ProcessExchangeBillMain");
			if (ds.Tables[0].Rows[0]["HPRDORGID"].ToString() != "7667152")
			{
			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 +400,7 @@
			{
			objJsonResult.code = "2";
			objJsonResult.count = 2;
			objJsonResult.Message = "";
			objJsonResult.Message = "[0000-1-037]";
			objJsonResult.data = dataSet.Tables[0];
			return objJsonResult;
			}
			@@ -357,7 +408,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "配件清单查无数据！,可能是当前用户工序不正确或者流转卡输入错误!";
			objJsonResult.Message = "[3791-2-019]配件清单查无数据！,可能是当前用户工序不正确或者流转卡输入错误!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -366,7 +417,7 @@
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.Message = "[0000-1-037]";
			objJsonResult.data = ds.Tables[0];
			}

			@@ -377,7 +428,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 +457,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限!";
			objJsonResult.Message = "[0000-2-038]无保存权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -416,10 +467,11 @@
			List<Model.Sc_AssemblyBill_BindSourceTemp> tempList = new List<Model.Sc_AssemblyBill_BindSourceTemp>();
			tempList = JsonConvert.DeserializeObject<List<Model.Sc_AssemblyBill_BindSourceTemp>>(msg1);

			if (tempList.Count == 0) {
			if (msg1 != "[]" && tempList.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无配件数据!";
			objJsonResult.Message = "[3791-2-026]无配件数据!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -450,7 +502,7 @@

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

			@@ -460,7 +512,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 +538,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限!";
			objJsonResult.Message = "[0000-2-038]无保存权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -500,13 +552,13 @@
			List<Model.ClsSc_AssemblyBillSub> sub = new List<Model.ClsSc_AssemblyBillSub>();
			sub = JsonConvert.DeserializeObject<List<Model.ClsSc_AssemblyBillSub>>(sSubStr);


			//条码上道工序是否过站
			ds = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_S '" + omodel.HBarCode_P + "'," + omodel.HProcID, "h_v_Gy_QualifiedRecordsList");
			if (ClsPub.isInt(ds.Tables[0].Rows.Count) == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "查无数据!";
			objJsonResult.Message = "[0000-1-045]查无数据!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -514,11 +566,12 @@
			{
			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;
			}

			//判断条码是否已经出站
			ds = oCN.RunProcReturn("select * from h_v_Gy_QualifiedRecordsList WITH(NOLOCK) where 产品条码='" + omodel.HBarCode_P + "' and HProcExchInterID="+ omodel .HProcExchInterID+ " and HProcExchEntryID="+ omodel.HProcExchEntryID + " and HProcID="+ omodel.HProcID, "h_v_Gy_QualifiedRecordsList");

			if (ds.Tables[0].Rows.Count > 0)
			@@ -526,7 +579,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 +598,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;
			}
			@@ -661,13 +714,13 @@
			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)
			@@ -720,7 +773,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "出站数量超过流转卡数量!";
			objJsonResult.Message = "[3791-2-028]出站数量超过流转卡数量!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -729,7 +782,7 @@

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

			@@ -739,7 +792,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;
			}
			@@ -796,7 +849,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码与流转卡不存在对应关系!";
			objJsonResult.Message = "[3791-2-016]条码与流转卡不存在对应关系!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -828,7 +881,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码与流转卡不存在对应关系!";
			objJsonResult.Message = "[3791-2-016]条码与流转卡不存在对应关系!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -843,7 +896,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码格式不正确!";
			objJsonResult.Message = "[0000-2-036]条码格式不正确!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -872,7 +925,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码与流转卡不存在对应关系!";
			objJsonResult.Message = "[3791-2-016]条码与流转卡不存在对应关系!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -892,7 +945,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码与流转卡不存在对应关系!";
			objJsonResult.Message = "[3791-2-016]条码与流转卡不存在对应关系!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -902,7 +955,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;
			}
			@@ -910,7 +963,7 @@

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

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

			@@ -1013,7 +1066,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.Message = "[0000-1-037]";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1022,7 +1075,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;
			}
			@@ -1041,7 +1094,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限!";
			objJsonResult.Message = "[0000-1-068]无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1051,7 +1104,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "SN码查无数据！";
			objJsonResult.Message = "[3791-2-023]SN码查无数据！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1060,7 +1113,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;
			}
			@@ -1071,7 +1124,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "配件条码判断失败！";
			objJsonResult.Message = "[3791-2-024]配件条码判断失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1079,14 +1132,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;
			}
			@@ -1095,7 +1148,7 @@

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.Message = "[0000-1-010]没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1114,7 +1167,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限!";
			objJsonResult.Message = "[0000-1-068]无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1122,13 +1175,14 @@
			ds = oCN.RunProcReturn("select * from gy_czygl WITH(NOLOCK) where czymc='" + user + "'", "gy_czygl");
			string HProcID = ds.Tables[0].Rows[0]["HProcID"].ToString();

			//查询流转卡所有工序信息
			ds = oCN.RunProcReturn(@"select * from h_v_Gy_BarCodeBillHICOMProcessExchange WITH(NOLOCK) where 条码='" + HBarCode + "' ", "h_v_Gy_BarCodeBillHICOMProcessExchange");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码查无数据！";
			objJsonResult.Message = "[0000-1-045]条码查无数据！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1144,7 +1198,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "当前条码与当前工序不匹配!";
			objJsonResult.Message = "[3791-2-017]当前条码与当前工序不匹配!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1152,14 +1206,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;
			}
			@@ -1168,7 +1222,7 @@

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

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

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

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

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.Message = "[0000-1-010]没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1261,7 +1315,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限!";
			objJsonResult.Message = "[0000-1-058]无删除权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1272,7 +1326,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();
			@@ -1305,7 +1359,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.Message = "[0000-1-037]Sucess！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1314,7 +1368,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;
			}
			@@ -1333,7 +1387,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限!";
			objJsonResult.Message = "[0000-1-058]无删除权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1346,7 +1400,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "查无数据！";
			objJsonResult.Message = "[0000-1-045]查无数据！";
			objJsonResult.data = null;
			}

			@@ -1375,7 +1429,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.Message = "[0000-1-037]Sucess！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1384,7 +1438,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;
			}
			@@ -1403,7 +1457,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限!";
			objJsonResult.Message = "[0000-1-068]无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1417,7 +1471,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码查无数据！";
			objJsonResult.Message = "[0000-2-020]条码查无数据！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1434,7 +1488,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "当前条码与当前工序不匹配!";
			objJsonResult.Message = "[3791-2-017]当前条码与当前工序不匹配!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1443,7 +1497,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;
			}
			@@ -1451,7 +1505,7 @@

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

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.Message = "[0000-1-010]没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1527,7 +1581,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限!";
			objJsonResult.Message = "[0000-1-068]无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1547,7 +1601,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;
			@@ -1556,7 +1610,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;
			}
			@@ -1583,7 +1637,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限!";
			objJsonResult.Message = "[0000-2-038]无保存权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1596,7 +1650,7 @@

			Model.Sc_AssemblyBill_BindSourceTemp temp = new Model.Sc_AssemblyBill_BindSourceTemp();
			temp = JsonConvert.DeserializeObject<Model.Sc_AssemblyBill_BindSourceTemp>(sSubStr);

			//工序返修记录单配件表
			ds = oCN.RunProcReturn("select * from Sc_SourceLineRepairBillSub_Mater where HInterID=" + model.HInterID+ " order by HEntryID desc", "Sc_SourceLineRepairBillSub_Mater");

			oCN.RunProc($@"insert into Sc_SourceLineRepairBillSub_Mater
			@@ -1610,7 +1664,7 @@
			oCN.RunProc("update Sc_AssemblyBillSub set HBarCode='" + temp.HBarCode + "' where HInterID=" + temp.HInterID + " and HEntryID=" + temp.HEntryID);
			//oCN.RunProc("exec h_p_AssemblyBill_Temp '" + temp.HProcExchBillNo + "'," + model.HProcess + "," + temp.HMaterID + ",'" + temp.HBatchNo + "'");
			}
			else if (HResult == "NG"\|\| HResult == "OK") {
			else if (HResult == "NG"\|\| HResult == "OK") {
			Model.ClsSc_SourceLineRepairBillMain model = new Model.ClsSc_SourceLineRepairBillMain();
			model = JsonConvert.DeserializeObject<Model.ClsSc_SourceLineRepairBillMain>(sMainStr);

			@@ -1659,15 +1713,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;
			}
			@@ -1677,7 +1743,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败,无结果！";
			objJsonResult.Message = "[0000-1-051]保存失败,无结果！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1687,7 +1753,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.Message = "[0000-1-050]Sucess！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1696,7 +1762,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;
			}
			@@ -1715,7 +1781,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限!";
			objJsonResult.Message = "[0000-1-058]无删除权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1725,7 +1791,7 @@
			if (ds.Tables[0].Rows.Count == 0) {
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "查无数据！";
			objJsonResult.Message = "[0000-1-045]查无数据！";
			objJsonResult.data = null;
			}

			@@ -1764,7 +1830,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;
			}
			@@ -1836,7 +1902,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限!";
			objJsonResult.Message = "[0000-1-068]无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1846,7 +1912,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.Message = "[0000-1-037]Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			@@ -1854,7 +1920,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;
			}
			@@ -1924,7 +1990,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;
			@@ -1934,7 +2000,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;
			}
			@@ -1964,7 +2030,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;
			@@ -1974,7 +2040,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;
			}
			@@ -2004,7 +2070,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;
			@@ -2014,7 +2080,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;
			}
			@@ -2044,7 +2110,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;
			@@ -2053,7 +2119,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;
			}
			@@ -2083,7 +2149,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;
			@@ -2093,7 +2159,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;
			}
			@@ -2110,6 +2176,7 @@

			List<object> columnNameList = new List<object>();

			//查询配件清单信息
			string sql = @"exec h_p_GZ_BarCodeBillList '" + HMaterNumber + "','" + HBatchNo + "','" + sWhere + "'";
			ds = oCN.RunProcReturn(sql, "h_p_GZ_BarCodeBillList");

			@@ -2123,7 +2190,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;
			@@ -2133,7 +2200,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;
			}
			@@ -2163,7 +2230,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;
			@@ -2173,7 +2240,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;
			}