From 60b2d679c57421c20dcf7ad1006b5e6342607b66 Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期五, 25 四月 2025 15:08:59 +0800
Subject: [PATCH] 基础信息
---
StandardInterface/MES.Service/Dto/webApi/ErpItems.cs | 1 +
StandardInterface/MES.Service/Dto/webApi/ErpStaff.cs | 3 ++-
StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs | 4 ++--
StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs | 1 +
StandardInterface/MES.Service/Dto/webApi/ErpDepots.cs | 1 +
StandardInterface/MES.Service/Modes/MesItems.cs | 6 +++++-
StandardInterface/MES.Service/Modes/MesStaffPositionLink.cs | 5 +++++
StandardInterface/MES.Service/Modes/MesDepots.cs | 5 +++++
StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs | 1 +
9 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpDepots.cs b/StandardInterface/MES.Service/Dto/webApi/ErpDepots.cs
index e83b538..ca5e970 100644
--- a/StandardInterface/MES.Service/Dto/webApi/ErpDepots.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/ErpDepots.cs
@@ -38,5 +38,6 @@
public string? FZYC { get; set; } //鐩磋繍浠�
public string? FGYC { get; set; } //绠℃槗浠�
public string? FZMC { get; set; } //鍒嗙粍鍚嶇О
+ public string? FCGYMC { get; set; } //鍒嗙粍鍚嶇О
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpItems.cs b/StandardInterface/MES.Service/Dto/webApi/ErpItems.cs
index 460d8c3..f891521 100644
--- a/StandardInterface/MES.Service/Dto/webApi/ErpItems.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/ErpItems.cs
@@ -78,4 +78,5 @@
public string? F_ZZSTLX { get; set; } //缁勭粐闂村彈鎵樼被鍨�
public string? F_DCSL { get; set; } //鍊掑啿鏁伴噺
public string? F_BZGS { get; set; } //鏍囧噯宸ユ椂
+ public string? F_FZMC { get; set; } //鐗╂枡鍒嗙粍鍚嶇О锛堢被鍨嬪悕绉帮級
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpStaff.cs b/StandardInterface/MES.Service/Dto/webApi/ErpStaff.cs
index 23c6ef2..0369007 100644
--- a/StandardInterface/MES.Service/Dto/webApi/ErpStaff.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/ErpStaff.cs
@@ -49,7 +49,7 @@
//鏂板涓�涓狿ostIdItem绫诲瀷鐨刲ist鏉ヨ幏鍙杄rp鐨勫矖浣峣d
public List<ErpStaffDetail>? ErpStaffDetails { get; set; }
- public string? FGZZZ { get; set; }//宸ヤ綔缁勭粐
+
}
/// <summary>
@@ -62,6 +62,7 @@
/// </remarks>
public class ErpStaffDetail
{
+ public string? FGZZZ { get; set; }//宸ヤ綔缁勭粐
public string? fPostDeptid { get; set; }
public string? fPostId { get; set; }
diff --git a/StandardInterface/MES.Service/Modes/MesDepots.cs b/StandardInterface/MES.Service/Modes/MesDepots.cs
index 60de486..d57d366 100644
--- a/StandardInterface/MES.Service/Modes/MesDepots.cs
+++ b/StandardInterface/MES.Service/Modes/MesDepots.cs
@@ -228,4 +228,9 @@
/// </summary>
[SugarColumn(ColumnName = "FZMC")]
public string? FZMC { get; set; }
+ /// <summary>
+ /// 鍒嗙粍鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "CGYMC")]
+ public string? CGYMC { get; set; }
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Modes/MesItems.cs b/StandardInterface/MES.Service/Modes/MesItems.cs
index 281324b..265e4c0 100644
--- a/StandardInterface/MES.Service/Modes/MesItems.cs
+++ b/StandardInterface/MES.Service/Modes/MesItems.cs
@@ -477,6 +477,10 @@
/// </summary>
[SugarColumn(ColumnName = "F_BZGS")]
public string? F_BZGS { get; set; }
-
+ /// <summary>
+ /// 鍒嗙粍鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "WLFZMC")]
+ public string? WLFZMC { get; set; }
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Modes/MesStaffPositionLink.cs b/StandardInterface/MES.Service/Modes/MesStaffPositionLink.cs
index f3e5cab..cce5d06 100644
--- a/StandardInterface/MES.Service/Modes/MesStaffPositionLink.cs
+++ b/StandardInterface/MES.Service/Modes/MesStaffPositionLink.cs
@@ -31,4 +31,9 @@
/// </summary>
[SugarColumn(ColumnName = "FSTAFFSTARTDATE")]
public DateTime? FStaffStartDate { get; set; }
+ /// <summary>
+ /// 宸ヤ綔缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "GZZZ")]
+ public string? GZZZ { get; set; }
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs b/StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs
index bd963ae..f43f5fb 100644
--- a/StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs
@@ -152,6 +152,7 @@
FZYC= depots.FZYC,
FGYC= depots.FGYC,
FZMC= depots.FZMC,
+ CGYMC= depots.FCGYMC,
Company = "1000",
Factory = "1000",
Type=depots.Type,
diff --git a/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs b/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs
index dbc2f2a..83eefff 100644
--- a/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs
@@ -217,6 +217,7 @@
F_ZZSTLX =item.F_ZZSTLX,
F_DCSL =item.F_DCSL,
F_BZGS =item.F_BZGS,
+ WLFZMC=item.F_FZMC,
};
}
diff --git a/StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs b/StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs
index 621e1d8..85a2730 100644
--- a/StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs
@@ -234,8 +234,7 @@
FDOCUMENTSTATUS = staff.FDocumentStatus,
FforbidStatus = staff.FForbidStatus,
CreateOrg = Convert.ToDecimal(staff.FCreateOrgId),
- UseOrg = Convert.ToDecimal(staff.FUseOrgId),
- FGZZZ=staff.FGZZZ,
+ UseOrg = Convert.ToDecimal(staff.FUseOrgId),
Type = staff.Type,
};
@@ -266,6 +265,7 @@
new MesStaffPositionLink
{
StaffId = Convert.ToDecimal(staff.Id),
+ GZZZ= staffDetail.FGZZZ,
PositionId =
string.IsNullOrEmpty(staffDetail.fPostId.ToString())
? null
--
Gitblit v1.9.3