ZhiHuiQiCe/FangCangZhiNeng.git

			@@ -55,17 +55,308 @@
			/// </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);
			// }
			//}


			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";
			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 = "2022-10-10 20:45:16"
			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);
			@@ -118,7 +409,7 @@
			else if (outorder.order_type == "1") // æ£å¸¸åºåºå
			{
			// æé¤ç¹æ®è¯å,ç¹æ®è¯åç´æ¥æå¥
			if (outorder.warehouse_no != "001" && outorder.warehouse_no != "å¤§ä»¶å¹³åº")
			if (outorder.warehouse_no != "001" && (outorder.warehouse_no == "010" \|\| outorder.warehouse_no == "003" \|\| outorder.warehouse_no == "017"))
			{
			var entityOrder = new Dt_DeliveryOrder
			{
			@@ -202,7 +493,7 @@
			Dt_DeliveryOrderDetail orderDetail = null;

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

			#region ä»ç«åºåºåºæ£ä»¶
			@@ -221,20 +512,6 @@
			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

			@@ -314,9 +591,11 @@
			{
			BaseDal.Db.InsertNav(_DeliveryOrders).Include(x => x.Details).ExecuteCommand();
			}
			//ä¸ååºåºåä»»å¡ç»wcs


			Db.Ado.CommitTran();
			var tex= CreateSupplyTask(order_no);
			var tex = CreateSupplyTask(order_no);
			if (!tex)
			{
			return responseContent.Error("åå»ºä¾åºä»»å¡å¤±è´¥");
			@@ -339,52 +618,10 @@


			/// <summary>
			/// åå»ºä¾åºä»»å¡
			/// çæåºåºåä»»å¡
			/// </summary>
			/// <param name="outorder">åºåºåä¿¡æ¯</param>
			/// <param name="item">åºåºæç»é¡¹</param>
			/// <param name="medication">ç©æä¿¡æ¯</param>
			/// <param name="quantity">ä»»å¡æ°é</param>
			/// <param name="taskType">ä»»å¡ç±»åï¼0ï¼åºåºï¼1ï¼å¥åºï¼2ï¼çç¹çï¼</param>
			/// <param name="remark">å¤æ³¨</param>
			/// <returns>ä»»å¡å¯¹è±¡</returns>
			//private bool CreateSupplyTask(List<string> order_no)
			//{
			// // åè·åç¬¦åæ¡ä»¶çä¸»è¡¨ID
			// var mainOrderIds = BaseDal.Db.Queryable<Dt_DeliveryOrder>()
			// .Where(x => order_no.Contains(x.Out_no))
			// .Select(x => x.Id)
			// .ToList();

			// // ç´æ¥æ¥è¯¢åè¡¨æ°æ®
			// List<Dt_DeliveryOrderDetail> filteredDetails = BaseDal.Db.Queryable<Dt_DeliveryOrderDetail>()
			// .Where(d => mainOrderIds.Contains(d.DeliveryOrderId) && d.OotDetailStatus == "æ°å»º")
			// .ToList();

			// foreach (var item in filteredDetails)
			// {
			// new Dt_SupplyTask
			// {
			// TaskNum = GetNextTaskNum(), // éè¦å®ç°è·åä¸ä¸ä¸ªä»»å¡ç¼å·çæ¹æ³
			// PalletCode = null, // æ ¹æ®ä¸å¡é»è¾è®¾ç½®æçç¼å·
			// BatchNo = item.Batch_num,
			// MaterielCode = item.Goods_no,
			// MaterielName = medication?.MaterielName, // ä»ç©æä¿¡æ¯è·å
			// MaterielSpec = medication?.MaterielSpec, // ä»ç©æä¿¡æ¯è·å
			// TaskType = 0, // 0-åºåºä»»å¡
			// TaskStatus = item.Status ==0 ? 0:1, // 0-æ°å»º
			// WarehouseCode = outorder.warehouse_no,
			// LocationCode = "ç«åº", // ç«åºä»»å¡çè´§ä½ç¼å·åºå®ä¸º"ç«åº"
			// StockQuantity = quantity,
			// SupplyQuantity = 0, // åå§çç¹æ°ä¸º0
			// OrderNo = outorder.order_no, // å³èåºåºåå·
			// Dispatchertime = DateTime.Now,
			// Remark = remark
			// };
			// }

			//}

			/// <param name="order_no">åºåºåå·</param>
			/// <returns></returns>
			private bool CreateSupplyTask(List<string> order_no)
			{
			try
			@@ -423,6 +660,13 @@


			if (mainOrder == null) continue;

			var location = Db.Queryable<Dt_InventoryInfo>()
			.Where(x => x.MaterielCode == ""//materielCode
			&& x.BatchNo == ""//batchNo
			&& x.StockQuantity > 0)
			.OrderBy(x => x.InDate) // æå¥åºæ¶é´æåº
			.First();

			var supplyTask = new Dt_SupplyTask
			{
			@@ -479,56 +723,6 @@
			return randomNum;
			}

			/// <summary>
			/// åå»ºä¾åºä»»å¡
			/// </summary>
			/// <param name="outorder">åºåºåä¿¡æ¯</param>
			/// <param name="item">åºåºæç»é¡¹</param>
			/// <param name="medication">ç©æä¿¡æ¯</param>
			/// <param name="quantity">ä»»å¡æ°é</param>
			/// <param name="taskType">ä»»å¡ç±»åï¼0ï¼åºåºï¼1ï¼å¥åºï¼2ï¼çç¹çï¼</param>
			/// <param name="remark">å¤æ³¨</param>
			/// <returns>ä»»å¡å¯¹è±¡</returns>
			//private Dt_SupplyTask CreateSupplyTask(UpstramOutOrderInfo outorder, dynamic item, Dt_MaterielInfo medication, decimal quantity, int taskType, string remark)
			//{
			// return new Dt_SupplyTask
			// {
			// TaskNum = GetNextTaskNum(), // éè¦å®ç°è·åä¸ä¸ä¸ªä»»å¡ç¼å·çæ¹æ³
			// PalletCode = null, // æ ¹æ®ä¸å¡é»è¾è®¾ç½®æçç¼å·
			// BatchNo = item.batch_num,
			// MaterielCode = item.goods_no,
			// MaterielName = medication?.MaterielName, // ä»ç©æä¿¡æ¯è·å
			// MaterielSpec = medication?.MaterielSpec, // ä»ç©æä¿¡æ¯è·å
			// TaskType = taskType, // 0-åºåºä»»å¡
			// TaskStatus = 0, // 0-æ°å»º
			// WarehouseCode = outorder.warehouse_no,
			// LocationCode = "ç«åº", // ç«åºä»»å¡çè´§ä½ç¼å·åºå®ä¸º"ç«åº"
			// StockQuantity = quantity,
			// SupplyQuantity = 0, // åå§çç¹æ°ä¸º0
			// OrderNo = outorder.order_no, // å³èåºåºåå·
			// Dispatchertime = DateTime.Now,
			// Remark = remark
			// };
			//}




			/// <summary>
			/// è·åä¸ä¸ä¸ªä»»å¡ç¼å·
			/// </summary>
			/// <returns>ä»»å¡ç¼å·</returns>
			private int GetNextTaskNum()
			{
			// è¿ééè¦æ ¹æ®æ¨çåºåçæé»è¾æ¥å®ç°
			// åè®¾ä½¿ç¨æ°æ®åºåºå
			return BaseDal.Db.Ado.GetInt("SELECT NEXT VALUE FOR SeqTaskNum");
			// æèå¦ææ¯èªå¢IDï¼å¯ä»¥æå¥åè·å
			}





			/// <summary>
			/// åºåºåæ¨éç» WCS
			@@ -575,7 +769,7 @@
			customerCode = "905",
			materialCode = materialCode,
			externalOrderNo = order.Out_no,
			outOrderType = order.Out_type == "1" ? "10" : order.Out_type == "2" ? "20" : "30",
			outOrderType = order.Out_type == "1" ? "10" : order.Out_type == "3" ? "20" : "30",//åºåºåç±»åæ¯1å°±æ¯æ£å¸¸çï¼3å°±æ¯çç¹
			priority = 1,
			Is_cancel = 0,
			details = order.Details.Select(d => new TowcsDto.ToeOutdiInDetail
			@@ -595,8 +789,8 @@
			};

			// 4. è°ç¨æ¥å£
			//var url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
			var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363076920";
			var url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
			//var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363076920";

			var result = HttpHelper.Post(url, ediDto.ToJsonString());
			var resp = JsonConvert.DeserializeObject<TowcsDto.TowcsResponse<object>>(result);
			@@ -611,7 +805,7 @@

			// æ´æ°æç»ç¶æ
			BaseDal.Db.Updateable<Dt_DeliveryOrderDetail>()
			.SetColumns(d => new Dt_DeliveryOrderDetail { Status = 1, OotDetailStatus = "å·²å®æ" })
			.SetColumns(d => new Dt_DeliveryOrderDetail { Status = 1, OotDetailStatus = "å¼å§" })
			.Where(d => d.DeliveryOrderId == order.Id && d.Status == 0)
			.ExecuteCommand();
			Console.WriteLine($"è®¢å {order.Out_no} æ¨éæå");