查找空库位，查找库存

zs

2025-05-09 14f9c8378bde7d9a8d8f1fcc393e0e8d49eced82

 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs

@@ -1,21 +1,19 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialStocks;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.WmsMaterialStocks;
using CMS.Plugin.HIAWms.Domain.Shared;
using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterialStocks;
using CMS.Plugin.HIAWms.Domain.WmsAreas;
using CMS.Plugin.HIAWms.Domain.WmsContainers;
using CMS.Plugin.HIAWms.Domain.WmsMaterials;
using CMS.Plugin.HIAWms.Domain.WmsMaterialStocks;
using CMS.Plugin.HIAWms.Domain.WmsPlaces;
using CmsQueryExtensions;
using Microsoft.Extensions.DependencyInjection;
using System.Text.Json;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Data;
using Volo.Abp.ObjectExtending;
using CMS.Plugin.HIAWms.Domain.Shared.Util;
using CMS.Plugin.HIAWms.Domain.WmsMaterials;
using CMS.Plugin.HIAWms.Domain.WmsContainers;
using CMS.Plugin.HIAWms.Domain.WmsPlaces;
using CMS.Plugin.HIAWms.Domain.WmsAreas;
using Volo.Abp.Uow;
using Microsoft.Extensions.DependencyInjection;
using NPOI.POIFS.Storage;
using System.Text.Json;

namespace CMS.Plugin.HIAWms.Application.Implements;

@@ -87,27 +85,16 @@
        //    throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialNo]);
        //}
        var material = await _wmsMaterialRepository.FindByNameAsync(input.MaterialNo);
        if(material == null)
        if (material == null)
        {
            throw new UserFriendlyException("物料信息不存在");
        }
        var container = await _wmscontainerRepository.FindByNameAsync(input.ContainerNo); 
        var container = await _wmscontainerRepository.FindByNameAsync(input.ContainerNo);
        if (container == null)
        {
            throw new UserFriendlyException("托盘信息不存在");
        }
        var place = await _wmsplaceRepository.FindByNameAsync(input.PlaceNo);
        if(place == null)
        {
            throw new UserFriendlyException("库位信息不存在");
        }
        var area = await _wmsareaRepository.FindByNameAsync(place.AreaCode);
        if(area == null)
        {
            throw new UserFriendlyException("库位库区信息不存在");
        }
        var maxSort = await _wmsmaterialstockRepository.GetMaxSortAsync();
        var sort = input.Sort ?? maxSort;

        var wmsmaterialstock = ObjectMapper.Map<WmsMaterialStockCreateDto, WmsMaterialStock>(input);
        input.MapExtraPropertiesTo(wmsmaterialstock, MappingPropertyDefinitionChecks.None);
        wmsmaterialstock.MaterialId = Guid.NewGuid().ToString("N");
@@ -115,11 +102,42 @@

        wmsmaterialstock.ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI;
        wmsmaterialstock.ContainerType = container.ContainerType;
        wmsmaterialstock.StorageTypeNo = Domain.Shared.Enums.PlaceTypeEnum.XUNIKUWEI;
        wmsmaterialstock.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.DAIRU;
        if (!string.IsNullOrEmpty(input.PlaceNo))
        {
            var place = await _wmsplaceRepository.FindByNameAsync(input.PlaceNo);
            if (place == null)
            {
                throw new UserFriendlyException("库位信息不存在");
            }
            var area = await _wmsareaRepository.FindByNameAsync(place.AreaCode);
            if (area == null)
            {
                throw new UserFriendlyException("库位库区信息不存在");
            }

        wmsmaterialstock.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.CUNHUO;
        wmsmaterialstock.StorageTypeNo = place.StorageTypeNo;
        wmsmaterialstock.AreaCode = place.AreaCode;
        wmsmaterialstock.AreaName = area.AreaName;
            wmsmaterialstock.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.CUNHUO;
            wmsmaterialstock.StorageTypeNo = place.StorageTypeNo;
            wmsmaterialstock.AreaCode = place.AreaCode;
            wmsmaterialstock.AreaName = area.AreaName;

            place.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.CUNHUO;
            place.Islock = input.IsLock;

            await _wmsplaceRepository.UpdateAsync(place);
        }
        var wmsmaterialstockList = await _wmsmaterialstockRepository.GetStockListAsync(new WmsMaterialStock { PlaceNo = input.PlaceNo });
        if (wmsmaterialstockList.Count > 0)
        {
            if (wmsmaterialstockList[0].MaterialNo != input.MaterialNo)
            {
                throw new UserFriendlyException("当前库位已存放别的物料");
            }
        }

        var maxSort = await _wmsmaterialstockRepository.GetMaxSortAsync();
        var sort = input.Sort ?? maxSort;

        wmsmaterialstock.MaterialModel = material.MaterialModel;
        wmsmaterialstock.MaterialBatch = input.MaterialBatch;
@@ -128,30 +146,27 @@
        wmsmaterialstock.InStockTime = DateTime.Now;

        var stockList = new List<WmsMaterialStock>();
        for (int i = 0; i< input.StockNumber; i++)
        for (int i = 0; i < input.StockNumber; i++)
        {
            var stock = new WmsMaterialStock();
            var json = JsonSerializer.Serialize(wmsmaterialstock);
            stock = JsonSerializer.Deserialize<WmsMaterialStock>(json);
            stock.MaterialId = Guid.NewGuid().ToString("N");
            stock.StockNumber = 1;
            stockList.Add(stock);       
            stockList.Add(stock);
        }

        await _wmsmaterialstockRepository.InsertManyAsync(stockList);


        container.ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI;
        place.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.CUNHUO;
        place.Islock = input.IsLock;

        await _wmscontainerRepository.UpdateAsync(container);
        await _wmsplaceRepository.UpdateAsync(place);

        if (input.Sort.HasValue && wmsmaterialstock.Sort != maxSort)
        {
            await AdjustSortAsync(wmsmaterialstock.Id, wmsmaterialstock.Sort);
        }
        //if (input.Sort.HasValue && wmsmaterialstock.Sort != maxSort)
        //{
        //    await AdjustSortAsync(wmsmaterialstock.Id, wmsmaterialstock.Sort);
        //}
        await uow.SaveChangesAsync();
        await uow.CompleteAsync();
        return ObjectMapper.Map<WmsMaterialStock, WmsMaterialStockDto>(wmsmaterialstock);
@@ -192,9 +207,9 @@
            throw new UserFriendlyException("库位库区信息不存在");
        }

        foreach(var wmsmaterialstock in wmsmaterialstockList)
        foreach (var wmsmaterialstock in wmsmaterialstockList)
        {
            if(input.StockNumber< wmsmaterialstockList.Count)
            if (input.StockNumber < wmsmaterialstockList.Count)
            {
                wmsmaterialstock.IsDeleted = true;
                input.StockNumber += 1;
@@ -222,7 +237,7 @@
            wmsmaterialstock.MaterialModel = material.MaterialModel;
            wmsmaterialstock.MaterialBatch = input.MaterialBatch;
        }
        if(input.StockNumber > wmsmaterialstockList.Count)
        if (input.StockNumber > wmsmaterialstockList.Count)
        {
            var stockList = new List<WmsMaterialStock>();
            for (int i = 0; i < input.StockNumber - wmsmaterialstockList.Count; i++)