From 79e43ccffd15afcd99934ee43b706f6133398079 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 07 七月 2025 15:29:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
MES.Service/Modes/MesItems.cs | 134 +++++++++++++++++++++++++++++++-------------
1 files changed, 94 insertions(+), 40 deletions(-)
diff --git a/MES.Service/Modes/MesItems.cs b/MES.Service/Modes/MesItems.cs
index 9fd6c4c..9e33027 100644
--- a/MES.Service/Modes/MesItems.cs
+++ b/MES.Service/Modes/MesItems.cs
@@ -18,73 +18,73 @@
/// 宸ュ巶
/// </summary>
[SugarColumn(ColumnName = "FACTORY")]
- public string? Factory { get; set; }
+ public string Factory { get; set; }
/// <summary>
/// 鍏徃缂栧彿
/// </summary>
[SugarColumn(ColumnName = "COMPANY")]
- public string? Company { get; set; }
+ public string Company { get; set; }
/// <summary>
/// 鐗╂枡缂栫爜 = ERP鐗╂枡缂栧彿||棰滆壊缂栧彿
/// </summary>
[SugarColumn(ColumnName = "ITEM_NO")]
- public string? ItemNo { get; set; }
+ public string ItemNo { get; set; }
/// <summary>
/// 鐗╂枡鍚嶇О
/// </summary>
[SugarColumn(ColumnName = "ITEM_NAME")]
- public string? ItemName { get; set; }
+ public string ItemName { get; set; }
/// <summary>
/// 鐗╂枡绠�绉�
/// </summary>
[SugarColumn(ColumnName = "ITEM_SNAME")]
- public string? ItemSname { get; set; }
+ public string ItemSname { get; set; }
/// <summary>
/// 瑙勬牸鍨嬪彿
/// </summary>
[SugarColumn(ColumnName = "ITEM_MODEL")]
- public string? ItemModel { get; set; }
+ public string ItemModel { get; set; }
/// <summary>
/// 鐗╂枡鎻忚堪
/// </summary>
[SugarColumn(ColumnName = "ITEM_DESCRIPTION")]
- public string? ItemDescription { get; set; }
+ public string ItemDescription { get; set; }
/// <summary>
/// 鐗╂枡鍗曚綅
/// </summary>
[SugarColumn(ColumnName = "ITEM_UNIT")]
- public string? ItemUnit { get; set; }
+ public string ItemUnit { get; set; }
/// <summary>
/// 鐗╂枡绫诲瀷
/// </summary>
[SugarColumn(ColumnName = "ITEM_TYPE")]
- public string? ItemType { get; set; }
+ public string ItemType { get; set; }
/// <summary>
/// 浜у搧鐗堟湰
/// </summary>
[SugarColumn(ColumnName = "ITEM_VERSION")]
- public string? ItemVersion { get; set; }
+ public string ItemVersion { get; set; }
/// <summary>
/// 瀹㈡埛缂栧彿
/// </summary>
[SugarColumn(ColumnName = "CUST_NO")]
- public string? CustNo { get; set; }
+ public string CustNo { get; set; }
/// <summary>
/// 鍒涘缓浜�
/// </summary>
[SugarColumn(ColumnName = "CREATE_BY")]
- public string? CreateBy { get; set; }
+ public string CreateBy { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
@@ -96,7 +96,7 @@
/// 鏈�鍚庢洿鏂颁汉
/// </summary>
[SugarColumn(ColumnName = "LASTUPDATE_BY")]
- public string? LastupdateBy { get; set; }
+ public string LastupdateBy { get; set; }
/// <summary>
/// 鏈�鍚庢洿鏂版椂闂�
@@ -108,13 +108,13 @@
/// 鏈�浣庡簱瀛�
/// </summary>
[SugarColumn(ColumnName = "LOWLIMIT")]
- public decimal? Lowlimit { get; set; }
+ public double? Lowlimit { get; set; }
/// <summary>
/// 鏈�澶у簱瀛�
/// </summary>
[SugarColumn(ColumnName = "HIGHLIMIT")]
- public decimal? Highlimit { get; set; }
+ public double? Highlimit { get; set; }
/// <summary>
/// 鏈�灏忓寘瑁呮暟
@@ -126,25 +126,25 @@
/// 璁㈠崟鍗曚綅
/// </summary>
[SugarColumn(ColumnName = "ORDERUNIT")]
- public string? Orderunit { get; set; }
+ public string Orderunit { get; set; }
/// <summary>
/// 閿�鍞崟浣�
/// </summary>
[SugarColumn(ColumnName = "SALEUNIT")]
- public string? Saleunit { get; set; }
+ public string Saleunit { get; set; }
/// <summary>
/// 搴撴埧鍗曚綅
/// </summary>
[SugarColumn(ColumnName = "STOREUNIT")]
- public string? Storeunit { get; set; }
+ public string Storeunit { get; set; }
/// <summary>
/// 鐢熶骇鍗曚綅
/// </summary>
[SugarColumn(ColumnName = "PRODUCTUNIT")]
- public string? Productunit { get; set; }
+ public string Productunit { get; set; }
/// <summary>
/// 鐗╂枡ID
@@ -156,43 +156,43 @@
/// ERP鏂欏彿
/// </summary>
[SugarColumn(ColumnName = "ERP_ITEM_NO")]
- public string? ErpItemNo { get; set; }
+ public string ErpItemNo { get; set; }
/// <summary>
/// 榛樿浠撳簱
/// </summary>
[SugarColumn(ColumnName = "DEPOT_CODE")]
- public string? DepotCode { get; set; }
+ public string DepotCode { get; set; }
/// <summary>
/// 鐗╂枡鍒嗙被缂栧彿
/// </summary>
[SugarColumn(ColumnName = "PPBOM00019124")]
- public string? Ppbom00019124 { get; set; }
+ public string Ppbom00019124 { get; set; }
/// <summary>
/// 鐗╂枡鍒嗙粍
/// </summary>
[SugarColumn(ColumnName = "REMARKS")]
- public string? Remarks { get; set; }
+ public string Remarks { get; set; }
/// <summary>
/// 閲囪喘鍛�
/// </summary>
[SugarColumn(ColumnName = "FPURCHASERID")]
- public string? Fpurchaserid { get; set; }
+ public string Fpurchaserid { get; set; }
/// <summary>
/// 绂佺敤鐘舵��
/// </summary>
[SugarColumn(ColumnName = "FFORBIDSTATUS")]
- public string? Fforbidstatus { get; set; }
+ public string Fforbidstatus { get; set; }
/// <summary>
/// 鐗╂枡鍒嗙粍
/// </summary>
[SugarColumn(ColumnName = "FMATERIALGROUP")]
- public string? Fmaterialgroup { get; set; }
+ public string Fmaterialgroup { get; set; }
/// <summary>
/// 瀹屽伐瓒呮敹姣斾緥
@@ -204,61 +204,115 @@
/// 鍙戞枡鏂瑰紡
/// </summary>
[SugarColumn(ColumnName = "FISSUETYPE")]
- public string? Fissuetype { get; set; }
+ public string Fissuetype { get; set; }
/// <summary>
/// 鍚敤鎵瑰彿绠＄悊
/// </summary>
[SugarColumn(ColumnName = "FISBATCHMANAGE")]
- public int? Fisbatchmanage { get; set; }
+ public decimal? Fisbatchmanage { get; set; }
/// <summary>
/// 閲囪喘鍗曚綅
/// </summary>
[SugarColumn(ColumnName = "FPURCHASEUNITID")]
- public string? Fpurchaseunitid { get; set; }
+ public string Fpurchaseunitid { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�1
+ /// 鏄惁鍖呰
/// </summary>
- [SugarColumn(ColumnName = "REMARK1")]
- public string? Remark1 { get; set; }
+ [SugarColumn(ColumnName = "CHECKBOX_SFBZ")]
+ public string CheckbosSFBZ { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�2
+ /// 鏄惁鎵撴爣
/// </summary>
- [SugarColumn(ColumnName = "REMARK2")]
- public string? Remark2 { get; set; }
+ [SugarColumn(ColumnName = "CHECKBOX_SFDB")]
+ public string CheckbosSFDB { get; set; }
/// <summary>
/// 鑷畾涔夊瓧娈�3
/// </summary>
[SugarColumn(ColumnName = "REMARK3")]
- public string? Remark3 { get; set; }
+ public string Remark3 { get; set; }
/// <summary>
/// 鑷畾涔夊瓧娈�4
/// </summary>
[SugarColumn(ColumnName = "REMARK4")]
- public string? Remark4 { get; set; }
+ public string Remark4 { get; set; }
/// <summary>
/// 鑷畾涔夊瓧娈�5
/// </summary>
[SugarColumn(ColumnName = "REMARK5")]
- public string? Remark5 { get; set; }
+ public string Remark5 { get; set; }
/// <summary>
/// 鐢熶骇杞﹂棿
/// </summary>
[SugarColumn(ColumnName = "PRODUCTION_WORKSHOP")]
- public string? ProductionWorkshop { get; set; }
+ public string ProductionWorkshop { get; set; }
/// <summary>
/// 鐗╂枡灞炴��
/// </summary>
[SugarColumn(ColumnName = "MATERIAL_PROPERTI")]
- public string? MaterialProperti { get; set; }
+ public string MaterialProperti { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "PRODUCE_UNIT")]
+ public string ProduceUnit { get; set; }
+
+ /// <summary>
+ /// 濮斿鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "SUBCON_UNIT")]
+ public string SubconUnit { get; set; }
+
+ /// <summary>
+ /// 鍥剧墖1
+ /// </summary>
+ [SugarColumn(ColumnName = "BZ06")]
+ public string Bz06 { get; set; }
+
+ /// <summary>
+ /// 鍥剧墖2
+ /// </summary>
+ [SugarColumn(ColumnName = "BZ07")]
+ public string Bz07 { get; set; }
+
+ /// <summary>
+ /// 鍥剧墖3
+ /// </summary>
+ [SugarColumn(ColumnName = "BZ08")]
+ public string Bz08 { get; set; }
+
+ /// <summary>
+ /// 鍥剧墖4
+ /// </summary>
+ [SugarColumn(ColumnName = "BZ09")]
+ public string Bz09 { get; set; }
+
+ /// <summary>
+ /// 鍥剧墖5
+ /// </summary>
+ [SugarColumn(ColumnName = "BZ10")]
+ public string Bz10 { get; set; }
+
+ /// <summary>
+ /// QC鍒嗙粍ID
+ /// </summary>
+ [SugarColumn(ColumnName = "QC_TEAMID")]
+ public string QcTeamid { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡ID
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_ID")]
+ public decimal? ItemId { get; set; }
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
\ No newline at end of file
--
Gitblit v1.9.3