ZhiHuiQiCe/FangCangZhiNeng.git

			@@ -13,6 +13,8 @@
			using static WIDESEA_DTO.SquareCabin.TowcsDto;
			using WIDESEA_Common.WareHouseEnum;
			using WIDESEA_DTO.SquareCabin;
			using WIDESEA_Common;
			using System.Xml.Linq;

			namespace WIDESEA_WMSServer
			{
			@@ -22,24 +24,16 @@
			private readonly ICabinOrderDetailServices _cabinDetailServices;
			private readonly IDeliveryOrderServices _deliveryOrderServices;
			private readonly IDeliveryOrderDetailServices _deliveryOrderDetailServices;
			private readonly IBasicService _basicService;
			private readonly IMessageInfoService _messageInfoService;
			private readonly IUnitOfWorkManage _unitOfWorkManage;
			private readonly IInventory_BatchServices _inventory_BatchServices;
			private readonly IInventoryInfoService _inventoryInfoService;
			private readonly ISupplyTaskService _supplyTaskService;
			private readonly ITacticsService _tacticsService;
			public Business(IDeliveryOrderServices deliveryOrderServices, IBasicService basicService, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, IDeliveryOrderDetailServices deliveryOrderDetailServices, ISupplyTaskService supplyTaskService, ICabinOrderServices cabinOrderServices, ITacticsService tacticsService, ICabinOrderDetailServices cabinDetailServices)
			public Business(IDeliveryOrderServices deliveryOrderServices, IUnitOfWorkManage unitOfWorkManage, IDeliveryOrderDetailServices deliveryOrderDetailServices, ICabinOrderServices cabinOrderServices, ICabinOrderDetailServices cabinDetailServices, IMessageInfoService messageInfoService)
			{
			_deliveryOrderServices = deliveryOrderServices;
			_basicService = basicService;
			_unitOfWorkManage = unitOfWorkManage;
			_inventory_BatchServices = inventory_BatchServices;
			_inventoryInfoService = inventoryInfoService;
			_deliveryOrderDetailServices = deliveryOrderDetailServices;
			_supplyTaskService = supplyTaskService;
			_cabinOrderServices = cabinOrderServices;
			_tacticsService = tacticsService;
			_cabinDetailServices = cabinDetailServices;
			_messageInfoService = messageInfoService;
			}
			#region è·åERPå¥åºå
			static string SearchInDate = "2025-09-10 00:00:00";
			@@ -97,23 +91,29 @@
			return responseContent.OK("ææå¥åºåå·²åå¨ï¼æ éæ°å¢");
			}

			_unitOfWorkManage.BeginTran();
			try
			//åå¨å¥åºåå·
			List<string> orderNos = new List<string>();
			string name = string.Empty;
			MessageGroupByEnum messageGroupBy = MessageGroupByEnum.InOrderAlarm;
			MessageStatusEnum messageStatus = MessageStatusEnum.Emergency;
			foreach (var order in newOrders)
			{
			List<Dt_CabinOrder> _CabinOrders = new List<Dt_CabinOrder>();
			//åå¨å¥åºåå·
			List<string> orderNos = new List<string>();

			foreach (var order in newOrders)
			try
			{
			_unitOfWorkManage.BeginTran();
			if (order.order_type == "1") //æ£å¸¸å¥åº
			{
			name = "åå»ºæ£å¸¸å¥åºå";
			responseContent = _cabinOrderServices.CreateInboundOrder(order);
			if (!responseContent.Status) throw new Exception(responseContent.Message);
			List<Dt_CabinOrder>? dt_CabinOrders = responseContent.Data as List<Dt_CabinOrder>;
			if (dt_CabinOrders != null) _CabinOrders.AddRange(dt_CabinOrders);
			if (dt_CabinOrders != null)
			_cabinOrderServices.Db.InsertNav(dt_CabinOrders).Include(x => x.Details).ExecuteCommand();
			}
			else if (order.order_type == "3")//å¥åºéæ
			{
			messageGroupBy = MessageGroupByEnum.OutOrderAlarm;
			name = "åå»ºå¥åºéè´§å";
			//åå»ºåºåºå
			#region è½¬æ¢ä¸ºåºåºå
			UpstramOutOrderInfo upstramOutOrderInfo = new UpstramOutOrderInfo()
			@@ -134,28 +134,29 @@
			};
			upstramOutOrderInfo.details.Add(detail);
			}
			_deliveryOrderServices.CreateOutboundOrder(upstramOutOrderInfo);
			var content = _deliveryOrderServices.CreateOutboundOrder(upstramOutOrderInfo);
			if (!content.Status) throw new Exception(content.Message);
			#endregion
			}
			else if (order.order_type == "5")//æ¥æº¢å¥åº
			{

			name = "åå»ºççå¥åºå";
			messageStatus = MessageStatusEnum.Undisposed;
			var content = _cabinOrderServices.CreateCheckInOrder(order);
			if (!content.Status) throw new Exception(content.Message);
			}
			};
			_cabinOrderServices.Db.InsertNav(_CabinOrders).Include(x => x.Details).ExecuteCommand();
			_unitOfWorkManage.CommitTran();
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			_messageInfoService.AddMessageInfo(messageGroupBy, name, ex.Message, messageStatus);
			SendErrorToUpstream(1, "", ex.Message, "");
			//return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			}
			};
			return responseContent.OK("åæ¥å¥åºåæå");

			//å¨ä¸åç»wcs
			//EdiIn(); //åç»ä¸æ¸¸
			//å¦æè¿ä¸ªæ¹æ³æåäºï¼é£ä¹å°±è°ç¨CompleteOrderæ¥å£ï¼ç¶åæ¹å
			_unitOfWorkManage.CommitTran();
			return responseContent.OK("åæ¥å¥åºåæå");
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			SendErrorToUpstream(1, "", ex.Message, "");
			return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			}
			}
			catch (Exception ex)
			{
			@@ -173,8 +174,8 @@
			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(SearchOutDate)) SearchOutDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
			//// è¯·æ±åæ°
			var requestData = new
			@@ -215,20 +216,26 @@
			return responseContent.OK("ææåºåºåå·²åå¨ï¼æ éæ°å¢");
			}

			_unitOfWorkManage.BeginTran();
			try
			List<Dt_DeliveryOrder> _DeliveryOrders = new List<Dt_DeliveryOrder>();
			List<string> orderNos = new List<string>();
			string name = string.Empty;
			MessageGroupByEnum messageGroupBy = MessageGroupByEnum.OutOrderAlarm;
			MessageStatusEnum messageStatus = MessageStatusEnum.Emergency;
			foreach (var outorder in newOutOrders)
			{
			List<Dt_DeliveryOrder> _DeliveryOrders = new List<Dt_DeliveryOrder>();
			List<string> orderNos = new List<string>();

			foreach (var outorder in newOutOrders)
			try
			{
			_unitOfWorkManage.BeginTran();
			if (outorder.order_type == "1") // æ£å¸¸åºåºå
			{
			_deliveryOrderServices.CreateOutboundOrder(outorder);//åå»ºåºåºåãå¤çåºåãæ·»å åºåºä»»å¡
			name = "åå»ºæ£å¸¸åºåºå";
			var content = _deliveryOrderServices.CreateOutboundOrder(outorder);
			if (!content.Status) throw new Exception(content.Message);
			}
			else if (outorder.order_type == "2")//åºåºéè´§
			{
			name = "åå»ºåºåºéè´§å";
			messageGroupBy = MessageGroupByEnum.InOrderAlarm;
			// åå»ºåºåºéè´§å - è¿ééè¦æ ¹æ®ä¸å¡é»è¾å®ç°
			// ææ¶è·³è¿æå®ç°éè´§é»è¾
			//continue;
			@@ -252,6 +259,7 @@
			order.details.Add(detail);
			}
			responseContent = _cabinOrderServices.CreateInboundOrder(order);
			if (!responseContent.Status) throw new Exception(responseContent.Message);
			List<Dt_CabinOrder>? dt_CabinOrders = responseContent.Data as List<Dt_CabinOrder>;
			if (dt_CabinOrders != null && dt_CabinOrders.Count > 0)
			_cabinOrderServices.Db.InsertNav(dt_CabinOrders).Include(x => x.Details).ExecuteCommand();
			@@ -259,32 +267,22 @@
			}
			else if (outorder.order_type == "6")//æ¥æåºåº
			{

			name = "åå»ºçæåºåºå";
			messageStatus = MessageStatusEnum.Undisposed;
			var content = _deliveryOrderServices.CreateCheckOutOrder(outorder);
			if (!content.Status) throw new Exception(content.Message);
			}
			_unitOfWorkManage.CommitTran();
			}

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


			_unitOfWorkManage.CommitTran();
			//var tex = CreateSupplyTask(order_no);
			//if (!tex)
			//{
			// return responseContent.Error("åå»ºä¾åºä»»å¡å¤±è´¥");
			//}
			return responseContent.OK($"åæ¥åºåºåæåï¼å±{_DeliveryOrders.Count}æ¡");
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			_messageInfoService.AddMessageInfo(messageGroupBy, name, ex.Message, messageStatus);
			SendErrorToUpstream(3, "", ex.Message, "");
			//return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			}
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			SendErrorToUpstream(3, "", ex.Message, "");
			return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			}
			return responseContent.OK($"åæ¥åºåºåæåï¼å±{_DeliveryOrders.Count}æ¡");
			}
			catch (Exception ex)
			{
			@@ -344,7 +342,7 @@
			//å¥åºåå·
			externalOrderNo = order.Order_no,
			//å¥åºåç±»å
			inOrderType = order.Order_type == "1" ? "10" : "20",
			inOrderType = order.Order_type == "5" ? "20" : "10",
			//ä¼åçº§
			priority = 0,
			//æ¯å¦åæ¶
			@@ -413,11 +411,12 @@
			public WebResponseContent EdiOut()
			{
			var responseContent = new WebResponseContent();
			var WarehouseLk = WarehouseEnum.ç«åº.ObjToInt().ToString("000");
			try
			{
			// 1. æ¥è¯¢ç¬¦åæ¡ä»¶çè®¢åï¼è¡¨å¤´=æ°å»º && åå«æææç»ï¼
			var outOrders = _deliveryOrderServices.Db.CopyNew().Queryable<Dt_DeliveryOrder>()
			.Where(o => o.OutStatus == "æ°å»º" && o.Warehouse_no == WarehouseEnum.ç«åº.ObjToInt().ToString("000"))
			.Where(o => o.OutStatus == "æ°å»º" && o.Warehouse_no == WarehouseLk)
			.Includes(o => o.Details, d => d.MedicineGoods)
			.ToList();

			@@ -445,13 +444,23 @@
			//å¦ææ¡ä»¶æ»¡è¶³ï¼å°ç©æä»£ç è®¾ç½®ä¸ºç¬¬ä¸ä¸ªæç»é¡¹å¯¹åºçè¯åç©æä»£ç
			materialCode = firstDetail.MedicineGoods.MaterielErpType;
			}
			switch (order.Out_type)
			{
			case "1"://æ£å¸¸åºåº
			case "3"://å¥åºéè´§
			order.Out_type = "10";//ä¸è¬äº¤æåºåºå
			break;
			case "6"://çäºåºåº
			order.Out_type = "30";//çäºåºåºå
			break;
			}
			// 3. ç»è£ DTO
			var ediDto = new TowcsDto.ToediOutInfo
			{
			customerCode = "905",
			materialCode = materialCode,
			externalOrderNo = order.Out_no,
			outOrderType = order.Out_type == "1" ? "10" : order.Out_type == "3" ? "20" : "30",//åºåºåç±»åæ¯1å°±æ¯æ£å¸¸çï¼3å°±æ¯çç¹
			outOrderType = order.Out_type,//20æ¯çç¹åºåºå
			priority = 1,
			Is_cancel = 0,
			details = order.Details.Select(d => new TowcsDto.ToeOutdiInDetail
			@@ -536,11 +545,13 @@
			if (!Orders.Where(x => x.OdrderStatus != "å·²å®æ").Any())
			{
			_unitOfWorkManage.BeginTran();
			_cabinOrderServices.Repository.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.èªå¨å®æ);
			foreach (var item in Orders)
			{
			_cabinDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.èªå¨å®æ);
			if (item.Details != null)
			_cabinDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.èªå¨å®æ);
			item.Details = null;
			}
			_cabinOrderServices.Repository.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.èªå¨å®æ);
			// è°ç¨ä¸æ¸¸æ¥å£
			var url = "http://121.37.118.63:80/GYZ2/95fck/inOrderOk";
			var result = HttpHelper.Post(url, new { order_no = inorder }.ToJsonString());
			@@ -587,11 +598,13 @@
			if (!Orders.Where(x => x.OutStatus != "å·²å®æ").Any())
			{
			_unitOfWorkManage.BeginTran();
			_deliveryOrderServices.Repository.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.èªå¨å®æ);
			foreach (var item in Orders)
			{
			_deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.èªå¨å®æ);
			if (item.Details != null)
			_deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.èªå¨å®æ);
			item.Details = null;
			}
			_deliveryOrderServices.Repository.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.èªå¨å®æ);
			var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
			var requestDate = new
			{