代码提交

647556386

3 天以前 2f8fc989f339a936b01092caebd4c46e6109da1b

 WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs

@@ -211,19 +211,19 @@
                List<Dt_StockInfodt> stolist= new List<Dt_StockInfodt>();
                for (int i = 0; i < entities.Count; i++)
                {
                    Dt_StockInfoDetail dt_StockIndet = detdata.Where(x => x.StockId == entities[i].Id).FirstOrDefault();
                    List<Dt_StockInfoDetail> dt_StockIndet = detdata.Where(x => x.StockId == entities[i].Id).ToList();
                    string MaterialTypet = "原材料";
                    if (entities[i].MaterialType == (int)InventoryMaterialType.成品)
                    {
                        MaterialTypet = "成品";
                    }
                    else if(entities[i].MaterialType == (int)InventoryMaterialType.空托)
                    else if (entities[i].MaterialType == (int)InventoryMaterialType.空托)
                    {
                        MaterialTypet = "空托";
                    }

                    string Wlstatust = "待检";
                    if (entities[i].Wlstatus== (int)InventoryMaterialStatus.合格)
                    if (entities[i].Wlstatus == (int)InventoryMaterialStatus.合格)
                    {
                        Wlstatust = "合格";
                    }
@@ -254,14 +254,14 @@
                        MaterialType = MaterialTypet,
                        LocationCode = entities[i].LocationCode,
                        Wlstatus = Wlstatust,
                        MaterielCode = dt_StockIndet?.MaterielCode ?? "", // 如果 dt_StockIndet 为 null，使用空字符串作为默认值
                        MaterielName = dt_StockIndet?.MaterielName ?? "",
                        OrderNo = dt_StockIndet?.OrderNo ?? "",
                        BatchNo = dt_StockIndet?.BatchNo ?? "",
                        SerialNumber = dt_StockIndet?.SerialNumber ?? "",
                        StockQuantity = dt_StockIndet?.StockQuantity ?? 0, // 假设 StockQuantity 是数值类型，使用 0 作为默认值
                        BatchNoName = dt_StockIndet?.BatchNoName ?? "",
                        CreateDate = dt_StockIndet?.CreateDate ?? DateTime.MinValue, // 假设 CreateDate 是日期类型，使用默认时间
                        MaterielCode = dt_StockIndet?.FirstOrDefault()?.MaterielCode ?? "",
                        MaterielName = dt_StockIndet?.FirstOrDefault()?.MaterielName ?? "",
                        OrderNo = dt_StockIndet?.FirstOrDefault()?.OrderNo ?? "",
                        BatchNo = dt_StockIndet?.FirstOrDefault()?.BatchNo ?? "",
                        SerialNumber = dt_StockIndet?.FirstOrDefault()?.SerialNumber ?? "",
                        StockQuantity = dt_StockIndet?.Sum(item => item.StockQuantity) ?? 0,
                        BatchNoName = dt_StockIndet?.FirstOrDefault()?.BatchNoName ?? "",
                        CreateDate = dt_StockIndet?.FirstOrDefault()?.CreateDate ?? DateTime.MinValue,
                        Remark = entities[i].Remark,
                    };
                    stolist.Add(dt_);
@@ -298,9 +298,9 @@
        }


        public List<Dt_StockInfo> GetUseableStocks(string materielCode, string batchNo, int warehoseId)
        public List<Dt_StockInfo> GetUseableStocks(string materielCode, string batchNo, List<Dt_Warehouse> warehouse)
        {
            List<string> locationCodes = _basicRepository.LocationInfoRepository.GetCanOutLocationCodes(warehoseId);
            List<string> locationCodes = _basicRepository.LocationInfoRepository.GetCanOutLocationCodes(warehouse);

            return BaseDal.GetStockInfos(materielCode, batchNo, locationCodes);
        }