ZhiHuiQiCe/FangCangZhiNeng.git

			@@ -19,6 +19,7 @@
			using static WIDESEA_DTO.SquareCabin.AlarmDto;
			using OfficeOpenXml.Style;
			using System.Security.Policy;
			using SqlSugar;

			namespace WIDESEA_SquareCabinServices
			{
			@@ -43,157 +44,355 @@
			}

			#region ä¸åç«åºå¥åºå
			//public WebResponseContent EdiIn()
			//{
			// try
			// {
			// var reslut = WarehouseEnum.ç«åº.ObjToInt().ToString("000");
			// var orders = _cabinOrderServices.Repository.QueryData(x => x.OdrderStatus == "æ°å»º" && x.Warehouse_no == reslut).ToList();
			// if (orders.Count < 1) return WebResponseContent.Instance.OK();
			// //string url = "http://172.16.1.2:9357/file-admin/api/in/ediIn";
			// var cabinOrderDetails = _cabinDetailServices.Repository.QueryData(x => orders.Select(x => x.Id).ToList().Contains(x.OrderId)).ToList();
			// var materielInfos = _materielInfoService.Repository.QueryData(x => cabinOrderDetails.Select(x => x.Goods_no).Contains(x.MaterielCode)).ToList();
			// foreach (var order in orders)
			// {
			// order.Details = cabinOrderDetails.Where(x => x.OrderId == order.Id).ToList();
			// foreach (var item in order.Details)
			// {
			// item.MedicineGoods = materielInfos.Where(x => x.MaterielCode == item.Goods_no).First();
			// }
			// #region ä¸åWCS
			// string materialCode = order.Details.FirstOrDefault()?.MedicineGoods?.MaterielErpType ?? "YY";
			// var ediDto = new ToediInInfo
			// {
			// //å®¢æ·ä»£ç
			// customerCode = "905",
			// //ç©æç±»å
			// materialCode = materialCode,
			// //å¥åºåå·
			// externalOrderNo = order.Order_no,
			// //å¥åºåç±»å
			// inOrderType = order.Order_type == "5" ? "20" : "10",
			// //ä¼åçº§
			// priority = 0,
			// //æ¯å¦åæ¶
			// Is_cancel = 0,
			// details = order.Details.Select(d => new ToediInDetail
			// {
			// //æ¹å·
			// batchNo = d.Batch_num,
			// //äº§å
			// productCode = d.Goods_no,
			// //skuåç§°
			// productName = d.MedicineGoods.MaterielName,
			// //skuè§æ ¼
			// productSpecifications = d.MedicineGoods.MaterielSpec,
			// //æ°é
			// quantity = (int)d.Order_qty,
			// //ææ
			// validityPeriod = d.Exp_date,
			// //çäº§åå®¶
			// manufacturer = d.MedicineGoods.Factory,
			// //æ¿å·
			// libraryNo = order.Warehouse_no,
			// }).ToList()
			// };
			// var result = HttpHelper.Post(url, ediDto.ToJsonString());
			// var resp = JsonConvert.DeserializeObject<TowcsResponse<object>>(result);
			// if (resp != null && resp.code == "0")
			// {
			// order.OdrderStatus = "å¼å§";
			// foreach (var item in cabinOrderDetails.Where(x => x.OrderId == order.Id))
			// {
			// item.Status = 1;
			// item.OrderDetailStatus = "å¼å§";
			// }
			// }
			// #endregion
			// }
			// _cabinOrderServices.UpdateData(orders);
			// _cabinDetailServices.UpdateData(cabinOrderDetails);
			// return WebResponseContent.Instance.OK();
			// }
			// catch (Exception ex)
			// {
			// Console.WriteLine("ä¸åWCSå¥åºåå¼å¸¸ï¼" + ex.Message);
			// return WebResponseContent.Instance.Error(ex.Message);
			// }
			//}
			#endregion

			#region ä¸åç«åºåºåºå
			//public WebResponseContent EdiOut()
			//{
			// try
			// {
			// var reslut = WarehouseEnum.ç«åº.ObjToInt().ToString("000");
			// var orders = _deliveryOrderServices.Repository.QueryData(x => x.OutStatus == "æ°å»º" && x.Warehouse_no == reslut).ToList();
			// if (orders.Count < 1) return WebResponseContent.Instance.OK();
			// string url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
			// var deliveryOrderDetails = _deliveryOrderDetailServices.Repository.QueryData(x => orders.Select(x => x.Id).ToList().Contains(x.DeliveryOrderId)).ToList();
			// var materielInfos = _materielInfoService.Repository.QueryData(x => deliveryOrderDetails.Select(x => x.Goods_no).Contains(x.MaterielCode)).ToList();
			// foreach (var order in orders)
			// {
			// order.Details = deliveryOrderDetails.Where(x => x.DeliveryOrderId == order.Id).ToList();
			// foreach (var item in order.Details)
			// {
			// item.MedicineGoods = materielInfos.Where(x => x.MaterielCode == item.Goods_no).First();
			// }
			// #region ä¸åWCS
			// string materialCode = order.Details.FirstOrDefault()?.MedicineGoods?.MaterielErpType ?? "YY";
			// var ediDto = new ToediOutInfo
			// {
			// //å®¢æ·ä»£ç
			// customerCode = "905",
			// //ç©æç±»å
			// materialCode = materialCode,
			// externalOrderNo = order.Out_no,
			// outOrderType = order.Out_type,
			// priority = 1,
			// Is_cancel = 0,
			// details = order.Details.Select(d => new ToeOutdiInDetail
			// {
			// batchNo = d.Batch_num,
			// productCode = d.Goods_no,
			// productName = d.MedicineGoods.MaterielName,
			// productSpecifications = d.MedicineGoods.MaterielModel,
			// quantity = (int)d.Order_qty,
			// }).ToList()
			// };
			// switch (order.Out_type)
			// {
			// case "1"://æ£å¸¸åºåº
			// case "3"://å¥åºéè´§
			// ediDto.outOrderType = "10";//ä¸è¬äº¤æåºåºå
			// break;
			// case "6"://çäºåºåº
			// ediDto.outOrderType = "30";//çäºåºåºå
			// break;
			// }
			// var result = HttpHelper.Post(url, ediDto.ToJsonString());
			// var resp = JsonConvert.DeserializeObject<TowcsResponse<object>>(result);
			// if (resp != null && resp.code == "0")
			// {
			// order.OutStatus = "å¼å§";
			// foreach (var item in deliveryOrderDetails.Where(x => x.DeliveryOrderId == order.Id))
			// {
			// item.Status = 1;
			// item.OotDetailStatus = "å¼å§";
			// }
			// }
			// #endregion
			// }
			// _deliveryOrderServices.UpdateData(orders);
			// _deliveryOrderDetailServices.UpdateData(deliveryOrderDetails);
			// return WebResponseContent.Instance.OK();
			// }
			// catch (Exception ex)
			// {
			// Console.WriteLine("ä¸åWCSåºåºåå¼å¸¸ï¼" + ex.Message);
			// return WebResponseContent.Instance.Error(ex.Message);
			// }
			//}
			#endregion





			// ä½¿ç¨ SqlSugar ç Ado.Connection æå¨ç®¡ç
			#region ä¸åç«åºå¥åºå
			public WebResponseContent EdiIn()
			{
			try
			// åå»ºç¬ç«ç SqlSugarClient
			using (var db = new SqlSugarClient(new ConnectionConfig
			{
			var reslut = WarehouseEnum.ç«åº.ObjToInt().ToString("000");
			var orders = _cabinOrderServices.Repository.QueryData(x => x.OdrderStatus == "æ°å»º" && x.Warehouse_no == reslut).ToList();
			if (orders.Count < 1) return WebResponseContent.Instance.OK();
			string url = "http://172.16.1.2:9357/file-admin/api/in/ediIn";
			var cabinOrderDetails = _cabinDetailServices.Repository.QueryData(x => orders.Select(x => x.Id).ToList().Contains(x.OrderId)).ToList();
			var materielInfos = _materielInfoService.Repository.QueryData(x => cabinOrderDetails.Select(x => x.Goods_no).Contains(x.MaterielCode)).ToList();
			foreach (var order in orders)
			ConnectionString = "Data Source=.;Initial Catalog=WIDESEA_WMSDBF_Z22;User ID=sa;Password=48PYX_h7KS@f;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
			DbType = DbType.SqlServer,
			IsAutoCloseConnection = true, // å³é®éç½®ï¼èªå¨å³éè¿æ¥
			MoreSettings = new ConnMoreSettings()
			{
			order.Details = cabinOrderDetails.Where(x => x.OrderId == order.Id).ToList();
			foreach (var item in order.Details)
			{
			item.MedicineGoods = materielInfos.Where(x => x.MaterielCode == item.Goods_no).First();
			}
			#region ä¸åWCS
			string materialCode = order.Details.FirstOrDefault()?.MedicineGoods?.MaterielErpType ?? "YY";
			var ediDto = new ToediInInfo
			{
			//å®¢æ·ä»£ç
			customerCode = "905",
			//ç©æç±»å
			materialCode = materialCode,
			//å¥åºåå·
			externalOrderNo = order.Order_no,
			//å¥åºåç±»å
			inOrderType = order.Order_type == "5" ? "20" : "10",
			//ä¼åçº§
			priority = 0,
			//æ¯å¦åæ¶
			Is_cancel = 0,
			details = order.Details.Select(d => new ToediInDetail
			{
			//æ¹å·
			batchNo = d.Batch_num,
			//äº§å
			productCode = d.Goods_no,
			//skuåç§°
			productName = d.MedicineGoods.MaterielName,
			//skuè§æ ¼
			productSpecifications = d.MedicineGoods.MaterielSpec,
			//æ°é
			quantity = (int)d.Order_qty,
			//ææ
			validityPeriod = d.Exp_date,
			//çäº§åå®¶
			manufacturer = d.MedicineGoods.Factory,
			//æ¿å·
			libraryNo = order.Warehouse_no,
			}).ToList()
			};
			var result = HttpHelper.Post(url, ediDto.ToJsonString());
			var resp = JsonConvert.DeserializeObject<TowcsResponse<object>>(result);
			if (resp != null && resp.code == "0")
			{
			order.OdrderStatus = "å¼å§";
			foreach (var item in cabinOrderDetails.Where(x => x.OrderId == order.Id))
			{
			item.Status = 1;
			item.OrderDetailStatus = "å¼å§";
			}
			}
			#endregion
			IsAutoRemoveDataCache = true
			}
			_cabinOrderServices.UpdateData(orders);
			_cabinDetailServices.UpdateData(cabinOrderDetails);
			return WebResponseContent.Instance.OK();
			}
			catch (Exception ex)
			}))
			{
			Console.WriteLine("ä¸åWCSå¥åºåå¼å¸¸ï¼" + ex.Message);
			return WebResponseContent.Instance.Error(ex.Message);
			}
			try
			{
			var reslut = WarehouseEnum.ç«åº.ObjToInt().ToString("000");

			// ä½¿ç¨æ°ç db å®ä¾æ§è¡æææ¥è¯¢
			var orders = db.Queryable<Dt_CabinOrder>()
			.Where(x => x.OdrderStatus == "æ°å»º" && x.Warehouse_no == reslut)
			.ToList();

			if (orders.Count < 1) return WebResponseContent.Instance.OK();
			string url = "http://172.16.1.2:9357/file-admin/api/in/ediIn";
			var orderIds = orders.Select(x => x.Id).ToList();


			var cabinOrderDetails = db.Queryable<Dt_CabinOrderDetail>()
			.Where(x => orderIds.Contains(x.OrderId))
			.ToList();


			var goodsCodes = cabinOrderDetails.Select(x => x.Goods_no).Distinct().ToList();

			var materielInfos = db.Queryable<Dt_MaterielInfo>()
			.Where(x => goodsCodes.Contains(x.MaterielCode))
			.ToList();


			foreach (var order in orders)
			{
			order.Details = cabinOrderDetails.Where(x => x.OrderId == order.Id).ToList();
			foreach (var item in order.Details) //æå¨åå»ºä¸ç©æè¡¨çè¿æ¥
			{
			item.MedicineGoods = materielInfos.Where(x => x.MaterielCode == item.Goods_no).First();
			}
			#region ä¸åWCS
			string materialCode = order.Details.FirstOrDefault()?.MedicineGoods?.MaterielErpType ?? "YY";
			var ediDto = new ToediInInfo
			{
			customerCode = "905",
			materialCode = materialCode,
			externalOrderNo = order.Order_no,
			inOrderType = order.Order_type == "5" ? "20" : "10",
			priority = 0,
			Is_cancel = 0,
			details = order.Details.Select(d => new ToediInDetail
			{
			batchNo = d.Batch_num,
			productCode = d.Goods_no,
			productName = d.MedicineGoods.MaterielName,
			productSpecifications = d.MedicineGoods.MaterielSpec,
			quantity = (int)d.Order_qty,
			validityPeriod = d.Exp_date,
			manufacturer = d.MedicineGoods.Factory,
			libraryNo = order.Warehouse_no,
			}).ToList()
			};
			var result = HttpHelper.Post(url, ediDto.ToJsonString());
			var resp = JsonConvert.DeserializeObject<TowcsResponse<object>>(result);
			if (resp != null && resp.code == "0")
			{
			order.OdrderStatus = "å¼å§";
			foreach (var item in cabinOrderDetails.Where(x => x.OrderId == order.Id))
			{
			item.Status = 1;
			item.OrderDetailStatus = "å¼å§";
			}
			}
			#endregion
			}

			// ä½¿ç¨åä¸ä¸ª db å®ä¾æ§è¡æ´æ°
			db.Updateable(orders).ExecuteCommand();
			db.Updateable(cabinOrderDetails).ExecuteCommand();

			return WebResponseContent.Instance.OK();
			}
			catch (Exception ex)
			{
			Console.WriteLine("ä¸åWCSå¥åºåå¼å¸¸ï¼" + ex.Message);
			return WebResponseContent.Instance.Error(ex.Message);
			}
			} // è¿éä¼èªå¨å³éè¿æ¥ï¼ä¸éè¦æå¨ç®¡ç
			}
			#endregion

			#region ä¸åç«åºåºåºå
			public WebResponseContent EdiOut()
			{
			try
			using (var db = new SqlSugarClient(new ConnectionConfig
			{
			var reslut = WarehouseEnum.ç«åº.ObjToInt().ToString("000");
			var orders = _deliveryOrderServices.Repository.QueryData(x => x.OutStatus == "æ°å»º" && x.Warehouse_no == reslut).ToList();
			if (orders.Count < 1) return WebResponseContent.Instance.OK();
			string url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
			var deliveryOrderDetails = _deliveryOrderDetailServices.Repository.QueryData(x => orders.Select(x => x.Id).ToList().Contains(x.DeliveryOrderId)).ToList();
			var materielInfos = _materielInfoService.Repository.QueryData(x => deliveryOrderDetails.Select(x => x.Goods_no).Contains(x.MaterielCode)).ToList();
			foreach (var order in orders)
			ConnectionString = "Data Source=.;Initial Catalog=WIDESEA_WMSDBF_Z22;User ID=sa;Password=48PYX_h7KS@f;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
			DbType = DbType.SqlServer,
			IsAutoCloseConnection = true, // å³é®éç½®ï¼èªå¨å³éè¿æ¥
			MoreSettings = new ConnMoreSettings()
			{
			order.Details = deliveryOrderDetails.Where(x => x.DeliveryOrderId == order.Id).ToList();
			foreach (var item in order.Details)
			{
			item.MedicineGoods = materielInfos.Where(x => x.MaterielCode == item.Goods_no).First();
			}
			#region ä¸åWCS
			string materialCode = order.Details.FirstOrDefault()?.MedicineGoods?.MaterielErpType ?? "YY";
			var ediDto = new ToediOutInfo
			{
			//å®¢æ·ä»£ç
			customerCode = "905",
			//ç©æç±»å
			materialCode = materialCode,
			externalOrderNo = order.Out_no,
			outOrderType = order.Out_type,
			priority = 1,
			Is_cancel = 0,
			details = order.Details.Select(d => new ToeOutdiInDetail
			{
			batchNo = d.Batch_num,
			productCode = d.Goods_no,
			productName = d.MedicineGoods.MaterielName,
			productSpecifications = d.MedicineGoods.MaterielModel,
			quantity = (int)d.Order_qty,
			}).ToList()
			};
			switch (order.Out_type)
			{
			case "1"://æ£å¸¸åºåº
			case "3"://å¥åºéè´§
			ediDto.outOrderType = "10";//ä¸è¬äº¤æåºåºå
			break;
			case "6"://çäºåºåº
			ediDto.outOrderType = "30";//çäºåºåºå
			break;
			}
			var result = HttpHelper.Post(url, ediDto.ToJsonString());
			var resp = JsonConvert.DeserializeObject<TowcsResponse<object>>(result);
			if (resp != null && resp.code == "0")
			{
			order.OutStatus = "å¼å§";
			foreach (var item in deliveryOrderDetails.Where(x => x.DeliveryOrderId == order.Id))
			{
			item.Status = 1;
			item.OotDetailStatus = "å¼å§";
			}
			}
			#endregion
			IsAutoRemoveDataCache = true
			}
			_deliveryOrderServices.UpdateData(orders);
			_deliveryOrderDetailServices.UpdateData(deliveryOrderDetails);
			return WebResponseContent.Instance.OK();
			}
			catch (Exception ex)
			}))
			{
			Console.WriteLine("ä¸åWCSåºåºåå¼å¸¸ï¼" + ex.Message);
			return WebResponseContent.Instance.Error(ex.Message);
			try
			{
			var reslut = WarehouseEnum.ç«åº.ObjToInt().ToString("000");
			var orders = db.Queryable<Dt_DeliveryOrder>().Where(x => x.OutStatus == "æ°å»º" && x.Warehouse_no == reslut).ToList();
			if (orders.Count < 1)
			{
			return WebResponseContent.Instance.OK();
			}
			string url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
			var deliveryOrderDetails = db.Queryable<Dt_DeliveryOrderDetail>().Where(x => orders.Select(x => x.Id).ToList().Contains(x.DeliveryOrderId)).ToList();
			var materielInfos = db.Queryable<Dt_MaterielInfo>().Where(x => deliveryOrderDetails.Select(x => x.Goods_no).Contains(x.MaterielCode)).ToList();
			foreach (var order in orders)
			{
			order.Details = deliveryOrderDetails.Where(x => x.DeliveryOrderId == order.Id).ToList();
			#region ä¸åWCS
			foreach (var item in order.Details) //æå¨åå»ºä¸ç©æè¡¨çè¿æ¥
			{
			item.MedicineGoods = materielInfos.Where(x => x.MaterielCode == item.Goods_no).First();
			}
			string materialCode = order.Details.FirstOrDefault()?.MedicineGoods?.MaterielErpType ?? "YY";
			var ediDto = new ToediOutInfo
			{
			//å®¢æ·ä»£ç
			customerCode = "905",
			//ç©æç±»å
			materialCode = materialCode,
			externalOrderNo = order.Out_no,
			outOrderType = order.Out_type,
			priority = 1,
			Is_cancel = 0,
			details = order.Details.Select(d => new ToeOutdiInDetail
			{
			batchNo = d.Batch_num,
			productCode = d.Goods_no,
			productName = d.MedicineGoods.MaterielName,
			productSpecifications = d.MedicineGoods.MaterielModel,
			quantity = (int)d.Order_qty,
			}).ToList()
			};
			switch (order.Out_type)
			{
			case "1"://æ£å¸¸åºåº
			case "3"://å¥åºéè´§
			ediDto.outOrderType = "10";//ä¸è¬äº¤æåºåºå
			break;
			case "6"://çäºåºåº
			ediDto.outOrderType = "30";//çäºåºåºå
			break;
			}
			var result = HttpHelper.Post(url, ediDto.ToJsonString());
			var resp = JsonConvert.DeserializeObject<TowcsResponse<object>>(result);
			if (resp != null && resp.code == "0")
			{
			order.OutStatus = "å¼å§";
			foreach (var item in deliveryOrderDetails.Where(x => x.DeliveryOrderId == order.Id))
			{
			item.Status = 1;
			item.OotDetailStatus = "å¼å§";
			}
			}
			#endregion
			}
			db.Updateable(orders).ExecuteCommand();
			db.Updateable(deliveryOrderDetails).ExecuteCommand();

			return WebResponseContent.Instance.OK();
			}
			catch (Exception ex)
			{
			Console.WriteLine("ä¸åWCSåºåºåå¼å¸¸ï¼" + ex.Message);
			return WebResponseContent.Instance.Error(ex.Message);
			}
			}
			}
			#endregion





			#region å¥åºå®æä¸æ¥ERP
			/// <summary>
			@@ -214,6 +413,7 @@
			var url = "http://121.37.118.63:80/GYZ2/95fck/inOrderOk";
			foreach (var item in Orders.GroupBy(x => x.Order_no))
			{
			//åªæå½è¯¥è®¢åå·ä¸çææè®°å½é½æ¯"å·²å®æ"ç¶ææ¶ï¼æç»§ç»å¤ç
			if (!item.Where(x => x.OdrderStatus != "å·²å®æ").Any())
			{
			if (item.First().Order_type == InOrderTypeEnum.Allocat.ObjToInt().ToString())
			@@ -293,7 +493,7 @@
			}
			else
			{
			if (item.First().Out_type == "3") url = "http://121.37.118.63:80/GYZ2/95fck/inOrderOk";//å¥åºéè´§
			if (item.First().Out_type == "3") url = "http://121.37.118.63:80/GYZ2/95fck/inOrderOk";//å¥åºéè´§ åºåºå
			var result = HttpHelper.Post(url, new { order_no = item.Key }.ToJsonString());
			var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
			if (response != null && response.resultCode == "0")
			@@ -327,5 +527,6 @@
			}
			}
			#endregion

			}
			}