From 10081828bf4b88b01a63bde072118bfdb582a28e Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期五, 12 九月 2025 19:41:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
MES.Service/Modes/MesUnit.cs | 160 ++++++++++++++++++++++++++++-------------------------
1 files changed, 84 insertions(+), 76 deletions(-)
diff --git a/MES.Service/Modes/MesUnit.cs b/MES.Service/Modes/MesUnit.cs
index 598c9d6..9ea8e2a 100644
--- a/MES.Service/Modes/MesUnit.cs
+++ b/MES.Service/Modes/MesUnit.cs
@@ -9,141 +9,149 @@
public class MesUnit
{
/// <summary>
- /// BASEINFO
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ ///
+ /// 榛樿鍊�: (newid())
+ ///</summary>
+ [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
+ public Guid Guid { get; set; }
+
+ /// <summary>
+ /// BASEINFO
+ ///</summary>
+ [SugarColumn(ColumnName = "id")]
public decimal Id { get; set; }
/// <summary>
- /// 鍘熷崟浣�
- /// </summary>
- [SugarColumn(ColumnName = "OLDUNIT")]
+ /// 鍘熷崟浣�
+ ///</summary>
+ [SugarColumn(ColumnName = "oldunit")]
public string? Oldunit { get; set; }
/// <summary>
- /// 鐩殑鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "NEWUNIT")]
+ /// 鐩殑鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "newunit")]
public string? Newunit { get; set; }
/// <summary>
- /// 鍘熷崟浣嶆暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "OLDQTY")]
- public decimal? Oldqty { get; set; }
+ /// 鍘熷崟浣嶆暟閲�
+ ///</summary>
+ [SugarColumn(ColumnName = "oldqty")]
+ public int? Oldqty { get; set; }
/// <summary>
- /// 鐩殑鍗曚綅鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "NEWQTY")]
- public decimal? Newqty { get; set; }
+ /// 鐩殑鍗曚綅鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName = "newqty")]
+ public int? Newqty { get; set; }
/// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
+ /// 鍒涘缓鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName = "create_date")]
public DateTime? CreateDate { get; set; }
/// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_BY")]
+ /// 鍒涘缓浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "create_by")]
public string? CreateBy { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ /// 鏈�鍚庢洿鏂版椂闂�
+ ///</summary>
+ [SugarColumn(ColumnName = "lastupdate_date")]
public DateTime? LastupdateDate { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+ /// 鏈�鍚庢洿鏂颁汉
+ ///</summary>
+ [SugarColumn(ColumnName = "lastupdate_by")]
public string? LastupdateBy { get; set; }
/// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "company")]
public string? Company { get; set; }
/// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "factory")]
public string? Factory { get; set; }
/// <summary>
- /// 缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "FNUMBER")]
+ /// 缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName = "fnumber")]
public string? Fnumber { get; set; }
/// <summary>
- /// 鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "FNAME")]
+ /// 鍚嶇О
+ ///</summary>
+ [SugarColumn(ColumnName = "fname")]
public string? Fname { get; set; }
/// <summary>
- /// 鎵�灞炵粍鍒�
- /// </summary>
- [SugarColumn(ColumnName = "FUNITGROUPID")]
+ /// 鎵�灞炵粍鍒�
+ ///</summary>
+ [SugarColumn(ColumnName = "funitgroupid")]
public string? Funitgroupid { get; set; }
/// <summary>
- /// 鎹㈢畻鍒嗘瘝
- /// </summary>
- [SugarColumn(ColumnName = "FCONVERTDENOMINATOR")]
- public double? Fconvertdenominator { get; set; }
+ /// 鎹㈢畻鍒嗘瘝
+ ///</summary>
+ [SugarColumn(ColumnName = "fconvertdenominator")]
+ public decimal? Fconvertdenominator { get; set; }
/// <summary>
- /// 褰撳墠鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "FCURRENTUNITID")]
+ /// 褰撳墠鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "fcurrentunitid")]
public string? Fcurrentunitid { get; set; }
/// <summary>
- /// 鎹㈢畻鍒嗗瓙
- /// </summary>
- [SugarColumn(ColumnName = "FCONVERTNUMERATOR")]
- public double? Fconvertnumerator { get; set; }
+ /// 鎹㈢畻鍒嗗瓙
+ ///</summary>
+ [SugarColumn(ColumnName = "fconvertnumerator")]
+ public decimal? Fconvertnumerator { get; set; }
/// <summary>
- /// 鍩哄噯鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "FBASEUNIT")]
+ /// 鍩哄噯鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "fbaseunit")]
public string? Fbaseunit { get; set; }
/// <summary>
- /// 鑸嶅叆绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "FROUNDTYPE")]
+ /// 鑸嶅叆绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName = "froundtype")]
public string? Froundtype { get; set; }
/// <summary>
- /// 绮惧害
- /// </summary>
- [SugarColumn(ColumnName = "FPRECISION")]
- public decimal? Fprecision { get; set; }
+ /// 绮惧害
+ ///</summary>
+ [SugarColumn(ColumnName = "fprecision")]
+ public int? Fprecision { get; set; }
/// <summary>
- /// 鎻忚堪
- /// </summary>
- [SugarColumn(ColumnName = "FDESCRIPTION")]
+ /// 鎻忚堪
+ ///</summary>
+ [SugarColumn(ColumnName = "fdescription")]
public string? Fdescription { get; set; }
/// <summary>
- /// 绂佺敤鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "FFORBIDSTATUS")]
+ /// 绂佺敤鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName = "fforbidstatus")]
public string? Fforbidstatus { get; set; }
- [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
-
/// <summary>
- /// 鏁版嵁鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "FDocumentStatus")]
- public string? FDocumentStatus { get; set; }
-
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "DATA_TYPE")]
+ public string? DataType { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
\ No newline at end of file
--
Gitblit v1.9.3