ZhiHuiQiCe/FangCangZhiNeng.git

			@@ -3,6 +3,8 @@
			using Microsoft.Data.SqlClient;
			using Microsoft.IdentityModel.Tokens;
			using Newtonsoft.Json;
			using OfficeOpenXml.Style;
			using Org.BouncyCastle.Asn1.X509;
			using System;
			using System.Collections.Generic;
			using System.Linq;
			@@ -11,7 +13,9 @@
			using WIDESEA_Common;
			using WIDESEA_Common.LocationEnum;
			using WIDESEA_Common.OrderEnum;
			using WIDESEA_Common.StockEnum;
			using WIDESEA_Common.TaskEnum;
			using WIDESEA_Common.WareHouseEnum;
			using WIDESEA_Core;
			using WIDESEA_Core.BaseRepository;
			using WIDESEA_Core.BaseServices;
			@@ -30,7 +34,7 @@
			{
			public partial class DeliveryOrderServices : ServiceBase<Dt_DeliveryOrder, IRepository<Dt_DeliveryOrder>>, IDeliveryOrderServices
			{
			static string SearchDate = "";

			private readonly IBasicService _basicService;
			private readonly IUnitOfWorkManage _unitOfWorkManage;
			private readonly IInventory_BatchServices _inventory_BatchServices;
			@@ -38,8 +42,9 @@
			private readonly IDeliveryOrderDetailServices _deliveryOrderDetailServices;
			private readonly ISupplyTaskService _supplyTaskService;
			private readonly ICabinOrderServices _cabinOrderServices;
			private readonly ITacticsService _tacticsService;
			public IRepository<Dt_DeliveryOrder> Repository => BaseDal;
			public DeliveryOrderServices(IRepository<Dt_DeliveryOrder> BaseDal, IBasicService basicService, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, IDeliveryOrderDetailServices deliveryOrderDetailServices, ISupplyTaskService supplyTaskService, ICabinOrderServices cabinOrderServices) : base(BaseDal)
			public DeliveryOrderServices(IRepository<Dt_DeliveryOrder> BaseDal, IBasicService basicService, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, IDeliveryOrderDetailServices deliveryOrderDetailServices, ISupplyTaskService supplyTaskService, ICabinOrderServices cabinOrderServices, ITacticsService tacticsService) : base(BaseDal)
			{
			_basicService = basicService;
			_unitOfWorkManage = unitOfWorkManage;
			@@ -48,300 +53,11 @@
			_inventory_BatchServices = inventory_BatchServices;
			_inventoryInfoService = inventoryInfoService;
			_cabinOrderServices = cabinOrderServices;
			_tacticsService = tacticsService;
			}

			/// <summary>
			/// è·åä¸æ¸¸åºåºå 0æå1å¤±è´¥
			/// </summary>
			/// <param name = "searchDate" ></ param >
			/// < returns ></ returns >
			//public WebResponseContent GetUpstreamOutOrder()
			//{
			// var responseContent = new WebResponseContent();
			// try
			// {
			// var url = "http://121.37.118.63:80/GYZ2/95fck/outOrder";
			// //var url = "http://127.0.0.1:4523/m1/5660322-5340849-default/GYZ2/95fck/outOrder";
			// if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
			// //// è¯·æ±åæ°
			// var requestData = new
			// {
			// searchDate = SearchDate
			// //searchDate = "2022-10-10 20:45:16" // æ£ç¡®çæ ¼å¼
			// };
			// SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");

			// var result = HttpHelper.Post(url, requestData.ToJsonString());
			// var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstramOutOrderInfo>>(result);

			// if (response.resultCode != "0")
			// {
			// SendErrorToUpstream(3, "", response.resultMsg ?? "ä¸æ¸¸æ¥å£è¿åå¤±è´¥", "");
			// return responseContent.Error(response.resultMsg ?? "ä¸æ¸¸æ¥å£è¿åå¤±è´¥");
			// }

			// if (response.data == null \|\| !response.data.Any())
			// {
			// return responseContent.OK("æ æ°åºåºåæ°æ®");
			// }

			// // å·²åå¨åºåºåå·
			// var existingOutOrderNos = BaseDal.Db.Queryable<Dt_DeliveryOrder>()
			// .Select(x => x.Out_no)
			// .ToList();

			// // æ°åºåºå
			// var newOutOrders = response.data
			// .Where(outorder => !existingOutOrderNos.Contains(outorder.order_no))
			// .ToList();

			// List<string> order_no = newOutOrders.Select(x => x.order_no).ToList();

			// if (!newOutOrders.Any())
			// {
			// return responseContent.OK("ææåºåºåå·²åå¨ï¼æ éæ°å¢");
			// }

			// Db.Ado.BeginTran();
			// try
			// {
			// List<Dt_DeliveryOrder> _DeliveryOrders = new List<Dt_DeliveryOrder>();
			// List<string> orderNos = new List<string>();

			// foreach (var outorder in newOutOrders)
			// {
			// bool skipOrder = false; // æ è®°æ¯å¦è·³è¿è¯¥åºåºå

			// // å¦æè¿ä¸ªåºåºåç±»åä¸çäº1ï¼å±äºåºåºéè´§ï¼è¦å¥è´§ä¸æ¸¸ä¼ è¿æ¥çæ°éä¸ºè´æ°ï¼
			// if (outorder.order_type != "1")
			// {
			// // åå»ºåºåºéè´§å - è¿ééè¦æ ¹æ®ä¸å¡é»è¾å®ç°
			// // ææ¶è·³è¿æå®ç°éè´§é»è¾
			// continue;
			// }
			// else if (outorder.order_type == "1") // æ£å¸¸åºåºå
			// {
			// // æé¤ç¹æ®è¯å,ç¹æ®è¯åç´æ¥æå¥
			// if (outorder.warehouse_no != "001" && (outorder.warehouse_no == "010" \|\| outorder.warehouse_no == "003" \|\| outorder.warehouse_no == "017"))
			// {
			// var entityOrder = new Dt_DeliveryOrder
			// {
			// Out_no = outorder.order_no,
			// Out_type = outorder.order_type,
			// Client_no = outorder.client_no,
			// Client_name = outorder.client_name,
			// Account_time = outorder.account_time,
			// Warehouse_no = outorder.warehouse_no,
			// OutStatus = "æ°å»º",
			// Details = outorder.details.Select(d => new Dt_DeliveryOrderDetail
			// {
			// Goods_no = d.goods_no,
			// Order_qty = Math.Abs(d.order_qty), // åºåºæ°éè½¬ä¸ºæ£æ°
			// Batch_num = d.batch_num,
			// Exp_date = d.exp_date,
			// OotDetailStatus = "æ°å»º",
			// Status = 2, // padå¹³åºï¼æ éåæ¥
			// }).ToList()
			// };
			// _DeliveryOrders.Add(entityOrder);
			// }
			// else // å¸¸è§è¯å001æ¿ç»ç«åº,è¦æ¯ææ´ç®±å°±ç»å¹³åº
			// {
			// var entityOrder = new Dt_DeliveryOrder
			// {
			// Out_no = outorder.order_no,
			// Out_type = outorder.order_type,
			// Client_no = outorder.client_no,
			// Client_name = outorder.client_name,
			// Account_time = outorder.account_time,
			// Warehouse_no = outorder.warehouse_no,
			// OutStatus = "æ°å»º",
			// Details = new List<Dt_DeliveryOrderDetail>()
			// };

			// // éååºåºæç»
			// foreach (var item in outorder.details)
			// {
			// // å°ä¸æ¸¸åºåºæ°éè½¬ä¸ºæ£æ°
			// decimal orderQty = Math.Abs((decimal)item.order_qty);

			// #region æ ¹æ®ç©æç¼ç æ¥è¯¢ç©æä¿¡æ¯
			// var medication = BaseDal.Db.Queryable<Dt_MaterielInfo>()
			// .Where(m => m.MaterielCode == item.goods_no)
			// .First();

			// // å¦æç©æä¿¡æ¯ä¸åå¨ï¼è·³è¿æ´ä¸ªåºåºå
			// if (medication == null)
			// {
			// skipOrder = true;
			// Console.WriteLine($"è·³åºå¤åºå {outorder.order_no}ï¼åå ï¼æªæ¾å°åå [{item.goods_no}] çç©æä¿¡æ¯ã");
			// break;
			// }

			// // è¥ç©æä¸åå¨æ MaterielSourceType ä¸ºç©ºï¼åè·³è¿æ´ä¸ªåºåºå
			// if (medication == null \|\| !Enum.IsDefined(typeof(MaterielSourceTypeEnum), medication.MaterielSourceType))
			// {
			// skipOrder = true;
			// break;
			// }
			// #endregion

			// /// æ ¹æ®ç©æä¿¡æ¯å¤§å°ä»¶å±æ§åºåæ¯å¦ä»ç«åºåºåº // å¤§ä»¶ä»å¹³åºåºåº
			// if (medication.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart) // å¦æç©ææ¯å¤§ä»¶
			// {
			// var orderDetail = new Dt_DeliveryOrderDetail()
			// {
			// Reservoirarea = outorder.warehouse_no,
			// Goods_no = item.goods_no,
			// Order_qty = orderQty,
			// Batch_num = item.batch_num,
			// Exp_date = item.exp_date,
			// OotDetailStatus = "æ°å»º",
			// Status = 2 // å¹³åºï¼æ éåæ¥
			// };
			// entityOrder.Details.Add(orderDetail);
			// }
			// else
			// {
			// Dt_DeliveryOrderDetail orderDetail = null;

			// // è®¡ç®æ´ç®±åæ£ä»¶æ°é
			// var ys = orderQty % medication.BoxQty; // ä¸è½æ´é¤ç®±è§çæ£ä»¶æ°
			// var xs = (int)(orderQty / medication.BoxQty); // æ´ç®±æ°éï¼ä¿çæ´æ°ï¼

			// #region ä»ç«åºåºåºæ£ä»¶

			// #region å¤ææ¯å¦ææ£ä»¶
			// if (ys > 0 && medication.Business_qty >= ys)
			// {
			// orderDetail = new Dt_DeliveryOrderDetail()
			// {
			// Reservoirarea = outorder.warehouse_no,
			// Goods_no = item.goods_no,
			// Order_qty = ys,
			// Batch_num = item.batch_num,
			// Exp_date = item.exp_date,
			// OotDetailStatus = "æ°å»º",
			// Status = 0 // ç«åºï¼éè¦åæ¥ç»WCS
			// };
			// medication.Business_qty -= ys;
			// }
			// else
			// {
			// // ç«åºåºåä¸è¶³ï¼æ£ä»¶ä¹ä»å¹³åºåº
			// orderDetail = new Dt_DeliveryOrderDetail()
			// {
			// Reservoirarea = outorder.warehouse_no,
			// Goods_no = item.goods_no,
			// Order_qty = ys,
			// Batch_num = item.batch_num,
			// Exp_date = item.exp_date,
			// OotDetailStatus = "æ°å»º",
			// Status = 2 // å¹³åº
			// };
			// }
			// #endregion

			// #region å¤æç«åºåºåæ¯å¦è¶³å¤åºæ´ç®±
			// while (medication.Business_qty >= medication.BoxQty && xs > 0)
			// {
			// xs--;
			// if (orderDetail == null)
			// {
			// orderDetail = new Dt_DeliveryOrderDetail()
			// {
			// Reservoirarea = outorder.warehouse_no,
			// Goods_no = item.goods_no,
			// Order_qty = medication.BoxQty,
			// Batch_num = item.batch_num,
			// Exp_date = item.exp_date,
			// OotDetailStatus = "æ°å»º",
			// Status = 0 // ç«åº
			// };
			// medication.Business_qty -= medication.BoxQty;
			// }
			// else
			// {
			// orderDetail.Order_qty += medication.BoxQty;
			// medication.Business_qty -= medication.BoxQty;
			// }
			// }

			// if (orderDetail != null)
			// entityOrder.Details.Add(orderDetail);
			// #endregion

			// #endregion

			// #region å©ä½æ´ä»¶ä»å¹³åºåºåº
			// if (xs > 0)
			// {
			// orderDetail = new Dt_DeliveryOrderDetail()
			// {
			// Reservoirarea = outorder.warehouse_no,
			// Goods_no = item.goods_no,
			// Order_qty = medication.BoxQty * xs,
			// Batch_num = item.batch_num,
			// Exp_date = item.exp_date,
			// OotDetailStatus = "æ°å»º",
			// Status = 2 // å¹³åº
			// };
			// entityOrder.Details.Add(orderDetail);
			// }
			// #endregion
			// }

			// // æ´æ°ç©æä¿¡æ¯
			// _basicService.MaterielInfoService.Repository.UpdateData(medication);

			// }

			// // å¦æè·³è¿è¯¥åï¼åç´æ¥continueï¼ä¸ä¿å
			// if (skipOrder)
			// {
			// Console.WriteLine($"è·³åºå¤åºå {outorder.order_no}ï¼å ä¸ºåå¨æªå®ä¹ç©æå±æ§çååã");
			// continue;
			// }

			// // ç¡®ä¿åºåºåææç»ææ·»å
			// if (entityOrder.Details.Any())
			// {
			// _DeliveryOrders.Add(entityOrder);
			// orderNos.Add(outorder.order_no);
			// }
			// }
			// }
			// }

			// // æ¹éæå¥åºåºååæç»
			// if (_DeliveryOrders.Any())
			// {
			// BaseDal.Db.InsertNav(_DeliveryOrders).Include(x => x.Details).ExecuteCommand();
			// }

			// Db.Ado.CommitTran();
			// var tex= CreateSupplyTask(order_no);
			// if (!tex)
			// {
			// return responseContent.Error("åå»ºä¾åºä»»å¡å¤±è´¥");
			// }
			// return responseContent.OK($"åæ¥åºåºåæåï¼å±{_DeliveryOrders.Count}æ¡");
			// }
			// catch (Exception ex)
			// {
			// Db.Ado.RollbackTran();
			// SendErrorToUpstream(3, "", ex.Message, "");
			// return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			// }
			// }
			// catch (Exception ex)
			// {
			// SendErrorToUpstream(3, "", ex.Message, "");
			// return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			// }
			//}


			static string SearchDate = "2025-09-10 00:00:00";
			public WebResponseContent GetUpstreamOutOrder()
			{
			var responseContent = new WebResponseContent();
			@@ -397,209 +113,60 @@

			foreach (var outorder in newOutOrders)
			{
			bool skipOrder = false; // æ è®°æ¯å¦è·³è¿è¯¥åºåºå

			// å¦æè¿ä¸ªåºåºåç±»åä¸çäº1ï¼å±äºåºåºéè´§ï¼è¦å¥è´§ä¸æ¸¸ä¼ è¿æ¥çæ°éä¸ºè´æ°ï¼
			if (outorder.order_type != "1")
			if (outorder.order_type == "1") // æ£å¸¸åºåºå
			{
			CreateOutboundOrder(outorder);//åå»ºåºåºåãå¤çåºåãæ·»å åºåºä»»å¡
			}
			else if (outorder.order_type == "2")//åºåºéè´§
			{
			// åå»ºåºåºéè´§å - è¿ééè¦æ ¹æ®ä¸å¡é»è¾å®ç°
			// ææ¶è·³è¿æå®ç°éè´§é»è¾
			continue;
			//continue;
			#region è½¬æ¢æå¥åºå
			UpstreamOrderInfo order = new UpstreamOrderInfo()
			{
			order_no = outorder.order_no,
			order_type = outorder.order_type,
			warehouse_no = outorder.warehouse_no,
			details = new List<UpstreamOrderDetail>()
			};
			foreach (var item in outorder.details)
			{
			UpstreamOrderDetail detail = new UpstreamOrderDetail()
			{
			batch_num = item.batch_num,
			goods_no = item.goods_no,
			order_qty = item.order_qty,
			exp_date = item.exp_date,
			};
			order.details.Add(detail);
			}
			responseContent = _cabinOrderServices.CreateInboundOrder(order);
			List<Dt_CabinOrder>? dt_CabinOrders = responseContent.Data as List<Dt_CabinOrder>;
			if (dt_CabinOrders != null && dt_CabinOrders.Count > 0)
			BaseDal.Db.InsertNav(dt_CabinOrders).Include(x => x.Details).ExecuteCommand();
			#endregion
			}
			else if (outorder.order_type == "1") // æ£å¸¸åºåºå
			else if (outorder.order_type == "3")//æ¥æåºåº
			{
			// æé¤ç¹æ®è¯å,ç¹æ®è¯åç´æ¥æå¥
			if (outorder.warehouse_no != "001" && (outorder.warehouse_no == "010" \|\| outorder.warehouse_no == "003" \|\| outorder.warehouse_no == "017"))
			{
			var entityOrder = new Dt_DeliveryOrder
			{
			Out_no = outorder.order_no,
			Out_type = outorder.order_type,
			Client_no = outorder.client_no,
			Client_name = outorder.client_name,
			Account_time = outorder.account_time,
			Warehouse_no = outorder.warehouse_no,
			OutStatus = "æ°å»º",
			Details = outorder.details.Select(d => new Dt_DeliveryOrderDetail
			{
			Goods_no = d.goods_no,
			Order_qty = Math.Abs(d.order_qty), // åºåºæ°éè½¬ä¸ºæ£æ°
			Batch_num = d.batch_num,
			Exp_date = d.exp_date,
			OotDetailStatus = "æ°å»º",
			Status = 2, // padå¹³åºï¼æ éåæ¥
			}).ToList()
			};
			_DeliveryOrders.Add(entityOrder);
			}
			else // å¸¸è§è¯å001æ¿ç»ç«åº,è¦æ¯ææ´ç®±å°±ç»å¹³åº
			{
			var entityOrder = new Dt_DeliveryOrder
			{
			Out_no = outorder.order_no,
			Out_type = outorder.order_type,
			Client_no = outorder.client_no,
			Client_name = outorder.client_name,
			Account_time = outorder.account_time,
			Warehouse_no = outorder.warehouse_no,
			OutStatus = "æ°å»º",
			Details = new List<Dt_DeliveryOrderDetail>()
			};

			// éååºåºæç»
			foreach (var item in outorder.details)
			{
			// å°ä¸æ¸¸åºåºæ°éè½¬ä¸ºæ£æ°
			decimal orderQty = Math.Abs((decimal)item.order_qty);

			#region æ ¹æ®ç©æç¼ç æ¥è¯¢ç©æä¿¡æ¯
			var medication = BaseDal.Db.Queryable<Dt_MaterielInfo>()
			.Where(m => m.MaterielCode == item.goods_no)
			.First();

			// å¦æç©æä¿¡æ¯ä¸åå¨ï¼è·³è¿æ´ä¸ªåºåºå
			if (medication == null)
			{
			skipOrder = true;
			Console.WriteLine($"è·³åºå¤åºå {outorder.order_no}ï¼åå ï¼æªæ¾å°åå [{item.goods_no}] çç©æä¿¡æ¯ã");
			break;
			}

			// è¥ç©æä¸åå¨æ MaterielSourceType ä¸ºç©ºï¼åè·³è¿æ´ä¸ªåºåºå
			if (medication == null \|\| !Enum.IsDefined(typeof(MaterielSourceTypeEnum), medication.MaterielSourceType))
			{
			skipOrder = true;
			break;
			}
			#endregion

			/// æ ¹æ®ç©æä¿¡æ¯å¤§å°ä»¶å±æ§åºåæ¯å¦ä»ç«åºåºåº // å¤§ä»¶ä»å¹³åºåºåº
			if (medication.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart) // å¦æç©ææ¯å¤§ä»¶
			{
			var orderDetail = new Dt_DeliveryOrderDetail()
			{
			Reservoirarea = outorder.warehouse_no,
			Goods_no = item.goods_no,
			Order_qty = orderQty,
			Batch_num = item.batch_num,
			Exp_date = item.exp_date,
			OotDetailStatus = "æ°å»º",
			Status = 2 // å¹³åºï¼æ éåæ¥
			};
			entityOrder.Details.Add(orderDetail);
			}
			else
			{
			Dt_DeliveryOrderDetail orderDetail = null;

			// è®¡ç®æ´ç®±åæ£ä»¶æ°é
			var ys = orderQty % medication.BoxQty; // ä¸è½æ´é¤ç®±è§çæ£ä»¶æ°
			var xs = (int)(orderQty / medication.BoxQty); // æ´ç®±æ°éï¼ä¿çæ´æ°ï¼

			#region ä»ç«åºåºåºæ£ä»¶

			#region å¤ææ¯å¦ææ£ä»¶
			if (ys > 0 && medication.Business_qty >= ys)
			{
			orderDetail = new Dt_DeliveryOrderDetail()
			{
			Reservoirarea = outorder.warehouse_no,
			Goods_no = item.goods_no,
			Order_qty = ys,
			Batch_num = item.batch_num,
			Exp_date = item.exp_date,
			OotDetailStatus = "æ°å»º",
			Status = 0 // ç«åºï¼éè¦åæ¥ç»WCS
			};
			medication.Business_qty -= ys;
			}
			#endregion

			#region å¤æç«åºåºåæ¯å¦è¶³å¤åºæ´ç®±
			while (medication.Business_qty >= medication.BoxQty && xs > 0)
			{
			xs--;
			if (orderDetail == null)
			{
			orderDetail = new Dt_DeliveryOrderDetail()
			{
			Reservoirarea = outorder.warehouse_no,
			Goods_no = item.goods_no,
			Order_qty = medication.BoxQty,
			Batch_num = item.batch_num,
			Exp_date = item.exp_date,
			OotDetailStatus = "æ°å»º",
			Status = 0 // ç«åº
			};
			medication.Business_qty -= medication.BoxQty;
			}
			else
			{
			orderDetail.Order_qty += medication.BoxQty;
			medication.Business_qty -= medication.BoxQty;
			}
			}

			if (orderDetail != null)
			entityOrder.Details.Add(orderDetail);
			#endregion

			#endregion

			#region å©ä½æ´ä»¶ä»å¹³åºåºåº
			if (xs > 0)
			{
			orderDetail = new Dt_DeliveryOrderDetail()
			{
			Reservoirarea = outorder.warehouse_no,
			Goods_no = item.goods_no,
			Order_qty = medication.BoxQty * xs,
			Batch_num = item.batch_num,
			Exp_date = item.exp_date,
			OotDetailStatus = "æ°å»º",
			Status = 2 // å¹³åº
			};
			entityOrder.Details.Add(orderDetail);
			}
			#endregion
			}

			// æ´æ°ç©æä¿¡æ¯
			_basicService.MaterielInfoService.Repository.UpdateData(medication);

			}

			// å¦æè·³è¿è¯¥åï¼åç´æ¥continueï¼ä¸ä¿å
			if (skipOrder)
			{
			Console.WriteLine($"è·³åºå¤åºå {outorder.order_no}ï¼å ä¸ºåå¨æªå®ä¹ç©æå±æ§çååã");
			continue;
			}

			// ç¡®ä¿åºåºåææç»ææ·»å
			if (entityOrder.Details.Any())
			{
			_DeliveryOrders.Add(entityOrder);
			orderNos.Add(outorder.order_no);
			}
			}
			}
			}

			// æ¹éæå¥åºåºååæç»
			if (_DeliveryOrders.Any())
			{
			BaseDal.Db.InsertNav(_DeliveryOrders).Include(x => x.Details).ExecuteCommand();
			}
			//if (_DeliveryOrders.Any())
			//{
			// BaseDal.Db.InsertNav(_DeliveryOrders).Include(x => x.Details).ExecuteCommand();
			//}
			//ä¸ååºåºåä»»å¡ç»wcs


			Db.Ado.CommitTran();
			var tex = CreateSupplyTask(order_no);
			if (!tex)
			{
			return responseContent.Error("åå»ºä¾åºä»»å¡å¤±è´¥");
			}
			//var tex = CreateSupplyTask(order_no);
			//if (!tex)
			//{
			// return responseContent.Error("åå»ºä¾åºä»»å¡å¤±è´¥");
			//}
			return responseContent.OK($"åæ¥åºåºåæåï¼å±{_DeliveryOrders.Count}æ¡");
			}
			catch (Exception ex)
			@@ -615,8 +182,378 @@
			return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			}
			}
			/// <summary>
			/// åå»ºåºåºå
			/// </summary>
			/// <param name="outorder"></param>
			/// <returns></returns>
			public WebResponseContent CreateOutboundOrder(UpstramOutOrderInfo outorder)
			{
			WebResponseContent webResponseContent = new WebResponseContent();
			try
			{
			Dt_Tactics tactics = _tacticsService.Repository.QueryFirst(x => x.TacticeName == "åºåºçç¥");
			if (outorder.warehouse_no == WarehouseEnum.éº»ç²¾åº.ObjToInt().ToString("000") \|\| outorder.warehouse_no == WarehouseEnum.å·å»åº.ObjToInt().ToString("000"))
			{
			#region æ·»å åºåºå
			var entityOrder = new Dt_DeliveryOrder
			{
			Out_no = outorder.order_no,
			Out_type = outorder.order_type,
			Client_no = outorder.client_no,
			Client_name = outorder.client_name,
			Account_time = outorder.account_time,
			Warehouse_no = outorder.warehouse_no,
			OutStatus = "æ°å»º",
			Details = outorder.details.Select(d => new Dt_DeliveryOrderDetail
			{
			Reservoirarea = outorder.warehouse_no,
			Goods_no = d.goods_no,
			Order_qty = Math.Abs(d.order_qty), // åºåºæ°éè½¬ä¸ºæ£æ°
			Batch_num = d.batch_num,
			Exp_date = d.exp_date,
			OotDetailStatus = "æ°å»º",
			Status = 2, // padå¹³åºï¼æ éåæ¥
			}).ToList()
			};
			BaseDal.Db.InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
			#endregion
			#region å¤çåºåãåºåæ¹æ¬¡ãæ·»å åºåºä»»å¡
			foreach (var item in entityOrder.Details)
			{
			Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.MaterielCode == item.Goods_no && x.BatchNo == item.Batch_num);
			if (inventory_Batch == null) throw new Exception($"æªæ¾å°åºåºåå·ã{entityOrder.Out_no}ãä¸ç©æç¼å·ã{item.Goods_no}ãç©ææ¹æ¬¡ã{item.Batch_num}ãçåºåæ¹æ¬¡ä¿¡æ¯");
			if (inventory_Batch.AvailableQuantity < item.Order_qty) throw new Exception($"åºåºåå·ã{entityOrder.Out_no}ãä¸ç©æç¼å·ã{item.Goods_no}ãç©ææ¹æ¬¡ã{item.Batch_num}ãçåºåæ¹æ¬¡ä¿¡æ¯å¯ç¨æ°éä¸è¶³");
			inventory_Batch.AvailableQuantity -= item.Order_qty;
			inventory_Batch.OutboundQuantity += item.Order_qty;
			List<Dt_InventoryInfo> dt_InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == item.Goods_no && x.BatchNo == item.Batch_num && x.StockStatus == StockStatusEmun.å¥åºå®æ.ObjToInt() && x.StockQuantity > x.OutboundQuantity && x.WarehouseCode == item.Reservoirarea);
			#region æåºåºçç¥æ¥æ¾åºå
			if (tactics.SelectTactice == TacticsEnum.ComeOutonFirstTime.ObjToInt())
			dt_InventoryInfos = dt_InventoryInfos.OrderBy(x => x.ValidityPeriod).ToList();
			else
			dt_InventoryInfos = dt_InventoryInfos.OrderBy(x => x.InDate).ToList();
			#endregion
			var Order_qty = item.Order_qty;//åºåºåæ°é
			foreach (var InventoryInfo in dt_InventoryInfos)
			{
			if (Order_qty <= 0) break;
			if (InventoryInfo.AvailableQuantity < Order_qty)
			{
			InventoryInfo.AvailableQuantity = 0;
			Order_qty -= InventoryInfo.AvailableQuantity;
			InventoryInfo.OutboundQuantity += InventoryInfo.AvailableQuantity;
			InventoryInfo.StockStatus = StockStatusEmun.åºåºéå®.ObjToInt();
			}
			else
			{
			InventoryInfo.AvailableQuantity -= Order_qty;
			Order_qty = 0;
			InventoryInfo.OutboundQuantity += Order_qty;
			InventoryInfo.StockStatus = StockStatusEmun.åºåºéå®.ObjToInt();
			}
			}
			dt_InventoryInfos = dt_InventoryInfos.Where(X => X.StockStatus == StockStatusEmun.åºåºéå®.ObjToInt()).ToList();
			List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
			foreach (var inventoryInfo in dt_InventoryInfos)
			{
			Dt_SupplyTask supplyTask = new Dt_SupplyTask()
			{
			WarehouseCode = inventoryInfo.WarehouseCode,
			BatchNo = inventoryInfo.BatchNo,
			MaterielName = inventoryInfo.MaterielName,
			MaterielCode = inventoryInfo.MaterielCode,
			MaterielSpec = inventoryInfo.MaterielSpec,
			TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
			TaskType = TaskTypeEnum.OutPick.ObjToInt(),
			CreateDate = DateTime.Now,
			Creater = App.User.UserName ?? "System",
			LocationCode = inventoryInfo.LocationCode,
			OrderNo = entityOrder.Out_no,
			StockQuantity = inventoryInfo.OutboundQuantity,
			SupplyQuantity = 0,
			Remark = "åºåº"
			};
			supplyTasks.Add(supplyTask);
			}
			_inventory_BatchServices.Repository.UpdateData(inventory_Batch);
			_inventoryInfoService.Repository.UpdateData(dt_InventoryInfos);
			_supplyTaskService.AddData(supplyTasks);
			}
			#endregion
			}
			else
			{
			#region åå»ºå¤§ä»¶åºãç«åºåºåºå¤´è¡¨
			var entityOrder = new Dt_DeliveryOrder
			{
			Out_no = outorder.order_no,
			Out_type = outorder.order_type,
			OutStatus = "æ°å»º",
			Client_name = outorder.client_name,
			Account_time = outorder.account_time,
			Client_no = outorder.client_no,
			Warehouse_no = WarehouseEnum.å¤§ä»¶åº.ObjToInt().ToString("000"),
			Details = new List<Dt_DeliveryOrderDetail>()
			};
			var entityOrderLK = new Dt_DeliveryOrder
			{
			Out_no = outorder.order_no,
			Out_type = outorder.order_type,
			OutStatus = "æ°å»º",
			Client_name = outorder.client_name,
			Account_time = outorder.account_time,
			Client_no = outorder.client_no,
			Warehouse_no = WarehouseEnum.ç«åº.ObjToInt().ToString("000"),
			Details = new List<Dt_DeliveryOrderDetail>()
			};
			#endregion
			#region æ¥æ¾åºå
			foreach (var detail in outorder.details)
			{
			#region æ¥è¯¢åºåæ¹æ¬¡ååºå
			Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.MaterielCode == detail.goods_no && x.BatchNo == detail.batch_num);
			if (inventory_Batch == null) throw new Exception($"æªæ¾å°åºåºåå·ã{outorder.order_no}ãä¸ç©æç¼å·ã{detail.goods_no}ãç©ææ¹æ¬¡ã{detail.batch_num}ãçåºåæ¹æ¬¡ä¿¡æ¯");
			if (inventory_Batch.AvailableQuantity < detail.order_qty) throw new Exception($"åºåºåå·ã{outorder.order_no}ãä¸ç©æç¼å·ã{detail.goods_no}ãç©ææ¹æ¬¡ã{detail.batch_num}ãçåºåæ¹æ¬¡ä¿¡æ¯å¯ç¨æ°éä¸è¶³");
			inventory_Batch.AvailableQuantity -= detail.order_qty;
			inventory_Batch.OutboundQuantity += detail.order_qty;
			List<Dt_InventoryInfo> dt_InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo && x.StockStatus == StockStatusEmun.å¥åºå®æ.ObjToInt() && x.StockQuantity > x.OutboundQuantity && (x.WarehouseCode == WarehouseEnum.å¤§ä»¶åº.ObjToInt().ToString("000") \|\| x.WarehouseCode == WarehouseEnum.ç«åº.ObjToInt().ToString("000")));
			#endregion
			#region æåºåºçç¥æ¥æ¾åºå
			if (tactics.SelectTactice == TacticsEnum.ComeOutonFirstTime.ObjToInt())
			dt_InventoryInfos = dt_InventoryInfos.OrderBy(x => x.ValidityPeriod).ToList();
			else
			dt_InventoryInfos = dt_InventoryInfos.OrderBy(x => x.InDate).ToList();
			#endregion
			var Order_qty = Math.Abs(detail.order_qty);//åºåºåæ°é
			#region æ ¹æ®ç©æç¼ç æ¥è¯¢ç©æä¿¡æ¯
			Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == detail.goods_no);
			if (materielInfo == null) throw new Exception($"æªæ¾å°è¯åç¼ç ã{detail.goods_no}ãçä¿¡æ¯");
			if (!Enum.IsDefined(typeof(MaterielSourceTypeEnum), materielInfo.MaterielSourceType))
			throw new Exception($"è¯·è®¾ç½®è¯åç¼å·ã{detail.goods_no}ãçå±æ§åç±»");
			if (materielInfo.BoxQty < 1) throw new Exception($"è¯·è®¾ç½®è¯åç¼å·ã{detail.goods_no}ãçç®±è§æ°é");
			#endregion
			#region å¤§ä»¶
			if (materielInfo.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart)//å¦æç©ææ¯å¤§ä»¶
			{
			#region æ·»å åºåºè¯¦æ
			Dt_DeliveryOrderDetail orderDetail = new Dt_DeliveryOrderDetail()
			{
			Reservoirarea = entityOrder.Warehouse_no,
			Goods_no = detail.goods_no,
			Order_qty = detail.order_qty,
			Batch_num = detail.batch_num,
			Exp_date = detail.exp_date,
			OotDetailStatus = "æ°å»º",
			Order_Outqty = 0,
			Status = 2
			};
			entityOrder.Details.Add(orderDetail);
			#endregion

			#region è®¡ç®åºå
			foreach (var InventoryInfo in dt_InventoryInfos)
			{
			if (Order_qty <= 0) break;
			if (InventoryInfo.AvailableQuantity < Order_qty)
			{
			InventoryInfo.AvailableQuantity = 0;
			Order_qty -= InventoryInfo.AvailableQuantity;
			InventoryInfo.OutboundQuantity += InventoryInfo.AvailableQuantity;
			InventoryInfo.StockStatus = StockStatusEmun.åºåºéå®.ObjToInt();
			}
			else
			{
			InventoryInfo.AvailableQuantity -= Order_qty;
			Order_qty = 0;
			InventoryInfo.OutboundQuantity += Order_qty;
			InventoryInfo.StockStatus = StockStatusEmun.åºåºéå®.ObjToInt();
			}
			}
			#endregion

			#region çæåºåºä»»å¡
			dt_InventoryInfos = dt_InventoryInfos.Where(X => X.StockStatus == StockStatusEmun.åºåºéå®.ObjToInt()).ToList();
			List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
			foreach (var inventoryInfo in dt_InventoryInfos)
			{
			Dt_SupplyTask supplyTask = new Dt_SupplyTask()
			{
			WarehouseCode = inventoryInfo.WarehouseCode,
			BatchNo = inventoryInfo.BatchNo,
			MaterielName = inventoryInfo.MaterielName,
			MaterielCode = inventoryInfo.MaterielCode,
			MaterielSpec = inventoryInfo.MaterielSpec,
			TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
			TaskType = TaskTypeEnum.OutPick.ObjToInt(),
			CreateDate = DateTime.Now,
			Creater = App.User.UserName ?? "System",
			LocationCode = inventoryInfo.LocationCode,
			OrderNo = entityOrder.Out_no,
			StockQuantity = inventoryInfo.OutboundQuantity,
			SupplyQuantity = 0,
			Remark = "åºåº"
			};
			supplyTasks.Add(supplyTask);
			}
			#endregion
			_inventory_BatchServices.Repository.UpdateData(inventory_Batch);
			_inventoryInfoService.Repository.UpdateData(dt_InventoryInfos);
			_supplyTaskService.AddData(supplyTasks);
			}
			#endregion
			else
			{
			Dt_DeliveryOrderDetail orderDetail = null;
			Dt_DeliveryOrderDetail orderDetailLK = null;
			var ys = Order_qty % materielInfo.BoxQty; //ä¸è½æ´é¤ç®±è§çæ£ä»¶æ°
			var xs = (int)(Order_qty / materielInfo.BoxQty);//ä¿çæ´æ°
			#region æ£ä»¶ä¼ååéç«åº
			if (ys > 0)
			{
			orderDetailLK = new Dt_DeliveryOrderDetail()
			{
			Reservoirarea = entityOrderLK.Warehouse_no,
			Goods_no = detail.goods_no,
			Order_qty = ys,
			Batch_num = detail.batch_num,
			Exp_date = detail.exp_date,
			OotDetailStatus = "æ°å»º",
			Order_Outqty = 0,
			Status = 0
			};
			}
			#endregion

			#region æ´ä»¶ä¼ååéå¤§ä»¶åº
			foreach (var item in dt_InventoryInfos.Where(x => x.WarehouseCode == WarehouseEnum.å¤§ä»¶åº.ObjToInt().ToString("000")))
			{
			if (xs <= 0) break;
			item.StockStatus = StockStatusEmun.åºåºéå®.ObjToInt();
			while (item.AvailableQuantity > 0 && xs > 0)
			{
			xs--;
			if (orderDetail == null)
			{
			orderDetail = new Dt_DeliveryOrderDetail()
			{
			Reservoirarea = entityOrder.Warehouse_no,
			Goods_no = detail.goods_no,
			Order_qty = materielInfo.BoxQty,
			Batch_num = detail.batch_num,
			Exp_date = detail.exp_date,
			OotDetailStatus = "æ°å»º",
			Order_Outqty = 0,
			Status = 0
			};
			item.AvailableQuantity -= materielInfo.BoxQty;
			item.OutboundQuantity += materielInfo.BoxQty;
			}
			else
			{
			orderDetail.Order_qty += materielInfo.BoxQty;
			item.AvailableQuantity -= materielInfo.BoxQty;
			item.OutboundQuantity += materielInfo.BoxQty;
			}
			}
			}
			#endregion

			#region åéå®å¤§ä»¶åºå¦æè¿æç®±æ°ï¼åéæ©åéç«åº
			if (orderDetailLK == null)
			{
			orderDetailLK = new Dt_DeliveryOrderDetail()
			{
			Reservoirarea = entityOrderLK.Warehouse_no,
			Goods_no = detail.goods_no,
			Order_qty = xs * materielInfo.BoxQty,
			Batch_num = detail.batch_num,
			Exp_date = detail.exp_date,
			OotDetailStatus = "æ°å»º",
			Order_Outqty = 0,
			Status = 0
			};
			}
			else
			{
			orderDetailLK.Order_qty += xs * materielInfo.BoxQty;
			}
			#endregion
			List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
			if (orderDetailLK != null)
			{
			#region æ·»å åºåºä»»å¡ãä¿®æ¹åºåä¿¡æ¯
			Dt_InventoryInfo inventoryInfo = dt_InventoryInfos.Where(x => x.WarehouseCode == WarehouseEnum.ç«åº.ObjToInt().ToString("000")).First();
			inventoryInfo.AvailableQuantity -= orderDetailLK.Order_qty;
			inventoryInfo.OutboundQuantity += orderDetailLK.Order_qty;
			inventoryInfo.StockStatus = StockStatusEmun.åºåºéå®.ObjToInt();
			_inventoryInfoService.Repository.UpdateData(inventoryInfo);
			Dt_SupplyTask supplyTask = new Dt_SupplyTask()
			{
			WarehouseCode = inventoryInfo.WarehouseCode,
			BatchNo = inventoryInfo.BatchNo,
			MaterielName = inventoryInfo.MaterielName,
			MaterielCode = inventoryInfo.MaterielCode,
			MaterielSpec = inventoryInfo.MaterielSpec,
			TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
			TaskType = TaskTypeEnum.OutPick.ObjToInt(),
			CreateDate = DateTime.Now,
			Creater = App.User.UserName ?? "System",
			LocationCode = inventoryInfo.LocationCode,
			OrderNo = entityOrder.Out_no,
			StockQuantity = inventoryInfo.OutboundQuantity,
			SupplyQuantity = 0,
			Remark = "åºåº"
			};
			supplyTasks.Add(supplyTask);
			#endregion
			entityOrderLK.Details.Add(orderDetailLK);
			}
			if (orderDetail != null)
			{
			#region æ·»å åºåºä»»å¡ãä¿®æ¹åºåä¿¡æ¯
			dt_InventoryInfos = dt_InventoryInfos.Where(X => X.StockStatus == StockStatusEmun.åºåºéå®.ObjToInt()).ToList();
			foreach (var inventoryInfo in dt_InventoryInfos)
			{
			Dt_SupplyTask supplyTask = new Dt_SupplyTask()
			{
			WarehouseCode = inventoryInfo.WarehouseCode,
			BatchNo = inventoryInfo.BatchNo,
			MaterielName = inventoryInfo.MaterielName,
			MaterielCode = inventoryInfo.MaterielCode,
			MaterielSpec = inventoryInfo.MaterielSpec,
			TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
			TaskType = TaskTypeEnum.OutPick.ObjToInt(),
			CreateDate = DateTime.Now,
			Creater = App.User.UserName ?? "System",
			LocationCode = inventoryInfo.LocationCode,
			OrderNo = entityOrder.Out_no,
			StockQuantity = inventoryInfo.OutboundQuantity,
			SupplyQuantity = 0,
			Remark = "åºåº"
			};
			supplyTasks.Add(supplyTask);
			}
			#endregion
			entityOrder.Details.Add(orderDetail);
			}
			_inventory_BatchServices.Repository.UpdateData(inventory_Batch);
			_inventoryInfoService.Repository.UpdateData(dt_InventoryInfos);
			_supplyTaskService.AddData(supplyTasks);
			}
			}
			if (entityOrder.Details.Count > 0)
			BaseDal.Db.InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
			if (entityOrderLK.Details.Count > 0)
			BaseDal.Db.InsertNav(entityOrderLK).Include(x => x.Details).ExecuteCommand();
			#endregion
			}
			}
			catch (Exception ex)
			{
			webResponseContent.Error(ex.Message);
			}
			return webResponseContent;
			}
			/// <summary>
			/// çæåºåºåä»»å¡
			/// </summary>
			@@ -735,7 +672,7 @@
			{
			// 1. æ¥è¯¢ç¬¦åæ¡ä»¶çè®¢åï¼è¡¨å¤´=æ°å»º && åå«æææç»ï¼
			var outOrders = BaseDal.Db.CopyNew().Queryable<Dt_DeliveryOrder>()
			.Where(o => o.OutStatus == "æ°å»º")
			.Where(o => o.OutStatus == "æ°å»º" && o.Warehouse_no == WarehouseEnum.ç«åº.ObjToInt().ToString("000"))
			.Includes(o => o.Details, d => d.MedicineGoods)
			.ToList();

			@@ -911,129 +848,41 @@
			var responseContent = new WebResponseContent();
			try
			{
			// æ¥æ¾ææâå¼å§âç¶æçåºåºå
			var orders = BaseDal.Db.Queryable<Dt_DeliveryOrder>()
			.Where(o => o.OutStatus == "å¼å§")
			.ToList();

			if (orders == null \|\| !orders.Any())
			#region æ¥æ¾ææå·²å®æåºåºå
			var outorders = BaseDal.QueryData(x => x.OutStatus == "å·²å®æ").Select(x => x.Out_no).Distinct().ToList();
			foreach (var outorder in outorders)
			{
			return responseContent.OK("ææ éè¦å¤ççåºåºå");
			}

			int successCount = 0;
			int failCount = 0;

			foreach (var order in orders)
			{
			try
			var Orders = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == outorder).Includes(x => x.Details).ToList();
			if (!Orders.Where(x => x.OutStatus != "å·²å®æ").Any())
			{
			Db.Ado.BeginTran();

			// æ¥è¯¢è¯¥åçæç»
			var details = BaseDal.Db.Queryable<Dt_DeliveryOrderDetail>()
			.Where(d => d.DeliveryOrderId == order.Id)
			.ToList();

			// å¤ææç»æ¯å¦å¨é¨å®æ
			var completedCount = details.Count(d => d.OotDetailStatus == "å·²å®æ");
			var totalCount = details.Count;

			if (totalCount > 0 && completedCount == totalCount)
			BaseDal.Db.Ado.BeginTran();
			BaseDal.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.èªå¨å®æ);
			foreach (var item in Orders)
			{
			// æ´æ°ç¶æä¸ºå·²å®æ
			BaseDal.Db.Updateable<Dt_DeliveryOrder>()
			.SetColumns(o => o.OutStatus == "å·²å®æ")
			.Where(o => o.Id == order.Id)
			.ExecuteCommand();

			// è°ç¨ä¸æ¸¸æ¥å£
			var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
			var requestDate = new
			{
			order_no = order.Out_no
			};
			var result = HttpHelper.Post(url, requestDate.ToJsonString());
			var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);

			if (response.resultCode == "0")
			{
			// â æå¥åå²è¡¨ï¼è¡¨å¤´ + æç»ï¼
			var orderHistory = new Dt_DeliveryOrder_Hty
			{
			Id = order.Id,
			Out_no = order.Out_no,
			Out_type = order.Out_type,
			Client_no = order.Client_no,
			Client_name = order.Client_name,
			Account_time = order.Account_time,
			Warehouse_no = order.Warehouse_no,
			OutStatus = "å·²å®æ",
			Details = details.Select(d => new Dt_DeliveryOrderDetail
			{
			Id = d.Id,
			DeliveryOrderId = d.DeliveryOrderId,
			Reservoirarea = d.Reservoirarea,
			Goods_no = d.Goods_no,
			Order_qty = d.Order_qty,
			Batch_num = d.Batch_num,
			Exp_date = d.Exp_date,
			OotDetailStatus = d.OotDetailStatus,
			Status = d.Status
			}).ToList()
			};

			// æå¥è¡¨å¤´åå²
			var historyId = BaseDal.Db.Insertable(orderHistory).ExecuteReturnIdentity();

			// æå¥æç»åå²ï¼å¸¦æ°å¤é®ï¼
			var detailHistories = details.Select(d => new Dt_DeliveryOrderDetail_Hty
			{
			Id = d.Id,
			DeliveryOrderId = order.Id,
			Reservoirarea = d.Reservoirarea,
			Goods_no = d.Goods_no,
			Order_qty = d.Order_qty,
			Batch_num = d.Batch_num,
			Exp_date = d.Exp_date,
			OotDetailStatus = d.OotDetailStatus,
			Status = d.Status
			}).ToList();

			BaseDal.Db.Insertable(detailHistories).ExecuteCommand();

			// å é¤åå§æ°æ®ï¼æç» â è¡¨å¤´ï¼
			BaseDal.Db.Deleteable<Dt_DeliveryOrderDetail>().Where(d => d.DeliveryOrderId == order.Id).ExecuteCommand();
			BaseDal.Db.Deleteable<Dt_DeliveryOrder>().Where(o => o.Id == order.Id).ExecuteCommand();

			Db.Ado.CommitTran();
			successCount++;
			}
			else
			{
			Db.Ado.RollbackTran();
			failCount++;
			SendErrorToUpstream(4, "", $"ä¸æ¸¸æ¥å£è¿åå¤±è´¥: {response.resultMsg}", order.Out_no);
			}
			_deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.èªå¨å®æ);
			}
			var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
			var requestDate = new
			{
			order_no = outorder
			};
			var result = HttpHelper.Post(url, requestDate.ToJsonString());
			var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
			if (response.resultCode == "0") BaseDal.Db.Ado.CommitTran();
			else
			{
			// ææªå®ææç»ï¼ä¸æ´æ°
			Db.Ado.RollbackTran();
			BaseDal.Db.Ado.RollbackTran();
			SendErrorToUpstream(4, "", $"ä¸æ¸¸æ¥å£è¿åå¤±è´¥: {response.resultMsg}", outorder);
			}
			}
			catch (Exception ex)
			{
			Db.Ado.RollbackTran();
			failCount++;
			SendErrorToUpstream(1, "", ex.Message, order.Out_no);
			}
			}
			#endregion

			return responseContent.OK($"æ¹éå¤çå®æï¼æå {successCount} åï¼å¤±è´¥ {failCount} åã");
			return responseContent.OK();
			}
			catch (Exception ex)
			{
			BaseDal.Db.Ado.RollbackTran();
			return responseContent.Error("æ¹éå¤çå¤±è´¥ï¼" + ex.Message);
			}
			}
			@@ -1119,7 +968,7 @@
			cabinOrder = Db.Queryable<Dt_DeliveryOrder>().Includes(x => x.Details).First(x => x.Out_no == orderNo && x.Out_type != "3");
			//List<Dt_DeliveryOrderDetail>? cabinOrderDetails = cabinOrder.Details?.Where(x => x.Reservoirarea == pageNo.ToString()).ToList();
			List<Dt_DeliveryOrderDetail>? cabinOrderDetails = cabinOrder.Details?.Where(x => x.Status == 2).ToList();
			content.OK(data: cabinOrderDetails);
			content.OK(data: cabinOrderDetails);
			return content;
			}

			@@ -1133,7 +982,20 @@
			Dt_SupplyTask supplyTask = _supplyTaskService.Repository.QueryFirst(x => x.TaskId == TaskId && x.TaskStatus == SupplyStatusEnum.NewOut.ObjToInt());
			if (supplyTask == null) throw new Exception("å½ååºåºä»»å¡å·²å®æ");
			if (supplyTask.LocationCode != LocationCode) throw new Exception($"å½ååºåºè´§ä½ã{LocationCode}ãä¸ä»»å¡åéè´§ä½ä¸å¹é");
			supplyTask.TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt();
			OutTaskFinish(supplyTask);
			}
			catch (Exception ex)
			{
			content.Error(ex.Message);
			}
			return content;
			}

			public WebResponseContent OutTaskFinish(Dt_SupplyTask supplyTask)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{

			Dt_DeliveryOrder cabinOrder = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == supplyTask.OrderNo && x.Warehouse_no == supplyTask.WarehouseCode).Includes(x => x.Details).First();
			if (cabinOrder == null) return WebResponseContent.Instance.Error($"åºåºåå·²å®æ");
			@@ -1147,7 +1009,7 @@
			return WebResponseContent.Instance.Error($"åºåºæ°éä¸å¯è¶åºåæ®æ°é");


			#region å¤çåºåºåï¼è´§ä½ï¼åºåï¼åºåæ¹æ¬¡ä¿¡æ¯
			#region å¤çåºåºåï¼è´§ä½ï¼åºåï¼åºåæ¹æ¬¡ä¿¡æ¯,åºåºä»»å¡
			_unitOfWorkManage.BeginTran();

			#region åºåºå
			@@ -1156,21 +1018,20 @@
			if (cabinOrderDetail.Order_Outqty == cabinOrderDetail.Order_qty)
			{
			cabinOrderDetail.OotDetailStatus = "å·²å®æ";
			_deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.èªå¨å®æ);
			//_deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.èªå¨å®æ);
			}
			else
			{
			_deliveryOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
			}
			var cabinOrder1 = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == cabinOrder.Out_no && x.Out_type != "3").Includes(x => x.Details).First();
			if (cabinOrder1.Details == null \|\| cabinOrder1.Details.Count < 1) cabinOrder.OutStatus = "å·²å®æ";
			_deliveryOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
			var cabinOrder1 = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == cabinOrder.Out_no && x.Warehouse_no == supplyTask.WarehouseCode && x.Out_type != "3").Includes(x => x.Details).First();
			if (!cabinOrder1.Details.Where(x => x.OotDetailStatus != "å·²å®æ").Any())
			cabinOrder.OutStatus = "å·²å®æ";
			Repository.UpdateData(cabinOrder);
			#endregion

			#region åºå
			Dt_InventoryInfo inventoryInfo = _inventoryInfoService.Repository.QueryFirst(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no && x.LocationCode == LocationCode);
			if (inventoryInfo == null) return WebResponseContent.Instance.Error($"æªæ¾å°è´§ä½ã{LocationCode}ãçåºåä¿¡æ¯");
			Dt_InventoryInfo inventoryInfo = _inventoryInfoService.Repository.QueryFirst(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no && x.LocationCode == supplyTask.LocationCode);
			if (inventoryInfo == null) return WebResponseContent.Instance.Error($"æªæ¾å°è´§ä½ã{supplyTask.LocationCode}ãçåºåä¿¡æ¯");
			inventoryInfo.StockQuantity -= supplyTask.StockQuantity;
			inventoryInfo.OutboundQuantity -= supplyTask.StockQuantity;
			if (inventoryInfo.StockQuantity <= 0)
			_inventoryInfoService.DeleteData(inventoryInfo);
			else
			@@ -1178,39 +1039,52 @@
			#endregion

			#region è´§ä½
			var location = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
			if (location == null) return WebResponseContent.Instance.Error($"è¯·ç»´æ¤è´§ä½ç¼å·ã{LocationCode}ãçè´§ä½ä¿¡æ¯");
			if (location.EnableStatus == EnableStatusEnum.Disable.ObjToInt())
			return WebResponseContent.Instance.Error($"è´§ä½ç¼å·ã{LocationCode}ãå·²ç¦ç¨ï¼è¯·æ¢å¤æ£å¸¸åä½¿ç¨");
			Dt_InventoryInfo inventoryInfo1 = _inventoryInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
			if (inventoryInfo1 == null)
			if (supplyTask.WarehouseCode != WarehouseEnum.ç«åº.ObjToInt().ToString("000"))
			{
			location.LocationStatus = LocationStatusEnum.Free.ObjToInt();
			_basicService.LocationInfoService.UpdateData(location);
			var location = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == supplyTask.LocationCode);
			if (location == null)
			return WebResponseContent.Instance.Error($"è¯·ç»´æ¤è´§ä½ç¼å·ã{supplyTask.LocationCode}ãçè´§ä½ä¿¡æ¯");
			//if (location.EnableStatus == EnableStatusEnum.Disable.ObjToInt())
			// return WebResponseContent.Instance.Error($"è´§ä½ç¼å·ã{supplyTask.LocationCode}ãå·²ç¦ç¨ï¼è¯·æ¢å¤æ£å¸¸åä½¿ç¨");
			Dt_InventoryInfo inventoryInfo1 = _inventoryInfoService.Repository.QueryFirst(x => x.LocationCode == supplyTask.LocationCode);
			if (inventoryInfo1 == null)
			{
			location.LocationStatus = LocationStatusEnum.Free.ObjToInt();
			_basicService.LocationInfoService.UpdateData(location);
			}
			}
			#endregion

			_supplyTaskService.UpdateData(supplyTask);
			//_supplyTaskService.UpdateData(supplyTask);
			supplyTask.TaskNum = cabinOrderDetail.Id;
			supplyTask.TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt();
			_supplyTaskService.Repository.DeleteAndMoveIntoHty(supplyTask, OperateTypeEnum.äººå·¥å®æ);

			#region åºåæ¹æ¬¡
			Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == inventoryInfo.BatchNo && x.MaterielCode == inventoryInfo.MaterielCode);
			if (inventory_Batch != null)
			{
			inventory_Batch.StockQuantity -= supplyTask.StockQuantity;
			inventory_Batch.OutboundQuantity -= supplyTask.StockQuantity;
			if (inventory_Batch.StockQuantity <= 0)
			_inventory_BatchServices.DeleteData(inventory_Batch);
			else
			_inventory_BatchServices.UpdateData(inventory_Batch);
			}
			#endregion

			if (supplyTask.WarehouseCode == WarehouseEnum.ç«åº.ObjToInt().ToString("000"))
			{
			materielInfo.Business_qty -= supplyTask.StockQuantity;
			_basicService.MaterielInfoService.Repository.UpdateData(materielInfo);
			if (materielInfo.Business_qty < materielInfo.MinQty)
			CreateAllocatInOut(materielInfo);//åå»ºè°æ¨ä»»å¡
			}
			_unitOfWorkManage.CommitTran();
			#endregion
			content.OK();
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			content.Error(ex.Message);
			}
			return content;