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-07-17 14:40:10 +08:00
parent 5bb09d4952 e2a03ded93
commit af91dc8cb3
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,9 +75,9 @@ namespace Tnb.WarehouseMgr
foreach (var ko in kittingOuts) foreach (var ko in kittingOuts)
{ {
var carrys = await _db.Queryable<WmsCarryH>() var carrys = await _db.Queryable<WmsCarryH>()
.InnerJoin<WmsCollocationSchemeH>((a,b) => a.collocation_scheme_id == b.id) .InnerJoin<WmsCollocationSchemeH>((a, b) => a.collocation_scheme_id == b.id)
.Where(a => a.collocation_scheme_id == ko.collocation_scheme_id && a.is_lock == 0) .Where(a => a.collocation_scheme_id == ko.collocation_scheme_id && a.is_lock == 0)
.OrderBy((a,b)=>b.seq) .OrderBy((a, b) => b.seq)
.ToListAsync(); .ToListAsync();
if (carrys?.Count > 0) if (carrys?.Count > 0)
{ {
@@ -158,7 +158,7 @@ namespace Tnb.WarehouseMgr
var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == ko.carry_id); var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == ko.carry_id);
if (carry != null) if (carry != null)
{ {
WmsPointH sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == carry.location_id); WmsPointH sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == carry.location_id);
WmsPointH ePoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == ko.location_id); WmsPointH ePoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == ko.location_id);
if (sPoint != null && ePoint != null) if (sPoint != null && ePoint != null)
@@ -236,15 +236,15 @@ namespace Tnb.WarehouseMgr
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);
var kods = await _db.Queryable<WmsKittingoutD>().Where(it => it.bill_id == input.requireId).ToListAsync(); var kods = await _db.Queryable<WmsKittingoutD>().Where(it => it.bill_id == input.requireId).ToListAsync();
//当前载具对应的所有条码插入 //载具为料架时，取所有料箱的条码
List<string> carryMIds = new(); List<string> carryMIds = new();
if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID) if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID)
{ {
var carryDs = await _db.Queryable<WmsCarryD>().Where(it => it.carry_id == carryId).ToListAsync(); var carryDs = await _db.Queryable<WmsCarryD>().Where(it => it.carry_id == carryId).ToListAsync();
carryMIds = carryDs.Select(x => x.membercarry_id).ToList(); carryMIds = carryDs.Select(x => x.membercarry_id).ToList();
} }
//当前载具对应的所有条码插入
Expression<Func<WmsCarryCode, bool>> whereExp = carryMIds?.Count > 0 ? a => carryMIds.Contains(a.carry_id) : a => a.carry_id == carryId; Expression<Func<WmsCarryCode, bool>> whereExp = carryMIds?.Count > 0 ? a => carryMIds.Contains(a.carry_id) : a => a.carry_id == carryId;
var carryCodes = await _db.Queryable<WmsCarryCode>().Where(whereExp).ToListAsync(); var carryCodes = await _db.Queryable<WmsCarryCode>().Where(whereExp).ToListAsync();
@@ -292,9 +292,7 @@ namespace Tnb.WarehouseMgr
//判断当前载具是否为料架，如果是料架 清空所有料架/料箱数据， //判断当前载具是否为料架，如果是料架 清空所有料架/料箱数据，
if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID) if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID)
{ {
var carryds = await _db.Queryable<WmsCarryD>().Where(it => it.id == carryId).ToListAsync(); var carrys = await _db.Queryable<WmsCarryH>().Where(it => carryMIds.Contains(it.id)).ToListAsync();
var mids = carryds.Select(x => x.membercarry_id).ToList();
var carrys = await _db.Queryable<WmsCarryH>().Where(it => mids.Contains(it.id)).ToListAsync();
carrys.Add(carry); carrys.Add(carry);
if (carrys?.Count > 0) if (carrys?.Count > 0)
{ {
@@ -330,7 +328,7 @@ namespace Tnb.WarehouseMgr
if (input.IsNull()) throw new ArgumentNullException("input"); if (input.IsNull()) throw new ArgumentNullException("input");
try try
{ {
await _db.Ado.BeginTranAsync(); await _db.Ado.BeginTranAsync();
List<WmsKittingoutD> kittingOutDs = new(); List<WmsKittingoutD> kittingOutDs = new();
var kittingOuts = input.Adapt<List<WmsKittingoutH>>(); var kittingOuts = input.Adapt<List<WmsKittingoutH>>();