ZhiHuiQiCe/FangCangZhiNeng.git

			@@ -37,15 +37,16 @@
			// try
			// {
			// // è¯·æ±å°å
			// var url = "http://127.0.0.1:9000/GYZ2/95fck/outOrder";
			// var url = "http://121.37.118.63:80/GYZ2/95fck/outOrder";

			// if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
			// //if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
			// //// è¯·æ±åæ°
			// var requestData = new
			// {
			// searchDate = SearchDate
			// //searchDate = SearchDate
			// searchDate = "2022-10-10 20:45:16" // æ£ç¡®çæ ¼å¼
			// };
			// SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
			// //SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
			// // åèµ·è¯·æ±
			// var result = HttpHelper.Post(url, requestData.ToJsonString());

			@@ -62,75 +63,111 @@
			// {
			// return responseContent.OK("æ æ°åºåºåæ°æ®");
			// }
			// // è·åææå·²åå¨çåºåºåå·
			// var existingOutOrderNos = BaseDal.Db.Queryable<Dt_DeliveryOrder>()
			// .Select(x => x.Out_no)
			// .ToList();

			// Db.Ado.BeginTran();
			// // è¿æ»¤æå·²åå¨çåºåºå
			// var newOutOrders = response.data
			// .Where(outorder => !existingOutOrderNos.Contains(outorder.order_no))//order_noåºåºåå·
			// .ToList();

			// foreach (var outorder in response.data)
			// 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)
			// {
			// var entityOrder = new Dt_DeliveryOrder
			// {
			// Out_no = outorder.out_no,
			// Out_type = outorder.out_type,
			// 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
			// //{
			// // // InsertNav ä¼èªå¨è®¾ç½®å³èåæ®µ DeliveryOrderId
			// // Goods_no = d.goods_no,
			// // Order_qty = d.order_qty,
			// // Batch_num = d.batch_num,
			// // Exp_date = d.exp_date,
			// // OotDetailStatus = "æ°å»º",
			// // Status = outorder.warehouse_no == "001" ? 0 : 2, //å¦ææ¯001æ¿é£ä¹å°ç¶æè®¾ç½®ä¸º0ï¼2ä¸ºäººå·¥å¤ç
			// //}).ToList()
			// };
			// var outorderId = BaseDal.Db.Insertable(entityOrder).ExecuteReturnIdentity();
			// #region æ ¹æ®åºåºåè¯¦ææ¥æ¾ç©æåç§°ãæ¹æ¬¡çåºåä¿¡æ¯(Dt_InventoryInfo)ï¼æ ¹æ®åå¥ååº,CreateDate
			// //æ ¹æ®ç©æåç§°æ¥æ¾ç©æä¿¡æ¯
			// foreach (var item in outorder.details)
			// {
			// // å°ä¸æ¸¸åºåºæ°éè½¬ä¸ºæ£æ°
			// item.order_qty = Math.Abs(item.order_qty);
			// var medication = BaseDal.Db.Queryable<Dt_MedicineGoods>()
			// .Where(m => m.Goods_no == item.goods_no)
			// .First();

			// // æå¥åºåºåæç»
			// var detailEntities = outorder.details.Select(d => new Dt_DeliveryOrderDetail
			// {
			// DeliveryOrderId = outorderId,
			// Goods_no = d.goods_no,
			// Order_qty = d.out_qty,
			// Batch_num = d.batch_num,
			// Exp_date = d.exp_date,
			// OotDetailStatus="æ°å»º"
			// }).ToList();
			// BaseDal.Db.Insertable(detailEntities).ExecuteCommand();

			// }
			// catch (Exception ex)
			// {
			// SendErrorToUpstream(3, outorder.out_no, ex.Message, "");
			// throw; // è®©å¤å±æè·å¹¶åæ»
			// }
			// }

			// //æ ¹æ®ç®±è§å¤ææ¯å¦ææ£ä»¶ï¼è®¡ç®åºæ£ä»¶æ°éåæ´ä»¶æ°

			// //æ ¹æ®å¥åºæ¶é´åç»ï¼ææ£ä»¶å°±ä¼ååéç«åºæ°éï¼æ´ä»¶ä¼ååéå¹³åºæ°é


			// #endregion
			// _DeliveryOrders.Add(entityOrder);

			// };

			// // ä½¿ç¨ InsertNav ä¸æ¬¡æ§æå¥ä¸»è¡¨ååè¡¨æ°æ®
			// BaseDal.Db.InsertNav(_DeliveryOrders).Include(x => x.Details).ExecuteCommand();

			// // è¿éå¯ä»¥æ·»å ä¸åå° WCS çé»è¾
			// // var result = EdiOut(); // åç»ä¸æ¸¸

			// Db.Ado.CommitTran();
			// return responseContent.OK("åæ¥åºåºåæå");
			// }
			// catch (Exception ex)
			// {
			// SendErrorToUpstream(3, "", ex.Message, "");
			// Db.Ado.RollbackTran();
			// SendErrorToUpstream(3, "", ex.Message, "");
			// return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			// }
			//}
			// catch (Exception ex)
			// {
			// // å¨å±å¼å¸¸æ¶ï¼ä¹æ¨éå¼å¸¸ç»ä¸æ¸¸
			// SendErrorToUpstream(3, "", ex.Message, "");
			// return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			// }
			//}



			public WebResponseContent GetUpstreamOutOrder()
			{
			var responseContent = new WebResponseContent();
			try
			{
			// è¯·æ±å°å
			var url = "http://121.37.118.63:80/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 = "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 result = HttpHelper.Post(url, requestData.ToJsonString());
			var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstramOutOrderInfo>>(result);

			if (response.resultCode != "0")
			@@ -143,26 +180,26 @@
			{
			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))//order_noåºåºåå·
			.Where(outorder => !existingOutOrderNos.Contains(outorder.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)
			{
			@@ -175,35 +212,207 @@
			Account_time = outorder.account_time,
			Warehouse_no=outorder.warehouse_no,
			OutStatus = "æªå®æ",
			Details = outorder.details.Select(d => new Dt_DeliveryOrderDetail
			Details = new List<Dt_DeliveryOrderDetail>()
			};

			// éååºåºæç»
			foreach (var item in outorder.details)
			{
			// InsertNav ä¼èªå¨è®¾ç½®å³èåæ®µ DeliveryOrderId
			Goods_no = d.goods_no,
			Order_qty = d.out_qty,
			Batch_num = d.batch_num,
			Exp_date = d.exp_date,
			// 1ï¸â£ è½¬ä¸ºæ£æ°ï¼ä¸æ¸¸å¯è½ä¼ è´æ°ï¼
			item.order_qty = Math.Abs(item.order_qty);
			decimal orderQty = (decimal)item.order_qty;

			// 2ï¸â£ æ¥ç©æåºç¡ä¿¡æ¯ï¼è·åç®±è§ï¼
			var medication = BaseDal.Db.Queryable<Dt_MedicineGoods>()
			.Where(m => m.Goods_no == item.goods_no)
			.First();

			if (medication == null)
			{
			SendErrorToUpstream(3, "", $"æ¾ä¸å°ç©æä¿¡æ¯ï¼{item.goods_no}", "");
			continue;
			}

			decimal boxQty = medication.BoxQty <= 0 ? 1 : medication.BoxQty;

			// 3ï¸â£ è®¡ç®æ´ä»¶ä¸æ£ä»¶æ°é
			var fullBoxes = (int)(orderQty / boxQty); // æ´ä»¶ç®±æ°
			var partialQty = orderQty % boxQty; // æ£ä»¶æ°é

			// è¥ä¸æ¸¸ç»äºæ¹æ¬¡å·ï¼åä¼åå¹é
			string requestedBatch = string.IsNullOrEmpty(item.batch_num) ? null : item.batch_num;

			// helper: æ¥è¯¢åºåå½æ°ï¼æå¥åºæ¶é´ååºï¼
			Func<int, List<Dt_InventoryInfo>> queryInventoryByStockStatus = (stockStatus) =>
			{
			var q = BaseDal.Db.Queryable<Dt_InventoryInfo>()
			.Where(i => i.MaterielCode == item.goods_no &&
			(i.StockQuantity - i.OutboundQuantity) > 0 &&
			i.StockStatus == stockStatus);

			if (!string.IsNullOrEmpty(requestedBatch))
			q = q.Where(i => i.BatchNo == requestedBatch);

			return q.OrderBy(i => i.InDate).ToList();
			};

			// 4ï¸â£åéæ£ä»¶ï¼ä¼åç«åº Status=1ï¼
			decimal remainingPartial = partialQty;
			if (remainingPartial > 0)
			{
			var invList_ly = queryInventoryByStockStatus(1);
			foreach (var inv in invList_ly)
			{
			if (remainingPartial <= 0) break;

			decimal available = (decimal)(inv.StockQuantity - inv.OutboundQuantity);
			if (available <= 0) continue;

			decimal use = Math.Min(available, remainingPartial);

			var detail = new Dt_DeliveryOrderDetail
			{
			Goods_no = item.goods_no,
			Order_qty = use,
			Batch_num = inv.BatchNo,
			Exp_date = inv.ValidityPeriod,
			OotDetailStatus = "æ°å»º",
			Status = outorder.warehouse_no == "001" ? 0 : 2, //å¦ææ¯001æ¿é£ä¹å°ç¶æè®¾ç½®ä¸º0ï¼2ä¸ºäººå·¥å¤ç
			}).ToList()
			Status = 1, // â ç«åº
			Reservoirarea = inv.LocationCode
			};
			#region æ ¹æ®åºåºåè¯¦ææ¥æ¾ç©æåç§°ãæ¹æ¬¡çåºåä¿¡æ¯(Dt_InventoryInfo)ï¼æ ¹æ®åå¥ååº,CreateDate
			//æ ¹æ®ç©æåç§°æ¥æ¾ç©æä¿¡æ¯
			entityOrder.Details.Add(detail);

			//æ ¹æ®ç®±è§å¤ææ¯å¦ææ£ä»¶ï¼è®¡ç®åºæ£ä»¶æ°éåæ´ä»¶æ°
			inv.OutboundQuantity += (float)use;
			BaseDal.Db.Updateable(inv).ExecuteCommand();

			//æ ¹æ®å¥åºæ¶é´åç»ï¼ææ£ä»¶å°±ä¼ååéç«åºæ°éï¼æ´ä»¶ä¼ååéå¹³åºæ°é
			remainingPartial -= use;
			}

			// ç«åºä¸å¤ â å¹³åºè¡¥ (Status=2)
			if (remainingPartial > 0)
			{
			var invList_pk = queryInventoryByStockStatus(2);
			foreach (var inv in invList_pk)
			{
			if (remainingPartial <= 0) break;

			#endregion
			decimal available = (decimal)(inv.StockQuantity - inv.OutboundQuantity);
			if (available <= 0) continue;

			decimal use = Math.Min(available, remainingPartial);

			var detail = new Dt_DeliveryOrderDetail
			{
			Goods_no = item.goods_no,
			Order_qty = use,
			Batch_num = inv.BatchNo,
			Exp_date = inv.ValidityPeriod,
			OotDetailStatus = "æ°å»º",
			Status = 2, //å¹³åº
			Reservoirarea = inv.LocationCode
			};
			entityOrder.Details.Add(detail);

			inv.OutboundQuantity += (float)use;
			BaseDal.Db.Updateable(inv).ExecuteCommand();

			remainingPartial -= use;
			}
			}

			if (remainingPartial > 0)
			{
			SendErrorToUpstream(3, "", $"åºåºå[{outorder.order_no}]ç©æ[{item.goods_no}]æ£ä»¶åºåä¸è¶³ï¼æªåéï¼{remainingPartial}", "");
			}
			}

			//åéæ´ä»¶ï¼ä¼åå¹³åº Status=2ï¼
			int remainingFullBoxes = fullBoxes;
			if (remainingFullBoxes > 0)
			{
			var invList_pk = queryInventoryByStockStatus(2);
			foreach (var inv in invList_pk)
			{
			if (remainingFullBoxes <= 0) break;

			decimal available = (decimal)(inv.StockQuantity - inv.OutboundQuantity);
			if (available < boxQty) continue;

			int canProvideBoxes = (int)(available / boxQty);
			if (canProvideBoxes <= 0) continue;

			int useBoxes = Math.Min(canProvideBoxes, remainingFullBoxes);
			decimal useQty = useBoxes * boxQty;

			var detail = new Dt_DeliveryOrderDetail
			{
			Goods_no = item.goods_no,
			Order_qty = useQty,
			Batch_num = inv.BatchNo,
			Exp_date = inv.ValidityPeriod,
			OotDetailStatus = "æ°å»º",
			Status = 2, //å¹³åº
			Reservoirarea = inv.LocationCode
			};
			entityOrder.Details.Add(detail);

			inv.OutboundQuantity += (float)useQty;
			BaseDal.Db.Updateable(inv).ExecuteCommand();

			remainingFullBoxes -= useBoxes;
			}

			// å¹³åºä¸å¤ â ç«åºè¡¥ (Status=1)
			if (remainingFullBoxes > 0)
			{
			var invList_ly = queryInventoryByStockStatus(1);
			foreach (var inv in invList_ly)
			{
			if (remainingFullBoxes <= 0) break;

			decimal available = (decimal)(inv.StockQuantity - inv.OutboundQuantity);
			if (available < boxQty) continue;

			int canProvideBoxes = (int)(available / boxQty);
			if (canProvideBoxes <= 0) continue;

			int useBoxes = Math.Min(canProvideBoxes, remainingFullBoxes);
			decimal useQty = useBoxes * boxQty;

			var detail = new Dt_DeliveryOrderDetail
			{
			Goods_no = item.goods_no,
			Order_qty = useQty,
			Batch_num = inv.BatchNo,
			Exp_date = inv.ValidityPeriod,
			OotDetailStatus = "æ°å»º",
			Status = 0, // â ç«åºï¼è¡¥æ´ç®±ï¼
			Reservoirarea = inv.LocationCode
			};
			entityOrder.Details.Add(detail);

			inv.OutboundQuantity += (float)useQty;
			BaseDal.Db.Updateable(inv).ExecuteCommand();

			remainingFullBoxes -= useBoxes;
			}
			}

			if (remainingFullBoxes > 0)
			{
			decimal unfilledQty = remainingFullBoxes * boxQty;
			SendErrorToUpstream(3, "", $"åºåºå[{outorder.order_no}]ç©æ[{item.goods_no}]æ´ç®±åºåä¸è¶³ï¼æªåéæ°éï¼{unfilledQty}", "");
			}
			}
			}

			_DeliveryOrders.Add(entityOrder);
			//orderNos.Add(outorder.out_no);
			};
			}

			// ä½¿ç¨ InsertNav ä¸æ¬¡æ§æå¥ä¸»è¡¨ååè¡¨æ°æ®
			BaseDal.Db.InsertNav(_DeliveryOrders).Include(x => x.Details).ExecuteCommand();

			// è¿éå¯ä»¥æ·»å ä¸åå° WCS çé»è¾
			// var result = EdiOut(); // åç»ä¸æ¸¸
			// æå¥ä¸»è¡¨+æç»
			BaseDal.Db.InsertNav(_DeliveryOrders)
			.Include(x => x.Details)
			.ExecuteCommand();

			Db.Ado.CommitTran();
			return responseContent.OK("åæ¥åºåºåæå");
			@@ -217,7 +426,6 @@
			}
			catch (Exception ex)
			{
			// å¨å±å¼å¸¸æ¶ï¼ä¹æ¨éå¼å¸¸ç»ä¸æ¸¸
			SendErrorToUpstream(3, "", ex.Message, "");
			return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			}
			@@ -467,6 +675,8 @@
			// return new WebResponseContent { Status = false, Message = ex.Message };
			// }
			//}


			public WebResponseContent InventoryGood(string externalOrderNo)
			{
			try