From edca9fd026f88d4edad94b528694d95d62246c67 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周五, 16 5月 2025 16:19:33 +0800
Subject: [PATCH] 添加记录
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs | 62 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs
index 6cb1570..f8d424b 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs
@@ -1,9 +1,13 @@
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockOrderDetail;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialStocks;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
+using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterialStocks;
using CMS.Plugin.HIAWms.Domain.WmsAreas;
using CMS.Plugin.HIAWms.Domain.WmsContainers;
+using CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord;
using CMS.Plugin.HIAWms.Domain.WmsMaterials;
using CMS.Plugin.HIAWms.Domain.WmsMaterialStocks;
using CMS.Plugin.HIAWms.Domain.WmsPlaces;
@@ -11,8 +15,10 @@
using CmsQueryExtensions;
using CmsQueryExtensions.Extension;
using Microsoft.Extensions.DependencyInjection;
+using SqlKata;
using System.Linq.Expressions;
using System.Text.Json;
+using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Data;
@@ -29,6 +35,8 @@
private readonly IWmsContainerRepository _wmscontainerRepository;
private readonly IWmsPlaceRepository _wmsplaceRepository;
private readonly IWmsAreaRepository _wmsareaRepository;
+ private readonly IWmsInOutStockRecordAppService _wmspInOutStockRecordAppService;
+ private readonly IWmsInOutStockRecordRepository _wmsInOutStockRecordRepository;
private readonly IServiceProvider _serviceProvider;
/// <summary>
@@ -41,7 +49,10 @@
IWmsPlaceRepository wmsplaceRepository,
IWmsAreaRepository wmsareaRepository
,
- IServiceProvider serviceProvider)
+ IServiceProvider serviceProvider,
+ IWmsInOutStockRecordAppService wmspInOutStockRecordAppService,
+ IWmsInOutStockRecordRepository wmsInOutStockRecordRepository
+ )
{
_wmsmaterialstockRepository = wmsmaterialstockRepository;
_wmsMaterialRepository = wmsMaterialRepository;
@@ -49,6 +60,8 @@
_wmsplaceRepository = wmsplaceRepository;
_wmsareaRepository = wmsareaRepository;
_serviceProvider = serviceProvider;
+ _wmspInOutStockRecordAppService = wmspInOutStockRecordAppService;
+ _wmsInOutStockRecordRepository = wmsInOutStockRecordRepository;
}
/// <inheritdoc />
@@ -162,12 +175,13 @@
using var uow = unitOfWorkManager.Begin(requiresNew: true);
await CheckCreateOrUpdateDtoAsync(input);
- //var exist = await _wmsmaterialstockRepository.NameExistAsync(input.MaterialNo);
- //if (exist)
- //{
- // throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialNo]);
- //}
- var material = await _wmsMaterialRepository.FindByNameAsync(input.MaterialNo);
+ var materialModel = await _wmsMaterialRepository.FindByModelAsync(input.MaterialModel);
+ if(materialModel == null)
+ {
+ throw new UserFriendlyException("鐗╂枡鍨嬪彿涓嶅瓨鍦�");
+ }
+
+ var material = await _wmsMaterialRepository.FindByNameAsync(materialModel.MaterialNo);
if (material == null)
{
throw new UserFriendlyException("鐗╂枡淇℃伅涓嶅瓨鍦�");
@@ -183,10 +197,10 @@
wmsmaterialstock.MaterialId = Guid.NewGuid().ToString("N");
wmsmaterialstock.MaterialName = material.MaterialName;
- wmsmaterialstock.ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI;
- wmsmaterialstock.ContainerType = container == null ? Domain.Shared.Enums.ContainerTypeEnum.XUNI : container.ContainerType;
- wmsmaterialstock.StorageTypeNo = Domain.Shared.Enums.PlaceTypeEnum.XUNIKUWEI;
- wmsmaterialstock.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.DAIRU;
+ wmsmaterialstock.ContainerStatus = ContainerStatusEnum.KUWEI;
+ wmsmaterialstock.ContainerType = container == null ? ContainerTypeEnum.XUNI : container.ContainerType;
+ wmsmaterialstock.StorageTypeNo = PlaceTypeEnum.XUNIKUWEI;
+ wmsmaterialstock.PlaceStatus = PlaceStatusEnum.DAIRU;
if (!string.IsNullOrEmpty(input.PlaceNo))
{
var place = await _wmsplaceRepository.FindByNameAsync(input.PlaceNo);
@@ -200,12 +214,12 @@
throw new UserFriendlyException("搴撲綅搴撳尯淇℃伅涓嶅瓨鍦�");
}
- wmsmaterialstock.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.CUNHUO;
+ wmsmaterialstock.PlaceStatus = PlaceStatusEnum.CUNHUO;
wmsmaterialstock.StorageTypeNo = place.StorageTypeNo;
wmsmaterialstock.AreaCode = place.AreaCode;
wmsmaterialstock.AreaName = area.AreaName;
- place.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.CUNHUO;
+ place.PlaceStatus = PlaceStatusEnum.CUNHUO;
place.Islock = input.IsLock;
await _wmsplaceRepository.UpdateAsync(place);
@@ -229,6 +243,7 @@
wmsmaterialstock.InStockTime = DateTime.Now;
var stockList = new List<WmsMaterialStock>();
+ var recordList = new List<WmsInOutStockRecord>();
for (int i = 0; i < input.StockNumber; i++)
{
var stock = new WmsMaterialStock();
@@ -237,8 +252,27 @@
stock.MaterialId = Guid.NewGuid().ToString("N");
stock.StockNumber = 1;
stockList.Add(stock);
- }
+ // 娣诲姞搴撳瓨璁板綍
+ var record = new WmsInOutStockRecord
+ {
+ TaskNo = input.TaskNo,
+ OrderNo = input.OrderNo,
+ StockType = StockTypeEnum.InBound,
+ ContainerNo = stock.ContainerNo,
+ MaterialId = stock.MaterialId,
+ MaterialModel = stock.MaterialModel,
+ MaterialName = stock.MaterialName,
+ MaterialNo = stock.MaterialNo,
+ MaterialBatch = stock.MaterialBatch,
+ SourcePlace = "娣诲姞搴撳瓨",
+ ToPlace = stock.PlaceNo,
+ OperateTime = DateTime.Now,
+ Remark = "鍏ュ簱",
+ };
+ recordList.Add(record);
+ }
+ await _wmsInOutStockRecordRepository.InsertManyAsync(recordList);
await _wmsmaterialstockRepository.InsertManyAsync(stockList);
if (container == null)
--
Gitblit v1.9.3