MeiRuiAn/HuaiAn.git

			@@ -28,15 +28,17 @@
			//WebResponseContent FeedbackInboundOrder(int id);

			WebResponseContent MaterielGroup(SaveModel saveModel);

			WebResponseContent MaterielPPorGM(string materielBoxCode="");
			/// <summary>
			/// å¥åºå®æä¸æ¥
			/// </summary>
			/// <returns></returns>
			WebResponseContent FeedbackInboundOrder(Dt_InboundOrder inboundOrder);
			WebResponseContent FeedbackInboundOrder(int inboundOrderId);
			/// <summary>
			/// éæå®æä¸æ¥è³ERP
			/// </summary>
			public WebResponseContent FeedbackReturnOrder(Dt_InboundOrder inboundOrder,Dt_ReturnOrder returnOrder);
			WebResponseContent FeedbackReturnOrder(Dt_InboundOrder inboundOrder,Dt_ReturnOrder returnOrder);
			/// <summary>
			/// æ ¹æ®ä»åºåæçå·è·åæçç±»å
			/// </summary>
			@@ -47,5 +49,9 @@
			/// </summary>
			/// <returns></returns>
			WebResponseContent ReceiveWarehousingOrder(ErpInOrderDTO model);
			/// <summary>
			/// æåå¥åºä¸ä¼ ERP
			/// </summary>
			WebResponseContent FeedbackProIn(Dt_MesProInOrder mesProInOrder);
			}
			}