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

1

Browse Source
This commit is contained in:
周科达
2024-10-11 11:05:08 +08:00
parent 1a76482a74
commit 7142f40a10
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs
View File

@@ -43,6 +43,7 @@ namespace Tnb.ProductionMgr
{ {
private const string BizTypeId = "FloorCallMaterial"; private const string BizTypeId = "FloorCallMaterial";
private readonly ISqlSugarRepository<PrdMaterialReceiptH> _repository; private readonly ISqlSugarRepository<PrdMaterialReceiptH> _repository;
private readonly ISqlSugarClient _db;
private readonly IUserManager _userManager; private readonly IUserManager _userManager;
private readonly IOrganizeService _organizeService; private readonly IOrganizeService _organizeService;
private readonly IBillRullService _billRullService; private readonly IBillRullService _billRullService;
@@ -63,6 +64,7 @@ namespace Tnb.ProductionMgr
) )
{ {
_repository = repository; _repository = repository;
_db = _repository.AsSugarClient();
_userManager = userManager; _userManager = userManager;
_organizeService = organizeService; _organizeService = organizeService;
_billRullService = billRullService; _billRullService = billRullService;
@@ -598,8 +600,8 @@ namespace Tnb.ProductionMgr
throw Oops.Bah("来源id为空"); throw Oops.Bah("来源id为空");
} }
var db = _repository.AsSugarClient(); // var db = _repository.AsSugarClient();
PrdMoTask moTask = await db.Queryable<PrdMoTask>().SingleAsync(x => x.id == input.requireId); PrdMoTask moTask = await _db.Queryable<PrdMoTask>().SingleAsync(x => x.id == input.requireId);
if (moTask == null) if (moTask == null)
{ {
throw Oops.Bah($"未找到来源id为{input.requireId}的生产任务单"); throw Oops.Bah($"未找到来源id为{input.requireId}的生产任务单");
@@ -623,7 +625,7 @@ namespace Tnb.ProductionMgr
foreach(string carryId in input.carryIds) foreach(string carryId in input.carryIds)
{ {
clearCarryIds.Add(carryId); clearCarryIds.Add(carryId);
WmsCarryH carry = await db.Queryable<WmsCarryH>().SingleAsync(x => x.id == carryId); WmsCarryH carry = await _db.Queryable<WmsCarryH>().SingleAsync(x => x.id == carryId);
string code = await _billRullService.GetBillNumber(CodeTemplateConst.MATERIAL_RECEIPT_CODE); string code = await _billRullService.GetBillNumber(CodeTemplateConst.MATERIAL_RECEIPT_CODE);
PrdMaterialReceiptH prdMaterialReceiptH = new PrdMaterialReceiptH() PrdMaterialReceiptH prdMaterialReceiptH = new PrdMaterialReceiptH()
{ {
@@ -669,19 +671,19 @@ namespace Tnb.ProductionMgr
if (carry.carrystd_id == WmsWareHouseConst.CARRY_ZYXCSTD_ID || if (carry.carrystd_id == WmsWareHouseConst.CARRY_ZYXCSTD_ID ||
carry.carrystd_id == WmsWareHouseConst.CARRY_ZYLJSTD_ID) carry.carrystd_id == WmsWareHouseConst.CARRY_ZYLJSTD_ID)
{ {
carryCodes = await db.Queryable<WmsCarryCode>().Where(x=>x.carry_id==carry.id).ToListAsync(); carryCodes = await _db.Queryable<WmsCarryCode>().Where(x=>x.carry_id==carry.id).ToListAsync();
} }
else else
{ {
//CarryQueryOutput carryQueryOutput = await _wmsCarryQueryService.MESCarryQueryResult(new MESCarryQueryResultInput(){carry_code = carry.carry_code}); //CarryQueryOutput carryQueryOutput = await _wmsCarryQueryService.MESCarryQueryResult(new MESCarryQueryResultInput(){carry_code = carry.carry_code});
memberCarryIds = await db.Queryable<WmsCarryD>().Where(x=>x.carry_id==carry.id).Select(x=>x.membercarry_id).ToListAsync(); memberCarryIds = await _db.Queryable<WmsCarryD>().Where(x=>x.carry_id==carry.id).Select(x=>x.membercarry_id).ToListAsync();
if (memberCarryIds == null || memberCarryIds.IsEmpty()) if (memberCarryIds == null || memberCarryIds.IsEmpty())
{ {
throw Oops.Bah($"未找到载具编号{carry.carry_code}的子载具"); throw Oops.Bah($"未找到载具编号{carry.carry_code}的子载具");
} }
memberCarrys = await db.Queryable<WmsCarryH>().Where(x=>memberCarryIds.Contains(x.id)).ToListAsync(); memberCarrys = await _db.Queryable<WmsCarryH>().Where(x=>memberCarryIds.Contains(x.id)).ToListAsync();
carryCodes = await db.Queryable<WmsCarryCode>().Where(x=>memberCarryIds.Contains(x.carry_id)).ToListAsync(); carryCodes = await _db.Queryable<WmsCarryCode>().Where(x=>memberCarryIds.Contains(x.carry_id)).ToListAsync();
clearCarryIds.AddRange(memberCarryIds); clearCarryIds.AddRange(memberCarryIds);
} }
@@ -806,7 +808,7 @@ namespace Tnb.ProductionMgr
} }
await db.Updateable<WmsCarryH>().SetColumns(r => new WmsCarryH await _db.Updateable<WmsCarryH>().SetColumns(r => new WmsCarryH
{ {
work_station = "" work_station = ""
}).Where(r => input.carryIds.Contains(r.id)).ExecuteCommandAsync(); }).Where(r => input.carryIds.Contains(r.id)).ExecuteCommandAsync();
@@ -816,7 +818,7 @@ namespace Tnb.ProductionMgr
string isCheck = ((int)EnumCheckConclusion.待检).ToString(); string isCheck = ((int)EnumCheckConclusion.待检).ToString();
foreach(string carryId in clearCarryIds) foreach(string carryId in clearCarryIds)
{ {
await db.Updateable<WmsCarryH>() await _db.Updateable<WmsCarryH>()
.SetColumns(x => x.carry_status == carryStatus) .SetColumns(x => x.carry_status == carryStatus)
.SetColumns(x => x.is_check == isCheck) .SetColumns(x => x.is_check == isCheck)
.Where(x => x.id==carryId) .Where(x => x.id==carryId)
@@ -830,16 +832,16 @@ namespace Tnb.ProductionMgr
} }
int dRow1 = await db.Deleteable<WmsCarryD>().Where(r => deleteCarryDIds.Contains(r.carry_id)).ExecuteCommandAsync(); int dRow1 = await _db.Deleteable<WmsCarryD>().Where(r => deleteCarryDIds.Contains(r.carry_id)).ExecuteCommandAsync();
Log.Information($"子载具{JsonConvert.SerializeObject(deleteCarryDIds)}已解绑,解绑条数{dRow1}"); Log.Information($"子载具{JsonConvert.SerializeObject(deleteCarryDIds)}已解绑,解绑条数{dRow1}");
int dRow2 = await db.Deleteable<WmsCarryCode>().Where(r => deleteCarryCodeIds.Contains(r.carry_id)).ExecuteCommandAsync(); int dRow2 = await _db.Deleteable<WmsCarryCode>().Where(r => deleteCarryCodeIds.Contains(r.carry_id)).ExecuteCommandAsync();
Log.Information($"载具条码{JsonConvert.SerializeObject(deleteCarryDIds)}已解绑,解绑条数{dRow2}"); Log.Information($"载具条码{JsonConvert.SerializeObject(deleteCarryDIds)}已解绑,解绑条数{dRow2}");
int row1 = await db.Insertable(insertHList).ExecuteCommandAsync(); int row1 = await _db.Insertable(insertHList).ExecuteCommandAsync();
int row2 = await db.Insertable(insertDList).ExecuteCommandAsync(); int row2 = await _db.Insertable(insertDList).ExecuteCommandAsync();
int row3 = await db.Insertable(insertFHList).ExecuteCommandAsync(); int row3 = await _db.Insertable(insertFHList).ExecuteCommandAsync();
int row4 = await db.Insertable(insertFDList).ExecuteCommandAsync(); int row4 = await _db.Insertable(insertFDList).ExecuteCommandAsync();
if (row1 <= 0 || row2 <= 0 || row3<=0 || row4<=0) if (row1 <= 0 || row2 <= 0 || row3<=0 || row4<=0)