From a4ae3bf5f1826e8e29a95da3dc2c947d713d4ebb Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 06 六月 2025 15:38:14 +0800
Subject: [PATCH] 1.仓库信息储存逻辑调整 2.生产订单接口优化。
---
MES.Service/service/BasicData/MesStaffManager.cs | 1 +
MES.Service/Modes/MesDepots.cs | 2 +-
MES.Service/service/BasicData/MesDepotsManager.cs | 1 +
MES.Service/service/WomcaaManager.cs | 2 +-
MESApplication/appsettings.json | 2 +-
5 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/MES.Service/Modes/MesDepots.cs b/MES.Service/Modes/MesDepots.cs
index 022bcf5..2896a89 100644
--- a/MES.Service/Modes/MesDepots.cs
+++ b/MES.Service/Modes/MesDepots.cs
@@ -11,7 +11,7 @@
/// 榛樿鍊�: (newid())
/// </summary>
[SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
- public Guid Guid { get; set; }
+ public string Guid { get; set; }
/// <summary>
/// ID(SEQ_INV_ID)
diff --git a/MES.Service/service/BasicData/MesDepotsManager.cs b/MES.Service/service/BasicData/MesDepotsManager.cs
index 2d93cf9..1a6bee0 100644
--- a/MES.Service/service/BasicData/MesDepotsManager.cs
+++ b/MES.Service/service/BasicData/MesDepotsManager.cs
@@ -91,6 +91,7 @@
{
return new MesDepots
{
+ Guid = depots.Id,
DepotCode = depots.FNumber,
DepotName = depots.FName,
DepotId = Convert.ToDecimal(depots.Id),
diff --git a/MES.Service/service/BasicData/MesStaffManager.cs b/MES.Service/service/BasicData/MesStaffManager.cs
index 8921d64..5ccd3f4 100644
--- a/MES.Service/service/BasicData/MesStaffManager.cs
+++ b/MES.Service/service/BasicData/MesStaffManager.cs
@@ -128,6 +128,7 @@
{
return new SysUser
{
+ IsStatus = true,
Account = staff.FStaffNumber,
UserName = staff.FName,
Password = "E1ADC3949BA59ABBE56E057F2F883E", // 鍒濆瀵嗙爜
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index d4e586b..c5bc955 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -174,7 +174,7 @@
? Convert.ToDecimal(dto.FNeedQty)
: null, /// 闇�棰嗙敤閲�
Cab007 = !string.IsNullOrEmpty(dto.FPickedQty)
- ? Convert.ToInt32(dto.FPickedQty)
+ ? Convert.ToDecimal(dto.FPickedQty)
: null, /// 宸查鐢ㄩ噺
PositionNo = dto.FPositionNO, /// 浣嶇疆鍙�
SupplyOrganization = dto.FChildSupplyOrgId, /// 渚涘簲缁勭粐
diff --git a/MESApplication/appsettings.json b/MESApplication/appsettings.json
index 60ded5e..6285023 100644
--- a/MESApplication/appsettings.json
+++ b/MESApplication/appsettings.json
@@ -10,6 +10,6 @@
"AppSettings": {
"TestErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfoTest",
"ProductionErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfoTest",
- "DataBaseConn": "Data Source=192.168.1.146;Initial Catalog=GS_MES;User ID=sa;Password =qixi123;Encrypt=True;TrustServerCertificate=True;"
+ "DataBaseConn": "Data Source=192.168.1.146;Initial Catalog=GS_MES;User ID=mesUser;Password =mesUser123;Encrypt=True;TrustServerCertificate=True;"
}
}
--
Gitblit v1.9.3