MeiRuiAn/HuaiAn.git

			@@ -6,6 +6,7 @@
			using WIDESEA_Core;
			using WIDESEA_Core.BaseServices;
			using WIDESEA_DTO;
			using WIDESEA_DTO.ERP;
			using WIDESEA_DTO.Inbound;
			using WIDESEA_External.Model;
			using WIDESEA_IInboundRepository;
			@@ -21,15 +22,36 @@
			WebResponseContent MaterielGroup(int inboundOrderId, string palletCode, string serNum);

			WebResponseContent InPinKu(string inboundOrderId,int warehouseId, List<string> serNums);
			WebResponseContent WMSInPinKu(int warehouseId, List<string> serNums);
			WebResponseContent MaterielGroup(string palletCode, int Initiallife, int warehouseId, List<string> serNums);

			WebResponseContent FeedbackInboundOrder(int id);
			//WebResponseContent FeedbackInboundOrder(int id);

			WebResponseContent MaterielGroup(SaveModel saveModel);

			WebResponseContent MaterielPPorGM(string materielBoxCode="");
			/// <summary>
			/// å¥åºå®æä¸æ¥
			/// </summary>
			/// <returns></returns>
			WebResponseContent FeedbackInboundOrder(Dt_StockInfo stockInfo,Dt_InboundOrder inboundOrder, List<ERPInboundDetailModel> detailModels);
			WebResponseContent FeedbackInboundOrder(int inboundOrderId);
			/// <summary>
			/// éæå®æä¸æ¥è³ERP
			/// </summary>
			WebResponseContent FeedbackReturnOrder(Dt_InboundOrder inboundOrder,Dt_ReturnOrder returnOrder);
			/// <summary>
			/// æ ¹æ®ä»åºåæçå·è·åæçç±»å
			/// </summary>
			/// <returns></returns>
			int GetPalletType(Dt_Warehouse warehouse, string palletCode);
			/// <summary>
			/// å¶ä»å¥åºåæ¥æ¶(è°æå¥ä»,å®¢ä¾åæ¶,ç©æéå®éè´§)
			/// </summary>
			/// <returns></returns>
			WebResponseContent ReceiveWarehousingOrder(ErpInOrderDTO model);
			/// <summary>
			/// æåå¥åºä¸ä¼ ERP
			/// </summary>
			WebResponseContent FeedbackProIn(Dt_MesProInOrder mesProInOrder);
			}
			}