From 56d441b400cf731de61eeed79ad10b43e6510131 Mon Sep 17 00:00:00 2001 From: hehaibing-1996 Date: Thu, 6 Mar 2025 14:35:23 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=95=B0=E6=8D=AE=E5=BA=93=E6=8D=A2=E4=B8=BA?= =?UTF-8?q?mysql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2.PDA界面调整 --- PDA/PDA/pages/main/main.vue | 22 ++++++------ .../dist/dev/app-plus/app-service.js | 18 +++++----- WCS.BLL/DbModels/STZL/LocationInfo.cs | 34 +++++++++++-------- WCS.BLL/DbModels/STZL/MatBaseInfo.cs | 13 +++---- WCS.BLL/DbModels/STZL/ShelfInfo.cs | 6 ++-- WCS.DAL/Db/DbHelp.cs | 7 ++-- 6 files changed, 54 insertions(+), 46 deletions(-) diff --git a/PDA/PDA/pages/main/main.vue b/PDA/PDA/pages/main/main.vue index 60d4eb4..e9997a3 100644 --- a/PDA/PDA/pages/main/main.vue +++ b/PDA/PDA/pages/main/main.vue @@ -28,11 +28,11 @@ - + - + - 产线呼叫 + 库存盘点 @@ -40,6 +40,14 @@ + + + + + + 产线呼叫 + + @@ -48,14 +56,6 @@ 货架送回 - - - - - - 库存盘点 - - diff --git a/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js b/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js index 76fe00c..c5afd2d 100644 --- a/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js +++ b/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js @@ -387,9 +387,9 @@ if (uni.restoreGlobal) { const _imports_0$1 = "/static/logOut.png"; const _imports_1 = "/static/bind.png"; const _imports_2 = "/static/bindQuery.png"; - const _imports_3 = "/static/callIn.png"; - const _imports_4 = "/static/callOut.png"; - const _imports_5 = "/static/stockTaking.png"; + const _imports_3 = "/static/stockTaking.png"; + const _imports_4 = "/static/callIn.png"; + const _imports_5 = "/static/callOut.png"; const _imports_6 = "/static/task.png"; const _imports_7 = "/static/shelfLocation.png"; const _sfc_main$f = { @@ -509,7 +509,7 @@ if (uni.restoreGlobal) { }, [ vue.createElementVNode("view", { "hover-class": "navigator-hover", - onClick: _cache[2] || (_cache[2] = ($event) => $options.handleNavigatorTap("产线呼叫")) + onClick: _cache[2] || (_cache[2] = ($event) => $options.handleNavigatorTap("库存盘点")) }, [ vue.createElementVNode("view", { class: "uni-flex uni-row", @@ -520,7 +520,7 @@ if (uni.restoreGlobal) { src: _imports_3 }) ]), - vue.createElementVNode("view", { class: "function-text" }, "产线呼叫") + vue.createElementVNode("view", { class: "function-text" }, "库存盘点") ]) ]), vue.createElementVNode("view", { style: { "flex": "1" } }) @@ -533,7 +533,7 @@ if (uni.restoreGlobal) { }, [ vue.createElementVNode("view", { "hover-class": "navigator-hover", - onClick: _cache[3] || (_cache[3] = ($event) => $options.handleNavigatorTap("货架送回")) + onClick: _cache[3] || (_cache[3] = ($event) => $options.handleNavigatorTap("产线呼叫")) }, [ vue.createElementVNode("view", { class: "uni-flex uni-row", @@ -544,7 +544,7 @@ if (uni.restoreGlobal) { src: _imports_4 }) ]), - vue.createElementVNode("view", { class: "function-text" }, "货架送回") + vue.createElementVNode("view", { class: "function-text" }, "产线呼叫") ]) ]), vue.createElementVNode("view", { @@ -553,7 +553,7 @@ if (uni.restoreGlobal) { }, [ vue.createElementVNode("view", { "hover-class": "navigator-hover", - onClick: _cache[4] || (_cache[4] = ($event) => $options.handleNavigatorTap("库存盘点")) + onClick: _cache[4] || (_cache[4] = ($event) => $options.handleNavigatorTap("货架送回")) }, [ vue.createElementVNode("view", { class: "uni-flex uni-row", @@ -564,7 +564,7 @@ if (uni.restoreGlobal) { src: _imports_5 }) ]), - vue.createElementVNode("view", { class: "function-text" }, "库存盘点") + vue.createElementVNode("view", { class: "function-text" }, "货架送回") ]) ]), vue.createElementVNode("view", { diff --git a/WCS.BLL/DbModels/STZL/LocationInfo.cs b/WCS.BLL/DbModels/STZL/LocationInfo.cs index 93439d6..6c91063 100644 --- a/WCS.BLL/DbModels/STZL/LocationInfo.cs +++ b/WCS.BLL/DbModels/STZL/LocationInfo.cs @@ -41,17 +41,7 @@ namespace WCS.DAL.DbModels public string RcsStoreCode { get; set; } - /// - /// X坐标 - /// - [SugarColumn(ColumnName = "X", IsNullable = true, DefaultValue = "0", ColumnDescription = "X坐标")] - public decimal X { get; set; } - /// - /// Y坐标 - /// - [SugarColumn(ColumnName = "Y", IsNullable = true, DefaultValue = "0", ColumnDescription = "Y坐标")] - public decimal Y { get; set; } /// /// 可放置货架类型 @@ -59,11 +49,7 @@ namespace WCS.DAL.DbModels [SugarColumn(ColumnName = "allow_shelf_types", Length = 256, IsNullable = true, ColumnDescription = "可放置货架类型", IsJson = true)] public List AllowShelfTypes { get; set; } - /// - /// 作为起点时 允许的目的地类型 - /// - [SugarColumn(ColumnName = "allow_destination_location_area", Length = 512, IsNullable = true, ColumnDescription = "可放置货架类型", IsJson = true)] - public List AllowDestinationLocationArea { get; set; } + /// /// 更新人 @@ -101,6 +87,24 @@ namespace WCS.DAL.DbModels } } + /// + /// 作为起点时 允许的目的地类型 + /// + [SugarColumn(ColumnName = "allow_destination_location_area", Length = 512, IsNullable = true, ColumnDescription = "可放置货架类型", IsJson = true)] + public List AllowDestinationLocationArea { get; set; } + + /// + /// X坐标 + /// + [SugarColumn(ColumnName = "X", IsNullable = true, DefaultValue = "0", ColumnDescription = "X坐标")] + public decimal X { get; set; } + + /// + /// Y坐标 + /// + [SugarColumn(ColumnName = "Y", IsNullable = true, DefaultValue = "0", ColumnDescription = "Y坐标")] + public decimal Y { get; set; } + /// /// 序号 /// diff --git a/WCS.BLL/DbModels/STZL/MatBaseInfo.cs b/WCS.BLL/DbModels/STZL/MatBaseInfo.cs index 0dae653..017fa58 100644 --- a/WCS.BLL/DbModels/STZL/MatBaseInfo.cs +++ b/WCS.BLL/DbModels/STZL/MatBaseInfo.cs @@ -44,11 +44,7 @@ namespace WCS.BLL.DbModels [SugarColumn(ColumnName = "mat_unit", Length = 64, IsNullable = true, ColumnDescription = "物料单位")] public string? MatUnit { get; set; } - /// - /// 物料默认数量 - /// - [SugarColumn(ColumnName = "mat_default_qty", IsNullable = true, ColumnDescription = "物料默认数量")] - public int? MatDefaultQty { get; set; } + /// /// 物料供应商 @@ -62,7 +58,6 @@ namespace WCS.BLL.DbModels [SugarColumn(ColumnName = "mat_customer", Length = 128, IsNullable = true, ColumnDescription = "物料客户")] public string? MatCustomer { get; set; } - /// /// Desc:更新人 /// Default: @@ -79,6 +74,12 @@ namespace WCS.BLL.DbModels [SugarColumn(ColumnName = "modify_time", IsNullable = true, ColumnDescription = "更新时间")] public DateTime? ModifyTime { get; set; } = DateTime.Now; + /// + /// 物料默认数量 + /// + [SugarColumn(ColumnName = "mat_default_qty", IsNullable = true, ColumnDescription = "物料默认数量")] + public int? MatDefaultQty { get; set; } + /// /// 是否启用 /// diff --git a/WCS.BLL/DbModels/STZL/ShelfInfo.cs b/WCS.BLL/DbModels/STZL/ShelfInfo.cs index 546200b..8f53d9f 100644 --- a/WCS.BLL/DbModels/STZL/ShelfInfo.cs +++ b/WCS.BLL/DbModels/STZL/ShelfInfo.cs @@ -85,9 +85,6 @@ namespace WCS.DAL.DbModels public string DestinationLocaiotnCode { get; set; } = string.Empty; - [SugarColumn(ColumnName = "current_task_code", Length = 100, IsNullable = true, ColumnDescription = "当前执行的任务码")] - public string CurrentTaskCode { get; set; } = string.Empty; - /// /// 货架运输状态 /// @@ -125,6 +122,9 @@ namespace WCS.DAL.DbModels } } + [SugarColumn(ColumnName = "current_task_code", Length = 100, IsNullable = true, ColumnDescription = "当前执行的任务码")] + public string CurrentTaskCode { get; set; } = string.Empty; + /// /// 序号 /// diff --git a/WCS.DAL/Db/DbHelp.cs b/WCS.DAL/Db/DbHelp.cs index 180b104..5ade2c7 100644 --- a/WCS.DAL/Db/DbHelp.cs +++ b/WCS.DAL/Db/DbHelp.cs @@ -15,8 +15,11 @@ namespace WCS.DAL.Db /// public static SqlSugarScope db = new SqlSugarScope(new ConnectionConfig() { - ConnectionString = $"Data Source={DbPath.DataDbPath};", - DbType = DbType.Sqlite,//[Sqlite]安装[System.Data.SQLite]; + ////本地调试用sqllite + //ConnectionString = $"Data Source={DbPath.DataDbPath};", + //DbType = DbType.Sqlite,//[Sqlite]安装[System.Data.SQLite]; + ConnectionString = @"Server=192.168.18.200;Database=wcs;User ID=root;Password=cquni@2025;", + DbType = DbType.MySqlConnector,//[Sqlite]安装[System.Data.SQLite]; IsAutoCloseConnection = true }, db => {