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-07-03 16:52:34 +08:00
parent 01e337cac8
commit b68970b5b1
3 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs
View File

@@ -60,7 +60,7 @@ namespace Tnb.WarehouseMgr
{
var carryOutPut = await _db.Queryable<WmsCarryH>().Where(it => it.id == carryId).Select<CarryInfoOutput>().FirstAsync();
if (carryOutPut == null) throw new AppFriendlyException("找不到载具", 500);
carryOutPut.carryDetails = await _db.Queryable<WmsCarryD>().Where(it=>it.carry_id == carryId).ToListAsync();
carryOutPut.carryDetails = await _db.Queryable<WmsCarryD>().Where(it => it.carry_id == carryId).ToListAsync();
carryOutPut.carryCodes = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == carryId).ToListAsync();
carryOutPut.carryMats = await _db.Queryable<WmsCarryMat>().Where(it => it.carry_id == carryId).ToListAsync();
return carryOutPut;
@@ -154,6 +154,7 @@ namespace Tnb.WarehouseMgr
return isOk;
}
[NonAction]
public async Task<int> UpdateNullCarry(WmsCarryH carryObj)
{
var row = -1;

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

@@ -17,6 +17,7 @@ using JNPF.VisualDev.Interfaces;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using SqlSugar.DbConvert;
using Tnb.BasicData.Entities;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Attributes;
@@ -283,13 +284,23 @@ namespace Tnb.WarehouseMgr
[HttpGet]
public async Task Testxx()
{
var carryCodePropNames = typeof(WmsCarryCode).GetProperties().Select(p => p.Name);
var outStockCodePropNames = typeof(WmsSetsortingCode).GetProperties().Select(p => p.Name);
var intersects = carryCodePropNames.Intersect(outStockCodePropNames).ToList();
var excepts = carryCodePropNames.Except(outStockCodePropNames).ToList();
var excepts2 = outStockCodePropNames.Except(carryCodePropNames).ToList();
//var carryCodePropNames = typeof(WmsCarryCode).GetProperties().Select(p => p.Name);
//var outStockCodePropNames = typeof(WmsSetsortingCode).GetProperties().Select(p => p.Name);
//var intersects = carryCodePropNames.Intersect(outStockCodePropNames).ToList();
//var excepts = carryCodePropNames.Except(outStockCodePropNames).ToList();
//var excepts2 = outStockCodePropNames.Except(carryCodePropNames).ToList();
//bill_id,bill_line,bill_d_id,bill_d_line,code_qty
try
{
var dddd = await _db.Queryable<TestTT>().Where(it => it.status == 8).ToListAsync();
}
catch (Exception ex)
{
throw;
}
var str = "";
}
@@ -482,11 +493,21 @@ namespace Tnb.WarehouseMgr
}
}
[SugarTable("test_tt")]
public class TestTT
{
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
public int id { get; set; }
[SugarColumn()]
//[SugarColumn( SqlParameterDbType = typeof(CommonPropertyConvert))]
public int status { get; set; }
}
public enum EnumTestType
{
Normal = 1,
Error = 2,
Warn = 4,
Info = 8,
Faild = 16,
}
}

26
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs
View File

@@ -77,7 +77,6 @@ namespace Tnb.WarehouseMgr
var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == carryId);
var feedBox = await _db.Queryable<WmsFeedbox>().SingleAsync(it => it.feedbox_code == feedBoxCode);
var carryMaterial = await _db.Queryable<WmsCarryMat>().FirstAsync(it => it.carry_id == carryId);
var carryCodes = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == carryId).ToListAsync();
if (carryMaterial != null && feedBox != null && carry != null)
{
//更新投料箱
@@ -156,30 +155,5 @@ namespace Tnb.WarehouseMgr
}
return row;
}
private async Task<bool> _updateSubCarry<T>(ExChangeCarryInput input) where T : BaseEntity<string>, IWmsCarryEntity, new()
{
var row = -1;
var items = await _db.Queryable<T>().Where(it => it.carry_id == input.old_carry_id).ToListAsync();
if (items?.Count > 0)
{
List<T> newItems = DeepCopyHelper<T>.DeepCopyList(items);
if (newItems?.Count > 0)
{
newItems.ForEach(x =>
{
x.id = SnowflakeIdHelper.NextId();
x.carry_id = input.new_carry_id;
});
row = await _db.Insertable(newItems).ExecuteCommandAsync();
}
if (row > 0)
{
row = await _db.Deleteable(items).ExecuteCommandAsync();
}
}
return (row > 0);
}
}
}