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;
			}
			@@ -307,8 +308,22 @@
			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 == "报废")
			{
			@@ -335,7 +350,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限!";
			objJsonResult.Message = "[0000-1-068]无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -346,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)
			@@ -366,7 +392,7 @@
			{
			objJsonResult.code = "2";
			objJsonResult.count = 2;
			objJsonResult.Message = "";
			objJsonResult.Message = "[0000-1-037]";
			objJsonResult.data = dataSet.Tables[0];
			return objJsonResult;
			}
			@@ -374,7 +400,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "配件清单查无数据！,可能是当前用户工序不正确或者流转卡输入错误!";
			objJsonResult.Message = "[3791-2-019]配件清单查无数据！,可能是当前用户工序不正确或者流转卡输入错误!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -383,7 +409,7 @@
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.Message = "[0000-1-037]";
			objJsonResult.data = ds.Tables[0];
			}

			@@ -394,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;
			}
			@@ -423,7 +449,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限!";
			objJsonResult.Message = "[0000-2-038]无保存权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -436,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;
			}
			@@ -467,7 +493,7 @@

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

			@@ -477,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;
			}
			@@ -503,7 +529,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限!";
			objJsonResult.Message = "[0000-2-038]无保存权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -523,7 +549,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "查无数据!";
			objJsonResult.Message = "[0000-1-045]查无数据!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -531,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;
			}
			@@ -543,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;
			}
			@@ -562,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;
			}
			@@ -735,7 +761,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "出站数量超过流转卡数量!";
			objJsonResult.Message = "[3791-2-028]出站数量超过流转卡数量!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -744,7 +770,7 @@

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

			@@ -754,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;
			}
			@@ -811,7 +837,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码与流转卡不存在对应关系!";
			objJsonResult.Message = "[3791-2-016]条码与流转卡不存在对应关系!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -843,7 +869,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码与流转卡不存在对应关系!";
			objJsonResult.Message = "[3791-2-016]条码与流转卡不存在对应关系!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -858,7 +884,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码格式不正确!";
			objJsonResult.Message = "[0000-2-036]条码格式不正确!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -887,7 +913,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码与流转卡不存在对应关系!";
			objJsonResult.Message = "[3791-2-016]条码与流转卡不存在对应关系!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -907,7 +933,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码与流转卡不存在对应关系!";
			objJsonResult.Message = "[3791-2-016]条码与流转卡不存在对应关系!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -917,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;
			}
			@@ -925,7 +951,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.Message = "[0000-1-037]";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			@@ -934,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;
			}
			@@ -957,7 +983,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条形码不能为空，不能生成条码！";
			objJsonResult.Message = "[0000-2-019]条形码不能为空，不能生成条码！";
			return objJsonResult;
			}

			@@ -1028,7 +1054,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.Message = "[0000-1-037]";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1037,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;
			}
			@@ -1056,7 +1082,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限!";
			objJsonResult.Message = "[0000-1-068]无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1066,7 +1092,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "SN码查无数据！";
			objJsonResult.Message = "[3791-2-023]SN码查无数据！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1075,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;
			}
			@@ -1086,7 +1112,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "配件条码判断失败！";
			objJsonResult.Message = "[3791-2-024]配件条码判断失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1094,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;
			}
			@@ -1110,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;
			}
			@@ -1129,7 +1155,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限!";
			objJsonResult.Message = "[0000-1-068]无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1143,7 +1169,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码查无数据！";
			objJsonResult.Message = "[0000-1-045]条码查无数据！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1159,7 +1185,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "当前条码与当前工序不匹配!";
			objJsonResult.Message = "[3791-2-017]当前条码与当前工序不匹配!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1167,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;
			}
			@@ -1183,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;
			}
			@@ -1202,7 +1228,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限!";
			objJsonResult.Message = "[0000-1-068]无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1211,7 +1237,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.Message = "[0000-1-037]";
			objJsonResult.data = ds;
			return objJsonResult;
			}
			@@ -1220,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;
			}
			@@ -1239,7 +1265,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限!";
			objJsonResult.Message = "[0000-1-068]无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1248,7 +1274,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.Message = "[0000-1-037]";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			@@ -1257,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;
			}
			@@ -1276,7 +1302,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限!";
			objJsonResult.Message = "[0000-1-058]无删除权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1287,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();
			@@ -1320,7 +1346,7 @@

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

			@@ -1390,7 +1416,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.Message = "[0000-1-037]Sucess！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1399,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;
			}
			@@ -1418,7 +1444,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限!";
			objJsonResult.Message = "[0000-1-068]无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1432,7 +1458,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码查无数据！";
			objJsonResult.Message = "[0000-2-020]条码查无数据！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1449,7 +1475,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "当前条码与当前工序不匹配!";
			objJsonResult.Message = "[3791-2-017]当前条码与当前工序不匹配!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1458,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;
			}
			@@ -1466,7 +1492,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.Message = "[0000-1-037]";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			@@ -1475,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;
			}
			@@ -1542,7 +1568,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限!";
			objJsonResult.Message = "[0000-1-068]无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1562,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;
			@@ -1571,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;
			}
			@@ -1598,7 +1624,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限!";
			objJsonResult.Message = "[0000-2-038]无保存权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1674,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;
			}
			@@ -1692,7 +1730,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败,无结果！";
			objJsonResult.Message = "[0000-1-051]保存失败,无结果！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1702,7 +1740,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.Message = "[0000-1-050]Sucess！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1711,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;
			}
			@@ -1730,7 +1768,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限!";
			objJsonResult.Message = "[0000-1-058]无删除权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1740,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;
			}

			@@ -1779,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;
			}
			@@ -1851,7 +1889,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限!";
			objJsonResult.Message = "[0000-1-068]无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1861,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;
			}
			@@ -1869,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;
			}
			@@ -1939,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;
			@@ -1949,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;
			}
			@@ -1979,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;
			@@ -1989,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;
			}
			@@ -2019,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;
			@@ -2029,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;
			}
			@@ -2059,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;
			@@ -2068,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;
			}
			@@ -2098,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;
			@@ -2108,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;
			}
			@@ -2138,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;
			@@ -2148,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;
			}
			@@ -2178,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;
			@@ -2188,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;
			}