diff --git a/src/Khd.Core.Domain/Models/WmsRawOutstockDetail.cs b/src/Khd.Core.Domain/Models/WmsRawOutstockDetail.cs index f16030b..0dae136 100644 --- a/src/Khd.Core.Domain/Models/WmsRawOutstockDetail.cs +++ b/src/Khd.Core.Domain/Models/WmsRawOutstockDetail.cs @@ -26,7 +26,7 @@ namespace Khd.Core.Domain.Models /// 原材料出库ID /// [Column("raw_outstock_id")] - public long rawOutstockId { get; set; } + public long? rawOutstockId { get; set; } /// /// 原材料出库任务编号 diff --git a/src/Khd.Core.Wcs/appsettings.json b/src/Khd.Core.Wcs/appsettings.json index b4585b3..fb47994 100644 --- a/src/Khd.Core.Wcs/appsettings.json +++ b/src/Khd.Core.Wcs/appsettings.json @@ -1,9 +1,9 @@ { "ConnectionStrings": { //"DefaultConnection": "server=106.12.13.113;port=3336;database=khd_jyhb;uid=khd;pwd=khd@123;charset='utf8';persistsecurityinfo=True;SslMode=none;Allow User Variables=True", - "DefaultConnection": "server=172.16.12.100;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khdrkjy2024...;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True" + //"DefaultConnection": "server=172.16.12.100;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khdrkjy2024...;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True" //"DefaultConnection": "server=localhost;port=3306;database=jyhb;uid=root;pwd=root;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True" - //"DefaultConnection": "server=175.27.215.92;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khd2024;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True" + "DefaultConnection": "server=175.27.215.92;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khd2024;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True" }, "DeleteLogDays": 10,//删除日志的时间间隔,单位:天 "PlcConfigs": [ diff --git a/src/Khd.Core.Wpf/LoginPage.xaml.cs b/src/Khd.Core.Wpf/LoginPage.xaml.cs index f8cfec5..5f6a013 100644 --- a/src/Khd.Core.Wpf/LoginPage.xaml.cs +++ b/src/Khd.Core.Wpf/LoginPage.xaml.cs @@ -80,7 +80,7 @@ namespace Khd.Core.Wpf private void btnSubmit_Click(object sender, RoutedEventArgs e) { - using var s + //using var s } } }