质检模块
This commit is contained in:
@@ -468,133 +468,135 @@ namespace Tnb.QcMgr
|
||||
//}, db);
|
||||
#endregion
|
||||
|
||||
List<PrdReport> prdReports= await db.Queryable<PrdReport>().Where(x => x.mo_task_id == prdMoTask.id && x.create_time >= CheckTaskInput.startEndTime[0].TimeStampToDateTime() && x.create_time <= CheckTaskInput.startEndTime[1].TimeStampToDateTime()).ToListAsync();
|
||||
//List<string> carryCodes = await db.Queryable<PrdReport>().Where(x => x.mo_task_id == prdMoTask.id && x.create_time >= CheckTaskInput.startEndTime[0].TimeStampToDateTime() && x.create_time <= CheckTaskInput.startEndTime[1].TimeStampToDateTime()).Select(x => x.material_box_code).Distinct().ToListAsync();
|
||||
var carryCodes= prdReports.Select(r=>r.material_box_code).Distinct().ToList();
|
||||
if (carryCodes != null && carryCodes.Count > 0)
|
||||
//载具需要在中储仓和暂存仓才需要暂控
|
||||
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)
|
||||
{
|
||||
await db.Updateable<WmsCarryH>()
|
||||
.SetColumns(x => x.is_check == ((int)EnumCheckConclusion.暂控).ToString())
|
||||
.SetColumns(x => x.carry_status == "6")//把料架状态改为退料状态，会自动触发把料架上的子载具从二楼暂存仓退回一楼中储仓任务
|
||||
.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 记录暂控处理单主/子表信息
|
||||
|
||||
if(carryCodes!=null && carryCodes.Count > 0)
|
||||
var carryCodes = prdReports.Select(r => r.material_box_code).Distinct().ToList();
|
||||
if (carryCodes != null && carryCodes.Count > 0)
|
||||
{
|
||||
await db.Updateable<WmsCarryH>()
|
||||
.SetColumns(x => x.is_check == ((int)EnumCheckConclusion.暂控).ToString())
|
||||
.SetColumns(x => x.carry_status == "6")//把料架状态改为退料状态，会自动触发把料架上的子载具从二楼暂存仓退回一楼中储仓任务
|
||||
.Where(x => carryCodes.Contains(x.carry_code))
|
||||
.ExecuteCommandAsync();
|
||||
|
||||
var basMaterial = await db.Queryable<BasMaterial>().Where(r => r.id == prdMoTask.material_id).FirstAsync();
|
||||
string outWHid = ""; string inWHid = "";
|
||||
if (basMaterial.category_id.Contains("DGJCJ") || basMaterial.category_id.Contains("ZSJ"))
|
||||
#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 记录暂控处理单主/子表信息
|
||||
|
||||
if (carryCodes != null && carryCodes.Count > 0)
|
||||
{
|
||||
outWHid = WmsWareHouseConst.WAREHOUSE_ZC_ID;
|
||||
inWHid = "中储不合格品仓id";
|
||||
}
|
||||
else if (basMaterial.category_id.Contains("CGJCJ"))
|
||||
{
|
||||
outWHid = WmsWareHouseConst.WAREHOUSE_HCC_ID;
|
||||
inWHid = "长管不合格品仓id";
|
||||
}
|
||||
|
||||
var carryIds = await db.Queryable<WmsCarryH>().Where(r => carryCodes.Contains(r.carry_code)).Select(r => r.id).ToListAsync();
|
||||
var wmsCarryCodes = await db.Queryable<WmsCarryCode>().Where(r => carryIds.Contains(r.carry_id) && r.material_id == QcCheckExecH.materialid).ToListAsync();
|
||||
var codeQty = wmsCarryCodes == null ? 0 : wmsCarryCodes.Sum(r => r.codeqty);
|
||||
var qcTempControlH = new QcTempControlH()
|
||||
{
|
||||
id = SnowflakeIdHelper.NextId(),
|
||||
bill_code = await _billRullService.GetBillNumber(CodeTemplateConst.QCCONTROLTEMP_CODE),
|
||||
source_code = QcCheckExecH.bill_code,
|
||||
pro_task_code = QcCheckExecH.mo_task_code,
|
||||
out_warehouse_id = outWHid,
|
||||
in_warehouse_id = inWHid,
|
||||
material_id = QcCheckExecH.materialid,
|
||||
material_code = basMaterial.code,
|
||||
control_lx_qty = carryCodes.Count.ToString(),
|
||||
control_qty = codeQty.ToString(),
|
||||
result = "暂控",
|
||||
loger_id = _userManager.UserId,
|
||||
confirmer_id = "",
|
||||
status = ((int)EnumTempControlStatus.待确认).ToString(),
|
||||
called_box_qty = "0",
|
||||
called_qty = "0",
|
||||
leave_call_box_qty = carryCodes.Count.ToString(),
|
||||
leave_call_qty = codeQty.ToString(),
|
||||
create_id = _userManager.UserId,
|
||||
create_time = DateTime.Now,
|
||||
};
|
||||
|
||||
await db.Insertable(qcTempControlH).ExecuteCommandAsync();
|
||||
|
||||
var qcTempControlDs = new List<QcTempControlD>();
|
||||
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();
|
||||
if (basLocation == null)
|
||||
throw Oops.Bah($"未找到编号为{wmsCarryH.location_code}的库位");
|
||||
WmsCarryMat wmsCarryMat = await db.Queryable<WmsCarryMat>().Where(r => r.carry_id == wmsCarryH.id).FirstAsync();
|
||||
BasWarehouse basWarehouse = await db.Queryable<BasWarehouse>().Where(r => r.id == basLocation.wh_id).FirstAsync();
|
||||
var _prdReports = prdReports.Where(r => r.material_box_code == carryCode).First();
|
||||
var qcTempConD = new QcTempControlD()
|
||||
var basMaterial = await db.Queryable<BasMaterial>().Where(r => r.id == prdMoTask.material_id).FirstAsync();
|
||||
string outWHid = ""; string inWHid = "";
|
||||
if (basMaterial.category_id.Contains("DGJCJ") || basMaterial.category_id.Contains("ZSJ"))
|
||||
{
|
||||
bill_id = qcTempControlH.id,
|
||||
carry_id = wmsCarryH.id,
|
||||
carry_code = carryCode,
|
||||
warehouse_id = basLocation?.wh_id,
|
||||
warehouse_code = basWarehouse.whcode,
|
||||
location_code = basLocation?.location_code,
|
||||
location_id = basLocation?.id,
|
||||
qty = wmsCarryCode?.codeqty.ToString(),
|
||||
submiter = _prdReports == null ? null : _prdReports.create_id,
|
||||
maker_id = "",
|
||||
outWHid = WmsWareHouseConst.WAREHOUSE_ZC_ID;
|
||||
inWHid = "中储不合格品仓id";
|
||||
}
|
||||
else if (basMaterial.category_id.Contains("CGJCJ"))
|
||||
{
|
||||
outWHid = WmsWareHouseConst.WAREHOUSE_HCC_ID;
|
||||
inWHid = "长管不合格品仓id";
|
||||
}
|
||||
|
||||
var carryIds = await db.Queryable<WmsCarryH>().Where(r => carryCodes.Contains(r.carry_code)).Select(r => r.id).ToListAsync();
|
||||
var wmsCarryCodes = await db.Queryable<WmsCarryCode>().Where(r => carryIds.Contains(r.carry_id) && r.material_id == QcCheckExecH.materialid).ToListAsync();
|
||||
var codeQty = wmsCarryCodes == null ? 0 : wmsCarryCodes.Sum(r => r.codeqty);
|
||||
var qcTempControlH = new QcTempControlH()
|
||||
{
|
||||
id = SnowflakeIdHelper.NextId(),
|
||||
bill_code = await _billRullService.GetBillNumber(CodeTemplateConst.QCCONTROLTEMP_CODE),
|
||||
source_code = QcCheckExecH.bill_code,
|
||||
pro_task_code = QcCheckExecH.mo_task_code,
|
||||
out_warehouse_id = outWHid,
|
||||
in_warehouse_id = inWHid,
|
||||
material_id = QcCheckExecH.materialid,
|
||||
material_code = basMaterial.code,
|
||||
control_lx_qty = carryCodes.Count.ToString(),
|
||||
control_qty = codeQty.ToString(),
|
||||
result = "暂控",
|
||||
loger_id = _userManager.UserId,
|
||||
confirmer_id = "",
|
||||
status = ((int)EnumTempControlStatus.待确认).ToString(),
|
||||
called_box_qty = "0",
|
||||
called_qty = "0",
|
||||
leave_call_box_qty = carryCodes.Count.ToString(),
|
||||
leave_call_qty = codeQty.ToString(),
|
||||
create_id = _userManager.UserId,
|
||||
create_time = DateTime.Now,
|
||||
check_status = "暂控",
|
||||
call_status = "未呼叫"
|
||||
};
|
||||
qcTempControlDs.Add(qcTempConD);
|
||||
}
|
||||
await db.Insertable(qcTempControlDs).ExecuteCommandAsync();
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
|
||||
await db.Insertable(qcTempControlH).ExecuteCommandAsync();
|
||||
|
||||
var qcTempControlDs = new List<QcTempControlD>();
|
||||
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();
|
||||
if (basLocation == null)
|
||||
throw Oops.Bah($"未找到编号为{wmsCarryH.location_code}的库位");
|
||||
WmsCarryMat wmsCarryMat = await db.Queryable<WmsCarryMat>().Where(r => r.carry_id == wmsCarryH.id).FirstAsync();
|
||||
BasWarehouse basWarehouse = await db.Queryable<BasWarehouse>().Where(r => r.id == basLocation.wh_id).FirstAsync();
|
||||
var _prdReports = prdReports.Where(r => r.material_box_code == carryCode).First();
|
||||
var qcTempConD = new QcTempControlD()
|
||||
{
|
||||
bill_id = qcTempControlH.id,
|
||||
carry_id = wmsCarryH.id,
|
||||
carry_code = carryCode,
|
||||
warehouse_id = basLocation?.wh_id,
|
||||
warehouse_code = basWarehouse.whcode,
|
||||
location_code = basLocation?.location_code,
|
||||
location_id = basLocation?.id,
|
||||
qty = wmsCarryCode?.codeqty.ToString(),
|
||||
submiter = _prdReports == null ? null : _prdReports.create_id,
|
||||
maker_id = "",
|
||||
create_id = _userManager.UserId,
|
||||
create_time = DateTime.Now,
|
||||
check_status = "暂控",
|
||||
call_status = "未呼叫"
|
||||
};
|
||||
qcTempControlDs.Add(qcTempConD);
|
||||
}
|
||||
await db.Insertable(qcTempControlDs).ExecuteCommandAsync();
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user