MeiRuiAn/HuaiAn.git

			@@ -30,6 +30,18 @@
			}

			/// <summary>
			/// å¥å¹³åº
			/// </summary>
			/// <param name="orderNo"></param>
			/// <param name="warehouseId"></param>
			/// <param name="serNums"></param>
			/// <returns></returns>
			[HttpPost, HttpGet, Route("InPinKu")]
			public WebResponseContent InPinKu(string orderNo, int warehouseId, [FromBody] List<string> serNums)
			{
			return Service.InPinKu(orderNo, warehouseId, serNums);
			}
			/// <summary>
			/// åä¸ªç©æç ç»ç
			/// </summary>
			/// <param name="inboundOrderId"></param>
			@@ -65,17 +77,25 @@
			return Service.MaterielGroup(saveModel);
			}

			/// <summary>
			/// å¥åºå®æååä¼ ERP
			/// </summary>
			/// <param name="id"></param>
			/// <returns></returns>
			[HttpPost, HttpGet, Route("FeedbackInboundOrder")]
			public WebResponseContent FeedbackInboundOrder(int id)
			{
			return Service.FeedbackInboundOrder(id);
			}
			///// <summary>
			///// å¥åºå®æååä¼ ERP
			///// </summary>
			///// <param name="id"></param>
			///// <returns></returns>
			//[HttpPost, HttpGet, Route("FeedbackInboundOrder")]
			//public WebResponseContent FeedbackInboundOrder(int id)
			//{
			// return Service.FeedbackInboundOrder(id);
			//}

			/// <summary>
			/// æ å¥åºåç»ç
			/// </summary>
			/// <param name="palletCode"></param>
			/// <param name="initiallife"></param>
			/// <param name="warehouseId"></param>
			/// <param name="serNums"></param>
			/// <returns></returns>
			[HttpPost, HttpGet, Route("ManualMaterielGroup")]
			public WebResponseContent MaterielGroup(string palletCode, int initiallife, int warehouseId, [FromBody] List<string> serNums)
			{