~yxj/MES-WEB-API.git

			@@ -1815,6 +1815,104 @@
			#endregion


			#region å ææ¨¡åè°ç¨æ¹æ³

			#region å ææ¨¡å æ«æææ¡ç

			/// <summary>
			/// å ææ¨¡å æ«æææ¡ç
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Get_PackBarCode_DeletePackUnionBill_Json")]
			[HttpGet]
			public object Get_PackBarCode_DeletePackUnionBill_Json(string HBarCode_Pack, string HMaker, Int64 HStockOrgID)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_AddPackBarCode_DeletePackUnionBill '" + HBarCode_Pack + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_WMS_AddPackBarCode_DeletePackUnionBill");
			if (ds == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«æææ¡ç å¤æå¤±è´¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 0)
			{
			List<object> columnNameList = new List<object>();
			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //è·åå°DataColumnåå¯¹è±¡çåå
			}
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«æææ¡ç å¤±è´¥ï¼" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å ææ¨¡åï¼è·åææ¡ç ä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region å ææ¨¡å ä¸ä¼ å é¤ç»æåä¿¡æ¯

			/// <summary>
			/// ä¸ä¼ å é¤ç»æåä¿¡æ¯
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetDeletePackUnionBill_Json")]
			[HttpGet]
			public object GetDeletePackUnionBill_Json(long HInterID, string HBillType, string HMaker)
			{
			try
			{
			oCn.RunProc("exec h_p_WMS_PackUnionBill_Delete " + HInterID.ToString() + ",'" + HBillType + "','" + HMaker + "'", ref DBUtility.ClsPub.sExeReturnInfo);
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å ææå";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å æå¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#endregion


			#region æ¢æè°æ¨åæ¨¡åè°ç¨æ¹æ³

			#region æ¢æè°æ¨åæ¨¡å æ«æè°å¥ææ¡ç