ZhongRui/ALDbanyunxiangmu.git

			@@ -10,6 +10,7 @@
			using System.Text;
			using System.Text.Json;
			using System.Threading.Tasks;
			using WIDESEA_BasicService;
			using WIDESEA_Common.CommonEnum;
			using WIDESEA_Common.LocationEnum;
			using WIDESEA_Common.OrderEnum;
			@@ -31,6 +32,7 @@
			using WIDESEA_IInboundService;
			using WIDESEA_IOutboundService;
			using WIDESEA_IStockService;
			using WIDESEA_ITaskInfoService;
			using WIDESEA_Model.Models;
			using WIDESEA_Model.Models.Basic;
			using WIDESEA_Model.Models.Check;
			@@ -62,6 +64,7 @@
			private readonly IInboundOrderDetailService _inboundOrderDetailService;
			private readonly IRepository<Dt_WarehouseArea> _warehouseAreaRepository;
			private readonly IReCheckOrderService _reCheckOrderService;
			private readonly ITask_HtyService _task_HtyService;
			private readonly ILogger<OutboundPickingService> _logger;

			private Dictionary<string, string> stations = new Dictionary<string, string>
			@@ -81,7 +84,7 @@
			public OutboundPickingService(IRepository<Dt_PickingRecord> BaseDal, IUnitOfWorkManage unitOfWorkManage, IStockInfoService stockInfoService, IStockService stockService,
			IOutStockLockInfoService outStockLockInfoService, IStockInfoDetailService stockInfoDetailService, ILocationInfoService locationInfoService,
			IOutboundOrderDetailService outboundOrderDetailService, ISplitPackageService splitPackageService, IOutboundOrderService outboundOrderService,
			IRepository<Dt_Task> taskRepository, IESSApiService eSSApiService, ILogger<OutboundPickingService> logger, IInvokeMESService invokeMESService, IDailySequenceService dailySequenceService, IAllocateService allocateService, IRepository<Dt_InboundOrder> inboundOrderRepository, IInboundOrderDetailService inboundOrderDetailService, IRepository<Dt_WarehouseArea> warehouseAreaRepository, IReCheckOrderService reCheckOrderService) : base(BaseDal)
			IRepository<Dt_Task> taskRepository, IESSApiService eSSApiService, ILogger<OutboundPickingService> logger, IInvokeMESService invokeMESService, IDailySequenceService dailySequenceService, IAllocateService allocateService, IRepository<Dt_InboundOrder> inboundOrderRepository, IInboundOrderDetailService inboundOrderDetailService, IRepository<Dt_WarehouseArea> warehouseAreaRepository, IReCheckOrderService reCheckOrderService, ITask_HtyService task_HtyService) : base(BaseDal)
			{
			_unitOfWorkManage = unitOfWorkManage;
			_stockInfoService = stockInfoService;
			@@ -102,6 +105,7 @@
			_inboundOrderDetailService = inboundOrderDetailService;
			_warehouseAreaRepository = warehouseAreaRepository;
			_reCheckOrderService = reCheckOrderService;
			_task_HtyService = task_HtyService;
			}


			@@ -477,10 +481,21 @@
			var completedLockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
			.Where(it => it.CurrentBarcode == barcode &&
			(it.Status == (int)OutLockStockStatusEnum.æ£éå®æ \|\|
			it.Status == (int)OutLockStockStatusEnum.å·²éæ¾ \|\|
			it.Status == (int)OutLockStockStatusEnum.å·²åèµ° \|\|
			it.PickedQty >= it.AssignQuantity)).FirstAsync();

			if (completedLockInfo != null)
			throw new Exception($"æ¡ç {barcode}å·²ç»å®æåæ£ï¼ä¸è½éå¤åæ£");
			{
			string statusMsg = completedLockInfo.Status switch
			{
			(int)OutLockStockStatusEnum.æ£éå®æ => "å·²ç»å®æåæ£",
			(int)OutLockStockStatusEnum.å·²éæ¾ => "å·²ç»éæ¾",
			(int)OutLockStockStatusEnum.å·²åèµ° => "å·²ç»åèµ°",
			_ => "å·²ç»å®æåæ£"
			};
			throw new Exception($"æ¡ç {barcode}{statusMsg}ï¼ä¸è½éå¤åæ£");
			}
			else
			return null;
			}
			@@ -816,13 +831,13 @@

			private async Task<bool> CanCancelPicking(Dt_OutStockLockInfo lockInfo, Dt_StockInfoDetail stockDetail)
			{
			if (lockInfo.Status == (int)OutLockStockStatusEnum.å·²éæ¾ \|\| lockInfo.Status == (int)OutLockStockStatusEnum.å·²åèµ°)
			return false;
			// éå®ä¿¡æ¯ç¶ææ£æ¥
			if (lockInfo.Status != (int)OutLockStockStatusEnum.æ£éå®æ)
			return false;

			////// åºåç¶ææ£æ¥
			////if (stockDetail.Status == StockStatusEmun.åºåºå®æ.ObjToInt())
			//// return false;


			// å¦ææ¯æåè®°å½ï¼è¿éè¦æ£æ¥ç¶éå®ä¿¡æ¯ç¶æ
			if (lockInfo.IsSplitted == 1 && lockInfo.ParentLockId.HasValue)
			@@ -830,7 +845,9 @@
			var parentLock = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
			.FirstAsync(x => x.Id == lockInfo.ParentLockId.Value);

			if (parentLock == null \|\| parentLock.Status == (int)OutLockStockStatusEnum.ååºä¸)
			if (parentLock == null \|\| parentLock.Status == (int)OutLockStockStatusEnum.ååºä¸ \|\|
			parentLock.Status == (int)OutLockStockStatusEnum.å·²éæ¾ \|\|
			parentLock.Status == (int)OutLockStockStatusEnum.å·²åèµ°)
			return false;
			}

			@@ -1110,7 +1127,7 @@
			{
			// è·åææ°çè®¢åæç»æ°æ®ï¼å¸¦éï¼
			var currentOrderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
			.With(SqlWith.RowLock)
			//.With(SqlWith.RowLock)
			.FirstAsync(x => x.Id == orderDetailId);

			decimal newOverOutQuantity = currentOrderDetail.OverOutQuantity - cancelQty;
			@@ -1388,8 +1405,8 @@
			await _outStockLockInfoService.Db.Updateable<Dt_OutStockLockInfo>()
			.SetColumns(it => new Dt_OutStockLockInfo
			{
			Status = (int)OutLockStockStatusEnum.å·²éæ¾, // éè¦æ°å¢è¿ä¸ªç¶æ
			// ReleaseTime = DateTime.Now,
			Status = (int)OutLockStockStatusEnum.å·²éæ¾,

			Operator = App.User.UserName
			})
			.Where(it => lockIds.Contains(it.Id))
			@@ -1671,13 +1688,20 @@

			};
			// ä¿åååºä»»å¡
			await _taskRepository.Db.Insertable(returnTask).ExecuteCommandAsync();
			var insertcount = await _taskRepository.Db.Insertable(returnTask).ExecuteCommandAsync();
			if (insertcount <= 0)
			{
			throw new Exception("åå»ºä»»å¡å¤±è´¥ï¼");
			}
			var targetAddress = originalTask.TargetAddress;

			// å é¤åå§åºåºä»»å¡
			_taskRepository.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.èªå¨å®æ);
			await _taskRepository.Db.Deleteable(originalTask).ExecuteCommandAsync();

			// _taskRepository.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.èªå¨å®æ);
			var result = _task_HtyService.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.äººå·¥å é¤);
			if (!result)
			{
			await _taskRepository.Db.Deleteable(originalTask).ExecuteCommandAsync();
			}


			// ç» ESS åéæµå¨ä¿¡å·ååå»ºä»»å¡
			@@ -1805,7 +1829,7 @@

			_logger.LogInformation($"è®¢åç¶ææ´æ° - OrderNo: {orderNo}, æ§ç¶æ: {outboundOrder.OrderStatus}, æ°ç¶æ: {newStatus}");



			}
			}
			catch (Exception ex)
			@@ -1935,7 +1959,7 @@
			{
			ReqCode = Guid.NewGuid().ToString(),
			ReqTime = DateTime.Now.ToString(),
			BusinessType = "3",
			BusinessType = "2",

			FactoryArea = outboundOrder.FactoryArea,
			OperationType = 1,
			@@ -1953,7 +1977,7 @@
			.Where(x => x.OrderNo == orderNo && x.Status == (int)OutLockStockStatusEnum.æ£éå®æ)
			.ToListAsync();

			var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.lineNo, item.Unit, item.WarehouseCode })
			var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.lineNo, item.BarcodeUnit, item.WarehouseCode })
			.Select(group => new AllocateDtoDetail
			{
			MaterialCode = group.Key.MaterielCode,
			@@ -1961,13 +1985,13 @@
			WarehouseCode = group.Key.WarehouseCode,
			Qty = group.Sum(x => x.PickedQty),

			Unit = group.Key.Unit,
			Unit = group.Key.BarcodeUnit,
			Barcodes = group.Select(row => new BarcodeInfo
			{
			Barcode = row.CurrentBarcode,
			SupplyCode = row.SupplyCode,
			BatchNo = row.BatchNo,
			Unit = row.Unit,
			Unit = row.BarcodeUnit,
			Qty = row.PickedQty
			}).ToList()

			@@ -2023,8 +2047,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(row => new WIDESEA_DTO.Outbound.BarcodesModel
			{
			@@ -2032,7 +2056,7 @@
			supplyCode = row.SupplyCode,
			batchNo = row.BatchNo,
			unit = row.BarcodeUnit,
			qty = row.BarcodeQty
			qty = row.PickedQty
			}).ToList()
			}).ToList();

			@@ -2079,8 +2103,7 @@
			{
			// 1. å é¤åºåæ°éä¸º0çæç»è®°å½
			var deleteDetailCount = await _stockInfoDetailService.Db.Deleteable<Dt_StockInfoDetail>()
			.Where(x => x.StockId == stockId && x.StockQuantity == 0 && (x.Status == StockStatusEmun.åºåºå®æ.ObjToInt() \|\| x.Status ==
			StockStatusEmun.å¥åºå®æ.ObjToInt()))
			.Where(x => x.StockId == stockId && x.StockQuantity == 0)
			.ExecuteCommandAsync();

			await _stockInfoService.Db.Deleteable<Dt_StockInfo>()
			@@ -2723,6 +2746,34 @@
			}
			outboundOrderDetails.Add(outboundOrderDetail);

			var newLockInfo = new Dt_OutStockLockInfo
			{
			OrderNo = outboundOrder.UpperOrderNo,
			OrderDetailId = outboundOrderDetail.Id,
			OutboundBatchNo = outboundOrderDetail.BatchNo,
			MaterielCode = outboundOrderDetail.MaterielCode,
			MaterielName = outboundOrderDetail.MaterielName,
			StockId = 0,
			OrderQuantity = outboundOrderDetail.OrderQuantity,
			AssignQuantity = outboundOrderDetail.OverOutQuantity,
			PickedQty = outboundOrderDetail.NoStockOutQty,
			LocationCode = "ç©º",
			PalletCode = "ç©º",
			TaskNum = 0,
			Status = (int)OutLockStockStatusEnum.æ£éå®æ,
			Unit = outboundOrderDetail.Unit,
			SupplyCode = outboundOrderDetail.SupplyCode ?? "æ ",
			OrderType = outboundOrder.OrderType,
			CurrentBarcode = inboundOrderDetail.Barcode,
			IsSplitted = 1,
			Operator = App.User.UserName,
			lineNo = outboundOrderDetail.lineNo,
			WarehouseCode = outboundOrderDetail.WarehouseCode ?? "æ ",
			BarcodeQty = outboundOrderDetail.NoStockOutQty,
			BarcodeUnit = outboundOrderDetail.BarcodeUnit,
			BatchNo = outboundOrderDetail.BatchNo
			};
			_outStockLockInfoService.AddData(newLockInfo);
			}
			//å¤æå¥åºåæ®æç»æ¯å¦å¨é¨æ¯å®æç¶æ
			int e = inboundOrder.Details.Count();
			@@ -2754,113 +2805,108 @@
			_outboundOrderService.UpdateData(outboundOrder);
			_unitOfWorkManage.CommitTran();

			if (inboundOrder.OrderStatus == InOrderStatusEnum.å¥åºå®æ.ObjToInt())
			//å¥åºåä¼ MES
			var infeedmodel = new FeedbackInboundRequestModel
			{
			var feedmodel = new FeedbackInboundRequestModel
			reqCode = Guid.NewGuid().ToString(),
			reqTime = DateTime.Now.ToString(),
			business_type = inboundOrder.BusinessType,
			factoryArea = inboundOrder.FactoryArea,
			operationType = 1,
			Operator = App.User.UserName,
			orderNo = inboundOrder.UpperOrderNo,
			status = inboundOrder.OrderStatus,
			details = new List<FeedbackInboundDetailsModel>()

			};

			var groupedData = inboundOrderDetails.GroupBy(item => new { item.MaterielCode, item.SupplyCode, item.BatchNo, item.lineNo, item.BarcodeUnit, item.WarehouseCode })
			.Select(group => new FeedbackInboundDetailsModel
			{
			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>()
			materialCode = group.Key.MaterielCode,
			supplyCode = group.Key.SupplyCode,
			batchNo = group.Key.BatchNo,
			lineNo = group.Key.lineNo,
			warehouseCode = group.Key.WarehouseCode,
			qty = group.Sum(x => x.BarcodeQty),
			// warehouseCode= "1072",
			unit = group.Key.BarcodeUnit,
			barcodes = group.Select(row => new FeedbackBarcodesModel
			{
			barcode = row.Barcode,
			qty = row.BarcodeQty
			}).ToList()
			}).ToList();
			infeedmodel.details = groupedData;

			};

			var groupedData = inboundOrder.Details.GroupBy(item => new { item.MaterielCode, item.SupplyCode, item.BatchNo, item.lineNo, item.BarcodeUnit, item.WarehouseCode })
			.Select(group => new FeedbackInboundDetailsModel
			{
			materialCode = group.Key.MaterielCode,
			supplyCode = group.Key.SupplyCode,
			batchNo = group.Key.BatchNo,
			lineNo = group.Key.lineNo,
			warehouseCode = group.Key.WarehouseCode,
			qty = group.Sum(x => x.BarcodeQty),
			// warehouseCode= "1072",
			unit = group.Key.BarcodeUnit,
			barcodes = group.Select(row => new FeedbackBarcodesModel
			{
			barcode = row.Barcode,
			qty = row.BarcodeQty
			}).ToList()
			}).ToList();
			feedmodel.details = groupedData;

			var result = await _invokeMESService.FeedbackInbound(feedmodel);
			if (result != null && result.code == 200)
			{
			_inboundOrderRepository.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 1 })
			.Where(it => it.Id == inboundOrder.Id).ExecuteCommand();
			_inboundOrderDetailService.Db.Updateable<Dt_InboundOrderDetail>().SetColumns(it => new Dt_InboundOrderDetail { ReturnToMESStatus = 1 })
			.Where(it => it.OrderId == inboundOrder.Id).ExecuteCommand();
			}
			var result1 = await _invokeMESService.FeedbackInbound(infeedmodel);
			if (result1 != null && result1.code == 200)
			{
			_inboundOrderRepository.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 1 })
			.Where(it => it.Id == inboundOrder.Id).ExecuteCommand();
			_inboundOrderDetailService.Db.Updateable<Dt_InboundOrderDetail>().SetColumns(it => new Dt_InboundOrderDetail { ReturnToMESStatus = 1 })
			.Where(it => it.OrderId == inboundOrder.Id).ExecuteCommand();
			}
			if (outboundOrder.OrderStatus == OutOrderStatusEnum.åºåºå®æ.ObjToInt())
			//åºåºåä¼ MES

			var documentNo = UniqueValueGenerator.Generate();

			var outfeedmodel = new FeedbackOutboundRequestModel
			{
			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 = outboundOrder.OrderNo,
			status = outboundOrder.OrderStatus,
			details = new List<FeedbackOutboundDetailsModel>()
			};
			reqCode = Guid.NewGuid().ToString(),
			reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
			business_type = outboundOrder.BusinessType,
			factoryArea = outboundOrder.FactoryArea,
			operationType = 1,
			Operator = App.User.UserName,
			orderNo = outboundOrder.UpperOrderNo,
			documentsNO = documentNo,
			status = outboundOrder.OrderStatus,
			details = new List<FeedbackOutboundDetailsModel>()
			};
			foreach (var detail in outboundOrder.Details)
			{
			// è·åè¯¥æç»å¯¹åºçæ¡ç ä¿¡æ¯ï¼ä»éå®è®°å½ï¼
			var detailLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
			.Where(x => x.OrderNo == outboundOrder.UpperOrderNo &&
			x.OrderDetailId == detail.Id &&
			(x.Status == (int)OutLockStockStatusEnum.æ£éå®æ \|\| x.Status == (int)OutLockStockStatusEnum.å·²ååº))
			.ToListAsync();

			var groupdata = detailLocks.GroupBy(item => new { item.MaterielCode, item.lineNo, item.BarcodeUnit, item.WarehouseCode })
			.Select(group => new FeedbackOutboundDetailsModel
			{

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

			var groupdata = detailLocks.GroupBy(item => new { item.MaterielCode, item.lineNo, item.BarcodeUnit, item.WarehouseCode })
			.Select(group => new FeedbackOutboundDetailsModel
			materialCode = group.Key.MaterielCode,
			lineNo = group.Key.lineNo,
			warehouseCode = group.Key.WarehouseCode,
			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
			{

			materialCode = group.Key.MaterielCode,
			lineNo = group.Key.lineNo,
			warehouseCode = group.Key.WarehouseCode,
			qty = group.Sum(x => x.BarcodeQty),
			currentDeliveryQty = group.Sum(x => x.BarcodeQty),
			unit = group.Key.BarcodeUnit,
			barcodes = group.Select(lockInfo => new WIDESEA_DTO.Outbound.BarcodesModel
			{
			barcode = lockInfo.CurrentBarcode,
			supplyCode = lockInfo.SupplyCode,
			batchNo = lockInfo.BatchNo,
			unit = lockInfo.BarcodeUnit,
			qty = lockInfo.BarcodeQty
			}).ToList()
			}).ToList();
			feedmodel.details.AddRange(groupdata);
			}
			var result = await _invokeMESService.FeedbackOutbound(feedmodel);
			if (result != null && result.code == 200)
			{
			await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
			.SetColumns(x => x.ReturnToMESStatus == 1)
			.Where(x => x.OrderId == outboundOrder.Id)
			.ExecuteCommandAsync();

			await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
			.SetColumns(x => x.ReturnToMESStatus == 1)
			.Where(x => x.Id == outboundOrder.Id)
			.ExecuteCommandAsync();
			}
			barcode = lockInfo.CurrentBarcode,
			supplyCode = lockInfo.SupplyCode,
			batchNo = lockInfo.BatchNo,
			unit = lockInfo.BarcodeUnit,
			qty = lockInfo.PickedQty
			}).ToList()
			}).ToList();
			outfeedmodel.details.AddRange(groupdata);
			}
			var result = await _invokeMESService.FeedbackOutbound(outfeedmodel);
			if (result != null && result.code == 200)
			{
			await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
			.SetColumns(x => x.ReturnToMESStatus == 1)
			.Where(x => x.OrderId == outboundOrder.Id)
			.ExecuteCommandAsync();


			await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
			.SetColumns(x => x.ReturnToMESStatus == 1)
			.Where(x => x.Id == outboundOrder.Id)
			.ExecuteCommandAsync();
			}
			return WebResponseContent.Instance.OK();
			}
			catch (Exception ex)
			@@ -2941,10 +2987,8 @@
			{
			return content.Error("åªææ¿å°éæ£ç»ææè½å¥åºï¼");
			}
			else
			{
			return content.Error("æ²¡ææ¾å°éæ£åæ®æ°æ®ã");
			}


			}
			// Dt_InboundOrder inboundOrder = GetInboundOrder(materielGroupDTO.OrderNo);

			@@ -2970,7 +3014,8 @@
			stockInfo.Details = new List<Dt_StockInfoDetail>();
			}
			var inboindId = 0; Dt_InboundOrder dt_InboundOrder = null;
			var dbinbound = _inboundOrderRepository.QueryData(x => x.InboundOrderNo == dbinboundOrderDetails.First().OrderNo).First();
			var orderno = dbinboundOrderDetails.First().OrderNo;
			var dbinbound = _inboundOrderRepository.QueryData(x => x.InboundOrderNo == orderno).FirstOrDefault();
			if (dbinbound == null)
			{
			dt_InboundOrder = new Dt_InboundOrder
			@@ -3013,7 +3058,7 @@
			FactoryArea = item.FactoryArea,
			Status = 0,
			OrderNo = item.OrderNo,
			BusinessType = InOrderTypeEnum.InternalAllocat.ObjToInt().ToString()
			BusinessType = materielGroupDTO.orderTypes.ToString()

			});
			item.WarehouseCode = item.WarehouseCode;