Sfoglia il codice sorgente

更新配置和数据库映射类

在 `appsettings.json` 中更新了数据库和 Redis 连接字符串,注释掉了旧的连接信息。
在 `DBService.cs` 中注释掉多个数据库表的初始化代码,以简化初始化过程。
新增 `BillPaiKu` 类于 `BillPaiKu.cs`,用于映射数据库中的排库表,并添加了相关属性和 SqlSugar 特性。
林豪 左 1 mese fa
parent
commit
332c0f08c4

+ 4 - 3
wms.api/appsettings.json

@@ -8,14 +8,15 @@
   "AllowedHosts": "*",
   "ConnectionConfigs": [
     {
-      "ConnectionString": "Data Source=10.30.44.50;User ID=sa;Password=P@ssw0rd;Initial Catalog=WMS_ZT_01FJ",
-      //"ConnectionString": "Data Source=LAPTOP-D9OEIS1K\\SQLEXPRESS01;User ID=sa;Password=7166766;database=WMS_ZT_01FJ;Integrated Security=False;",
+      //"ConnectionString": "Data Source=10.30.44.50;User ID=sa;Password=P@ssw0rd;Initial Catalog=WMS_ZT_01FJ",
+      "ConnectionString": "Data Source=ZLH;User ID=sa;Password=7166766;Initial Catalog=WMS_ZT_01FJ",
       "DbType": 1,
       "ConfigId": "fj",
       "IsAutoCloseConnection": true
     }
   ],
-  "CSRedisConnectString": "10.30.37.2:6379,defaultDatabase=6",
+  //"CSRedisConnectString": "10.30.37.2:6379,defaultDatabase=6",
+  "CSRedisConnectString": "127.0.0.1:6379,password=7166766,defaultDatabase=6",
   "Serilog": {
     "MinimumLevel": {
       "Default": "Debug", //最小记录日志级别

+ 19 - 17
wms.service/Service/DBService.cs

@@ -103,22 +103,23 @@ namespace wms.service.Service
         {
             var db1 = SqlSugarHelper.Db.GetConnectionScopeWithAttr<sqlsugar.model.fj.BillPushinfo>();
             db1.DbMaintenance.CreateDatabase();
-            db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseContinfo>();
-            db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseCustinfo>();
-            db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseMatgrp>();
-            db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseMatinfo>();
-            db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseSuppinfo>();
-            db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseUnitgrp>();
-            db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseUnitinfo>();
-            db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseUnitrate>();
-            db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseWarearea>();
-            db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseWarecell>();
-            db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseWarehouse>();
-            db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseWarerule>();
-            db1.CodeFirst.InitTables<sqlsugar.model.fj.BillBominfo>();
-            db1.CodeFirst.InitTables<sqlsugar.model.fj.BillBomsetgrp>();
-            db1.CodeFirst.InitTables<sqlsugar.model.fj.BillBomsetinfo>();
-            db1.CodeFirst.InitTables<sqlsugar.model.fj.BillDocsinfo>();
+            //db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseContinfo>();
+            //db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseCustinfo>();
+            //db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseMatgrp>();
+            //db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseMatinfo>();
+            //db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseSuppinfo>();
+            //db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseUnitgrp>();
+            //db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseUnitinfo>();
+            //db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseUnitrate>();
+            //db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseWarearea>();
+            //db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseWarecell>();
+            //db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseWarehouse>();
+            //db1.CodeFirst.InitTables<sqlsugar.model.fj.BaseWarerule>();
+            //db1.CodeFirst.InitTables<sqlsugar.model.fj.BillBominfo>();
+            //db1.CodeFirst.InitTables<sqlsugar.model.fj.BillBomsetgrp>();
+            //db1.CodeFirst.InitTables<sqlsugar.model.fj.BillBomsetinfo>();
+            //db1.CodeFirst.InitTables<sqlsugar.model.fj.BillDocsinfo>();
+
             //db1.CodeFirst.InitTables<sqlsugar.model.fj.BillInvflow>();
             //db1.CodeFirst.InitTables<sqlsugar.model.fj.BillInvinit>();
             //db1.CodeFirst.InitTables<sqlsugar.model.fj.BillInvnow>();
@@ -126,7 +127,8 @@ namespace wms.service.Service
             //db1.CodeFirst.InitTables<sqlsugar.model.fj.BillPushinfo>();
             //db1.CodeFirst.InitTables<sqlsugar.model.fj.BillSpoolTrans>();
             //db1.CodeFirst.InitTables<sqlsugar.model.fj.BillMachinfo>();
-            db1.CodeFirst.InitTables<sqlsugar.model.fj.BillRingPalletizingInfo>();
+            //db1.CodeFirst.InitTables<sqlsugar.model.fj.BillRingPalletizingInfo>();
+            db1.CodeFirst.InitTables<sqlsugar.model.fj.BillPaiKu>();
         }
 
         public void InitSxDB()

+ 35 - 0
wms.sqlsugar/model/fj/BillPaiKu.cs

@@ -0,0 +1,35 @@
+using SqlSugar;
+
+namespace wms.sqlsugar.model.fj
+{
+    /// <summary>
+    ///  排库表
+    /// </summary>
+    [Tenant("fj")]
+    [SugarTable("Bill_PaiKu")]
+    public partial class BillPaiKu : BaseModel
+    {
+        /// <summary>
+        /// 垛型ID
+        /// </summary>
+        [SugarColumn(ColumnDataType = "bigint", IsNullable = false)]
+        public long BomsetgrpId { get; set; }
+
+        /// <summary>
+        /// 所属仓库Id
+        /// </summary>
+        [SugarColumn(ColumnDataType = "nvarchar", Length = 50)]
+        public long WarehousId { get; set; }
+
+        /// <summary>
+        /// 所属仓库编码(1N,1S,2N,2S,3N,3S)
+        /// </summary>
+        [SugarColumn(ColumnDataType = "nvarchar", Length = 50)]
+        public string WarehouseCode { get; set; }
+
+        /// <summary>
+        ///  垛型对应此仓库的占比
+        /// </summary>
+        public float Percent { get; set; }
+    }
+}