ソースを参照

新增货物数量返回

林豪 左 3 年 前
コミット
9ea7413186

+ 10 - 0
Projects/永冠OPP/WCS.Service/Extensions/TypeExtension.cs

@@ -14,6 +14,16 @@ namespace WCS.Service.Extensions
             return Convert.ToInt16(value);
         }
 
+        /// <summary>
+        /// 将int转换为short
+        /// </summary>
+        /// <param name="txt">需要转换的字符串</param>
+        /// <returns></returns>
+        public static short ToShort(this int value)
+        {
+            return Convert.ToInt16(value);
+        }
+
         /// <summary>
         /// 将字符串转换为int
         /// </summary>

+ 3 - 4
Projects/永冠OPP/WCS.Service/WCSDB.cs

@@ -1,7 +1,6 @@
 using DBHelper;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
@@ -30,9 +29,9 @@ namespace WCS.Service
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
-            var loggerFactory = new LoggerFactory();
-            loggerFactory.AddProvider(new EFLoggerProvider());
-            optionsBuilder.UseSqlServer(AppSettings.Config.GetConnectionString("WCSDB")).UseLoggerFactory(loggerFactory).EnableSensitiveDataLogging();
+            //var loggerFactory = new LoggerFactory();
+            //loggerFactory.AddProvider(new EFLoggerProvider());
+            optionsBuilder.UseSqlServer(AppSettings.Config.GetConnectionString("WCSDB"))/*.UseLoggerFactory(loggerFactory)*/.EnableSensitiveDataLogging();
             //optionsBuilder.UseLoggerFactory(LoggerFactory.Create(builder =>
             //{
             //    builder.AddFilter((category, level) => category == DbLoggerCategory.Database.Command.Name && level == LogLevel.Information).AddConsole();

+ 1 - 0
Projects/永冠OPP/WCS.Service/Works/Station/涂布出库.cs

@@ -210,6 +210,7 @@ namespace WCS.Service.Works.Station
                         finish.Station.Data.Goodsstart = finish.Station.Entity.CODE.ToShort();
                         finish.Station.Data.Goodsend = task.ADDRNEXT.ToShort();
                         finish.Station.Data.GoodsSize = (short)task.Length;
+                        finish.Station.Data.Goodsnum = finishTaskList.Count.ToShort();
                         finish.Station.Data.CmdType = IstationCmdType.分配目标地址;
                         finish.Station.Data.VoucherNo++;
                     }

+ 2 - 1
Projects/永冠OPP/WCS.Service/appsettings.json

@@ -9,6 +9,7 @@
   "ConnectionStrings": {
     //"WCSDB": "Data Source=192.168.251.12;User ID=sa;Password=abc.123;Initial Catalog=WCS_MW;Integrated Security=False"
     //"WCSDB": "Data Source=192.168.249.120;User ID=sa;Password=password@123$%^;Initial Catalog=WCS_MW;Integrated Security=False;"
-    "WCSDB": "Data Source=192.168.249.151;User ID=sa;Password=Password@123;Initial Catalog=WCS_OPP;Integrated Security=False;"
+    "WCSDB": "Data Source=192.168.249.151;User ID=sa;Password=Password@123;Initial Catalog=WCS_OPP;Integrated Security=False;",
+    "WMSDB": "Data Source=192.168.249.151;User ID=sa;Password=Password@123;Initial Catalog=yongguanwms_opp;Integrated Security=False;"
   }
 }