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-06-19 15:43:30 +08:00
parent f4b40f22cc
commit 7c3e39e104
2 changed files with 51 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1404,33 +1404,38 @@ namespace Tnb.ProductionMgr
PrdMo prdMo = await db.Queryable<PrdMo>().SingleAsync(x => x.id == item.mo_id); PrdMo prdMo = await db.Queryable<PrdMo>().SingleAsync(x => x.id == item.mo_id);
if (prdMo.mo_type == DictConst.PrdMoTypeBZ) if (prdMo.mo_type == DictConst.PrdMoTypeBZ)
{ {
if (await _db.Queryable<PrdOutPackMarkLabel>().Where(x => // if (await _db.Queryable<PrdOutPackMarkLabel>().Where(x =>
x.mo_task_code == item.mo_task_code && x.status == "0" && x.is_label == null && x.is_mark==0).AnyAsync()) // x.mo_task_code == item.mo_task_code && x.status == "0" && x.is_label == null && x.is_mark==0).AnyAsync())
{ // {
await _db.Updateable<PrdOutPackMarkLabel>() // await _db.Updateable<PrdOutPackMarkLabel>()
.SetColumns(x => x.is_label == 0) // .SetColumns(x => x.is_label == 0)
.Where(x => x.mo_task_code == item.mo_task_code && x.status == "0" && x.is_label == null && // .Where(x => x.mo_task_code == item.mo_task_code && x.status == "0" && x.is_label == null &&
x.is_mark == 0) // x.is_mark == 0)
.ExecuteCommandAsync(); // .ExecuteCommandAsync();
} // }
else // else
{ // {
PrdOutPackMarkLabel prdOutPackMarkLabel = new PrdOutPackMarkLabel() // PrdOutPackMarkLabel prdOutPackMarkLabel = new PrdOutPackMarkLabel()
{ // {
is_mark = null, // is_mark = null,
is_label = 0, // is_label = 0,
mo_task_code = item.mo_task_code, // mo_task_code = item.mo_task_code,
material_code = item.material_code, // material_code = item.material_code,
create_time = DateTime.Now, // create_time = DateTime.Now,
}; // };
//
// await _db.Insertable<PrdOutPackMarkLabel>(prdOutPackMarkLabel).ExecuteCommandAsync();
// }
await _db.Insertable<PrdOutPackMarkLabel>(prdOutPackMarkLabel).ExecuteCommandAsync(); OrganizeEntity organizeEntity = await _db.Queryable<OrganizeEntity>().SingleAsync(x => x.Id == item.workline_id);
} string batch = $"{organizeEntity.EnCode.Substring(organizeEntity.EnCode.Length - 2, 2)}{DateTime.Now.ToString("yyMMdd")}";
PrdMoTask parent = await _db.Queryable<PrdMoTask>().SingleAsync(x => x.id == item.parent_id); PrdMoTask parent = await _db.Queryable<PrdMoTask>().SingleAsync(x => x.id == item.parent_id);
BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x=>x.id==parent.material_id); BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x=>x.id==parent.material_id);
BasMbom basMbom = await _db.Queryable<BasMbom>().SingleAsync(x => x.id == item.bom_id);
string code = $"(01){basMaterial.di ?? ""}(11){DateTime.Now.ToString("yyMMdd")}(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}(10){parent.batch??""}#{basMaterial.material_specification}*{DateTime.Now.ToString("yyyyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}"; //string code = $"(01){basMaterial.di ?? ""}(11){DateTime.Now.ToString("yyMMdd")}(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}(10){batch}#{basMaterial.material_specification}*{batch}*{DateTime.Now.ToString("yyyyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}";
string code = $"(01){basMaterial.di ?? ""}*(11){DateTime.Now.ToString("yyMMdd")}*(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}*(10){batch}#{basMaterial.material_specification}*{batch}*{DateTime.Now.ToString("yyyyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}";
Dictionary<string, string> dicCommand1 = new(StringComparer.OrdinalIgnoreCase) Dictionary<string, string> dicCommand1 = new(StringComparer.OrdinalIgnoreCase)
{ {
["DevName"] = "外包装箱码垛线", ["DevName"] = "外包装箱码垛线",
@@ -1445,8 +1450,21 @@ namespace Tnb.ProductionMgr
["TagName"] = "WBZX_pm_cs", ["TagName"] = "WBZX_pm_cs",
["Value"] = code, ["Value"] = code,
}; };
Dictionary<String, String> workLineDic = new Dictionary<string, string>()
{
[WmsWareHouseConst.XUELUGUAN1XIAN] = "WBZX_x1_dy_quantity",
[WmsWareHouseConst.XUELUGUAN2XIAN] = "WBZX_x2_dy_quantity",
};
Dictionary<string, string> dicCommand3 = new(StringComparer.OrdinalIgnoreCase)
{
["DevName"] = "外包装箱码垛线",
["token"] = _eleCtlCfg.token,
["TagName"] = workLineDic[item.workline_id],
["Value"] = basMbom.full_qty.ToString(),
};
await HttpClientHelper.GetRequestAsync(_eleCtlCfg.WriteTagUrl, dicCommand1); await HttpClientHelper.GetRequestAsync(_eleCtlCfg.WriteTagUrl, dicCommand1);
await HttpClientHelper.GetRequestAsync(_eleCtlCfg.WriteTagUrl, dicCommand2); await HttpClientHelper.GetRequestAsync(_eleCtlCfg.WriteTagUrl, dicCommand2);
await HttpClientHelper.GetRequestAsync(_eleCtlCfg.WriteTagUrl, dicCommand3);
} }
} }
} }

8
WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
View File

@@ -371,7 +371,15 @@
/// </summary> /// </summary>
public const string LIAOXIANGID = "26037262680357"; public const string LIAOXIANGID = "26037262680357";
/// <summary>
/// 血路管自动生产线1线
/// </summary>
public const string XUELUGUAN1XIAN = "30019971917589";
/// <summary>
/// 血路管自动生产线2线
/// </summary>
public const string XUELUGUAN2XIAN = "25966313322789";
} }
} }