ZhongRui/ALDbanyunxiangmu.git

			@@ -682,8 +682,10 @@
			return WebResponseContent.Instance.Error($"æç{palletCode}ä¸æªæ¾å°æ¡ç {barcode}çæç»è®°å½");
			}

			ResetInboundOrderStatus(new List<string> { targetDetail.OrderNo},new List<string> { targetDetail.Barcode});
			// å é¤æå®æç»
			_stockDetailRepository.DeleteData(targetDetail);


			// éæ°æ¥è¯¢å©ä½æç»ï¼ä¿è¯æ°æ®åç¡®æ§ï¼
			var remainingDetails = _stockDetailRepository.Db.Queryable<Dt_StockInfoDetail>()
			@@ -749,8 +751,13 @@

			if (inboundOrder == null) continue;

			bool isSingleBarcode = barcodes != null && barcodes.Count == 1;
			if (!isSingleBarcode)
			{
			// éåä¸ªæ¡ç ï¼æ´å/å¤ä¸ªæ¡ç ï¼ï¼éç½®ä¸»è¡¨ç¶æä¸º0
			inboundOrder.OrderStatus = 0;
			_inboundOrderRepository.UpdateData(inboundOrder);
			}

			// éç½®å¥åºåæç»ç¶æ
			if (inboundOrder.Details == null \|\| !inboundOrder.Details.Any()) continue;

			@@ -110,15 +110,18 @@
			var groupedData = new Dictionary<string, StockDetailByMateriel>();
			foreach (var item in allData)
			{

			string groupKey = $"{item.MaterielCode}\|{item.SupplyCode}\|{item.BatchNo}\|{item.WarehouseCode}";

			// ç¡®ä¿åå§å¼ä¸ºdecimalç±»å
			if (groupedData.ContainsKey(item.MaterielCode))
			if (groupedData.ContainsKey(groupKey))
			{
			groupedData[item.MaterielCode].StockQuantity += Convert.ToDecimal(item.StockQuantity);
			groupedData[item.MaterielCode].OutboundQuantity += Convert.ToDecimal(item.OutboundQuantity);
			groupedData[groupKey].StockQuantity += Convert.ToDecimal(item.StockQuantity);
			groupedData[groupKey].OutboundQuantity += Convert.ToDecimal(item.OutboundQuantity);
			}
			else
			{
			groupedData[item.MaterielCode] = new StockDetailByMateriel
			groupedData[groupKey] = new StockDetailByMateriel
			{
			StockId = item.StockId,
			MaterielCode = item.MaterielCode,

	项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_StockService/StockDetailByMaterielService.cs	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史