1

wankeda

2026-03-16 d5538af4a0bbc5511990aceb3431fb1caa9bbc65

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs

@@ -1,6 +1,7 @@
using AutoMapper;
using Magicodes.ExporterAndImporter.Core;
using Magicodes.ExporterAndImporter.Excel;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using SqlSugar;
using System;
@@ -20,6 +21,7 @@
using WIDESEA_IStockRepository;
using WIDESEA_IStockService;
using WIDESEA_Model.Models;
using static WIDESEA_IStockService.IStockInfoService;

namespace WIDESEA_StockService
{
@@ -211,19 +213,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 +256,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_);