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:
马健
2024-10-18 13:42:03 +08:00
parent abe6bd70b3
commit 8ae060e8d6
17 changed files with 149 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -285,13 +285,13 @@ namespace Tnb.WarehouseMgr
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<List<BasLocation>> InStockStrategy([FromQuery] InStockStrategyQuery input)
public async Task<List<BasLocation>> InStockStrategy([FromQuery] InStockStrategyQuery input, ISqlSugarClient dbConn = null)
{
List<BasLocation> items = new();
try
{
var db = input.dbConn;
if (input.dbConn == null)
var db = dbConn;
if (dbConn == null)
{
db = _db.CopyNew();
}
@@ -340,13 +340,13 @@ namespace Tnb.WarehouseMgr
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<List<BasLocation>> InStockStrategyBCK([FromQuery] InStockStrategyQuery input)
public async Task<List<BasLocation>> InStockStrategyBCK([FromQuery] InStockStrategyQuery input, ISqlSugarClient dbConn = null)
{
List<BasLocation> items = new();
try
{
var db = input.dbConn;
if (input.dbConn == null)
var db = dbConn;
if (dbConn == null)
{
db = _db.CopyNew();
}
@@ -376,13 +376,13 @@ namespace Tnb.WarehouseMgr
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<List<BasLocation>> BCKF2InStockStrategy([FromQuery] InStockStrategyQuery input)
public async Task<List<BasLocation>> BCKF2InStockStrategy([FromQuery] InStockStrategyQuery input, ISqlSugarClient dbConn = null)
{
List<BasLocation> items = new();
try
{
var db = input.dbConn;
if (input.dbConn == null)
var db = dbConn;
if (dbConn == null)
{
db = _db.CopyNew();
}
@@ -482,7 +482,7 @@ namespace Tnb.WarehouseMgr
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<List<Tuple<string, WmsCarryH, WmsCarryCode, BasLocation>>> OutStockStrategy_saleRelease([FromQuery] OutStockStrategyQuery input)
public async Task<List<Tuple<string, WmsCarryH, WmsCarryCode, BasLocation>>> OutStockStrategy_saleRelease([FromQuery] OutStockStrategyQuery input, ISqlSugarClient dbConn = null)
{
Expressionable<WmsCarryH, WmsCarryCode, BasLocation> whereExprable = Expressionable.Create<WmsCarryH, WmsCarryCode, BasLocation>()
.And((a, b, c) => a.is_lock == 0 && c.is_lock == 0)
@@ -502,8 +502,8 @@ namespace Tnb.WarehouseMgr
_ = whereExprable.And(carryStatusFilterExp);
Expression<Func<WmsCarryH, WmsCarryCode, BasLocation, bool>> whereExpr = whereExprable.ToExpression();
var cyDb = input.dbConn;
if (input.dbConn == null)
var cyDb = dbConn;
if (dbConn == null)
{
cyDb = _db.CopyNew();
}
@@ -545,10 +545,10 @@ namespace Tnb.WarehouseMgr
return items;
}
public async Task<List<WmsCarryH>> OutStockStrategy([FromQuery] OutStockStrategyQuery input)
public async Task<List<WmsCarryH>> OutStockStrategy([FromQuery] OutStockStrategyQuery input, ISqlSugarClient dbConn = null)
{
var cyDb = input.dbConn;
if (input.dbConn == null)
var cyDb = dbConn;
if (dbConn == null)
{
cyDb = _db.CopyNew();
}
@@ -662,10 +662,10 @@ namespace Tnb.WarehouseMgr
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="AppFriendlyException"></exception>
public async Task<List<Tuple<WmsCarryH, decimal, BasLocation>>> OutStockStrategyZCC2Floor2([FromQuery] OutStockStrategyZCC2Floor2Query input)
public async Task<List<Tuple<WmsCarryH, decimal, BasLocation>>> OutStockStrategyZCC2Floor2([FromQuery] OutStockStrategyZCC2Floor2Query input, ISqlSugarClient dbConn = null)
{
var cyDb = input.dbConn;
if (input.dbConn == null)
var cyDb = dbConn;
if (dbConn == null)
{
cyDb = _db.CopyNew();
}
@@ -3689,7 +3689,7 @@ namespace Tnb.WarehouseMgr
points.Add(wmsPointHs.Where(r => r.point_code == $"DT-C-04-0{elevatorSno}").First());
points.Add(wmsPointHs.Where(r => r.point_code == $"DT-4-{elevatorSno}").First());
points.Add(wmsPointHs.Where(r => r.point_code == $"DT-3-{elevatorSno}").First());
points.Add(wmsPointHs.Where(r => r.point_code == $"DT-R-03-0{elevatorSno}").First());
points.Add(wmsPointHs.Where(r => r.point_code == $"DT-03-0{elevatorSno}").First());
points.Add(wmsPointHs.Where(r => r.id == pEndId).First());
}
else