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

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
alex
2023-08-15 17:04:16 +08:00
parent 56ff4e4d75 a92a9d0082
commit 35823a91df
3 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
WarehouseMgr/Tnb.WarehouseMgr/PDATransferSignService.cs
View File

@@ -19,11 +19,14 @@ using System.Collections.Immutable;
using JNPF.Common.Core.Manager; using JNPF.Common.Core.Manager;
using Tnb.WarehouseMgr.Interfaces; using Tnb.WarehouseMgr.Interfaces;
using Senparc.Weixin.Work.Entities; using Senparc.Weixin.Work.Entities;
using JNPF;
using Tnb.WarehouseMgr.Entities.Exceptions;
using JNPF.Common.Const;
//using JNPF.Extras.CollectiveOAuth.Utils; //using JNPF.Extras.CollectiveOAuth.Utils;
namespace Tnb.WarehouseMgr namespace Tnb.WarehouseMgr
{ {
public class PDATransferSignService : BaseWareHouseService public class PDATransferSignService : BaseWareHouseService, IWmsPDATransferSignService
{ {
private readonly ISqlSugarClient _db; private readonly ISqlSugarClient _db;
private readonly IDictionaryDataService _dictionaryDataService; private readonly IDictionaryDataService _dictionaryDataService;
@@ -148,10 +151,13 @@ namespace Tnb.WarehouseMgr
[HttpPost] [HttpPost]
public async Task IsMinStorage(CancellationTokenSource? cts = default) public async Task IsMinStorage(CancellationTokenSource? cts = default)
{ {
if (UserManager.AsscessToken.IsNullOrWhiteSpace()) return;
var curUser = await GetUserIdentity();
var curDb = _db.CopyNew();
try try
{ {
List<Dictionary<string, object>> dics = new List<Dictionary<string, object>>(); List<Dictionary<string, object>> dics = new List<Dictionary<string, object>>();
var sgs = await _db.Queryable<WmsMinstrategyH>().LeftJoin<WmsMinstrategyD>((a, b) => a.id == b.bill_id) var sgs = await curDb.Queryable<WmsMinstrategyH>().LeftJoin<WmsMinstrategyD>((a, b) => a.id == b.bill_id)
.Select((a, b) => new .Select((a, b) => new
{ {
sendWh = a.sendwh_id, sendWh = a.sendwh_id,
@@ -160,7 +166,7 @@ namespace Tnb.WarehouseMgr
b.box_num, b.box_num,
}) })
.ToListAsync(); .ToListAsync();
var items = await _db.Queryable<WmsCarryCode>() var items = await curDb.Queryable<WmsCarryCode>()
.LeftJoin<BasMaterialSendWarehouse>((a, b) => a.material_id == b.id) .LeftJoin<BasMaterialSendWarehouse>((a, b) => a.material_id == b.id)
.LeftJoin<BasMaterial>((a, b, c) => b.material_id == c.id) .LeftJoin<BasMaterial>((a, b, c) => b.material_id == c.id)
.Where(a => sgs.Select(x => x.receiveWh).Contains(a.warehouse_id)) .Where(a => sgs.Select(x => x.receiveWh).Contains(a.warehouse_id))
@@ -182,16 +188,16 @@ namespace Tnb.WarehouseMgr
dics.Add(dic); dics.Add(dic);
} }
//查找符合条件的出库库位 //查找符合条件的出库库位
//var locs = await _db.Queryable<BasLocation>().Where(it => it.is_type == ((int)EnumLocationType.存储库位).ToString() && it.wh_id == "2" && it.is_lock == 0 && it.is_use == ((int)EnumCarryStatus.空闲).ToString()).ToListAsync(); //var locs = await curDb.Queryable<BasLocation>().Where(it => it.is_type == ((int)EnumLocationType.存储库位).ToString() && it.wh_id == "2" && it.is_lock == 0 && it.is_use == ((int)EnumCarryStatus.空闲).ToString()).ToListAsync();
MESCreateOutstockInput input = new() MESCreateOutstockInput input = new()
{ {
outstock = outstock =
{ {
org_id = _userManager.User.OrganizeId, org_id = curUser.FindFirst(ClaimConst.CLAINMORGID)?.Value,
bill_date = DateTime.Now, bill_date = DateTime.Now,
bill_type = "28135837838101",//单据类型：自动补货单 bill_type = "28135837838101",//单据类型：自动补货单
warehouse_id = "1", warehouse_id = "1",
create_id= _userManager.UserId, create_id= curUser.FindFirst(ClaimConst.CLAINMUSERID)!.Value,
} }
}; };
foreach (var d in dics) foreach (var d in dics)
@@ -208,10 +214,18 @@ namespace Tnb.WarehouseMgr
} }
} }
} }
catch (Exception) catch (Exception ex)
{ {
await curDb.Ado.RollbackTranAsync();
throw; TimedTaskErrorInfo ei = new()
{
RequestURL = App.HttpContext?.Request?.Path,
RequestMethod = App.HttpContext?.Request?.Method,
userIdentity = curUser,
};
var timedTaskEx = ex.ToTimedTaskException(ei);
cts?.Cancel();
throw timedTaskEx;
} }
} }
} }

10
WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs
View File

@@ -261,9 +261,15 @@ namespace Tnb.WarehouseMgr
{ {
JNPF.Logging.Log.Error("齐套分拣执行时出现错误", ex); JNPF.Logging.Log.Error("齐套分拣执行时出现错误", ex);
await curDb.Ado.RollbackTranAsync(); await curDb.Ado.RollbackTranAsync();
TimedTaskErrorInfo ei = new()
{
RequestURL = App.HttpContext?.Request?.Path,
RequestMethod = App.HttpContext?.Request?.Method,
userIdentity = curUser,
};
var timedTaskEx = ex.ToTimedTaskException(ei);
cts?.Cancel(); cts?.Cancel();
throw; throw timedTaskEx;
} }
} }

20
WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs
View File

@@ -166,8 +166,16 @@ namespace Tnb.WarehouseMgr
catch (Exception ex) catch (Exception ex)
{ {
Log.Error("齐套出库，新增时出现错误", ex); Log.Error("齐套出库，新增时出现错误", ex);
await curDb.Ado.RollbackTranAsync();
TimedTaskErrorInfo ei = new()
{
RequestURL = App.HttpContext?.Request?.Path,
RequestMethod = App.HttpContext?.Request?.Method,
userIdentity = curUser,
};
var timedTaskEx = ex.ToTimedTaskException(ei);
cts?.Cancel(); cts?.Cancel();
throw; throw timedTaskEx;
} }
} }
/// <summary> /// <summary>
@@ -265,8 +273,16 @@ namespace Tnb.WarehouseMgr
catch (Exception ex) catch (Exception ex)
{ {
Log.Error("齐套出库，待配送时出现错误", ex); Log.Error("齐套出库，待配送时出现错误", ex);
await curDb.Ado.RollbackTranAsync();
TimedTaskErrorInfo ei = new()
{
RequestURL = App.HttpContext?.Request?.Path,
RequestMethod = App.HttpContext?.Request?.Method,
userIdentity = curUser,
};
var timedTaskEx = ex.ToTimedTaskException(ei);
cts?.Cancel(); cts?.Cancel();
throw; throw timedTaskEx;
} }
finally finally
{ {