From aaeff2d517b26bf2732182e4975f5b1156b752c3 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 07 六月 2025 11:37:28 +0800
Subject: [PATCH] 解决冲突
---
Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs | 14 ++++++--------
Admin.NET/WCS.Application/Configuration/Database.json | 4 ++--
Admin.NET/WCS.Application/Entity/WcsTask.cs | 4 ++--
WCS.rar | 0
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/Admin.NET/WCS.Application/Configuration/Database.json b/Admin.NET/WCS.Application/Configuration/Database.json
index a586878..8e1405e 100644
--- a/Admin.NET/WCS.Application/Configuration/Database.json
+++ b/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": [ // 璇诲啓鍒嗙/涓讳粠
diff --git a/Admin.NET/WCS.Application/Entity/WcsTask.cs b/Admin.NET/WCS.Application/Entity/WcsTask.cs
index 0b5f99e..a5a6e9e 100644
--- a/Admin.NET/WCS.Application/Entity/WcsTask.cs
+++ b/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>
/// 鏄惁缁戝畾
diff --git a/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs b/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
index f7ee732..dc82f3e 100644
--- a/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
+++ b/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,10 +146,8 @@
LotNo = models.LotNo,
SkuName = models.SkuName,
- Qty = int.Parse(nqty),
- CompleteQty = int.Parse(ncomqty),
-
- OrderNo = models.OrderNo
+ Qty = nqty,
+ CompleteQty = ncomqty
};
_db.Insertable(taskAdd).ExecuteCommand();
diff --git a/WCS.rar b/WCS.rar
new file mode 100644
index 0000000..d75ec40
--- /dev/null
+++ b/WCS.rar
Binary files differ
--
Gitblit v1.8.0