1.数据库换为mysql

2.PDA界面调整

PDA/PDA/pages/main/main.vue

@@ -28,11 +28,11 @@
 				</view>
 			</view>
 			<view class="uni-flex uni-column" style="flex: 5;">
-				<view hover-class="navigator-hover" @click="handleNavigatorTap('产线呼叫')">
+				<view hover-class="navigator-hover" @click="handleNavigatorTap('库存盘点')">
 					<view class="uni-flex uni-row" style="-webkit-justify-content: center;justify-content: center;">
-						<image class="function-image" src="/static/callIn.png" />
+						<image class="function-image" src="/static/stockTaking.png" />
 					</view>
-					<view class="function-text">产线呼叫</view>
+					<view class="function-text">库存盘点</view>
 				</view>
 			</view>
 			<view style="flex: 1;"></view>
@@ -40,6 +40,14 @@
 
 		<view style="display: flex;flex-direction: row;margin-bottom: 10rpx;margin-top: 30rpx;">
 			<view style="flex: 1;"></view>
+			<view class="uni-flex uni-column" style="flex: 5;">
+				<view hover-class="navigator-hover" @click="handleNavigatorTap('产线呼叫')">
+					<view class="uni-flex uni-row" style="-webkit-justify-content: center;justify-content: center;">
+						<image class="function-image" src="/static/callIn.png" />
+					</view>
+					<view class="function-text">产线呼叫</view>
+				</view>
+			</view>
 			<view class="uni-flex uni-column" style="flex: 5;">
 				<view hover-class="navigator-hover" @click="handleNavigatorTap('货架送回')">
 					<view class="uni-flex uni-row" style="-webkit-justify-content: center;justify-content: center;">
@@ -48,14 +56,6 @@
 					<view class="function-text">货架送回</view>
 				</view>
 			</view>
-			<view class="uni-flex uni-column" style="flex: 5;">
-				<view hover-class="navigator-hover" @click="handleNavigatorTap('库存盘点')">
-					<view class="uni-flex uni-row" style="-webkit-justify-content: center;justify-content: center;">
-						<image class="function-image" src="/static/stockTaking.png" />
-					</view>
-					<view class="function-text">库存盘点</view>
-				</view>
-			</view>
 			<view class="uni-flex uni-column" style="flex: 5;">
 				<view hover-class="navigator-hover" @click="handleNavigatorTap('任务管理')">
 					<view class="uni-flex uni-row" style="-webkit-justify-content: center;justify-content: center;">

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_3 = "/static/stockTaking.png";
-  const _imports_4 = "/static/callOut.png";
+  const _imports_4 = "/static/callIn.png";
-  const _imports_5 = "/static/stockTaking.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", {

WCS.BLL/DbModels/STZL/LocationInfo.cs

@@ -41,17 +41,7 @@ namespace WCS.DAL.DbModels
         public string RcsStoreCode { get; set; }
 
 
-        /// <summary>
-        /// X坐标
-        /// </summary>
-        [SugarColumn(ColumnName = "X", IsNullable = true, DefaultValue = "0", ColumnDescription = "X坐标")]
-        public decimal X { get; set; }
 
-        /// <summary>
-        /// Y坐标
-        /// </summary>
-        [SugarColumn(ColumnName = "Y", IsNullable = true, DefaultValue = "0", ColumnDescription = "Y坐标")]
-        public decimal Y { get; set; }
 
         /// <summary>
         /// 可放置货架类型
@@ -59,11 +49,7 @@ namespace WCS.DAL.DbModels
         [SugarColumn(ColumnName = "allow_shelf_types", Length = 256, IsNullable = true, ColumnDescription = "可放置货架类型", IsJson = true)]
         public List<int> AllowShelfTypes { get; set; }
 
-        /// <summary>
+
-        /// 作为起点时 允许的目的地类型
-        /// </summary>
-        [SugarColumn(ColumnName = "allow_destination_location_area", Length = 512, IsNullable = true, ColumnDescription = "可放置货架类型", IsJson = true)]
-        public List<int> AllowDestinationLocationArea { get; set; }
 
         /// <summary>
         /// 更新人
@@ -101,6 +87,24 @@ namespace WCS.DAL.DbModels
             }
         }
 
+        /// <summary>
+        /// 作为起点时 允许的目的地类型
+        /// </summary>
+        [SugarColumn(ColumnName = "allow_destination_location_area", Length = 512, IsNullable = true, ColumnDescription = "可放置货架类型", IsJson = true)]
+        public List<int> AllowDestinationLocationArea { get; set; }
+
+        /// <summary>
+        /// X坐标
+        /// </summary>
+        [SugarColumn(ColumnName = "X", IsNullable = true, DefaultValue = "0", ColumnDescription = "X坐标")]
+        public decimal X { get; set; }
+
+        /// <summary>
+        /// Y坐标
+        /// </summary>
+        [SugarColumn(ColumnName = "Y", IsNullable = true, DefaultValue = "0", ColumnDescription = "Y坐标")]
+        public decimal Y { get; set; }
+
         /// <summary>
         /// 序号
         /// </summary>

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; }
 
-        /// <summary>
+
-        /// 物料默认数量
-        /// </summary>           
-        [SugarColumn(ColumnName = "mat_default_qty", IsNullable = true, ColumnDescription = "物料默认数量")]
-        public int? MatDefaultQty { get; set; }
 
         /// <summary>
         /// 物料供应商
@@ -62,7 +58,6 @@ namespace WCS.BLL.DbModels
         [SugarColumn(ColumnName = "mat_customer", Length = 128, IsNullable = true, ColumnDescription = "物料客户")]
         public string? MatCustomer { get; set; }
 
-
         /// <summary>
         /// Desc:更新人
         /// Default:
@@ -79,6 +74,12 @@ namespace WCS.BLL.DbModels
         [SugarColumn(ColumnName = "modify_time", IsNullable = true, ColumnDescription = "更新时间")]
         public DateTime? ModifyTime { get; set; } = DateTime.Now;
 
+        /// <summary>
+        /// 物料默认数量
+        /// </summary>           
+        [SugarColumn(ColumnName = "mat_default_qty", IsNullable = true, ColumnDescription = "物料默认数量")]
+        public int? MatDefaultQty { get; set; }
+
         /// <summary>
         /// 是否启用
         /// </summary>

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;
-
         /// <summary>
         /// 货架运输状态
         /// </summary>
@@ -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;
+
         /// <summary>
         /// 序号
         /// </summary>

WCS.DAL/Db/DbHelp.cs

@@ -15,8 +15,11 @@ namespace WCS.DAL.Db
         /// </summary>
         public static SqlSugarScope db = new SqlSugarScope(new ConnectionConfig()
         {
-            ConnectionString = $"Data Source={DbPath.DataDbPath};",
+            ////本地调试用sqllite
-            DbType = DbType.Sqlite,//[Sqlite]安装[System.Data.SQLite];
+            //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 =>
         {