~yxj/MES-WEB-API.git

			@@ -23,13 +23,78 @@
			public string sWhere = "";
			public WebServer webserver = new WebServer();
			public DataSet ds = new DataSet();
			private json objjson = new json();
			private json objJsonResult = new json();
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			public ClsKf_ICStockBill_WMS oBar = new Model.ClsKf_ICStockBill_WMS();
			public WebS.WebService1 oWebs = new WebS.WebService1();
			public WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
			Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();


			WebS.ClsXt_SystemParameterMain oSystemParameterMain = new WebS.ClsXt_SystemParameterMain();


			#region å¬ç¨æ¹æ³

			#region è·åæå¤§åæ®IDãåæ®å·

			/// <summary>
			/// è·åæå¤§åæ®IDãåæ®å·
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetMaxBillNoAndID_Json")]
			[HttpGet]
			public object GetMaxBillNoAndID_Json(string HBillType)
			{
			try
			{
			string sErrMsg = "";
			Int64 HInterID = 0;
			string HBillNo = "";
			HInterID = DBUtility.ClsPub.CreateBillID_Prod(HBillType, ref sErrMsg);
			HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(HBillType, ref sErrMsg, true);

			//----------åå»ºèè¡¨------------------------
			DataTable dt_Main = new DataTable("Json");
			dt_Main.Columns.Add("HBillNo", typeof(string));
			dt_Main.Columns.Add("HInterID", typeof(int));
			//---------åå»ºæ°è¡------------------------
			DataRow dr_main = dt_Main.NewRow(); //åå»ºæ°è¡
			dt_Main.Rows.Add(dr_main); //å°æ°è¡å å¥å°è¡¨ä¸
			dr_main["HBillNo"] = DBUtility.ClsPub.isStrNull(HBillNo);
			dr_main["HInterID"] = DBUtility.ClsPub.isLong(HInterID);
			//è¿åæ°æ®
			if (HBillNo == "" \|\| HInterID == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æå¤§åæ®IDãåæ®å·è·åå¤±è´¥";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "è·åæå";
			objJsonResult.data = dt_Main;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åæå¤§åæ®IDãåæ®å·å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion


			#endregion


			#region åºç¡èµæ
			@@ -60,14 +125,154 @@
			#endregion


			#region çé¢æ§ä»¶åè½è°ç¨æ¹æ³

			#region æ ¹æ®åæ®ç±»åè·ååæ®åç±»å

			/// <summary>
			/// æ ¹æ®åæ®ç±»åè·ååæ®åç±»å
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetBillSubType_Json")]
			[HttpGet]
			public Object GetBillSubType_Json(string HBillType, Int64 HStockOrgID)
			{
			try
			{
			ds = oWebs.get_BillSubType(HBillType, HStockOrgID);
			if (ds == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¥è¯¢ä¸å°åæ®åç±»åä¿¡æ¯ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æå";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ ¹æ®åæ®ç±»åè·ååæ®åç±»åä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#endregion

			#region å·²ä¸ä¼ æ¥è¯¢çé¢ï¼æ ¹æ®åæ®å·ãæºåå·æ¥è¯¢å·²ä¸ä¼ åæ®ä¿¡æ¯

			/// <summary>
			/// å·²ä¸ä¼ æ¥è¯¢çé¢ï¼æ ¹æ®åæ®å·ãæºåå·æ¥è¯¢å·²ä¸ä¼ åæ®ä¿¡æ¯
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetKf_ICStockBillQueryList_Json")]
			[HttpGet]
			public object GetKf_ICStockBillQueryList_Json(string HBillType, string HBillNo, string HSourceBillNo)
			{
			try
			{
			ds = oWebs.GetKf_ICStockBillQueryList(HBillType, HBillNo, HSourceBillNo);
			if (ds == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¥è¯¢ä¸å°è¯¥åæ®è®°å½ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			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;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åå·²ä¸ä¼ åæ®ä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion


			#region å·²ä¸ä¼ åè¡¨çé¢ï¼æ¤éåè½ï¼å é¤WMSè¡¨åæ¬å°åºå¥åºåè®°å½ï¼å¹¶æ´æ°TEMPè¡¨ä¸çä¸ä¼ åæ®µ HRelationInterID=0

			/// <summary>
			/// å·²ä¸ä¼ åè¡¨çé¢ï¼æ¤éåè½ï¼å é¤WMSè¡¨åæ¬å°åºå¥åºåè®°å½ï¼å¹¶æ´æ°TEMPè¡¨ä¸çä¸ä¼ åæ®µ HRelationInterID=0
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/DeleteICStockBillAndWMS_Json")]
			[HttpGet]
			public object DeleteICStockBillAndWMS_Json(Int64 HInterID, string HBillNo, string HBillType)
			{
			try
			{
			if (oWebs.DeleteICStockBillAndWMS(HInterID, HBillNo, HBillType, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			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/set_DelPonderationBillMain_Temp_InterIDAndSource_Json")]
			[HttpPost]
			[HttpGet]
			public object set_DelPonderationBillMain_Temp_InterIDAndSource_Json(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string HBillType)
			{
			try
			@@ -93,7 +298,86 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤æ¡ç åºå¥åºä¸´æ¶è¡¨è®°å½å¤±è´¥ï¼" + e.ToString();
			objJsonResult.Message = "å é¤æéè¡æ¡ç åºå¥åºä¸´æ¶è¡¨è®°å½å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			/// <summary>
			/// æ ¹æ®åæ®ID,å é¤æ¡ç åºå¥åºä¸´æ¶è¡¨è®°å½
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/DeleteBillList_Json")]
			[HttpGet]
			public object DeleteBillList_Json(long HInterID)
			{
			try
			{
			if (oWebs.DeleteBillList(HInterID, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			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 å é¤åè¿ååºä¸´æ¶è¡¨ï¼æ´æ° HlineStatus =1ï¼

			/// <summary>
			/// å é¤åè¿ååºä¸´æ¶è¡¨ï¼æ´æ° HlineStatus =1ï¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_DelPonderationBillMain_Temp_FIFO_Json")]
			[HttpGet]
			public object set_DelPonderationBillMain_Temp_FIFO_Json(long HInterID, string HBillType)
			{
			try
			{
			if (oWebs.set_DelPonderationBillMain_Temp_FIFO(HInterID, HBillType, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ´æ°åè¿ååºä¸´æ¶è¡¨HlineStatuså¼å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -165,6 +449,66 @@
			#endregion


			#region å§å¤é¢æ ä¸ä¼ çå

			#region å§å¤é¢æ æ ¡éªæ¨¡å¼

			/// <summary>
			/// å§å¤é¢ææ ¡éªä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SaveEntrustOutBill_BillCheck_Json")]
			[HttpPost]
			public object set_SaveEntrustOutBill_BillCheck_Json([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();

			try
			{
			List<Model.ClsKf_EntrustOutBillMain> lsmain = new List<Model.ClsKf_EntrustOutBillMain>();
			ListModels oListModels = new ListModels();
			lsmain = oListModels.getEntrustOutBillMainByJson(msg1);

			WebAPI.WebS.ClsKf_EntrustOutBillMain websLsmain = new WebS.ClsKf_EntrustOutBillMain();

			websLsmain.HInterID = lsmain[0].HInterID;
			websLsmain.HBillNo = lsmain[0].HBillNo;
			websLsmain.HBillType = "1211";
			websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;

			if (oWebs.set_SaveEntrustOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			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 çäº§è¡¥æ æ ¡éªæ¨¡å¼
			@@ -224,6 +568,109 @@

			#endregion


			#region å§å¤è¡¥æ ä¸ä¼ çå

			#region å§å¤è¡¥æ æ ¡éªæ¨¡å¼

			/// <summary>
			/// å§å¤è¡¥ææ ¡éªä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SaveEntrustReplenishOutBill_BillCheck_Json")]
			[HttpPost]
			public object set_SaveEntrustReplenishOutBill_BillCheck_Json([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();

			try
			{
			List<Model.ClsKf_EntrustReplenishOutBillMain> lsmain = new List<Model.ClsKf_EntrustReplenishOutBillMain>();
			ListModels oListModels = new ListModels();
			lsmain = oListModels.getEntrustReplenishOutBillMainByJson(msg1);

			WebAPI.WebS.ClsKf_EntrustReplenishOutBillMain websLsmain = new WebS.ClsKf_EntrustReplenishOutBillMain();

			websLsmain.HInterID = lsmain[0].HInterID;
			websLsmain.HBillNo = lsmain[0].HBillNo;
			websLsmain.HBillType = "1255";
			websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;

			if (oWebs.set_SaveEntrustReplenishOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			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 çäº§ç»æå ä¸ä¼ çå

			/// <summary>
			/// ä¸ä¼ çæçäº§ç»æå
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SavePackUnionBill_Json")]
			[HttpGet]
			public object set_SavePackUnionBill_Json(Int64 HInterID, string HBillType, string HBillNo, string HBarCode_Pack, string HMaker, Int64 HStockOrgID)
			{
			try
			{
			if (oWebs.set_SavePackUnionBill_Add(HInterID, HBillType, HBillNo, HBarCode_Pack, HMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			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


			@@ -270,6 +717,53 @@
			}

			#endregion



			#region çäº§å¥åº æ«ææºåæ¡ç

			/// <summary>
			/// çäº§å¥åº æ«ææºåæ¡ç
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Get_SourceBarCode_PoStockIn_Json")]
			[HttpGet]
			public object Get_SourceBarCode_PoStockIn_Json(Int64 HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, Int64 HStockOrgID,Int64 HAccessFlag, WebS.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
			{
			try
			{
			WebSoBar = oWebs.get_SourceBill_MaterBarCode(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HStockOrgID, HAccessFlag, oSystemParameterMain, ref DBUtility.ClsPub.sErrInfo);
			if (WebSoBar == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æå";
			objJsonResult.data = WebSoBar;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææºåæ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion




			#region çäº§é¢æ æ«ææºåæ¡ç

			@@ -323,39 +817,19 @@

			#endregion

			#region ç´æ¥è°æ¨ æ«ææºåæ¡ç


			#endregion

			#region åæ¥å¼è°åº æ«ææºåæ¡ç


			#endregion

			#region åæ¥å¼è°å¥ æ«ææºåæ¡ç


			#endregion

			#endregion


			#region ç©ææ¡ç å¤çæ¹æ³
			#region å¶ä»åºåº æ«ææºåæ¡ç

			/// <summary>
			/// ç©ææ¡ç ææ¬æ¡ æ«ç è°ç¨
			/// å¶ä»åºåº æ«ææºåæ¡ç
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Get_BarCode_Json")]
			[Route("WEBSController/get_SourceBarCode_OtherOut_Json")]
			[HttpGet]
			public Object get_BarCode_Json(string sBarCode, Int64 HInterID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Double HQty, bool HRedBlueFlag, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HStockOrgID, string HScanStyle, string HCustom1, string HCustom2)
			public object get_SourceBarCode_OtherOut_Json(Int64 HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, Int64 HFIFOWhID, Int64 HOWNERID)
			{
			try
			{
			var sJXCode = POStockInBillController.JX_Json(sBarCode, HInterID, HBillType, HStockOrgID, HBillNo,HMaker);
			SourceFlag = true;
			WebSoBar = oWebs.get_BarCode(sJXCode, HInterID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HStockOrgID, HScanStyle, HCustom1, HCustom2, ref DBUtility.ClsPub.sErrInfo);
			WebSoBar = oWebs.get_SourceBarCode_OtherOut(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HFIFOWhID, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
			if (WebSoBar == null)
			{
			objJsonResult.code = "0";
			@@ -377,11 +851,294 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.Message = "æ«ææºåæ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region ç´æ¥è°æ¨ æ«ææºåæ¡ç

			/// <summary>
			/// ç´æ¥è°æ¨ æ«ææºåæ¡ç
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/get_SourceBarCode_MoveStock_Json")]
			[HttpGet]
			public object get_SourceBarCode_MoveStock_Json(Int64 HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, Int64 HFIFOWhID, Int64 HOWNERID)
			{
			try
			{
			WebSoBar = oWebs.get_SourceBarCode_MoveStock(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HFIFOWhID, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
			if (WebSoBar == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æå";
			objJsonResult.data = WebSoBar;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææºåæ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region åæ¥å¼è°åº æ«ææºåæ¡ç


			#endregion

			#region åæ¥å¼è°å¥ æ«ææºåæ¡ç


			#endregion

			#endregion


			#region ç©ææ¡ç å¤çæ¹æ³ å¶ä»åºåºåºæ¨¡å

			/// <summary>
			/// ç©ææ¡ç ææ¬æ¡ æ«ç è°ç¨
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Get_BarCode_Json")]
			[HttpGet]
			public Object get_BarCode_Json(string sBarCode, Int64 HInterID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Double HQty, bool HRedBlueFlag, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HStockOrgID, string HScanStyle, string HCustom1, string HCustom2)
			{
			//è·åç³»ç»åæ°
			string sErrMsg = "";
			string sJXCode = "";
			if (oSystemParameter.ShowBill(ref sErrMsg) == true)
			{
			if (oSystemParameter.omodel.WMS_CampanyName == "å®ç") //ç³»ç»åæ° å®¢æ·å®å¶ååç§° ç©ºç½ä¸ºéç¨
			{
			sJXCode = POStockInBillController.JX_Json(sBarCode, HInterID, HBillType, HStockOrgID, HBillNo, HMaker);
			SourceFlag = true;
			}
			else
			{
			sJXCode = sBarCode;
			}
			try
			{
			WebSoBar = oWebs.get_BarCode(sJXCode, HInterID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HStockOrgID, HScanStyle, HCustom1, HCustom2, ref DBUtility.ClsPub.sErrInfo);
			if (WebSoBar == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æå";
			objJsonResult.data = WebSoBar;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

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

			/// <summary>
			/// ç©ææ¡ç ææ¬æ¡ æ«ç è°ç¨
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/get_BarCode_MoveStock_Json")]
			[HttpGet]
			public Object get_BarCode_MoveStock_Json(string sBarCode, Int64 HInterID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Int64 HSCWHID, Int64 HSCSPID, Double HQty, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HStockInOrgID, Int64 HStockOutOrgID, string HScanStyle)
			{
			string sErrMsg = "";
			string sJXCode = "";
			if (oSystemParameter.ShowBill(ref sErrMsg) == true)
			{
			if (oSystemParameter.omodel.WMS_CampanyName == "å®ç") //ç³»ç»åæ° å®¢æ·å®å¶ååç§° ç©ºç½ä¸ºéç¨
			{
			sJXCode = POStockInBillController.JX_Json(sBarCode, HInterID, HBillType, HStockOutOrgID, HBillNo, HMaker);
			SourceFlag = true;
			}
			else
			{
			sJXCode = sBarCode;
			}
			try
			{
			string HCustom1 = "", HCustom2 = "";
			WebSoBar = oWebs.get_BarCode_MoveStock(sJXCode, HInterID, HBillType, HBillNo, HMaker, HWhID, HSPID, HSCWHID, HSCSPID, HQty, SourceFlag, HSourceBillNo, HSourceBillType, HStockInOrgID, HStockOutOrgID, HScanStyle, ref DBUtility.ClsPub.sErrInfo, HCustom1, HCustom2);
			if (WebSoBar == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æå";
			objJsonResult.data = WebSoBar;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}



			//try
			//{
			// var sJXCode = POStockInBillController.JX_Json(sBarCode, HInterID, HBillType, HStockOutOrgID, HBillNo, HMaker);
			// WebSoBar = oWebs.get_BarCode_MoveStock(sJXCode, HInterID, HBillType, HBillNo, HMaker, HWhID, HSPID, HSCWHID, HSCSPID, HQty, SourceFlag, HSourceBillNo, HSourceBillType, HStockInOrgID, HStockOutOrgID, HScanStyle, ref DBUtility.ClsPub.sErrInfo);
			// if (WebSoBar == null)
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			// objJsonResult.data = null;
			// return objJsonResult;
			// }
			// else
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 1;
			// objJsonResult.Message = "æå";
			// objJsonResult.data = WebSoBar;
			// 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/get_BarCode_MoveStock_PD")]
			//[HttpGet]
			//public Object get_BarCode_MoveStock_PD(string sBarCode, Int64 HInterID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Int64 HSCWHID, Int64 HSCSPID, Double HQty, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HStockInOrgID, Int64 HStockOutOrgID, string HScanStyle)
			//{
			// string sErrMsg = "";
			// string sJXCode = "";
			// if (oSystemParameter.ShowBill(ref sErrMsg) == true)
			// {
			// if (oSystemParameter.omodel.WMS_CampanyName == "å®ç") //ç³»ç»åæ° å®¢æ·å®å¶ååç§° ç©ºç½ä¸ºéç¨
			// {
			// sJXCode = POStockInBillController.JX_Json(sBarCode, HInterID, HBillType, HStockOutOrgID, HBillNo, HMaker);
			// SourceFlag = true;
			// }
			// else
			// {
			// sJXCode = sBarCode;
			// }
			// try
			// {
			// WebSoBar = oWebs.get_BarCode_MoveStock_PD(sJXCode, HInterID, HBillType, HBillNo, HMaker, HWhID, HSPID, HSCWHID, HSCSPID, HQty, SourceFlag, HSourceBillNo, HSourceBillType, HStockInOrgID, HStockOutOrgID, HScanStyle, ref DBUtility.ClsPub.sErrInfo);
			// if (WebSoBar == null)
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			// objJsonResult.data = null;
			// return objJsonResult;
			// }
			// else
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 1;
			// objJsonResult.Message = "æå";
			// objJsonResult.data = WebSoBar;
			// return objJsonResult;
			// }
			// }
			// catch (Exception e)
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "æ«ææ¡ç å¤±è´¥ï¼" + e.ToString();
			// objJsonResult.data = null;
			// return objJsonResult;
			// }
			// }
			// else
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			// objJsonResult.data = null;
			// return objJsonResult;
			// }
			//}

			#endregion

			@@ -394,86 +1151,45 @@
			/// <returns></returns>
			[Route("WEBSController/GetBillEntryTmpList_Json")]
			[HttpGet]
			public object GetBillEntryTmpList(long HInterID, string HBillNo, string HBillType, Int64 HStockOrgID, string sMouldManagerCtl, string sFIFOCtl)
			public object GetBillEntryTmpList(long HInterID, string HBillNo, string HBillType, Int64 HStockOrgID)
			{
			try
			{
			string sSimpleMode = "N"; //æ¯å¦å¯ç¨æ«ç ç®ææ¨¡å¼ï¼åªæ¾ç¤ºå·²æ«ç æºåè®°å½(Y,N)
			string sReturn = "";

			//è·åç³»ç»åæ°
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sReturn) == true)
			string sMouldManagerCtl = "N"; //æ¯å¦å¯ç¨å¨å·ç®¡ç
			string sFIFOCtl = "N"; //æ¯å¦å¯ç¨åè¿ååºç®¡ç
			ds = oWebs.GetBillEntryTmpList(HInterID, HBillNo, HBillType, HStockOrgID, ref sMouldManagerCtl, ref sFIFOCtl, ref DBUtility.ClsPub.sErrInfo);
			if (ds == null)
			{
			//å¤ææ¯å¦å¯ç¨å¨å·ç®¡ç(Y,N)
			if (oSystemParameter.omodel.WMS_MouldManagerCtl == "Y") //å¯ç¨æ¨¡æ²»å·ç®¡ç
			{
			sMouldManagerCtl = "Y";
			}

			//å¤ææ¯å¦å¯ç¨åè¿ååºç®¡ç(Y,N)ï¼æ¯å¦å¯ç¨æ«ç ç®ææ¨¡å¼ï¼åªæ¾ç¤ºå·²æ«ç æºåè®°å½(Y,N)
			if (HBillType == "1204") //çäº§é¢æå
			{
			if (oSystemParameter.omodel.Kf_MateOutBill_FIFOCtl == "Y" \|\| oSystemParameter.omodel.Kf_MateOutBill_FIFOList == "Y") //çäº§é¢æå-åè¿ååºæ§å¶
			{
			sFIFOCtl = "Y";
			}
			if (oSystemParameter.omodel.Kf_MateOutBill_SimpleMode == "Y") //çäº§é¢æå-æ«ç ç®ææ¨¡å¼
			{
			sSimpleMode = "Y";
			}
			}
			else if (HBillType == "1205" && (oSystemParameter.omodel.Kf_SellOutBill_FIFOCtl == "Y" \|\| oSystemParameter.omodel.Kf_SellOutBill_FIFOList == "Y")) //éå®åºåºå-åè¿ååºæ§å¶
			{
			sFIFOCtl = "Y";
			}
			else if (HBillType == "1211" && (oSystemParameter.omodel.Kf_EntrustOutBill_FIFOCtl == "Y" \|\| oSystemParameter.omodel.Kf_EntrustOutBill_FIFOList == "Y")) //å§å¤åºåºå-åè¿ååºæ§å¶
			{
			sFIFOCtl = "Y";
			}
			else if (HBillType == "1207" && (oSystemParameter.omodel.Kf_MoveStockBill_FIFOCtl == "Y" \|\| oSystemParameter.omodel.Kf_MoveStockBill_FIFOList == "Y")) //ç´æ¥è°æ¨å-åè¿ååºæ§å¶
			{
			sFIFOCtl = "Y";
			}
			else if (HBillType == "1250" && (oSystemParameter.omodel.Kf_MoveStockStepOutBill_FIFOCtl == "Y" \|\| oSystemParameter.omodel.Kf_MoveStockStepOutBill_FIFOList == "Y")) //åæ¥å¼è°åºå-åè¿ååºæ§å¶
			{
			sFIFOCtl = "Y";
			}

			DataSet ds = oCn.RunProcReturn("exec h_p_WMS_BillEntryTmpList_LayUI " + HInterID.ToString() + ",'" + HBillType + "','" + sMouldManagerCtl + "','" + sFIFOCtl + "','" + sSimpleMode + "'", "h_p_WMS_BillEntryTmpList_LayUI");

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½è®°å½ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			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åå¯¹è±¡çåå
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //è·åå°DataColumnåå¯¹è±¡çåå
			}

			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½è®°å½ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "è·åä¿¡æ¯æåï¼";
			objJsonResult.data = ds;
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·ï¼" + HBillNo + "ï¼åæ®IDï¼" + HInterID + "ï¼è¿åç©ææç»åè¡¨æ¶è·åç³»ç»åæ°å¤±è´¥ï¼ " + sReturn;
			objJsonResult.data = null;
			objJsonResult.count = 1;
			objJsonResult.Message = "è·åä¿¡æ¯æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.data = new
			{
			Materlist = ds.Tables[0], //è¿åç©ææç»åè¡¨ä¿¡æ¯ï¼0ï¼
			Mouldlist = ds.Tables[1], //è¿åæ¨¡æ²»å·åè¡¨ä¿¡æ¯ï¼1ï¼
			FIFOlist = ds.Tables[2], //è¿ååè¿ååºåè¡¨ä¿¡æ¯ï¼2ï¼
			BarCodelist = ds.Tables[3], //è¿åæ¡ç æç»åè¡¨ä¿¡æ¯ï¼3ï¼
			ICMOReportlist = ds.Tables[4], //è¿åæºåçäº§æ±æ¥åæ¡ç æç»åè¡¨ä¿¡æ¯ï¼4ï¼
			BarCodeDetailslist = ds.Tables[5] //è¿åå½åææ«ææ¡ç æç»ä¿¡æ¯ï¼5ï¼
			};
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			@@ -586,10 +1302,182 @@
			[HttpGet]
			public Object get_CheckTypeByBarCode_BillCheck_Json(string sBarCode, Int64 HBillID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Double HQty, Int64 HStockOrgID)
			{
			//è·åç³»ç»åæ°
			string sErrMsg = "";
			string sJXCode = "";
			if (oSystemParameter.ShowBill(ref sErrMsg) == true)
			{
			if (oSystemParameter.omodel.WMS_CampanyName == "å®ç") //ç³»ç»åæ° å®¢æ·å®å¶ååç§° ç©ºç½ä¸ºéç¨
			{
			sJXCode = POStockInBillController.JX_Json(sBarCode, HBillID, HBillType, HStockOrgID, HBillNo, HMaker);
			}
			else
			{
			sJXCode = sBarCode;
			}
			try
			{
			WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sJXCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
			if (WebSoBar == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æå";
			objJsonResult.data = WebSoBar;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ ¡éªæ¨¡å¼ï¼æ«ææ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region è¿ååæ®åè¡¨ä¿¡æ¯

			/// <summary>
			/// è¿ååæ®åè¡¨ä¿¡æ¯ æ ¡éªæ¨¡å¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetKf_PonderationBillMain_Temp_BillCheck_Json")]
			[HttpGet]
			public object GetKf_PonderationBillMain_Temp_BillCheck_Json(long HInterID, string HBillType, string sWhere)
			{
			try
			{
			WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sBarCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
			if (WebSoBar == null)
			ds = oWebs.GetKf_PonderationBillMain_Temp_BillCheck(HInterID, HBillType, sWhere);
			if (ds == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½è®°å½ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			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;
			}
			}
			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/GetKf_PonderationBillMain_TempList_BillCheck_Json")]
			[HttpGet]
			public object GetKf_PonderationBillMain_TempList_BillCheck_Json(string HBillType, string HMaker, Int64 HStockOrgID)
			{
			try
			{
			ds = oWebs.GetKf_PonderationBillMain_TempList_BillCheck(HBillType, HMaker, HStockOrgID);
			if (ds == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®æ ç¼åè®°å½ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			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;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åç¼ååè¡¨ä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#endregion


			#region çäº§ç»æåæ¨¡åè°ç¨æ¹æ³

			#region çäº§ç»æåæ¨¡å æ«æææ¡ç

			/// <summary>
			/// çäº§ç»æåæ¨¡å æ«æææ¡ç
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Get_PackBarCode_PackUnionBill_Json")]
			[HttpGet]
			public object get_PackBarCode_PackUnionBill_Json(Int64 HInterID, string HBillNo, string HBillType, string HBarCode_Pack, string HMaker, Int64 HStockOrgID)
			{
			try
			{
			WebS.ClsGy_BarCodeBill_WMS_Model WebSoBarModel = new WebS.ClsGy_BarCodeBill_WMS_Model();
			WebSoBarModel = oWebs.get_PackBarCode_PackUnionBill(HInterID, HBillNo, HBillType, HBarCode_Pack, HMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
			if (WebSoBarModel == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -602,7 +1490,7 @@
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æå";
			objJsonResult.data = WebSoBar;
			objJsonResult.data = WebSoBarModel;
			return objJsonResult;
			}
			}
			@@ -610,7 +1498,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ ¡éªæ¨¡å¼ï¼æ«ææ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.Message = "æ«æææ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -618,8 +1506,233 @@

			#endregion

			#region å¤çæ¹æ³
			#region çäº§ç»æåæ¨¡å æ«æææ¡ç å¯¹åºåä¸ªæ¡ç

			/// <summary>
			/// çäº§ç»æåæ¨¡å æ«æææ¡ç å¯¹åºåä¸ªæ¡ç
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Get_BarCode_PackUnionBill_Json")]
			[HttpGet]
			public object get_BarCode_PackUnionBill_Json(string HBarCode, Int64 HInterID, string HBillType, string HBillNo, string HBarCode_Pack, string HMaker, Int64 HStockOrgID)
			{
			try
			{
			if (oWebs.get_BarCode_PackUnionBill(HBarCode, HInterID, HBillType, HBillNo, HBarCode_Pack, HMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			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/GetBillEntry_Tmp_Pack_Json")]
			[HttpGet]
			public object GetBillEntry_Tmp_Pack_Json(long HInterID, string HBillNo, string HBillType)
			{
			try
			{
			ds = oWebs.GetBillEntry_Tmp_Pack(HInterID, HBillNo, HBillType, ref DBUtility.ClsPub.sErrInfo);
			if (ds == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½è®°å½ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			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;
			}
			}
			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/set_DelPackUnionBill_Temp_Pack_Json")]
			[HttpGet]
			public object set_DelPackUnionBill_Temp_Pack_Json(Int64 HInterID, string HBarCode, string HBillType)
			{
			try
			{
			if (oWebs.set_DelPackUnionBill_Temp_Pack(HInterID, HBarCode, HBillType, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			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 ç»æç¼ååè¡¨æ¨¡åè°ç¨æ¹æ³

			#region è¿åç»æç¼ååè¡¨ä¿¡æ¯

			/// <summary>
			/// è¿åç»æç¼ååè¡¨ä¿¡æ¯
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetSc_PackUnionBill_TempList_Json")]
			[HttpGet]
			public object GetSc_PackUnionBill_TempList_Json(string HBillType, string HMaker, long HStockOrgID)
			{
			try
			{
			ds = oWebs.GetSc_PackUnionBill_TempList(HBillType, HMaker, HStockOrgID);
			if (ds == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®æ ç¼åè®°å½ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			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;
			}
			}
			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/DeleteTemp_PackUnionBill_Json")]
			[HttpGet]
			public object DeleteTemp_PackUnionBill_Json(Int64 HInterID)
			{
			try
			{
			if (oWebs.DeleteTemp_PackUnionBill(HInterID, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			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