MeiRuiAn/HuaiAn.git

			@@ -28,6 +28,7 @@
			using WIDESEA_Core.BaseServices;
			using WIDESEA_Core.Enums;
			using WIDESEA_DTO;
			using WIDESEA_DTO.Basic;
			using WIDESEA_DTO.ERP;
			using WIDESEA_DTO.MES;
			using WIDESEA_DTO.Stock;
			@@ -47,7 +48,7 @@
			/// <param name="tasks"></param>
			/// <param name="agvDescription"></param>
			/// <returns></returns>
			WebResponseContent PushTasksToWCS(List<Dt_Task> tasks, string agvDescription = "");
			WebResponseContent PushTasksToWCS(List<Dt_Task> tasks, string agvDescription = "", string agvtaskNum = "");

			/// <summary>
			///
			@@ -55,7 +56,7 @@
			/// <param name="taskNum"></param>
			/// <param name="agvDescription"></param>
			/// <returns></returns>
			WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "");
			WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "", string agvtaskNum = "");

			/// <summary>
			/// ç³è¯·å¥åºä»»å¡(PDAä½¿ç¨ï¼ä»æçç»å®å¥åºç«å°ï¼ä¸åéè´§ä½)
			@@ -65,6 +66,10 @@
			/// <returns></returns>
			//WebResponseContent RequestInboundTask(string palletCode, string stationCode);
			WebResponseContent RequestInboundTask(SaveModel saveModel);
			/// <summary>
			/// æ¥è¯¢è´¨æ£æ°é
			/// </summary>
			WebResponseContent InQualityConfirm(string palletCode);
			/// <summary>
			/// ç©ºç®±å¥åº
			/// </summary>
			@@ -125,6 +130,8 @@
			/// <returns></returns>
			WebResponseContent AssignInboundTaskLocationByHeight(int taskNum, string roadwayNo, int heightType);

			WebResponseContent RequestZHInboundTask(string agvTaskCode, string palletCode, string palletType, string materialLot);

			/// <summary>
			///
			/// </summary>
			@@ -145,6 +152,10 @@
			/// <returns></returns>
			MesResponseContent TestToolOut(TestToolOutModel model);

			//é²çå°çº¿è¾¹
			MesResponseContent SolderMaskOut(SolderMaskOut model);
			//é²çæ´¾å·¥
			MesResponseContent SolderMaskOutNotice(SolderMaskOutNotice model);
			/// <summary>
			/// çæåºåºä»»å¡
			/// </summary>
			@@ -189,6 +200,12 @@
			/// <param name="locationCode"></param>
			/// <returns></returns>
			WebResponseContent IsRelocation(int taskNum, string locationCode);
			/// <summary>
			/// æå¨ç§»åº
			/// </summary>
			/// <param name="relocationDTO"></param>
			/// <returns></returns>
			WebResponseContent ManualRelocation(RelocationDTO relocationDTO);

			/// <summary>
			///
			@@ -203,6 +220,7 @@
			/// <param name="id"></param>
			/// <returns></returns>
			WebResponseContent Outbound(int id);
			WebResponseContent TakeOutbound(List<StockViewDTO> stockViews);

			/// <summary>
			/// ç©æåºåºï¼WMSåæ¥åºåºç©ææ¹æ¬¡è³MES
			@@ -332,6 +350,11 @@
			/// <returns></returns>
			WebResponseContent ShipmentOrderSync(MesShipmentOrderSync model);
			/// <summary>
			/// WMSåæ¥æååºåºè³MESå¤åè£æº
			/// </summary>
			/// <returns></returns>
			WebResponseContent ShipmentOrderMESSync(MesShipmentOrderSync model);
			/// <summary>
			/// çæMESPPå¤§å·åºåºä»»å¡
			/// </summary>
			/// <param name="keys"></param>
			@@ -355,6 +378,7 @@
			/// <param name="StationCode">ç«å°å°å</param>
			/// <returns></returns>
			Task<WebResponseContent> OutProductTask(int[] keys, string StationCode, int Grade);
			Task<WebResponseContent> OutProScrapTask(int[] keys, string StationCode, int Grade);
			/// <summary>
			/// æåä½æéåºå¥ä»
			/// </summary>
			@@ -373,5 +397,13 @@
			/// äººå·¥éæ©åºå
			/// </summary>
			WebResponseContent OutProductSelect(int orderDetailId, List<ProStockViewDTO> proStockViews);
			WebResponseContent GetZHMesMaterialLot(string materialLot);
			/// <summary>
			/// ä»»å¡åæ¶
			/// </summary>
			/// <param name="taskNum"></param>
			/// <param name="warehouseId"></param>
			/// <returns></returns>
			public Task<WebResponseContent> TaskHandCancel(int taskNum);
			}
			}