From e464d0b01b80a1ef325b4210aec09870fae36bba Mon Sep 17 00:00:00 2001 From: liuwf Date: Tue, 13 Aug 2024 16:29:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Khd.Core.Domain/Models/DmsBaseAlarmRule.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Khd.Core.Domain/Models/DmsBaseAlarmRule.cs b/src/Khd.Core.Domain/Models/DmsBaseAlarmRule.cs index 7a13af6..fc4b74f 100644 --- a/src/Khd.Core.Domain/Models/DmsBaseAlarmRule.cs +++ b/src/Khd.Core.Domain/Models/DmsBaseAlarmRule.cs @@ -36,7 +36,7 @@ namespace Khd.Core.Domain.Models [Column("remark")] public string Remark { get; set; } - [Column("status")] + [Column("alarm_status_word")] public string Status { get; set; } } } From f04b6d7531256010ddb46ae2d5459569a5c9752d Mon Sep 17 00:00:00 2001 From: liuwf Date: Wed, 14 Aug 2024 19:00:25 +0800 Subject: [PATCH 2/4] . --- src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs | 16 ++++++++++++---- src/Khd.Core.Wpf/appsettings.json | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs index 035e43a..caec108 100644 --- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs +++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs @@ -2996,6 +2996,7 @@ namespace Khd.Core.Wpf.Form select t1.location_id locationId, t1.container_code containerCode, t1.location_code locationCode + from wms_base_location t1 left join wms_raw_stock t2 on t1.location_code=t2.location_code @@ -3003,6 +3004,8 @@ namespace Khd.Core.Wpf.Form and t1.container_status=1 and t1.warehouse_id=512 order by t1.loc_column,t1.loc_row "); + + var wmsLocation = dbContext.WmsBaseLocation.FirstOrDefault(t => t.locationId == idList[0] && t.locationStatus == "1"); if (wmsLocation == null) { @@ -3017,7 +3020,8 @@ namespace Khd.Core.Wpf.Form MessageBoxResult messageBoxResult = HandyControl.Controls.MessageBox.Show("选择了一个移库料箱，需要出空料箱，是否确认？", "提示", MessageBoxButton.YesNo, MessageBoxImage.Question); if (messageBoxResult == MessageBoxResult.Yes) { - WmsBaseLocation emptyLocation = emptyLocations.First(); + var emptyLocation = dbContext.WmsBaseLocation.FirstOrDefault(t => t.locationId == emptyLocations.First().locationId); + //WmsBaseLocation emptyLocation = emptyLocations.First(); emptyLocation.locationStatus = "4"; emptyLocation.ContainerStatus = "2"; wmsLocation.locationStatus = "4"; @@ -4126,7 +4130,7 @@ namespace Khd.Core.Wpf.Form } else { - this.removeScan.Text = wmsRawStock.frozenAmount.ToString(); + this.removeScan.Text = (wmsRawStock.totalAmount - wmsRawStock.frozenAmount).ToString(); } } catch @@ -4159,12 +4163,16 @@ namespace Khd.Core.Wpf.Form { WmsBaseLocation removeLocation = dbContext.WmsBaseLocation.Where(t => t.containerCode == this.removeSourceBox.Text).First(); WmsBaseLocation rawLocation = dbContext.WmsBaseLocation.Where(t => t.containerCode == this.rawSourceBox.Text).First(); - dbContext.WmsRawStock.Where(t => t.locationCode == rawLocation.locationCode) + // 更新 WmsRawStock 中的记录 + dbContext.WmsRawStock + .Where(t => t.locationCode == rawLocation.locationCode) .Where(t => t.instockBatch == this.removeBarCode.Text) .Update(t => new WmsRawStock { - locationCode = removeLocation.locationCode, + locationCode = removeLocation.locationCode, // 更新 locationCode + palletInfoCode = removeLocation.containerCode // 更新 palletInfoCode }); + HandyControl.Controls.MessageBox.Show("移库成功!"); this.removeBarCode.Text = ""; this.removeScan.Text = string.Empty; diff --git a/src/Khd.Core.Wpf/appsettings.json b/src/Khd.Core.Wpf/appsettings.json index 92204c3..14994a2 100644 --- a/src/Khd.Core.Wpf/appsettings.json +++ b/src/Khd.Core.Wpf/appsettings.json @@ -3,8 +3,8 @@ //mysql 本地 //"DefaultConnection": "server=106.12.13.113;port=3306;database=khd_jyhb;uid=root;pwd=root;charset='utf8';persistsecurityinfo=True;SslMode=none;Allow User Variables=True" //khd服务器 - //"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=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=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=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=localhost;port=3306;database=jyhb;uid=root;pwd=root;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True" }, "PlcConfigs": [ From 573f7bfe708d0b1b30549d3ab5200fe002d876d6 Mon Sep 17 00:00:00 2001 From: liuwf Date: Wed, 14 Aug 2024 19:08:56 +0800 Subject: [PATCH 3/4] . --- src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs b/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs index e7dbbf1..61b0787 100644 --- a/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs +++ b/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs @@ -149,7 +149,7 @@ namespace Khd.Core.Wcs.Wcs } else { - if (task.taskType == StaticTaskType.FiveAccessoryOut) + if (task.taskType == StaticTaskType.FiveAccessoryOut || task.taskType == StaticTaskType.FiveAccessoryRemove) { dbContext.WcsTask.Where(t => t.objid == task.objid).Delete(); #region 如果已经开始入库,还有出库任务，删除出库任务 From 822dda30d0c53c9a0f46414901cc82f32d179351 Mon Sep 17 00:00:00 2001 From: liuwf Date: Thu, 15 Aug 2024 14:02:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?change-=E4=BF=AE=E6=94=B95=E6=A5=BC?= =?UTF-8?q?=E8=BE=85=E6=96=99=E7=A7=BB=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Khd.Core.Wpf/Form/FormBoardT.xaml | 68 +++++-- src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs | 248 +++++++++++++++++------ 2 files changed, 236 insertions(+), 80 deletions(-) diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml index 195ec8b..a64b341 100644 --- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml +++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml @@ -2462,6 +2462,8 @@ + + @@ -2469,33 +2471,73 @@ - + + - - + + + + + + + + - - + + - - - - - - - + + + + -