ZhongRui/ALDbanyunxiangmu.git

			@@ -17,6 +17,7 @@
			using WIDESEA_IOutboundService;
			using WIDESEA_IStockService;
			using WIDESEA_Model.Models;
			using WIDESEA_Model.Models.Basic;

			namespace WIDESEA_OutboundService
			{
			@@ -30,9 +31,9 @@
			private readonly IOutStockLockInfoService _outStockLockInfoService;
			private readonly IDailySequenceService _dailySequenceService;
			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) : base(BaseDal)
			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;
			@@ -41,172 +42,8 @@
			_dailySequenceService = dailySequenceService;
			_invokeMESService = invokeMESService;
			_logger = logger;
			_materielToMesService = materielToMesService;
			}

			/// <summary>
			/// æåæç®±æä½
			/// </summary>
			//public async Task<WebResponseContent> SplitPackage(SplitPackageDto request)
			//{
			// try
			// {
			// _unitOfWorkManage.BeginTran();

			// // 1. éªè¯åºåºéå®ä¿¡æ¯
			// var lockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
			// .Where(x => x.OrderNo == request.OrderNo &&
			// x.PalletCode == request.PalletCode &&
			// x.CurrentBarcode == request.OriginalBarcode &&
			// x.Status == 1)
			// .FirstAsync();

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

			// // 2. æ£æ¥å©ä½éå®æ°é
			// decimal remainingLockQuantity = lockInfo.OriginalQuantity - lockInfo.PickedQty;
			// if (request.SplitQuantity > remainingLockQuantity)
			// return WebResponseContent.Instance.Error($"æåæ°éä¸è½å¤§äºå©ä½éå®æ°éï¼å©ä½ï¼{remainingLockQuantity}");

			// 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}å¯¹åºçåºåè®°å½");


			// // 4. è®¡ç®æååçæ°é
			// decimal remainingQty = baseStockDetail.StockQuantity - request.SplitQuantity;

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


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


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

			// };
			// await _outStockLockInfoService.Db.Insertable(newStockDetail).ExecuteCommandAsync();

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

			// OrderNo = lockInfo.OrderNo,
			// OrderDetailId = lockInfo.OrderDetailId,
			// BatchNo = lockInfo.BatchNo,
			// MaterielCode = lockInfo.MaterielCode,
			// MaterielName = lockInfo.MaterielName,
			// StockId = lockInfo.StockId,
			// OrderQuantity = request.SplitQuantity,
			// OriginalQuantity = request.SplitQuantity,
			// AssignQuantity = request.SplitQuantity, // æ°æ¡ç åéæ°é
			// PickedQty = 0, // æ°æ¡ç æªæ£é
			// LocationCode = lockInfo.LocationCode,
			// PalletCode = lockInfo.PalletCode,
			// TaskNum = lockInfo.TaskNum,
			// Status = (int)OutLockStockStatusEnum.åºåºä¸,
			// Unit = lockInfo.Unit,
			// SupplyCode = lockInfo.SupplyCode,
			// OrderType = lockInfo.OrderType,
			// CurrentBarcode = newBarcode, // æ°æ¡ç
			// OriginalLockQuantity = request.SplitQuantity,
			// IsSplitted = 1,
			// ParentLockId = lockInfo.Id // è®°å½ç¶çº§éå®ID
			// };
			// await _outStockLockInfoService.Db.Insertable(newLockInfo).ExecuteCommandAsync();

			// lockInfo.AssignQuantity = remainingQty;
			// lockInfo.IsSplitted = 1; // æ è®°ä¸ºå·²æå
			// await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();

			// var previousSplitRecord = await Db.Queryable<Dt_SplitPackageRecord>()
			// .Where(x => x.OriginalBarcode == request.OriginalBarcode && !x.IsReverted)
			// .OrderByDescending(x => x.SplitTime)
			// .FirstAsync();

			// // 6. è®°å½æååå²ï¼ç¨äºè¿½è¸ªï¼
			// var splitHistory = new Dt_SplitPackageRecord
			// {
			// FactoryArea = lockInfo.FactoryArea,
			// TaskNum = lockInfo.TaskNum,
			// OutStockLockInfoId = lockInfo.Id,
			// StockId = baseStockDetail.StockId,
			// Operator = App.User.UserName,
			// IsReverted = false,
			// OriginalBarcode = request.OriginalBarcode,
			// NewBarcode = newBarcode,
			// SplitQty = request.SplitQuantity,
			// RemainQuantity = remainingQty, // è®°å½æååçå©ä½æ°é
			// MaterielCode = lockInfo.MaterielCode,
			// SplitTime = DateTime.Now,
			// OrderNo = request.OrderNo,
			// PalletCode = request.PalletCode,
			// Status = (int)SplitPackageStatusEnum.å·²æå,
			// PreviousSplitRecordId = previousSplitRecord?.Id??0 // è®°å½åä¸æ¬¡æåIDï¼å»ºç«æåé¾
			// };
			// await Db.Insertable(splitHistory).ExecuteCommandAsync();

			// _unitOfWorkManage.CommitTran();

			// try
			// {
			// MaterielToMesDTO dto = new MaterielToMesDTO
			// {
			// batchNo = baseStockDetail.BatchNo,
			// factoryArea = baseStockDetail.FactoryArea,
			// materialCode = baseStockDetail.MaterielCode,
			// newmaterialCode = newBarcode,
			// oldmaterialCode = request.OriginalBarcode,
			// operationType = 1,
			// qty = remainingQty,
			// supplyCode = baseStockDetail.SupplyCode,
			// unit = baseStockDetail.BarcodeUnit,
			// warehouseCode = baseStockDetail.WarehouseCode,
			// reqCode = Guid.NewGuid().ToString(),
			// reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
			// };
			// _invokeMESService.NewMaterielToMes(dto);
			// }
			// catch(Exception ex)
			// {
			// _logger.LogError("SplitPackage åä¼ MES: " + ex.Message);
			// }
			// return WebResponseContent.Instance.OK("æåæå", new
			// {
			// NewBarcode = newBarcode,
			// NewLockInfoId = newLockInfo.Id
			// });
			// }
			// catch (Exception ex)
			// {
			// _unitOfWorkManage.RollbackTran();
			// return WebResponseContent.Instance.Error($"æåå¤±è´¥: {ex.Message}");
			// }
			//}
			// è·åæ¡ç çæååå²é¾

			public async Task<WebResponseContent> SplitPackage(SplitPackageDto request)
			{
			@@ -271,6 +108,7 @@
			OutboundQuantity = request.SplitQuantity,
			Barcode = newBarcode,
			InboundOrderRowNo = baseStockDetail.InboundOrderRowNo,
			FactoryArea = baseStockDetail.FactoryArea,
			};
			await _stockInfoDetailService.Db.Insertable(newStockDetail).ExecuteCommandAsync();

			@@ -297,7 +135,11 @@
			CurrentBarcode = newBarcode,
			OriginalLockQuantity = request.SplitQuantity,
			IsSplitted = 1,
			ParentLockId = lockInfo.Id
			ParentLockId = lockInfo.Id,
			Operator = App.User.UserName,
			FactoryArea = lockInfo.FactoryArea,
			lineNo = lockInfo.lineNo,
			WarehouseCode = lockInfo.WarehouseCode,
			};
			await _outStockLockInfoService.Db.Insertable(newLockInfo).ExecuteCommandAsync();

			@@ -330,6 +172,30 @@
			await Db.Insertable(splitHistory).ExecuteCommandAsync();

			_unitOfWorkManage.CommitTran();

			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,

			};
			_materielToMesService.AddData(dt_MaterielToMes);

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

			return WebResponseContent.Instance.OK("æåæå", new SplitPackageChainDto
			{
			@@ -418,7 +284,7 @@
			{
			record.IsReverted = true;
			record.RevertTime = DateTime.Now;


			record.Status = (int)SplitPackageStatusEnum.å·²æ¤é;
			}
			await Db.Updateable(splitRecords).ExecuteCommandAsync();
			@@ -526,14 +392,14 @@
			// è·åå¯æ¤éçæåè®°å½åè¡¨
			public Dt_SplitPackageRecord GetRevertableSplitRecords(string originalBarcode)
			{
			var revertableRecords = Db.Queryable<Dt_SplitPackageRecord>()
			var revertableRecords = Db.Queryable<Dt_SplitPackageRecord>()
			.Where(x => x.OriginalBarcode == originalBarcode && !x.IsReverted)
			.OrderBy(x => x.SplitTime)
			.First();

			return revertableRecords ;
			return revertableRecords;
			}


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