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-06-21 15:16:47 +08:00
parent 0095ebec24 b522a27ee9
commit 094414596e
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,7 @@ using Tnb.WarehouseMgr.Entities.Dto;
using Tnb.WarehouseMgr.Entities.Dto.Inputs; using Tnb.WarehouseMgr.Entities.Dto.Inputs;
using Tnb.WarehouseMgr.Interfaces; using Tnb.WarehouseMgr.Interfaces;
using Tnb.WarehouseMgr; using Tnb.WarehouseMgr;
using Tnb.WarehouseMgr.Entities.Enums;
// using Tnb.PerMgr.Entities; // using Tnb.PerMgr.Entities;
@@ -1435,20 +1436,21 @@ namespace Tnb.ProductionMgr
BasMbom basMbom = await _db.Queryable<BasMbom>().SingleAsync(x => x.id == item.bom_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){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}";
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 code1 = $"(01){basMaterial.di ?? ""}*(11){DateTime.Now.ToString("yyMMdd")}*(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}*(10){batch}";
string code2 = $"{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"] = "外包装箱码垛线",
["token"] = _eleCtlCfg.token, ["token"] = _eleCtlCfg.token,
["TagName"] = "WBZX_tb_cs", ["TagName"] = "WBZX_tb_cs",
["Value"] = code, ["Value"] = code1,
}; };
Dictionary<string, string> dicCommand2 = new(StringComparer.OrdinalIgnoreCase) Dictionary<string, string> dicCommand2 = new(StringComparer.OrdinalIgnoreCase)
{ {
["DevName"] = "外包装箱码垛线", ["DevName"] = "外包装箱码垛线",
["token"] = _eleCtlCfg.token, ["token"] = _eleCtlCfg.token,
["TagName"] = "WBZX_pm_cs", ["TagName"] = "WBZX_pm_cs",
["Value"] = code, ["Value"] = code2,
}; };
Dictionary<String, String> workLineDic = new Dictionary<string, string>() Dictionary<String, String> workLineDic = new Dictionary<string, string>()
{ {
@@ -1958,6 +1960,10 @@ namespace Tnb.ProductionMgr
WmsCarryH wmsCarryH = await db.Queryable<WmsCarryH>().SingleAsync((x => x.carry_code == materialBoxCode)); WmsCarryH wmsCarryH = await db.Queryable<WmsCarryH>().SingleAsync((x => x.carry_code == materialBoxCode));
if (wmsCarryH == null) if (wmsCarryH == null)
throw Oops.Bah($"未找到{materialBoxCode}载具"); throw Oops.Bah($"未找到{materialBoxCode}载具");
if (wmsCarryH.carry_status == ((int)EnumCarryStatus.占用).ToString())
{
throw Oops.Bah($"提报失败，载具已绑定");
}
BindCarryCodeInput bindCarryCodeInput = new BindCarryCodeInput(); BindCarryCodeInput bindCarryCodeInput = new BindCarryCodeInput();
bindCarryCodeInput.carry_id = wmsCarryH.id; bindCarryCodeInput.carry_id = wmsCarryH.id;