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

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
马健
2024-09-25 16:00:05 +08:00
parent b42d34f8d8 be36534602
commit 7a301d5775
1 changed files with 1 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
View File

@@ -4058,51 +4058,7 @@ namespace Tnb.ProductionMgr
//PrdMoTask parent = await _db.Queryable<PrdMoTask>().SingleAsync(x => x.id == prdMoTask.parent_id);
BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x=>x.id==prdMoTask.material_id);
PrdMo mo = await _db.Queryable<PrdMo>().SingleAsync(x => x.id == prdMoTask.mo_id);
string batch = "";
if (mo.mo_type == DictConst.PrdMoTypeZS)
{
EqpEquipment equipment = await _db.Queryable<EqpEquipment>().SingleAsync(x => x.id == prdMoTask.eqp_id);
batch = $"{equipment.code.Substring(equipment.code.Length - 2, 2)}{DateTime.Now.ToString("yyMMdd")}";
}else if (mo.mo_type == DictConst.PrdMoTypeJC)
{
EqpEquipment equipment = await _db.Queryable<EqpEquipment>().SingleAsync(x => x.id == prdMoTask.eqp_id);
ToolMolds toolMolds = await _db.Queryable<ToolMolds>().SingleAsync(x => x.id == prdMoTask.mold_id);
batch = $"{toolMolds.mold_code.Substring(toolMolds.mold_code.Length - 2, 2)}{equipment.code.Substring(equipment.code.Length - 2, 2)}{DateTime.Now.ToString("yyMMdd")}";
}else
{
// LableRecord lableRecord = await _db.Queryable<LableRecord>().FirstAsync();
// if (lableRecord == null)
// {
// batch = $"{DateTime.Now.ToString("yyMMdd")}5{"1".PadLeft(3,'0')}";
// await _db.Insertable(new LableRecord()
// {
// id = SnowflakeIdHelper.NextId(),
// last_day = DateTime.Now.ToString("yyyyMMdd"),
// num = 1
// }).ExecuteCommandAsync();
// }
// else
// {
// int num = 1;
// if(DateTime.Now.ToString("yyyyMMdd") == lableRecord.last_day)
// {
// num = lableRecord.num+1;
// batch = $"{DateTime.Now.ToString("yyMMdd")}5{(lableRecord.num+1).ToString().PadLeft(3,'0')}";
// }
// else
// {
// batch = $"{DateTime.Now.ToString("yyMMdd")}5{"1".PadLeft(3,'0')}";
// }
//
// await _db.Updateable<LableRecord>()
// .SetColumns(x=>x.last_day==DateTime.Now.ToString("yyyyMMdd"))
// .SetColumns(x=>x.num==num)
// .Where(x=>x.id==lableRecord.id)
// .ExecuteCommandAsync();
// }
OrganizeEntity organizeEntity = await _db.Queryable<OrganizeEntity>().SingleAsync(x => x.Id == prdMoTask.workline_id);
batch = $"{organizeEntity.EnCode.Substring(organizeEntity.EnCode.Length - 2, 2)}{DateTime.Now.ToString("yyMMdd")}";
}
string batch = prdMoTask.batch;
string code = $"(01){basMaterial.di ?? ""}*(11){prdMoTask.act_start_date.Value.ToString("yyMMdd")}*(17){prdMoTask.first_start_date.Value.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}*(10){batch}#{basMaterial.material_specification}*{batch}*{prdMoTask.act_start_date.Value.ToString("yyyyMMdd")}*{prdMoTask.first_start_date.Value.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.material_standard}";
return code;