MES-WEB-API.git

			@@ -64,7 +64,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "指引卡无保存权限！";
			objJsonResult.Message = "[3772-2-029]指引卡无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -74,7 +74,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "流转卡无保存权限！";
			objJsonResult.Message = "[3772-2-029]流转卡无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -98,7 +98,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！没有单据日期，无法保存！";
			objJsonResult.Message = "[3772-2-030]保存失败！没有单据日期，无法保存！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -179,9 +179,34 @@
			}
			if (bResult)
			{

			//自动审核设置
			if (msg5 == "xz")
			{
			objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //返回主ID
			//系统参数自动审核
			string sReturn = "";
			if (oSystemParameter.ShowBill(ref sReturn) == true)
			{
			if (oSystemParameter.omodel.Sc_ProcessExchangeBill_AutoCheck == "Y") //系统参数自动审核
			{
			objJsonResult.Verify = "Y";
			}
			else
			{
			objJsonResult.Verify = "N";
			}
			}
			}
			else
			{
			objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //返回主ID
			objJsonResult.Verify = "N";
			}

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			objJsonResult.Message = "[0000-1-050]保存成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;
			@@ -190,7 +215,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.Message = "[0000-1-051]保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -199,7 +224,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + e.ToString();
			objJsonResult.Message = "[0000-1-051]保存失败！" + e.ToString();
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -718,7 +743,7 @@

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.Message = "[0000-1-037]Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = listCol;
			return objJsonResult;
			@@ -727,7 +752,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;
			}
			@@ -870,14 +895,14 @@
			ds = oCN.RunProcReturn(sql+ " where hmainid="+ HInterID + " order by cast(流水号 as int) ", "h_v_Sc_ProcessExchangeBillQuerySub");
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.Message = "[0000-1-037]获取信息成功！";
			objJsonResult.data = ds.Tables[0];
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.Message = "[0000-1-045]没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			}
			return objJsonResult;
			@@ -901,7 +926,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "指引卡无删除权限！";
			objJsonResult.Message = "[0000-1-004]指引卡无删除权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -912,7 +937,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "流转卡无删除权限！";
			objJsonResult.Message = "[0000-1-004]流转卡无删除权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -940,7 +965,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据号:" + oBill.omodel.HBillNo + "单据ID为空！";
			objJsonResult.Message = "[0000-1-009]单据号:" + oBill.omodel.HBillNo + "单据ID为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -956,7 +981,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据号:" + oBill.omodel.HBillNo + "流转卡已经有下游进出站单后，不允许删除！";
			objJsonResult.Message = "[3772-1-010]单据号:" + oBill.omodel.HBillNo + "流转卡已经有下游进出站单后，不允许删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -970,7 +995,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据号:" + oBill.omodel.HBillNo + "只能删除本人的单据！";
			objJsonResult.Message = "[0000-1-011]单据号:" + oBill.omodel.HBillNo + "只能删除本人的单据！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -982,7 +1007,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据号:" + oBill.omodel.HBillNo + "单据当前处于不能删除状态,不能删除！";
			objJsonResult.Message = "[0000-1-012]单据号:" + oBill.omodel.HBillNo + "单据当前处于不能删除状态,不能删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -991,7 +1016,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据号:" + oBill.omodel.HBillNo + "单据已经审核,不能删除！";
			objJsonResult.Message = "[0000-1-013]单据号:" + oBill.omodel.HBillNo + "单据已经审核,不能删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1002,7 +1027,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据未找到";
			objJsonResult.Message = "[0000-1-005]单据未找到";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1024,7 +1049,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无流转卡数据!";
			objJsonResult.Message = "[0000-1-005]无流转卡数据!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1039,7 +1064,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败!原因:删除前判断失败，请与网络管理人员联系";
			objJsonResult.Message = "[0000-1-006]删除失败!原因:删除前判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			@@ -1049,7 +1074,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.Message = "[3772-1-007]删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString();
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			@@ -1063,7 +1088,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.Message = "[3772-1-007]" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1084,7 +1109,7 @@

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.Message = "[0000-1-008]" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1115,7 +1140,7 @@
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.list = columnNameList;
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.Message = "[0000-1-037]获取信息成功！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			@@ -1123,7 +1148,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.Message = "[0000-1-038]没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1175,14 +1200,14 @@

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.Message = "[0000-1-037]获取信息成功！";
			objJsonResult.data = ds.Tables[0];
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.Message = "[0000-1-045]没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			}
			return objJsonResult;
			@@ -1412,7 +1437,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "指引卡无权限审核!";
			objJsonResult.Message = "[3772-1-022]指引卡无权限审核!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1423,7 +1448,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "流转卡无权限审核!";
			objJsonResult.Message = "[3772-1-022]流转卡无权限审核!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1434,7 +1459,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HInterID为空！";
			objJsonResult.Message = "[0000-1-009]HInterID为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1456,7 +1481,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已审核!不需要再审核!";
			objJsonResult.Message = "[0000-1-023]单据已审核!不需要再审核!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1470,7 +1495,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "审核失败!原因:审核前判断失败，请与网络管理人员联系";
			objJsonResult.Message = "[0000-1-024]审核失败!原因:审核前判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			return objJsonResult;

			@@ -1479,7 +1504,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "审核失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.Message = "[0000-1-025]审核失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1490,7 +1515,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "审核失败!原因:" + ClsPub.sExeReturnInfo;
			objJsonResult.Message = "[0000-1-025]审核失败!原因:" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1507,7 +1532,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已反审核!不需要再反审核!";
			objJsonResult.Message = "[0000-1-026]单据已反审核!不需要再反审核!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1521,7 +1546,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "反审核失败!原因:反审核前判断失败，请与网络管理人员联系";
			objJsonResult.Message = "[0000-1-027]反审核失败!原因:反审核前判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			return objJsonResult;

			@@ -1530,7 +1555,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "反审核失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.Message = "[0000-1-028]反审核失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1553,7 +1578,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "审核失败!原因:" + ClsPub.sExeReturnInfo;
			objJsonResult.Message = "[0000-1-028]审核失败!原因:" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1563,7 +1588,7 @@

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "执行成功！";
			objJsonResult.Message = "[0000-1-029]执行成功！";
			objJsonResult.data = null;
			return objJsonResult; ;

			@@ -1572,7 +1597,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "执行失败！" + e.ToString();
			objJsonResult.Message = "[0000-1-025]执行失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1593,7 +1618,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "指引卡无权限关闭!";
			objJsonResult.Message = "[3772-1-032]指引卡无权限关闭!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1605,7 +1630,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "流转卡无权限关闭!";
			objJsonResult.Message = "[3772-1-032]流转卡无权限关闭!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1616,7 +1641,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HInterID为空！";
			objJsonResult.Message = "[0000-1-009]HInterID为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1638,7 +1663,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已关闭!不需要再关闭!";
			objJsonResult.Message = "[0000-1-033]单据已关闭!不需要再关闭!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1648,7 +1673,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "关闭失败!原因:" + ClsPub.sExeReturnInfo;
			objJsonResult.Message = "[0000-1-034]关闭失败!原因:" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1665,7 +1690,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已反关闭!不需要再反关闭!";
			objJsonResult.Message = "[0000-1-035]单据已反关闭!不需要再反关闭!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1675,7 +1700,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "反关闭失败!原因:" + ClsPub.sExeReturnInfo;
			objJsonResult.Message = "[0000-1-036]反关闭失败!原因:" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1685,7 +1710,7 @@

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "执行成功！";
			objJsonResult.Message = "[0000-1-037]执行成功！";
			objJsonResult.data = null;
			return objJsonResult; ;

			@@ -1694,7 +1719,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "执行失败！" + e.ToString();
			objJsonResult.Message = "[0000-1-038]执行失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1721,7 +1746,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "作废失败！无权限！";
			objJsonResult.Message = "[0000-1-039]作废失败！无权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1730,7 +1755,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HInterID小于0！";
			objJsonResult.Message = "[0000-1-009]HInterID小于0！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1792,7 +1817,7 @@
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "作废成功";
			objJsonResult.Message = "[0000-1-040]作废成功";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1800,7 +1825,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "作废失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.Message = "[0000-1-041]作废失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1818,7 +1843,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "反作废失败!原因:" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]).ToString();
			objJsonResult.Message = "[0000-1-042]反作废失败!原因:" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]).ToString();
			objJsonResult.data = null;

			oBill.oCn.RollBack();
			@@ -1828,7 +1853,7 @@
			oBill.oCn.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "反作废成功";
			objJsonResult.Message = "[0000-1-043]反作废成功";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1836,7 +1861,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "反作废失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.Message = "[0000-1-042]反作废失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1847,7 +1872,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "作废失败或者反作废失败！" + e.ToString();
			objJsonResult.Message = "[0000-1-044]作废失败或者反作废失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}