diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs index 8abb05fa..10c4e57f 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs @@ -79,8 +79,21 @@ namespace Tnb.WarehouseMgr //出库取起点,获取所有符合输入的载具规格的载具 var setQty = await _db.Queryable().FirstAsync(it => it.bill_code == input.data[nameof(WmsEmptyOutstockH.bill_code)]); var carrys = await _db.Queryable().LeftJoin((a, b) => a.location_id == b.id) - .Where(a => a.carrystd_id == input.data[nameof(WmsEmptyOutstockH.carrystd_id)].ToString()) + .Select((a,b) => new + { + carry_id = a.id, + carrystd_id = a.id, + location_id = b.id, + carry_status = a.carry_status, + c_is_lock = a.is_lock, + l_is_lock = b.is_lock, + l_is_use = b.is_use, + l_is_type = b.is_type + }) + .Where(it => it.carrystd_id == input.data[nameof(WmsEmptyOutstockH.carrystd_id)].ToString() + && it.carry_status == "0"&& it.c_is_lock == 0 && it.l_is_lock == 0 && it.l_is_use == "0" && it.l_is_type == "0") .ToListAsync(); + WmsPointH sPoint = null; WmsPointH ePoint = null; if (input.data.ContainsKey(nameof(WmsPointH.location_id)))