ZhongRui/ALDbanyunxiangmu.git

			@@ -477,10 +477,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 +827,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 +841,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;
			}

			@@ -1388,8 +1401,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))
			@@ -1805,11 +1818,7 @@

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

			// åªææ£å¸¸åæ£å®ææ¶æåMESåé¦
			if (allCompleted && newStatus == (int)OutOrderStatusEnum.åºåºå®æ)
			{
			await HandleOrderCompletion(outboundOrder, orderNo);
			}

			}
			}
			catch (Exception ex)
			@@ -1957,7 +1966,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,
			@@ -1965,13 +1974,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()

			@@ -2018,7 +2027,7 @@

			// åªè·åå·²æ£éå®æçéå®è®°å½
			var lists = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
			.Where(x => x.OrderNo == orderNo && x.Status == (int)OutLockStockStatusEnum.æ£éå®æ)
			.Where(x => x.OrderNo == orderNo && (x.Status == (int)OutLockStockStatusEnum.æ£éå®æ \|\| x.Status == (int)OutLockStockStatusEnum.å·²ååº))
			.ToListAsync();

			var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.lineNo, item.BarcodeUnit, item.WarehouseCode })
			@@ -2027,8 +2036,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
			{
			@@ -2036,7 +2045,7 @@
			supplyCode = row.SupplyCode,
			batchNo = row.BatchNo,
			unit = row.BarcodeUnit,
			qty = row.BarcodeQty
			qty = row.PickedQty
			}).ToList()
			}).ToList();

			@@ -2205,7 +2214,7 @@
			_logger.LogInformation($"è®¢å {orderNo} å·²æ è®°ä¸ºåºåºå®æ");

			// åMESåé¦è®¢åå®æï¼å¦æéè¦ï¼
			await HandleOrderCompletion(outboundOrder, orderNo);
			//await HandleOrderCompletion(outboundOrder, orderNo);
			}
			}

			@@ -2811,7 +2820,7 @@
			business_type = outboundOrder.BusinessType,
			factoryArea = outboundOrder.FactoryArea,
			operationType = 1,
			Operator = outboundOrder.Operator,
			Operator = App.User.UserName,
			orderNo = outboundOrder.UpperOrderNo,
			documentsNO = outboundOrder.OrderNo,
			status = outboundOrder.OrderStatus,
			@@ -2825,7 +2834,7 @@
			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.æ£éå®æ \|\| x.Status == (int)OutLockStockStatusEnum.å·²ååº))
			.ToListAsync();

			var groupdata = detailLocks.GroupBy(item => new { item.MaterielCode, item.lineNo, item.BarcodeUnit, item.WarehouseCode })
			@@ -2833,10 +2842,10 @@
			{

			materialCode = group.Key.MaterielCode,
			lineNo = group.Key.lineNo,
			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
			{
			@@ -2844,7 +2853,7 @@
			supplyCode = lockInfo.SupplyCode,
			batchNo = lockInfo.BatchNo,
			unit = lockInfo.BarcodeUnit,
			qty = lockInfo.BarcodeQty
			qty = lockInfo.PickedQty
			}).ToList()
			}).ToList();
			feedmodel.details.AddRange(groupdata);