ZhongRui/ALDbanyunxiangmu.git

			@@ -43,7 +43,10 @@

			public async Task<ResponseModel> FeedbackInbound(FeedbackInboundRequestModel model)
			{
			string json = JsonConvert.SerializeObject(model);
			string json =JsonConvert.SerializeObject(model, new JsonSerializerSettings
			{
			ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
			});
			var content = new StringContent(json, Encoding.UTF8, "application/json");
			var _client = _httpClientFactory.CreateClient("MESUrl");
			_client.DefaultRequestHeaders.Clear();
			@@ -63,7 +66,10 @@

			public async Task FeedbackOutbound(FeedbackOutboundRequestModel model)
			{
			string json = JsonConvert.SerializeObject(model);
			string json = JsonConvert.SerializeObject(model, new JsonSerializerSettings
			{
			ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
			});
			var content = new StringContent(json, Encoding.UTF8, "application/json");
			var _client = _httpClientFactory.CreateClient("MESUrl");
			_client.DefaultRequestHeaders.Clear();
			@@ -83,7 +89,10 @@

			public async Task<ResponseModel> NewMaterielToMes(MaterielToMesDTO model)
			{
			string json = JsonConvert.SerializeObject(model);
			string json = JsonConvert.SerializeObject(model, new JsonSerializerSettings
			{
			ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
			});


			//string userDataEncoded = Uri.EscapeDataString(json);
			@@ -190,27 +199,29 @@
			reqTime = DateTime.Now.ToString(),
			business_type = inboundOrder.BusinessType,
			factoryArea = inboundOrder.FactoryArea,
			operationType = 1,
			operationType=1,
			Operator= inboundOrder.Operator,
			orderNo = inboundOrder.UpperOrderNo,
			status = inboundOrder.OrderStatus,
			details = new List<FeedbackInboundDetailsModel>()

			};

			var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.SupplyCode, item.BatchNo, item.InboundOrderRowNo, item.Unit, item.WarehouseCode })
			var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.SupplyCode, item.BatchNo, item.InboundOrderRowNo, item.BarcodeUnit, item.WarehouseCode })
			.Select(group => new FeedbackInboundDetailsModel
			{
			materialCode = group.Key.MaterielCode,
			supplyCode = group.Key.SupplyCode,
			batchNo = group.Key.BatchNo,
			lineNo = group.Key.InboundOrderRowNo,
			qty = group.Sum(x=>x.BarcodeQty),
			// warehouseCode = group.Key.WarehouseCode=="0"?"1072": group.Key.WarehouseCode,
			warehouseCode = "1072",
			unit = group.Key.Unit,
			warehouseCode =group.Key.WarehouseCode,
			unit = group.Key.BarcodeUnit,
			barcodes = group.Select(row => new FeedbackBarcodesModel
			{
			barcode = row.Barcode,
			qty = row.StockQuantity
			qty = row.BarcodeQty
			}).ToList()
			}).ToList();
			feedmodel.details = groupedData;