ZhongRui/ALDbanyunxiangmu.git

			@@ -26,6 +26,7 @@
			using WIDESEA_IBasicService;
			using WIDESEA_IOutboundService;
			using WIDESEA_Model.Models;
			using WIDESEA_Model.Models.Outbound;

			namespace WIDESEA_BasicService
			{
			@@ -45,13 +46,14 @@
			private readonly IOutboundOrderService _outboundOrderService;
			private readonly IOutboundOrderDetailService _outboundOrderDetailService;
			private readonly IOutStockLockInfoService _outStockLockInfoService;
			private readonly IRepository<Dt_InterfaceLog> _interfacelogRepository;

			// åå¨èµæºIDåå¶å¯¹åºçéå¯¹è±¡ãä½¿ç¨ ConcurrentDictionary ç¡®ä¿å¯¹åå¸æä½æ¬èº«ççº¿ç¨å®å¨ã
			private static readonly ConcurrentDictionary<string, object> _resourceLocks = new ConcurrentDictionary<string, object>();

			// å¨å±éæéï¼ç¨äºä¿æ¤ _resourceLocks åå¸ä¸ GetOrAdd æ TryRemove æ¶çç«äº
			private static readonly object _globalLocker = new object();
			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)
			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, IRepository<Dt_InterfaceLog> interfacelogRepository)
			{
			_httpClientFactory = httpClientFactory;
			_logger = logger;
			@@ -64,6 +66,7 @@
			_outStockLockInfoService = outStockLockInfoService;
			_materialUnitService = materialUnitService;
			_pickingRecoreRepository = pickingRecoreRepository;
			_interfacelogRepository = interfacelogRepository;
			}

			/// <summary>
			@@ -241,159 +244,164 @@
			/// <returns></returns>
			public async Task<WebResponseContent> BatchOrderFeedbackToMes(List<string> orderNos, int inout)
			{
			// 1. ãååéæ¢å ã
			if (MemoryLockManager.TryAcquireLock(orderNos[0]))
			{
			try
			{
			if (inout == 1)
			{
			foreach (var orderNo in orderNos)
			try
			{ // 1. ãååéæ¢å ã
			//if (MemoryLockManager.TryAcquireLock(orderNos[0]))
			//{

			if (inout == 1)
			{
			try
			foreach (var orderNo in orderNos)
			{
			var stockinfos = _stockInfoRepository.Db.Queryable<Dt_StockInfo>("info").Where(info => info.StockStatus == 6)
			.Where(it => SqlFunc.Subqueryable<Dt_StockInfoDetail>().Where(s => s.StockId == it.Id && s.OrderNo == orderNo).Any())
			.ToList();
			var feeds = _feedbacktomesRepository.Db.Queryable<Dt_FeedbackToMes>().Where(x => x.OrderNo == orderNo && x.ReportStatus == 1).Select(o => o.PalletCode).ToList();
			var unreports = stockinfos.Where(x => !feeds.Contains(x.PalletCode)).ToList();
			if (unreports != null && !unreports.Any())
			try
			{
			return WebResponseContent.Instance.Error("æ²¡æéè¦åä¼ çæ°æ®");
			}
			foreach (var item in unreports)
			{
			var lists = _stockInfoDetailRepository.Db.Queryable<Dt_StockInfoDetail>().Where(x => x.StockId == item.Id).ToList();
			if (lists.Any())
			var stockinfos = _stockInfoRepository.Db.Queryable<Dt_StockInfo>("info").Where(info => info.StockStatus == 6)
			.Where(it => SqlFunc.Subqueryable<Dt_StockInfoDetail>().Where(s => s.StockId == it.Id && s.OrderNo == orderNo).Any())
			.ToList();
			var feeds = _feedbacktomesRepository.Db.Queryable<Dt_FeedbackToMes>().Where(x => x.OrderNo == orderNo && x.ReportStatus == 1).Select(o => o.PalletCode).ToList();
			var unreports = stockinfos.Where(x => !feeds.Contains(x.PalletCode)).ToList();
			if (unreports != null && !unreports.Any())
			{
			var inboundOrder = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().First(x => x.InboundOrderNo == lists.FirstOrDefault().OrderNo);
			if (inboundOrder != null)
			return WebResponseContent.Instance.Error("æ²¡æéè¦åä¼ çæ°æ®");
			}
			foreach (var item in unreports)
			{
			var lists = _stockInfoDetailRepository.Db.Queryable<Dt_StockInfoDetail>().Where(x => x.StockId == item.Id).ToList();
			if (lists.Any())
			{
			if (inboundOrder.OrderType == (int)InOrderTypeEnum.AllocatInbound)//è°æ¨å¥åº
			var inboundOrder = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().First(x => x.InboundOrderNo == lists.FirstOrDefault().OrderNo);
			if (inboundOrder != null)
			{
			var allocate = SqlSugarHelper.DbWMS.Queryable<Dt_AllocateOrder>().Where(x => x.OrderNo == inboundOrder.InboundOrderNo).First();
			var allocatefeedmodel = new AllocateDto
			if (inboundOrder.OrderType == (int)InOrderTypeEnum.AllocatInbound)//è°æ¨å¥åº
			{
			ReqCode = Guid.NewGuid().ToString(),
			ReqTime = DateTime.Now.ToString(),
			BusinessType = "2",
			FactoryArea = inboundOrder.FactoryArea,
			OperationType = 1,
			Operator = inboundOrder.Operator,
			OrderNo = inboundOrder.UpperOrderNo,
			fromWarehouse = allocate?.FromWarehouse ?? "",
			toWarehouse = allocate?.ToWarehouse ?? "",
			Details = new List<AllocateDtoDetail>()
			var allocate = SqlSugarHelper.DbWMS.Queryable<Dt_AllocateOrder>().Where(x => x.OrderNo == inboundOrder.InboundOrderNo).First();
			var allocatefeedmodel = new AllocateDto
			{
			ReqCode = Guid.NewGuid().ToString(),
			ReqTime = DateTime.Now.ToString(),
			BusinessType = "2",
			FactoryArea = inboundOrder.FactoryArea,
			OperationType = 1,
			Operator = inboundOrder.Operator,
			OrderNo = inboundOrder.UpperOrderNo,
			fromWarehouse = allocate?.FromWarehouse ?? "",
			toWarehouse = allocate?.ToWarehouse ?? "",
			Details = new List<AllocateDtoDetail>()

			};
			};

			var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.InboundOrderRowNo, item.BarcodeUnit, item.WarehouseCode })
			.Select(group => new AllocateDtoDetail
			{
			MaterialCode = group.Key.MaterielCode,
			LineNo = group.Key.InboundOrderRowNo,
			WarehouseCode = group.Key.WarehouseCode,
			Qty = group.Sum(x => x.BarcodeQty),
			Unit = group.Key.BarcodeUnit,
			Barcodes = group.Select(row => new BarcodeInfo
			var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.InboundOrderRowNo, item.BarcodeUnit, item.WarehouseCode })
			.Select(group => new AllocateDtoDetail
			{
			Barcode = row.Barcode,
			Qty = row.BarcodeQty,
			BatchNo = row.BatchNo,
			SupplyCode = row.SupplyCode,
			Unit = row.BarcodeUnit
			}).ToList()
			}).ToList();
			allocatefeedmodel.Details = groupedData;
			MaterialCode = group.Key.MaterielCode,
			LineNo = group.Key.InboundOrderRowNo,
			WarehouseCode = group.Key.WarehouseCode,
			Qty = group.Sum(x => x.BarcodeQty),
			Unit = group.Key.BarcodeUnit,
			Barcodes = group.Select(row => new BarcodeInfo
			{
			Barcode = row.Barcode,
			Qty = row.BarcodeQty,
			BatchNo = row.BatchNo,
			SupplyCode = row.SupplyCode,
			Unit = row.BarcodeUnit
			}).ToList()
			}).ToList();
			allocatefeedmodel.Details = groupedData;

			var result = await FeedbackAllocate(allocatefeedmodel);
			if (result != null && result.code == 200)
			{
			_feedbacktomesRepository.Db.Insertable(new Dt_FeedbackToMes { OrderNo = orderNo, PalletCode = item.PalletCode, ReportStatus = 1 }).ExecuteCommand();
			var result = await FeedbackAllocate(allocatefeedmodel);
			if (result != null && result.code == 200)
			{
			_feedbacktomesRepository.Db.Insertable(new Dt_FeedbackToMes { OrderNo = orderNo, PalletCode = item.PalletCode, ReportStatus = 1 }).ExecuteCommand();
			}
			}
			}
			else
			{
			var feedmodel = new FeedbackInboundRequestModel
			else
			{
			reqCode = Guid.NewGuid().ToString(),
			reqTime = DateTime.Now.ToString(),
			business_type = inboundOrder.BusinessType,
			factoryArea = inboundOrder.FactoryArea,
			operationType = 1,
			Operator = inboundOrder.Operator,
			orderNo = inboundOrder.UpperOrderNo,
			status = inboundOrder.OrderStatus,
			details = new List<FeedbackInboundDetailsModel>()
			var feedmodel = new FeedbackInboundRequestModel
			{
			reqCode = Guid.NewGuid().ToString(),
			reqTime = DateTime.Now.ToString(),
			business_type = inboundOrder.BusinessType,
			factoryArea = inboundOrder.FactoryArea,
			operationType = 1,
			Operator = inboundOrder.Operator,
			orderNo = inboundOrder.UpperOrderNo,
			status = inboundOrder.OrderStatus,
			details = new List<FeedbackInboundDetailsModel>()

			};
			};

			var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.SupplyCode, item.BatchNo, item.InboundOrderRowNo, item.BarcodeUnit, item.WarehouseCode })
			.Select(group => new FeedbackInboundDetailsModel
			{
			materialCode = group.Key.MaterielCode,
			supplyCode = group.Key.SupplyCode,
			batchNo = group.Key.BatchNo,
			lineNo = group.Key.InboundOrderRowNo,
			qty = group.Sum(x => x.BarcodeQty),
			// warehouseCode = group.Key.WarehouseCode=="0"?"1072": group.Key.WarehouseCode,
			warehouseCode = group.Key.WarehouseCode,
			unit = group.Key.BarcodeUnit,
			barcodes = group.Select(row => new FeedbackBarcodesModel
			var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.SupplyCode, item.BatchNo, item.InboundOrderRowNo, item.BarcodeUnit, item.WarehouseCode })
			.Select(group => new FeedbackInboundDetailsModel
			{
			barcode = row.Barcode,
			qty = row.BarcodeQty
			}).ToList()
			}).ToList();
			feedmodel.details = groupedData;
			var result = await FeedbackInbound(feedmodel);
			if (result != null && result.code == 200)
			{
			_feedbacktomesRepository.Db.Insertable(new Dt_FeedbackToMes { OrderNo = orderNo, PalletCode = item.PalletCode, ReportStatus = 1 }).ExecuteCommand();
			materialCode = group.Key.MaterielCode,
			supplyCode = group.Key.SupplyCode,
			batchNo = group.Key.BatchNo,
			lineNo = group.Key.InboundOrderRowNo,
			qty = group.Sum(x => x.BarcodeQty),
			// warehouseCode = group.Key.WarehouseCode=="0"?"1072": group.Key.WarehouseCode,
			warehouseCode = group.Key.WarehouseCode,
			unit = group.Key.BarcodeUnit,
			barcodes = group.Select(row => new FeedbackBarcodesModel
			{
			barcode = row.Barcode,
			qty = row.BarcodeQty
			}).ToList()
			}).ToList();
			feedmodel.details = groupedData;
			var result = await FeedbackInbound(feedmodel);
			if (result != null && result.code == 200)
			{
			_feedbacktomesRepository.Db.Insertable(new Dt_FeedbackToMes { OrderNo = orderNo, PalletCode = item.PalletCode, ReportStatus = 1 }).ExecuteCommand();
			}
			}
			}
			}
			}
			}
			}
			catch (Exception ex)
			{
			_logger.LogInformation("InvokeMESService BatchOrderFeedbackToMes ååMESå¤±è´¥: " + ex.Message);
			return WebResponseContent.Instance.Error(ex.Message);
			}
			catch (Exception ex)
			{
			_logger.LogInformation("InvokeMESService BatchOrderFeedbackToMes ååMESå¤±è´¥: " + ex.Message);
			return WebResponseContent.Instance.Error(ex.Message);
			}

			}
			}
			}
			else if (inout == 2)
			{
			foreach (var orderNo in orderNos)
			else if (inout == 2)
			{
			var outboundOrder = await _outboundOrderService.Db.Queryable<Dt_OutboundOrder>().FirstAsync(x => x.OrderNo == orderNo);
			if (outboundOrder != null && outboundOrder.IsBatch == 0)
			foreach (var orderNo in orderNos)
			{
			var result = await HandleOutboundOrderToMESCompletion(outboundOrder, orderNo);
			return result;
			var outboundOrder = await _outboundOrderService.Db.Queryable<Dt_OutboundOrder>().FirstAsync(x => x.OrderNo == orderNo);
			if (outboundOrder != null && outboundOrder.IsBatch == 0)
			{
			var result = await HandleOutboundOrderToMESCompletion(outboundOrder, orderNo);
			return result;
			}
			else if (outboundOrder != null && outboundOrder.IsBatch == 1)
			{
			var result = await HandleOutboundOrderBatchToMESCompletion(outboundOrder, orderNo);
			return result;
			}
			}
			else if (outboundOrder != null && outboundOrder.IsBatch == 1)
			{
			var result = await HandleOutboundOrderBatchToMESCompletion(outboundOrder, orderNo);
			return result;
			}

			}

			//}
			//else
			//{
			// // æ¢éå¤±è´¥ï¼è¯´ææå¦ä¸ä¸ªçº¿ç¨ï¼WCSåè°æäººå·¥æä½ï¼æ£å¨å¤ç

			}
			}
			finally
			{
			// 2. ãéæ¾ååéãæ è®ºæåå¤±è´¥ï¼å¿é¡»éæ¾
			MemoryLockManager.ReleaseLock(orderNos[0]);
			}
			// return WebResponseContent.Instance.Error("WMSæ£å¨å¤çæ¤åä¼ ä»»å¡ï¼è¯·å¿éå¤æä½ã");
			//}
			}
			else
			catch(Exception ex)
			{
			// æ¢éå¤±è´¥ï¼è¯´ææå¦ä¸ä¸ªçº¿ç¨ï¼WCSåè°æäººå·¥æä½ï¼æ£å¨å¤ç

			return WebResponseContent.Instance.OK("WMSæ£å¨å¤çæ¤åä¼ ä»»å¡ï¼è¯·å¿éå¤æä½ã");
			_logger.LogInformation("InvokeMESService BatchOrderFeedbackToMes : " +ex.Message);
			}
			finally
			{
			// 2. ãéæ¾ååéãæ è®ºæåå¤±è´¥ï¼å¿é¡»éæ¾
			// MemoryLockManager.ReleaseLock(orderNos[0]);
			}
			return WebResponseContent.Instance.OK();
			}
			@@ -406,10 +414,10 @@
			try
			{
			// æ ¡éªï¼å·²åä¼ ç´æ¥è¿åéè¯¯
			if (outboundOrder.ReturnToMESStatus == 1)
			{
			return WebResponseContent.Instance.Error("è¯¥åå·²ç»åä¼ ï¼");
			}
			//if (outboundOrder.ReturnToMESStatus == 1)
			//{
			// return WebResponseContent.Instance.Error("è¯¥åå·²ç»åä¼ ï¼");
			//}

			// æ¥è¯¢è®¢åæç»ï¼ä»æ¥è¯¢æªåä¼ æåçï¼
			var orderDetails = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
			@@ -433,29 +441,49 @@
			var groups = pickingRecords.GroupBy(x => x.FeedBackMesDocumentNo).ToList();
			foreach (var group in groups)
			{


			List<Dt_PickingRecord> records = group.ToList(); // è¯¥åç»ä¸çææè®°å½
			if (string.IsNullOrEmpty(group.Key))
			{
			var emptydocumentNo = UniqueValueGenerator.Generate();
			records.ForEach(x => { x.FeedBackMesDocumentNo = emptydocumentNo; });
			var result= await _pickingRecoreRepository.Db.Insertable(records).ExecuteCommandAsync();
			var result = await _pickingRecoreRepository.Db.Updateable(records).ExecuteCommandAsync();

			var interfacelog = new Dt_InterfaceLog
			{
			Content = JsonConvert.SerializeObject(records),
			DocumentNo = emptydocumentNo,
			OrderNo = orderNo,
			OrderType = "2",
			};
			_interfacelogRepository.AddData(interfacelog);

			if (result > 0)
			{
			(bool _flowControl, WebResponseContent _value) = await FeedBackBatchToMes(outboundOrder, orderNo, orderDetails, pickingRecords, emptydocumentNo);
			if (!_flowControl)
			{
			return _value;
			}

			return _value;

			}
			}
			else
			{
			(bool _flowControl, WebResponseContent _value) = await FeedBackBatchToMes(outboundOrder, orderNo, orderDetails, pickingRecords, group.Key);
			if (!_flowControl)
			var ilog = _interfacelogRepository.QueryFirst(x => x.DocumentNo == group.Key);
			if (ilog == null)
			{
			return _value;
			var interfacelog = new Dt_InterfaceLog
			{
			Content = JsonConvert.SerializeObject(records),
			DocumentNo = group.Key,
			OrderNo = orderNo,
			OrderType = "2",
			};
			_interfacelogRepository.AddData(interfacelog);
			}
			(bool _flowControl, WebResponseContent _value) = await FeedBackBatchToMes(outboundOrder, orderNo, orderDetails, pickingRecords, group.Key);

			return _value;

			}
			}

			@@ -594,7 +622,7 @@

			// æ´æ°è®¢åç¶æ
			int newStatus = allCompleted ? (int)OutOrderStatusEnum.åºåºå®æ : (int)OutOrderStatusEnum.åºåºä¸;
			if (outboundOrder.OrderStatus != newStatus)
			if (allCompleted && outboundOrder.OrderStatus != newStatus)
			{

			int updateCount = await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
			@@ -637,6 +665,11 @@
			x.ReturnToMESStatus = 1;
			});
			await _pickingRecoreRepository.Db.Updateable(updates).ExecuteCommandAsync();
			await _interfacelogRepository.Db.Updateable<Dt_InterfaceLog>()
			.SetColumns(x => x.ReturnToMESStatus == 1)
			.Where(x => x.OrderNo == orderNo)
			.ExecuteCommandAsync();

			if (allCompleted)
			{
			//MESåä¼ æåï¼æ´æ°æç»ä¸ºåä¼ æåç¶æ