BUG修改
This commit is contained in:
parent
41f5df88be
commit
88a65ffc61
@ -148,7 +148,19 @@ public partial class VarietyManagerViewModel : ObservableObject
|
|||||||
if(mod is null)
|
if(mod is null)
|
||||||
{
|
{
|
||||||
_toastManager.CreateToast()
|
_toastManager.CreateToast()
|
||||||
.WithTitle("请检查产品代码是否错误")
|
.WithTitle("保存失败")
|
||||||
|
.WithContent("无法从上游获取产品信息,请检查产品代码是否正确!")
|
||||||
|
.Dismiss().After(TimeSpan.FromSeconds(3))
|
||||||
|
.OfType(NotificationType.Error)
|
||||||
|
.Dismiss().ByClicking()
|
||||||
|
.Queue();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (variety.GrossWeight < variety.NetWeight)
|
||||||
|
{
|
||||||
|
_toastManager.CreateToast()
|
||||||
|
.WithTitle("保存失败")
|
||||||
|
.WithContent("毛重小于净重,请检查是否输入错误!")
|
||||||
.Dismiss().After(TimeSpan.FromSeconds(3))
|
.Dismiss().After(TimeSpan.FromSeconds(3))
|
||||||
.OfType(NotificationType.Error)
|
.OfType(NotificationType.Error)
|
||||||
.Dismiss().ByClicking()
|
.Dismiss().ByClicking()
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
<!-- 输出到文件 -->
|
<!-- 输出到文件 -->
|
||||||
<target name="file" xsi:type="File" fileName="${basedir}/logs/${shortdate}.log"
|
<target name="file" xsi:type="File" fileName="${basedir}/logs/${shortdate}.log"
|
||||||
layout="${longdate} ${uppercase:${level}} ${message}" />
|
layout="${longdate} ${uppercase:${level}} ${message} ${onexception:${exception:format=tostring} | ${stacktrace}}" />
|
||||||
</targets>
|
</targets>
|
||||||
|
|
||||||
<!-- 定义规则,决定哪些日志应该输出到哪些目标 -->
|
<!-- 定义规则,决定哪些日志应该输出到哪些目标 -->
|
||||||
|
@ -149,11 +149,15 @@ public class HyosungPlcService(ILogger<HyosungPlcService> logger) : IHyosungPlcS
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (color == 1)
|
if (color == 1)
|
||||||
await _writer.WriteShortsAsync(13050, [1, 1, 1, 2]);
|
{
|
||||||
|
await _writer.WriteShortsAsync(13050, [1, 1, 1, masterCount]);
|
||||||
|
await _writer.WriteShortsAsync(13055, [1, 1]);
|
||||||
|
}
|
||||||
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
await _writer.WriteShortsAsync(13050, [1, 1, 1, 1]);
|
await _writer.WriteShortsAsync(13050, [1, 1, 1, 1]);
|
||||||
await _writer.WriteShortsAsync(13056, 2);
|
await _writer.WriteShortsAsync(13055, [1, masterCount]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -408,8 +408,10 @@ public class HyosungRuntime(
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
//if (arg1 == 3)
|
||||||
|
// arg1 = 2;
|
||||||
await printer.PrintMasterLabelAsync(arg1-1, tray.TrayCode);
|
await printer.PrintMasterLabelAsync(arg1-1, tray.TrayCode);
|
||||||
// await hyosungWmsService.AddLabelResult(new LabelResult(tray, variety));
|
await hyosungWmsService.AddLabelResult(new LabelResult(tray, variety));
|
||||||
}
|
}
|
||||||
|
|
||||||
await hyosungPlcService.WritePrintLabelResultAsync(arg1, true);
|
await hyosungPlcService.WritePrintLabelResultAsync(arg1, true);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user