ZhongRui/ALDbanyunxiangmu.git

			@@ -1,4 +1,5 @@
			ï»¿using Dm.filter;
			using MailKit.Search;
			using Microsoft.Extensions.Logging;
			using Newtonsoft.Json;
			using Org.BouncyCastle.Asn1.Ocsp;
			@@ -8,6 +9,7 @@
			using System.Linq;
			using System.Net;
			using System.Net.Http;
			using System.Reflection.Metadata;
			using System.Security.Policy;
			using System.Text;
			using System.Threading.Tasks;
			@@ -26,6 +28,30 @@

			namespace WIDESEA_BasicService
			{
			public class TransferDataDto
			{
			public DateTime TransferTime { get; set; }
			public List<TransferItemDto> Items { get; set; }
			}

			public class TransferItemDto
			{
			public string MaterialCode { get; set; }
			public decimal TotalQuantity { get; set; }
			public List<LocationInfoDto> Locations { get; set; }
			}
			public class LocationInfoDto
			{
			public string LocationCode { get; set; }
			public decimal Quantity { get; set; }
			public List<BarcodeInfoDto> Barcodes { get; set; }
			}

			public class BarcodeInfoDto
			{
			public string Barcode { get; set; }
			public decimal Quantity { get; set; }
			}
			public class InvokeMESService : IInvokeMESService
			{
			private readonly IHttpClientFactory _httpClientFactory;
			@@ -37,11 +63,12 @@
			private readonly IRepository<Dt_StockInfoDetail> _stockInfoDetailRepository;
			private readonly IRepository<Dt_StockInfo> _stockInfoRepository;
			private readonly IRepository<Dt_InboundOrder> _inboundOrderRepository;
			private readonly IRepository<Dt_PickingRecord> _pickingRecoreRepository;
			private readonly IMaterialUnitService _materialUnitService;
			private readonly IOutboundOrderService _outboundOrderService;
			private readonly IOutboundOrderDetailService _outboundOrderDetailService;
			private readonly IOutStockLockInfoService _outStockLockInfoService;
			public InvokeMESService(IHttpClientFactory httpClientFactory, ILogger<InvokeMESService> logger, IRepository<Dt_FeedbackToMes> feedbacktomesRepository, IRepository<Dt_StockInfoDetail> stockInfoDetailRepository, IRepository<Dt_StockInfo> stockInfoRepository, IRepository<Dt_InboundOrder> inboundOrderRepository, IOutboundOrderService outboundOrderService, IOutboundOrderDetailService outboundOrderDetailService, IOutStockLockInfoService outStockLockInfoService, IMaterialUnitService materialUnitService)
			public InvokeMESService(IHttpClientFactory httpClientFactory, ILogger<InvokeMESService> logger, IRepository<Dt_FeedbackToMes> feedbacktomesRepository, IRepository<Dt_StockInfoDetail> stockInfoDetailRepository, IRepository<Dt_StockInfo> stockInfoRepository, IRepository<Dt_InboundOrder> inboundOrderRepository, IOutboundOrderService outboundOrderService, IOutboundOrderDetailService outboundOrderDetailService, IOutStockLockInfoService outStockLockInfoService, IMaterialUnitService materialUnitService, IRepository<Dt_PickingRecord> pickingRecoreRepository)
			{
			_httpClientFactory = httpClientFactory;
			_logger = logger;
			@@ -53,6 +80,7 @@
			_outboundOrderDetailService = outboundOrderDetailService;
			_outStockLockInfoService = outStockLockInfoService;
			_materialUnitService = materialUnitService;
			_pickingRecoreRepository = pickingRecoreRepository;
			}

			/// <summary>
			@@ -101,7 +129,7 @@
			_client.DefaultRequestHeaders.Clear();
			_client.DefaultRequestHeaders.Add("Accept", "application/json");

			_logger.LogInformation("InvokeMESService FeedbackOutbound : " + json);
			_logger.LogInformation("InvokeMESService FeedbackOutbound : "+ model.orderNo +" , " + json);

			var response = await _client.PostAsync("AldMaterialOutbound/MaterialOutbound", content);
			string body = await response.Content.ReadAsStringAsync();
			@@ -111,7 +139,7 @@

			throw new HttpRequestException(body);
			}

			_logger.LogInformation("InvokeMESService FeedbackOutbound body: " + body);

			return JsonConvert.DeserializeObject<ResponseModel>(body);
			}
			@@ -220,6 +248,7 @@
			}
			}


			/// <summary>
			///
			/// </summary>
			@@ -275,7 +304,7 @@
			MaterialCode = group.Key.MaterielCode,
			LineNo = group.Key.InboundOrderRowNo,
			WarehouseCode = group.Key.WarehouseCode,
			Qty = group.Sum(x => x.BarcodeQty),
			Qty = group.Sum(x => x.BarcodeQty),
			Unit = group.Key.BarcodeUnit,
			Barcodes = group.Select(row => new BarcodeInfo
			{
			@@ -366,11 +395,12 @@
			}
			return WebResponseContent.Instance.OK();
			}

			private async Task<WebResponseContent> HandleOutboundOrderBatchToMESCompletion(Dt_OutboundOrder outboundOrder, string orderNo)
			{
			// å®ä¹é»è®¤è¿åï¼æåæï¼
			WebResponseContent response = WebResponseContent.Instance.OK("åä¼ MESå¤çå®æ");

			//0 = æªåä¼ ï¼1 = å·²åä¼ æåï¼2 = åä¼ å¤±è´¥
			try
			{
			// æ ¡éªï¼å·²åä¼ ç´æ¥è¿åéè¯¯
			@@ -391,8 +421,104 @@
			return WebResponseContent.Instance.Error("ææ éè¦å¤ççè®¢åæç»");
			}

			// çéå·²å®æåºåºçæç»ID

			var pickingRecords = await _pickingRecoreRepository.Db.Queryable<Dt_PickingRecord>().Where(x => x.OrderNo == orderNo && x.ReturnToMESStatus != 1 && !x.IsCancelled).ToListAsync();

			if (!pickingRecords.Any())
			return WebResponseContent.Instance.Error("æ²¡æéè¦åä¼ çåæ£è®°å½");


			var documentNo = UniqueValueGenerator.Generate();


			var feedModel = new FeedbackOutboundRequestModel
			{
			reqCode = Guid.NewGuid().ToString(),
			reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
			business_type = outboundOrder.BusinessType,
			factoryArea = outboundOrder.FactoryArea,
			operationType = 1,
			Operator = outboundOrder.Operator!=""? outboundOrder.Operator:App.User.UserName,
			orderNo = outboundOrder.UpperOrderNo,
			documentsNO = documentNo,
			status = outboundOrder.OrderStatus,
			details = new List<FeedbackOutboundDetailsModel>()
			};
			var detailIds = new List<int>();
			// å¡«åæç»åæ¡ç ä¿¡æ¯
			foreach (var detail in orderDetails)
			{
			// æ¥è¯¢è¯¥æç»å¯¹åºçéå®æ¡ç è®°å½
			var detailPicks = pickingRecords.Where(x => x.OrderNo == orderNo
			&& detail.Id == x.OrderDetailId).ToList();
			if (!detailPicks.Any())
			{
			continue;
			}
			var detailModel = new FeedbackOutboundDetailsModel
			{
			materialCode = detail.MaterielCode,
			lineNo = detail.lineNo,
			warehouseCode = detail.WarehouseCode,
			qty = detail.BarcodeQty,
			currentDeliveryQty = 0,
			unit = detail.BarcodeUnit,
			barcodes = new List<WIDESEA_DTO.Outbound.BarcodesModel>()
			};

			// å¡«åæ¡ç ä¿¡æ¯ï¼å«åä½è½¬æ¢ï¼
			foreach (var item in detailPicks)
			{
			if (item.PickQuantity <= 0)
			{
			continue;
			}
			var barModel = new WIDESEA_DTO.Outbound.BarcodesModel
			{
			barcode = item.Barcode,
			supplyCode = item.SupplyCode,
			batchNo = item.BatchNo,
			unit = item.BarcodeUnit,
			qty = item.PickQuantity
			};

			// åä½ä¸ä¸è´æ¶è½¬æ¢
			if (detail.BarcodeUnit != detail.Unit)
			{
			var convertResult = await _materialUnitService.ConvertAsync(
			item.MaterielCode, item.PickQuantity, detail.Unit, detail.BarcodeUnit);
			barModel.unit = convertResult.Unit;
			barModel.qty = convertResult.Quantity;
			}
			else
			{
			barModel.qty = item.PickQuantity;
			}
			detailModel.currentDeliveryQty += barModel.qty;
			detailModel.barcodes.Add(barModel);
			}
			detailIds.Add(detail.Id);
			feedModel.details.Add(detailModel);
			}

			feedModel.details = feedModel.details.GroupBy(item => new { item.materialCode, item.lineNo, item.warehouseCode, item.unit,item.qty }).Select(group => new FeedbackOutboundDetailsModel
			{
			materialCode = group.Key.materialCode,
			lineNo = group.Key.lineNo,
			warehouseCode = group.Key.warehouseCode,
			qty = group.Key.qty,
			currentDeliveryQty = group.Sum(x => x.currentDeliveryQty),
			unit = group.Key.unit,
			barcodes = group.SelectMany(x => x.barcodes.GroupBy(o => new { o.barcode, o.supplyCode, o.batchNo, o.unit }).Select(row => new WIDESEA_DTO.Outbound.BarcodesModel
			{
			barcode = row.Key.barcode,
			supplyCode = row.Key.supplyCode,
			batchNo = row.Key.batchNo,
			unit = row.Key.unit,
			qty = row.Sum(y => y.qty)
			})).ToList()
			}).ToList();

			var allCompleted = true;

			// çéå¾åä¼ çæç»ï¼ReturnToMESStatus=0ï¼
			@@ -415,7 +541,7 @@
			int newStatus = allCompleted ? (int)OutOrderStatusEnum.åºåºå®æ : (int)OutOrderStatusEnum.åºåºä¸;
			if (outboundOrder.OrderStatus != newStatus)
			{
			// ä¿®æ£åæè¯æ³éè¯¯ï¼SetColumns æ¯èµå¼ï¼=ï¼èéå¤æï¼==ï¼

			int updateCount = await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
			.SetColumns(x => x.OrderStatus == newStatus)
			.Where(x => x.OrderNo == orderNo)
			@@ -424,85 +550,16 @@
			if (updateCount <= 0)
			{
			_logger.LogWarning($"æ´æ°åºåºåç¶æå¤±è´¥ - OrderNo: {orderNo}, ç®æ ç¶æ: {newStatus}");
			// ç¶ææ´æ°å¤±è´¥ä¸ä¸ææµç¨ï¼ä½è®°å½è¦å

			}
			}

			// æå»ºåä¼ MESçæ¨¡å
			var documentNo = UniqueValueGenerator.Generate();
			var feedModel = new FeedbackOutboundRequestModel
			{
			reqCode = Guid.NewGuid().ToString(),
			reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
			business_type = outboundOrder.BusinessType,
			factoryArea = outboundOrder.FactoryArea,
			operationType = 1,
			Operator = outboundOrder.Operator,
			orderNo = outboundOrder.UpperOrderNo,
			documentsNO = documentNo,
			status = outboundOrder.OrderStatus,
			details = new List<FeedbackOutboundDetailsModel>()
			};

			// å¡«åæç»åæ¡ç ä¿¡æ¯
			foreach (var detail in orderDetails )
			{
			// æ¥è¯¢è¯¥æç»å¯¹åºçéå®æ¡ç è®°å½
			var detailLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
			.Where(x => x.OrderNo == orderNo
			&& detail.Id == x.OrderDetailId
			&& (x.Status == (int)OutLockStockStatusEnum.æ£éå®æ
			\|\| x.Status == (int)OutLockStockStatusEnum.å·²ååº))
			.ToListAsync();

			var detailModel = new FeedbackOutboundDetailsModel
			{
			materialCode = detail.MaterielCode,
			lineNo = detail.lineNo,
			warehouseCode = detail.WarehouseCode,
			qty =0,
			currentDeliveryQty = 0,
			unit = detail.BarcodeUnit,
			barcodes = new List<WIDESEA_DTO.Outbound.BarcodesModel>()
			};

			// å¡«åæ¡ç ä¿¡æ¯ï¼å«åä½è½¬æ¢ï¼
			foreach (var item in detailLocks)
			{
			if (item.PickedQty > 0)
			{
			var barModel = new WIDESEA_DTO.Outbound.BarcodesModel
			{
			barcode = item.CurrentBarcode,
			supplyCode = item.SupplyCode,
			batchNo = item.BatchNo,
			unit = item.BarcodeUnit,
			qty = item.BarcodeQty
			};

			// åä½ä¸ä¸è´æ¶è½¬æ¢
			if (item.BarcodeUnit != item.Unit)
			{
			var convertResult = await _materialUnitService.ConvertAsync(
			item.MaterielCode, item.BarcodeQty, item.Unit, item.BarcodeUnit);
			barModel.unit = convertResult.Unit;
			barModel.qty = convertResult.Quantity;
			}

			detailModel.qty += barModel.qty;
			detailModel.currentDeliveryQty += barModel.qty;
			detailModel.barcodes.Add(barModel);
			}
			}

			feedModel.details.Add(detailModel);
			}

			// è°ç¨MESåä¼ æ¥å£
			var mesResult = await FeedbackOutbound(feedModel);
			if (mesResult == null \|\| mesResult.code != 200)
			{


			// æ´æ°æç»ä¸ºåä¼ å¤±è´¥ï¼ReturnToMESStatus=2ï¼
			await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
			.SetColumns(it => new Dt_OutboundOrderDetail
			@@ -515,17 +572,28 @@

			return WebResponseContent.Instance.Error($"åä¼ MESå¤±è´¥");
			}

			//MESåä¼ æåï¼æ´æ°æç»ä¸ºåä¼ æåç¶æ
			await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
			.SetColumns(it => new Dt_OutboundOrderDetail
			{
			ReturnToMESStatus = 1,
			documentsNO = documentNo,
			})
			.Where(x => detailIds.Contains(x.Id))
			.ExecuteCommandAsync();

			foreach (var record in pickingRecords.Where(x => detailIds.Contains(x.OrderDetailId)).ToList())
			{
			record.ReturnToMESStatus = 1;
			}
			var updates = pickingRecords.Where(x => detailIds.Contains(x.OrderDetailId)).ToList();
			updates.ForEach(x =>
			{
			x.ReturnToMESStatus = 1;
			});
			await _pickingRecoreRepository.Db.Updateable(updates).ExecuteCommandAsync();
			if (allCompleted)
			{
			//MESåä¼ æåï¼æ´æ°æç»ä¸ºåä¼ æåç¶æ
			await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
			.SetColumns(it => new Dt_OutboundOrderDetail
			{
			ReturnToMESStatus = 1,
			documentsNO = documentNo,
			})
			.Where(x => detailIds.Contains(x.Id))
			.ExecuteCommandAsync();
			}
			// æ ¡éªæ¯å¦æææç»é½å®æï¼æ´æ°è®¢åæç»ç¶æ
			if (allCompleted && newStatus == (int)OutOrderStatusEnum.åºåºå®æ)
			{
			@@ -673,8 +741,8 @@
			materialCode = group.Key.MaterielCode,
			lineNo = group.Key.lineNo,
			warehouseCode = group.Key.WarehouseCode,
			qty = group.Sum(x => x.BarcodeQty),
			currentDeliveryQty = group.Sum(x => x.BarcodeQty),
			qty = group.Sum(x => x.PickedQty),
			currentDeliveryQty = group.Sum(x => x.PickedQty),
			unit = group.Key.BarcodeUnit,
			barcodes = group.Select(lockInfo => new WIDESEA_DTO.Outbound.BarcodesModel
			{
			@@ -682,7 +750,7 @@
			supplyCode = lockInfo.SupplyCode,
			batchNo = lockInfo.BatchNo,
			unit = lockInfo.BarcodeUnit,
			qty = lockInfo.BarcodeQty
			qty = lockInfo.PickedQty
			}).ToList()
			}).ToList();

			@@ -709,6 +777,11 @@
			.Where(x => x.OrderNo == orderNo)
			.ExecuteCommandAsync();

			await _pickingRecoreRepository.Db.Updateable<Dt_PickingRecord>()
			.SetColumns(x => x.ReturnToMESStatus == 1)
			.Where(x => x.OrderNo == orderNo)
			.ExecuteCommandAsync();

			return WebResponseContent.Instance.OK("åä¼ MESæå");
			}
			else
			@@ -728,7 +801,7 @@
			return WebResponseContent.Instance.Error("å¤çåä¼ MESæ¶åçå¼å¸¸ï¼è¯·èç³»ç®¡çå");
			}
			}
			}
			}

			public static class UniqueValueGenerator
			{
			@@ -742,14 +815,14 @@
			public static string Generate()
			{
			var now = DateTime.Now;
			string datePart = now.ToString("yyyyMMdd");
			string datePart = now.ToString("MMdd");
			long ticksPart = now.Ticks;

			// ååéå¢è®¡æ°å¨ï¼åæ¨¡1000ï¼ç¡®ä¿è®¡æ°å¨ä»3ä½ï¼æ§å¶é¿åº¦ï¼
			long counterPart = Interlocked.Increment(ref _counter) % 1000;

			// æ¼æ¥ï¼è®¡æ°å¨è¡¥0ä¸º3ä½ï¼é¿åä½æ°ä¸ä¸è´ï¼
			return $"{datePart}{ticksPart}{counterPart:D3}";
			return $"{datePart}{ticksPart}";
			}
			}
			}