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-11-13 18:57:07 +08:00
parent e7ceaef0a0
commit 5cbff329db
1 changed files with 59 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
View File

@@ -470,6 +470,43 @@ namespace Tnb.QcMgr
//}, db);
#endregion
#region 记录时间区间内的载具信息
var prdCarrs = await db.Queryable<PrdReport>().Where(a => a.mo_task_id == prdMoTask.id && a.create_time >= CheckTaskInput.startEndTime[0].TimeStampToDateTime() && a.create_time <= CheckTaskInput.startEndTime[1].TimeStampToDateTime()).ToListAsync();
var qcCheckExecCarrys = new List<QcCheckExecCarry>();
foreach (var prdCarr in prdCarrs)
{
var wmsCarryH = await db.Queryable<WmsCarryH>().Where(r => r.carry_code == prdCarr.material_box_code).FirstAsync();
if (wmsCarryH == null)
continue;
WmsCarryCode wmsCarryCode = await db.Queryable<WmsCarryCode>().FirstAsync(x => x.carry_id == wmsCarryH.id);
BasLocation basLocation = await db.Queryable<BasLocation>().Where(r => r.location_code == wmsCarryH.location_code).FirstAsync();
//WmsCarryMat wmsCarryMat = await db.Queryable<WmsCarryMat>().Where(r => r.carry_id == wmsCarryH.id).FirstAsync();
var qcCheckExecCarry = new QcCheckExecCarry()
{
qc_check_exec_id = QcCheckExecH.id,
carry_id = wmsCarryH.id,
carry_code = wmsCarryH.carry_code,
warehouse_id = basLocation != null ? basLocation.wh_id : "",
qty = wmsCarryCode != null ? wmsCarryCode.codeqty.ToString() : "",
status = wmsCarryH.is_check,
location_id = basLocation != null ? basLocation.id : "",
location_code = basLocation != null ? basLocation.location_code : "",
material_id = wmsCarryCode?.material_id,
reporter_id= prdCarr.create_id,
processer_id=_userManager.UserId,
create_id = _userManager.UserId,
create_time = DateTime.Now
};
qcCheckExecCarrys.Add(qcCheckExecCarry);
}
_ = await db.Insertable(qcCheckExecCarrys).ExecuteCommandAsync();
#endregion
//载具需要在中储仓和暂存仓才需要暂控
List<PrdReport> prdReports = await db.Queryable<PrdReport>().LeftJoin<WmsCarryH>((a, b) => a.material_box_code == b.carry_code).LeftJoin<BasLocation>((a, b, c) => b.location_id == c.id).LeftJoin<BasWarehouse>((a, b, c, d) => c.wh_id == d.id).Where((a, b, c, d) => a.mo_task_id == prdMoTask.id && a.create_time >= CheckTaskInput.startEndTime[0].TimeStampToDateTime() && a.create_time <= CheckTaskInput.startEndTime[1].TimeStampToDateTime() && (c.wh_id == WmsWareHouseConst.WAREHOUSE_ZC_ID || c.wh_id == WmsWareHouseConst.WAREHOUSE_ZCC_ID)).ToListAsync();
if (prdReports != null)
@@ -483,36 +520,7 @@ namespace Tnb.QcMgr
.Where(x => carryCodes.Contains(x.carry_code))
.ExecuteCommandAsync();
#region 记录被暂控的载具信息
//var qcCheckExecCarrys = new List<QcCheckExecCarry>();
//foreach(var carryCode in carryCodes)
//{
// var wmsCarryH = await db.Queryable<WmsCarryH>().Where(r => r.carry_code == carryCode).FirstAsync();
// if (wmsCarryH == null)
// continue;
// WmsCarryCode wmsCarryCode = await db.Queryable<WmsCarryCode>().FirstAsync(x => x.carry_id == wmsCarryH.id);
// BasLocation basLocation = await db.Queryable<BasLocation>().Where(r => r.location_code == wmsCarryH.location_code).FirstAsync();
// WmsCarryMat wmsCarryMat = await db.Queryable<WmsCarryMat>().Where(r => r.carry_id == wmsCarryH.id).FirstAsync();
// var qcCheckExecCarry = new QcCheckExecCarry()
// {
// qc_check_exec_id = QcCheckExecH.id,
// carry_id = wmsCarryH.id,
// carry_code = wmsCarryH.carry_code,
// warehouse_id = basLocation != null ? basLocation.wh_id : "",
// qty = wmsCarryCode != null ? wmsCarryCode.codeqty.ToString() : "",
// status = wmsCarryH.is_check,
// location_id = basLocation != null ? basLocation.id : "",
// location_code = basLocation != null ? basLocation.location_code : "",
// material_id= wmsCarryMat?.material_id,
// create_id = _userManager.UserId,
// create_time = DateTime.Now
// };
// qcCheckExecCarrys.Add(qcCheckExecCarry);
//}
//_ = await db.Insertable(qcCheckExecCarrys).ExecuteCommandAsync();
#endregion
#region 记录暂控处理单主/子表信息
@@ -674,33 +682,33 @@ namespace Tnb.QcMgr
}).FirstAsync();
Result.checktypes = new List<List<Checktype>>();
//var qcCheckExecCarrys = await db.Queryable<QcCheckExecCarry>().Where(r => r.qc_check_exec_id == QcCheckExecH.id).ToListAsync();
//if(qcCheckExecCarrys!=null && qcCheckExecCarrys.Count > 0)
//{
// var checkCarrys = new List<CheckCarry>();
// foreach(var acec in qcCheckExecCarrys)
// {
// WmsCarryH carryH = await db.Queryable<WmsCarryH>().FirstAsync(x => x.id == acec.carry_id);
// BasMaterial basMaterial = await db.Queryable<BasMaterial>().SingleAsync(x => x.id == acec.material_id);
// var carry = new CheckCarry()
// {
// carry_name = carryH.carry_name,
// location_id = acec.location_id,
// location_code = acec.location_code,
// material_name = basMaterial?.name,
// qty = string.IsNullOrEmpty(acec.qty) ? 0 : Convert.ToDecimal(acec.qty),
// is_check=acec.status
// };
// checkCarrys.Add(carry);
// }
// Result.carryInfo= checkCarrys;
//}
var qcCheckExecCarrys = await db.Queryable<QcCheckExecCarry>().Where(r => r.qc_check_exec_id == QcCheckExecH.id).ToListAsync();
if (qcCheckExecCarrys != null && qcCheckExecCarrys.Count > 0)
{
var checkCarrys = new List<CheckCarry>();
foreach (var acec in qcCheckExecCarrys)
{
WmsCarryH carryH = await db.Queryable<WmsCarryH>().FirstAsync(x => x.id == acec.carry_id);
BasMaterial basMaterial = await db.Queryable<BasMaterial>().SingleAsync(x => x.id == acec.material_id);
var carry = new CheckCarry()
{
carry_name = carryH.carry_name,
location_id = acec.location_id,
location_code = acec.location_code,
material_name = basMaterial?.name,
qty = string.IsNullOrEmpty(acec.qty) ? 0 : Convert.ToDecimal(acec.qty),
is_check = acec.status
};
checkCarrys.Add(carry);
}
Result.carryInfo = checkCarrys;
}
//if (!string.IsNullOrEmpty(QcCheckExecH.carry_code))
//{
// WmsCarryH carryH = await db.Queryable<WmsCarryH>().FirstAsync(x => x.carry_code == QcCheckExecH.carry_code);
// WmsCarryCode carryCode = await db.Queryable<WmsCarryCode>().FirstAsync(x => x.carry_id == carryH.id);
// string materialId = carryCode?.id ?? "";
// BasMaterial basMaterial = await db.Queryable<BasMaterial>().SingleAsync(x=>x.id==materialId);
// BasMaterial basMaterial = await db.Queryable<BasMaterial>().SingleAsync(x => x.id == materialId);
// Result.carryInfo = new CheckCarry()
// {
// carry_name = carryH.carry_name,