wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

出库签收，解决获取不到登录用户的问题

Browse Source
This commit is contained in:
alex
2023-09-06 18:26:33 +08:00
parent 3fb3866009
commit b52e48ce9a
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
View File

@@ -5,6 +5,7 @@ using System.Linq.Expressions;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Aop.Api.Domain; using Aop.Api.Domain;
using JNPF.Common.Const;
using JNPF.Common.Contracts; using JNPF.Common.Contracts;
using JNPF.Common.Core.Manager; using JNPF.Common.Core.Manager;
using JNPF.Common.Dtos.VisualDev; using JNPF.Common.Dtos.VisualDev;
@@ -643,11 +644,12 @@ namespace Tnb.WarehouseMgr
{ {
await _db.Ado.BeginTranAsync(); await _db.Ado.BeginTranAsync();
var curUser = await GetUserIdentity();
var carryId = input.carryIds[^input.carryIds.Count]; var carryId = input.carryIds[^input.carryIds.Count];
var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == carryId); var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == carryId);
if (carry != null) if (carry != null)
{ {
var otds = await _db.Queryable<WmsOutstockD>().Where(it => it.bill_id == input.requireId).ToListAsync(); var otds = await _db.Queryable<WmsOutstockD>().Where(it => it.bill_id == input.requireId).ToListAsync();
var outStatus = carry.out_status.ToEnum<EnumOutStatus>(); var outStatus = carry.out_status.ToEnum<EnumOutStatus>();
if (outStatus == EnumOutStatus.全部出) if (outStatus == EnumOutStatus.全部出)
@@ -656,6 +658,7 @@ namespace Tnb.WarehouseMgr
var carryCodes = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == carryId).ToListAsync(); var carryCodes = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == carryId).ToListAsync();
var outStockCodes = carryCodes.Adapt<List<WmsOutstockCode>>(); var outStockCodes = carryCodes.Adapt<List<WmsOutstockCode>>();
outStockCodes.ForEach(x => outStockCodes.ForEach(x =>
{ {
var billDId = otds?.Find(xx => xx.material_id == x.material_id && xx.code_batch == x.code_batch)?.id; var billDId = otds?.Find(xx => xx.material_id == x.material_id && xx.code_batch == x.code_batch)?.id;
@@ -666,8 +669,8 @@ namespace Tnb.WarehouseMgr
x.id = SnowflakeIdHelper.NextId(); x.id = SnowflakeIdHelper.NextId();
x.bill_id = input.requireId; x.bill_id = input.requireId;
x.bill_d_id = billDId!; x.bill_d_id = billDId!;
x.org_id = _userManager.User.OrganizeId; x.org_id = _userManager.User?.OrganizeId ?? curUser.FindFirst(ClaimConst.CLAINMORGID)?.Value ?? string.Empty;
x.create_id = _userManager.UserId; x.create_id = _userManager.UserId ?? curUser.FindFirst(ClaimConst.CLAINMUSERID)?.Value ?? string.Empty; ;
x.create_time = DateTime.Now; x.create_time = DateTime.Now;
}); });
await _db.Insertable(outStockCodes).ExecuteCommandAsync(); await _db.Insertable(outStockCodes).ExecuteCommandAsync();
@@ -718,8 +721,8 @@ namespace Tnb.WarehouseMgr
x.id = SnowflakeIdHelper.NextId(); x.id = SnowflakeIdHelper.NextId();
x.bill_id = input.requireId; x.bill_id = input.requireId;
x.bill_d_id = billDId!; x.bill_d_id = billDId!;
x.org_id = _userManager.User.OrganizeId; x.org_id = _userManager.User?.OrganizeId ?? curUser.FindFirst(ClaimConst.CLAINMORGID)?.Value ?? string.Empty;
x.create_id = _userManager.UserId; x.create_id = _userManager.UserId?? curUser.FindFirst(ClaimConst.CLAINMUSERID)?.Value ?? string.Empty;
x.create_time = DateTime.Now; x.create_time = DateTime.Now;
}); });
await _db.Insertable(osCodes).ExecuteCommandAsync(); await _db.Insertable(osCodes).ExecuteCommandAsync();