ZhongRui/ALDbanyunxiangmu.git

			@@ -1,5 +1,7 @@
			ï»¿using Microsoft.AspNetCore.Http;
			using Microsoft.Extensions.Logging;
			using Org.BouncyCastle.Asn1.Ocsp;
			using SqlSugar.Extensions;
			using System;
			using System.Collections.Generic;
			using System.Linq;
			@@ -9,11 +11,13 @@
			using WIDESEA_Core;
			using WIDESEA_Core.BaseRepository;
			using WIDESEA_Core.BaseServices;
			using WIDESEA_DTO.Basic;
			using WIDESEA_DTO.Outbound;
			using WIDESEA_IBasicService;
			using WIDESEA_IOutboundService;
			using WIDESEA_IStockService;
			using WIDESEA_Model.Models;
			using WIDESEA_Model.Models.Basic;

			namespace WIDESEA_OutboundService
			{
			@@ -26,19 +30,21 @@
			private readonly IStockInfoDetailService _stockInfoDetailService;
			private readonly IOutStockLockInfoService _outStockLockInfoService;
			private readonly IDailySequenceService _dailySequenceService;

			public SplitPackageService(IRepository<Dt_SplitPackageRecord> BaseDal, IUnitOfWorkManage unitOfWorkManage, IStockInfoService stockInfoService, IOutStockLockInfoService outStockLockInfoService, IStockInfoDetailService stockInfoDetailService, IDailySequenceService dailySequenceService) : base(BaseDal)
			private readonly IInvokeMESService _invokeMESService;
			private readonly IMaterielToMesService _materielToMesService;
			private readonly ILogger<SplitPackageService> _logger;
			public SplitPackageService(IRepository<Dt_SplitPackageRecord> BaseDal, IUnitOfWorkManage unitOfWorkManage, IStockInfoService stockInfoService, IOutStockLockInfoService outStockLockInfoService, IStockInfoDetailService stockInfoDetailService, IDailySequenceService dailySequenceService, IInvokeMESService invokeMESService, ILogger<SplitPackageService> logger, IMaterielToMesService materielToMesService) : base(BaseDal)
			{
			_unitOfWorkManage = unitOfWorkManage;
			_stockInfoService = stockInfoService;
			_outStockLockInfoService = outStockLockInfoService;
			_stockInfoDetailService = stockInfoDetailService;
			_dailySequenceService = dailySequenceService;
			_invokeMESService = invokeMESService;
			_logger = logger;
			_materielToMesService = materielToMesService;
			}

			/// <summary>
			/// æåæç®±æä½
			/// </summary>
			public async Task<WebResponseContent> SplitPackage(SplitPackageDto request)
			{
			try
			@@ -61,58 +67,64 @@
			if (request.SplitQuantity > remainingLockQuantity)
			return WebResponseContent.Instance.Error($"æåæ°éä¸è½å¤§äºå©ä½éå®æ°éï¼å©ä½ï¼{remainingLockQuantity}");

			var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
			.Where(x => x.Barcode == request.OriginalBarcode && x.StockId == lockInfo.StockId)
			.FirstAsync();
			if (stockDetail == null)
			// 3. æ¥æ¾å½åæ¡ç çåºåä¿¡æ¯
			var baseStockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
			.Where(x => x.Barcode == request.OriginalBarcode && x.StockId == lockInfo.StockId)
			.FirstAsync();

			if (baseStockDetail == null)
			throw new Exception($"æªæ¾å°æ¡ç {request.OriginalBarcode}å¯¹åºçåºåè®°å½");

			stockDetail.StockQuantity = request.SplitQuantity;
			stockDetail.OutboundQuantity = request.SplitQuantity;
			_stockInfoDetailService.Db.Updateable<Dt_StockInfoDetail>(stockDetail).ExecuteCommand();
			// 4. è®°å½æååçåºåæ°éåéå®ä¿¡æ¯
			decimal stockBeforeSplit = baseStockDetail.StockQuantity;
			decimal assignBeforeSplit = lockInfo.AssignQuantity;

			// 5. è®¡ç®æååçå©ä½æ°é
			decimal remainingQty = baseStockDetail.StockQuantity - request.SplitQuantity;

			// æ´æ°åºç¡æ¡ç çåºåæ°éä¸ºå©ä½æ°é
			baseStockDetail.StockQuantity = remainingQty;
			baseStockDetail.OutboundQuantity = remainingQty;
			await _stockInfoDetailService.Db.Updateable(baseStockDetail).ExecuteCommandAsync();

			// 6. çææ°æ¡ç
			var seq = await _dailySequenceService.GetNextSequenceAsync();
			// 3. çææ°æ¡ç
			string newBarcode = "WSLOT" + DateTime.Now.ToString("yyyyMMdd") + seq.ToString()?.PadLeft(5, '0');

			decimal remainingQty = remainingLockQuantity - request.SplitQuantity;

			// ä¸ºæåäº§ççæ°æ¡ç åå»ºåºåè®°å½
			// 7. ä¸ºæ°æ¡ç åå»ºåºåè®°å½ï¼æååºçæ°éï¼
			var newStockDetail = new Dt_StockInfoDetail
			{
			SupplyCode = stockDetail.SupplyCode,
			WarehouseCode = stockDetail.WarehouseCode,
			BarcodeQty = stockDetail.BarcodeQty,
			BarcodeUnit = stockDetail.BarcodeUnit,
			BusinessType = stockDetail.BusinessType,
			Unit = stockDetail.Unit,
			SupplyCode = baseStockDetail.SupplyCode,
			WarehouseCode = baseStockDetail.WarehouseCode,
			BarcodeQty = baseStockDetail.BarcodeQty,
			BarcodeUnit = baseStockDetail.BarcodeUnit,
			BusinessType = baseStockDetail.BusinessType,
			Unit = baseStockDetail.Unit,
			StockId = lockInfo.StockId,
			MaterielCode = stockDetail.MaterielCode,
			OrderNo = stockDetail.OrderNo,
			BatchNo = stockDetail.BatchNo,
			StockQuantity = remainingQty,
			OutboundQuantity = remainingQty, // éå®å¨é¨æ°é
			MaterielCode = baseStockDetail.MaterielCode,
			OrderNo = baseStockDetail.OrderNo,
			BatchNo = baseStockDetail.BatchNo,
			StockQuantity = request.SplitQuantity,
			OutboundQuantity = request.SplitQuantity,
			Barcode = newBarcode,
			InboundOrderRowNo = stockDetail.InboundOrderRowNo,

			InboundOrderRowNo = baseStockDetail.InboundOrderRowNo,
			FactoryArea = baseStockDetail.FactoryArea,
			};
			await _outStockLockInfoService.Db.Insertable(newStockDetail).ExecuteCommandAsync();
			await _stockInfoDetailService.Db.Insertable(newStockDetail).ExecuteCommandAsync();

			// 4. åå»ºæ°çåºåºéå®ä¿¡æ¯ï¼æ°æ¡ç ï¼
			// 8. åå»ºæ°çåºåºéå®ä¿¡æ¯ï¼æ°æ¡ç ï¼
			var newLockInfo = new Dt_OutStockLockInfo
			{

			OrderNo = lockInfo.OrderNo,
			OrderDetailId = lockInfo.OrderDetailId,
			BatchNo = lockInfo.BatchNo,
			MaterielCode = lockInfo.MaterielCode,
			MaterielName = lockInfo.MaterielName,
			StockId = lockInfo.StockId,
			OrderQuantity = remainingQty,
			OriginalQuantity = remainingQty,
			AssignQuantity = remainingQty, // æ°æ¡ç åéæ°é
			PickedQty = 0, // æ°æ¡ç æªæ£é
			OrderQuantity = request.SplitQuantity,
			OriginalQuantity = request.SplitQuantity,
			AssignQuantity = request.SplitQuantity,
			PickedQty = 0,
			LocationCode = lockInfo.LocationCode,
			PalletCode = lockInfo.PalletCode,
			TaskNum = lockInfo.TaskNum,
			@@ -120,30 +132,37 @@
			Unit = lockInfo.Unit,
			SupplyCode = lockInfo.SupplyCode,
			OrderType = lockInfo.OrderType,
			CurrentBarcode = newBarcode, // æ°æ¡ç
			CurrentBarcode = newBarcode,
			OriginalLockQuantity = request.SplitQuantity,
			IsSplitted = 1,
			ParentLockId = lockInfo.Id // è®°å½ç¶çº§éå®ID
			ParentLockId = lockInfo.Id,
			Operator = App.User.UserName,
			FactoryArea = lockInfo.FactoryArea,
			lineNo = lockInfo.lineNo,
			WarehouseCode = lockInfo.WarehouseCode,
			};
			await _outStockLockInfoService.Db.Insertable(newLockInfo).ExecuteCommandAsync();

			// 5. æ´æ°åéå®ä¿¡æ¯çåéæ°éï¼åå°æåæ°éï¼
			lockInfo.AssignQuantity = request.SplitQuantity;
			// 9. æ´æ°åéå®ä¿¡æ¯çåéæ°éï¼åå°æåæ°éï¼
			lockInfo.AssignQuantity = remainingQty;
			lockInfo.IsSplitted = 1;
			await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();

			// 6. è®°å½æååå²ï¼ç¨äºè¿½è¸ªï¼
			// 10. è®°å½æååå²
			var splitHistory = new Dt_SplitPackageRecord
			{
			FactoryArea = lockInfo.FactoryArea,
			TaskNum = lockInfo.TaskNum,
			OutStockLockInfoId = lockInfo.Id,
			StockId = stockDetail?.StockId ?? 0,
			StockId = baseStockDetail.StockId,
			Operator = App.User.UserName,
			IsReverted = false,
			OriginalBarcode = lockInfo.CurrentBarcode,
			OriginalBarcode = request.OriginalBarcode,
			NewBarcode = newBarcode,
			SplitQty = request.SplitQuantity,
			RemainQuantity = lockInfo.OriginalQuantity - request.SplitQuantity,
			RemainQuantity = remainingQty,
			StockBeforeSplit = stockBeforeSplit, // è®°å½æååçåºåæ°é
			AssignBeforeSplit = assignBeforeSplit, // è®°å½æååçåéæ°é
			MaterielCode = lockInfo.MaterielCode,
			SplitTime = DateTime.Now,
			OrderNo = request.OrderNo,
			@@ -154,13 +173,35 @@

			_unitOfWorkManage.CommitTran();

			// 7. åä¼ æ°æ¡ç ç»MES
			// await SendBarcodeToMES(newBarcode, request.MaterielCode, request.SplitQuantity);
			try
			{

			var dt_MaterielToMes = new Dt_MaterielToMes
			{
			OldMaterialBarCode = request.OriginalBarcode,
			NewMaterialBarCode = newBarcode,
			Unit = baseStockDetail.BarcodeUnit,
			factoryArea = baseStockDetail.FactoryArea,
			Qty = remainingQty,
			supplyCode = baseStockDetail.SupplyCode,
			warehouseCode = baseStockDetail.WarehouseCode,
			BatchNo = baseStockDetail.BatchNo,
			MaterielCode = baseStockDetail.MaterielCode,

			return WebResponseContent.Instance.OK("æåæå", new
			};
			_materielToMesService.AddData(dt_MaterielToMes);

			}
			catch (Exception ex)
			{
			_logger.LogError("SplitPackage åä¼ MES: " + ex.Message);
			}

			return WebResponseContent.Instance.OK("æåæå", new SplitPackageChainDto
			{
			NewBarcode = newBarcode,
			NewLockInfoId = newLockInfo.Id
			NewLockInfoId = newLockInfo.Id,
			RemainQuantity = remainingQty
			});
			}
			catch (Exception ex)
			@@ -170,7 +211,96 @@
			}
			}


			public async Task<WebResponseContent> RevertSplitPackage(string originalBarcode)
			{
			try
			{
			_unitOfWorkManage.BeginTran();

			// 1. æ¥æ¾è¯¥æ¡ç ä½ä¸ºåå§æ¡ç çæææªæ¤éæåè®°å½ï¼ææ¶é´ååº
			var splitRecords = await Db.Queryable<Dt_SplitPackageRecord>()
			.Where(x => x.OriginalBarcode == originalBarcode && !x.IsReverted)
			.OrderByDescending(x => x.SplitTime)
			.ToListAsync();

			if (splitRecords == null \|\| !splitRecords.Any())
			return WebResponseContent.Instance.Error("æªæ¾å°å¯æ¤éçæåè®°å½");

			// 2. æ£æ¥æææ°æ¡ç æ¯å¦å·²æ£é
			var newBarcodes = splitRecords.Select(x => x.NewBarcode).ToList();
			var newLockInfos = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
			.Where(x => newBarcodes.Contains(x.CurrentBarcode))
			.ToListAsync();

			var pickedBarcodes = newLockInfos.Where(x => x.Status == 2).Select(x => x.CurrentBarcode).ToList();
			if (pickedBarcodes.Any())
			return WebResponseContent.Instance.Error($"ä»¥ä¸æ¡ç å·²æ£éï¼æ æ³æ¤éæåï¼{string.Join(",", pickedBarcodes)}");

			// 3. è·ååæ¡ç çéå®ä¿¡æ¯ååºåä¿¡æ¯
			var originalLockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
			.Where(x => x.CurrentBarcode == originalBarcode)
			.FirstAsync();

			if (originalLockInfo == null)
			return WebResponseContent.Instance.Error("æªæ¾å°åæ¡ç éå®ä¿¡æ¯");

			var originalStockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
			.Where(x => x.Barcode == originalBarcode && x.StockId == originalLockInfo.StockId)
			.FirstAsync();

			if (originalStockDetail == null)
			return WebResponseContent.Instance.Error("æªæ¾å°åæ¡ç åºåä¿¡æ¯");

			// 4. æ¥æ¾ç¬¬ä¸æ¬¡æåè®°å½ï¼è·åæååçç¶æ
			var firstSplitRecord = splitRecords.OrderBy(x => x.SplitTime).FirstOrDefault();
			if (firstSplitRecord == null)
			return WebResponseContent.Instance.Error("æªæ¾å°ææçæåè®°å½");

			// 5. æ¢å¤åæ¡ç å°æååçç¶æ
			originalStockDetail.StockQuantity = firstSplitRecord.StockBeforeSplit;
			originalStockDetail.OutboundQuantity = firstSplitRecord.StockBeforeSplit;
			await _stockInfoDetailService.Db.Updateable(originalStockDetail).ExecuteCommandAsync();

			// 6. æ¢å¤åæ¡ç éå®ä¿¡æ¯å°æååçç¶æ
			originalLockInfo.AssignQuantity = firstSplitRecord.AssignBeforeSplit;
			originalLockInfo.OriginalQuantity = firstSplitRecord.AssignBeforeSplit;
			originalLockInfo.OrderQuantity = firstSplitRecord.AssignBeforeSplit;
			originalLockInfo.Status = (int)OutLockStockStatusEnum.åºåºä¸;
			originalLockInfo.IsSplitted = 0; // æ¢å¤ä¸ºæªæåç¶æ
			await _outStockLockInfoService.Db.Updateable(originalLockInfo).ExecuteCommandAsync();

			// 7. å é¤æææ°æ¡ç çéå®ä¿¡æ¯
			await _outStockLockInfoService.Db.Deleteable<Dt_OutStockLockInfo>()
			.Where(x => newBarcodes.Contains(x.CurrentBarcode))
			.ExecuteCommandAsync();

			// 8. å é¤æææ°æ¡ç çåºåè®°å½
			await _stockInfoDetailService.Db.Deleteable<Dt_StockInfoDetail>()
			.Where(x => newBarcodes.Contains(x.Barcode))
			.ExecuteCommandAsync();

			// 9. æ è®°æææåè®°å½ä¸ºå·²æ¤é
			foreach (var record in splitRecords)
			{
			record.IsReverted = true;
			record.RevertTime = DateTime.Now;

			record.Status = (int)SplitPackageStatusEnum.å·²æ¤é;
			}
			await Db.Updateable(splitRecords).ExecuteCommandAsync();

			_unitOfWorkManage.CommitTran();

			return WebResponseContent.Instance.OK($"æ¤éæåæåï¼å±æ¤é{splitRecords.Count}æ¬¡æåï¼{originalBarcode}æ¢å¤ä¸ºæååæ°éï¼{firstSplitRecord.StockBeforeSplit}");

			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			return WebResponseContent.Instance.Error($"æ¤éæåå¤±è´¥ï¼{ex.Message}");
			}
			}

			//public async Task<WebResponseContent> RevertSplitPackage(string originalBarcode)
			//{
			// try
			@@ -202,7 +332,7 @@
			// if (originalLockInfo == null)
			// return WebResponseContent.Instance.Error("æªæ¾å°åæ¡ç éå®ä¿¡æ¯");



			// originalLockInfo.AssignQuantity += splitRecord.RemainQuantity;
			// // originalLockInfo.Status = (int)OutLockStockStatusEnum.åºåºä¸;
			// originalLockInfo.IsSplitted = 0; // æ è®°ä¸ºæªæå
			@@ -243,7 +373,7 @@

			// // 8. æ´æ°æåè®°å½ä¸ºå·²æ¤é
			// splitRecord.IsReverted = true;


			// await Db.Updateable(splitRecord).ExecuteCommandAsync();

			// _unitOfWorkManage.CommitTran();
			@@ -257,101 +387,19 @@
			// return WebResponseContent.Instance.Error($"æ¤éæåå¤±è´¥ï¼{ex.Message}");
			// }
			//}

			public async Task<WebResponseContent> RevertSplitPackage(string originalBarcode)


			// è·åå¯æ¤éçæåè®°å½åè¡¨
			public Dt_SplitPackageRecord GetRevertableSplitRecords(string originalBarcode)
			{
			try
			{
			_unitOfWorkManage.BeginTran();
			var revertableRecords = Db.Queryable<Dt_SplitPackageRecord>()
			.Where(x => x.OriginalBarcode == originalBarcode && !x.IsReverted)
			.OrderBy(x => x.SplitTime)
			.First();

			// 1. æ¥æ¾æææªæ¤éçæåè®°å½
			var splitRecords = await Db.Queryable<Dt_SplitPackageRecord>()
			.Where(x => x.OriginalBarcode == originalBarcode && !x.IsReverted)
			.OrderBy(x => x.SplitTime) // ææ¶é´æ£åºï¼ä»ææ©å¼å§æ¤é
			.ToListAsync();

			if (splitRecords == null \|\| !splitRecords.Any())
			return WebResponseContent.Instance.Error("æªæ¾å°å¯æ¤éçæåè®°å½");

			// 2. æ£æ¥æææ°æ¡ç æ¯å¦å·²æ£é
			var newBarcodes = splitRecords.Select(x => x.NewBarcode).ToList();
			var newLockInfos = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
			.Where(x => newBarcodes.Contains(x.CurrentBarcode))
			.ToListAsync();

			var pickedBarcodes = newLockInfos.Where(x => x.Status == 2).Select(x => x.CurrentBarcode).ToList();
			if (pickedBarcodes.Any())
			return WebResponseContent.Instance.Error($"ä»¥ä¸æ¡ç å·²æ£éï¼æ æ³æ¤éï¼{string.Join(",", pickedBarcodes)}");

			// 3. è·ååæ¡ç ä¿¡æ¯
			var originalLockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
			.Where(x => x.CurrentBarcode == originalBarcode)
			.FirstAsync();

			if (originalLockInfo == null)
			return WebResponseContent.Instance.Error("æªæ¾å°åæ¡ç éå®ä¿¡æ¯");

			var originalStockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
			.Where(x => x.Barcode == originalBarcode && x.StockId == originalLockInfo.StockId)
			.FirstAsync();

			// 4. è·åæææ°æ¡ç çåºåè®°å½
			var newStockDetails = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
			.Where(x => newBarcodes.Contains(x.Barcode))
			.ToListAsync();

			// 5. è®¡ç®æ»è¿åæ°é
			decimal totalRevertQty = newStockDetails.Sum(x => x.StockQuantity);

			// 6. è¿ååæ¡ç åºåè®°å½
			if (originalStockDetail != null)
			{
			// åæ¡ç å½åæ°éå ä¸æææ°æ¡ç çæ°é
			originalStockDetail.StockQuantity += totalRevertQty;
			originalStockDetail.OutboundQuantity += totalRevertQty;
			await _stockInfoDetailService.Db.Updateable(originalStockDetail).ExecuteCommandAsync();
			}

			// 7. è¿ååæ¡ç éå®ä¿¡æ¯
			decimal totalAssignQty = newLockInfos.Sum(x => x.AssignQuantity);
			originalLockInfo.AssignQuantity += totalAssignQty;
			if (originalLockInfo.OrderQuantity < originalLockInfo.AssignQuantity)
			{
			originalLockInfo.AssignQuantity=originalLockInfo.OrderQuantity;
			}
			originalLockInfo.Status = (int)OutLockStockStatusEnum.åºåºä¸;
			originalLockInfo.IsSplitted = 0;
			await _outStockLockInfoService.Db.Updateable(originalLockInfo).ExecuteCommandAsync();

			// 8. å é¤æææ°æ¡ç çéå®ä¿¡æ¯
			await _outStockLockInfoService.Db.Deleteable<Dt_OutStockLockInfo>()
			.Where(x => newBarcodes.Contains(x.CurrentBarcode))
			.ExecuteCommandAsync();

			// 9. å é¤æææ°æ¡ç çåºåè®°å½
			await _stockInfoDetailService.Db.Deleteable<Dt_StockInfoDetail>()
			.Where(x => newBarcodes.Contains(x.Barcode))
			.ExecuteCommandAsync();

			// 10. æ è®°æææåè®°å½ä¸ºå·²æ¤é
			foreach (var record in splitRecords)
			{
			record.IsReverted = true;

			}
			await Db.Updateable(splitRecords).ExecuteCommandAsync();

			_unitOfWorkManage.CommitTran();

			return WebResponseContent.Instance.OK($"æ¤éæåæåï¼å±è¿å{splitRecords.Count}æ¬¡æåï¼æ»æ°éï¼{totalRevertQty}");

			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			return WebResponseContent.Instance.Error($"æ¤éæåå¤±è´¥ï¼{ex.Message}");
			}
			return revertableRecords;
			}

			// è·åæåä¿¡æ¯
			public async Task<WebResponseContent> GetSplitPackageInfo(string orderNo, string palletCode, string barcode)
			{