Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu

wangxinhui

2026-03-19 5f53f4af369a1c7a8a09eb1f45c20a8581d107a9

 ÏîÄ¿´úÂë/WMS/WMSServices/WIDESEA_BasicService/Base/LocationInfoService.cs

@@ -1,4 +1,4 @@
using HslCommunication.WebSocket;
using HslCommunication.WebSocket;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using SqlSugar;
@@ -44,7 +44,7 @@
        }

        /// <summary>
        /// æŸ¥è¯¢è´§ä½å¯¹åº”çš„RFID
        /// æŸ¥è¯¢è´§ä½å¯¹åº”çš„RFID及库存信息
        /// </summary>
        /// <param name="locationCodes"></param>
        /// <returns></returns>
@@ -60,28 +60,47 @@

                if (warehouseId == 1)
                {
                    // æŸ¥è¯¢åŽŸæ–™åº“Dt_StockInfo表，获取RFID信息
                    // æŸ¥è¯¢åŽŸæ–™åº“Dt_StockInfo表，获取RFID及库存信息
                    var rawMaterialRfidList = _stockInfoRepository.QueryData()
                        .Where(x => locationCodes.Contains(x.LocationCode))
                        .Select(x => new { x.LocationCode, x.RfidCode })
                        .Select(x => new {
                            locationCode = x.LocationCode,
                            rfidCode = x.RfidCode,
                            paperRoll = x.MaterielName, // çº¸å·åç§°
                            width = x.MaterielWide, // é—¨å¹…（幅宽）
                            barcode = x.PalletCode, // çº¸å·æ¡ç 
                            status = x.StockStatus, // çŠ¶æ€
                            inDate = x.CreateDate // å…¥åº“时间（创建时间）
                        })
                        .ToList();

                    var rfidList = rawMaterialRfidList.ToList();
                    // è¿”回结果
                    return WebResponseContent.Instance.OK(data: rfidList);
                    return WebResponseContent.Instance.OK(data: rawMaterialRfidList);
                }

                if (warehouseId == 2)
                {
                    // æŸ¥è¯¢æˆå“åº“Dt_ProStockInfo表，获取PalletCode信息
                    var finishedProductRfidList =_proStockInfoRepository.QueryData()
                    // æ›¿æ¢åŽŸæœ‰çš„ .Select(x => new { ... Detail = x.proStockInfoDetails?.FirstOrDefault() ... }) ä»£ç å—
                    var finishedProductRfidList = _proStockInfoRepository.Db.Queryable<Dt_ProStockInfo>()
                        .Includes(x => x.proStockInfoDetails)
                        .Where(x => locationCodes.Contains(x.LocationCode))
                        .Select(x => new { x.LocationCode, RfidCode = x.PalletCode })
                        .ToList()
                        .Select(x => new
                        {
                            locationCode = x.LocationCode,
                            rfidCode = x.PalletCode,
                            paperRoll = (x.proStockInfoDetails != null && x.proStockInfoDetails.Count > 0) ? x.proStockInfoDetails[0].ProductName : string.Empty,
                            productName = (x.proStockInfoDetails != null && x.proStockInfoDetails.Count > 0) ? x.proStockInfoDetails[0].ProductName : string.Empty,
                            width = (x.proStockInfoDetails != null && x.proStockInfoDetails.Count > 0) ? x.proStockInfoDetails[0].StockQty : 0,
                            quantity = (x.proStockInfoDetails != null && x.proStockInfoDetails.Count > 0) ? x.proStockInfoDetails[0].StockQty : 0,
                            barcode = x.PalletCode,
                            status = x.StockStatus,
                            inDate = x.CreateDate
                        })
                        .ToList();

                    var rfidList = finishedProductRfidList.ToList();
                    // è¿”回结果
                    return WebResponseContent.Instance.OK(data: rfidList);
                    return WebResponseContent.Instance.OK(data: finishedProductRfidList);
                }
                // å¦‚果没有匹配的仓库ID，返回空列表
                return WebResponseContent.Instance.OK(data: new List<object>());