zhaowc
2025-06-07 9dfb7d191bdf19595d766647222171f992d8af3f
修改显示屏显示
3个文件已修改
1个文件已添加
20 ■■■■ 已修改文件
Admin.NET/WCS.Application/Configuration/Database.json 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Admin.NET/WCS.Application/Entity/WcsTask.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WCS.rar 补丁 | 查看 | 原始文档 | blame | 历史
Admin.NET/WCS.Application/Configuration/Database.json
@@ -11,8 +11,8 @@
        //"ConnectionString": "PORT=5432;DATABASE=xxx;HOST=localhost;PASSWORD=xxx;USER ID=xxx", // PostgreSQL 库连接字符串
        //"ConnectionString": "Server=localhost;Database=xxx;Uid=xxx;Pwd=xxx;SslMode=None;", // MySql 库连接字符串",
        //"ConnectionString": "User Id=xxx; Password=xxx; Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL)))", // Oracle 库连接字符串
        "ConnectionString": "Server=10.18.99.10;Database=WCSnet6;User Id=sa;Password=sql2024;", // SqlServer 库连接字符串
        //"ConnectionString": "Server=192.168.62.200;Database=WCSnet6;User Id=sa;Password=sql2019;", // SqlServer 库连接字符串
        //"ConnectionString": "Server=10.18.99.10;Database=WCSnet6;User Id=sa;Password=sql2024;", // SqlServer 库连接字符串
        "ConnectionString": "Server=192.168.62.200;Database=WCSnet6;User Id=sa;Password=sql2019;", // SqlServer 库连接字符串
        //"SlaveConnectionConfigs": [ // 读写分离/主从
Admin.NET/WCS.Application/Entity/WcsTask.cs
@@ -101,13 +101,13 @@
    /// 数量
    /// </summary>
    [SugarColumn(ColumnName = "Qty", ColumnDescription = "数量")]
    public int? Qty { get; set; }
    public decimal? Qty { get; set; }
    
    /// <summary>
    /// 拆垛数量
    /// </summary>
    [SugarColumn(ColumnName = "CompleteQty", ColumnDescription = "拆垛数量")]
    public int? CompleteQty { get; set; }
    public decimal? CompleteQty { get; set; }
    /// <summary>
    /// 是否绑定
Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
@@ -100,8 +100,8 @@
            }
            Enum type;
            var bale = "0";
            var nqty = "0";
            var ncomqty = "0";
            decimal nqty = 0;
            decimal ncomqty = 0;
            if (models.TaskType == "0" )
            {
                type = TaskTypeEnum.In;
@@ -121,11 +121,11 @@
            }
            if (!string.IsNullOrEmpty( models.Qty))
            {
                nqty = models.Qty;
                nqty =Convert.ToDecimal(models.Qty);
            }
            if (!string.IsNullOrEmpty(models.CompleteQty))
            {
                nqty = models.CompleteQty;
                ncomqty = Convert.ToDecimal(models.CompleteQty);
            }
            //新增任务
            var taskAdd = new WcsTask()
@@ -146,8 +146,8 @@
                LotNo = models.LotNo,
                SkuName = models.SkuName,
                Qty = int.Parse(nqty),
                CompleteQty = int.Parse(ncomqty)
                Qty = nqty,
                CompleteQty = ncomqty
            };
            _db.Insertable(taskAdd).ExecuteCommand();           
WCS.rar
Binary files differ