From 2701067facd19ce46f123990abb561009125ece9 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期四, 20 三月 2025 20:21:01 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~sjz/YC

---
 MES.Service/Modes/MesItems.cs |  204 ++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 153 insertions(+), 51 deletions(-)

diff --git a/MES.Service/Modes/MesItems.cs b/MES.Service/Modes/MesItems.cs
index f90f8fa..5265c1a 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>
     ///     鏈�鍚庢洿鏂版椂闂�
@@ -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,7 +204,7 @@
     ///     鍙戞枡鏂瑰紡
     /// </summary>
     [SugarColumn(ColumnName = "FISSUETYPE")]
-    public string Fissuetype { get; set; }
+    public string? Fissuetype { get; set; }
 
     /// <summary>
     ///     鍚敤鎵瑰彿绠＄悊
@@ -216,97 +216,97 @@
     ///     閲囪喘鍗曚綅
     /// </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 = "CREATE_ORG")]
+    public decimal CreateOrg { get; set; }
 
     /// <summary>
-    ///     鑷畾涔夊瓧娈�2
+    ///     浣跨敤缁勭粐
     /// </summary>
-    [SugarColumn(ColumnName = "REMARK2")]
-    public string Remark2 { get; set; }
+    [SugarColumn(ColumnName = "USE_ORG")]
+    public decimal UseOrg { get; set; }
 
     /// <summary>
-    ///     鑷畾涔夊瓧娈�3
+    ///     鎹熻�楃巼
     /// </summary>
-    [SugarColumn(ColumnName = "REMARK3")]
-    public string Remark3 { get; set; }
+    [SugarColumn(ColumnName = "LOSS_PERCENT")]
+    public string? LossPercent { get; set; }
 
     /// <summary>
-    ///     鑷畾涔夊瓧娈�4
+    ///     鍔╄鐮�
     /// </summary>
-    [SugarColumn(ColumnName = "REMARK4")]
-    public string Remark4 { get; set; }
+    [SugarColumn(ColumnName = "MNEMONIC_CODE")]
+    public string? MnemonicCode { get; set; }
 
     /// <summary>
-    ///     鑷畾涔夊瓧娈�5
+    ///     淇濊川鏈�
     /// </summary>
-    [SugarColumn(ColumnName = "REMARK5")]
-    public string Remark5 { get; set; }
+    [SugarColumn(ColumnName = "EXP_PERIOD")]
+    public string? ExpPeriod { 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; }
+    public string? ProduceUnit { get; set; }
 
     /// <summary>
     ///     濮斿鍗曚綅
     /// </summary>
     [SugarColumn(ColumnName = "SUBCON_UNIT")]
-    public string SubconUnit { get; set; }
+    public string? SubconUnit { get; set; }
 
     /// <summary>
     ///     鍥剧墖1
     /// </summary>
     [SugarColumn(ColumnName = "BZ06")]
-    public string Bz06 { get; set; }
+    public string? Bz06 { get; set; }
 
     /// <summary>
     ///     鍥剧墖2
     /// </summary>
     [SugarColumn(ColumnName = "BZ07")]
-    public string Bz07 { get; set; }
+    public string? Bz07 { get; set; }
 
     /// <summary>
     ///     鍥剧墖3
     /// </summary>
     [SugarColumn(ColumnName = "BZ08")]
-    public string Bz08 { get; set; }
+    public string? Bz08 { get; set; }
 
     /// <summary>
     ///     鍥剧墖4
     /// </summary>
     [SugarColumn(ColumnName = "BZ09")]
-    public string Bz09 { get; set; }
+    public string? Bz09 { get; set; }
 
     /// <summary>
     ///     鍥剧墖5
     /// </summary>
     [SugarColumn(ColumnName = "BZ10")]
-    public string Bz10 { get; set; }
+    public string? Bz10 { get; set; }
 
     /// <summary>
     ///     QC鍒嗙粍ID
     /// </summary>
     [SugarColumn(ColumnName = "QC_TEAMID")]
-    public string QcTeamid { get; set; }
+    public string? QcTeamid { get; set; }
 
     /// <summary>
     ///     鐗╂枡ID
@@ -314,5 +314,107 @@
     [SugarColumn(ColumnName = "ITEM_ID")]
     public decimal? ItemId { get; set; }
 
+    /// <summary>
+    ///     棰滆壊
+    /// </summary>
+    [SugarColumn(ColumnName = "COLOR_NAME")]
+    public string? ColorName { get; set; }
+
+    /// <summary>
+    ///     璁惧
+    /// </summary>
+    [SugarColumn(ColumnName = "F_WWC_TEXT8")]
+    public string? F_WWC_TEXT8 { get; set; }
+
+    /// <summary>
+    ///     鍔熺巼
+    /// </summary>
+    [SugarColumn(ColumnName = "F_WWC_DECIMAL")]
+    public string? F_WWC_DECIMAL { get; set; }
+
+    /// <summary>
+    ///     鍗曞皬鏃朵骇鑳�
+    /// </summary>
+    [SugarColumn(ColumnName = "F_WWC_DECIMAL1")]
+    public string? F_WWC_DECIMAL1 { get; set; }
+
+    /// <summary>
+    ///     浜烘暟
+    /// </summary>
+    [SugarColumn(ColumnName = "F_WWC_DECIMAL2")]
+    public string? F_WWC_DECIMAL2 { get; set; }
+
+    /// <summary>
+    ///     浜哄伐灏忔椂宸ヨ祫
+    /// </summary>
+    [SugarColumn(ColumnName = "F_WWC_DECIMAL3")]
+    public string? F_WWC_DECIMAL3 { get; set; }
+
+    /// <summary>
+    ///     浜哄伐瀹氶
+    /// </summary>
+    [SugarColumn(ColumnName = "F_WWC_DECIMAL4")]
+    public string? F_WWC_DECIMAL4 { get; set; }
+
+    /// <summary>
+    ///     鏍囧噯浜ц兘
+    /// </summary>
+    [SugarColumn(ColumnName = "FBCN")]
+    public string? FBCN { get; set; }
+
+    /// <summary>
+    ///     閽㈢綉
+    /// </summary>
+    [SugarColumn(ColumnName = "FGW")]
+    public string? FGW { get; set; }
+
+    /// <summary>
+    ///     娌诲叿
+    /// </summary>
+    [SugarColumn(ColumnName = "FYJ")]
+    public string? FYJ { get; set; }
+
+    /// <summary>
+    ///     璁惧
+    /// </summary>
+    [SugarColumn(ColumnName = "FSB")]
+    public string? FSB { get; set; }
+
+    /// <summary>
+    ///     鍥惧彿
+    /// </summary>
+    [SugarColumn(ColumnName = "F_WWC_TEXT1")]
+    public string? F_WWC_TEXT1 { get; set; }
+
+    /// <summary>
+    ///     妯″叿缂栧彿
+    /// </summary>
+    [SugarColumn(ColumnName = "F_WWC_TEXT2")]
+    public string? F_WWC_TEXT2 { get; set; }
+
+    /// <summary>
+    ///     妯″叿鍑烘暟
+    /// </summary>
+    [SugarColumn(ColumnName = "F_WWC_TEXT3")]
+    public string? F_WWC_TEXT3 { get; set; }
+
+    /// <summary>
+    ///     娉ㄥ鍛ㄦ湡
+    /// </summary>
+    [SugarColumn(ColumnName = "F_WWC_TEXT4")]
+    public string? F_WWC_TEXT4 { get; set; }
+
+    /// <summary>
+    ///     鍗曞弻鑹�
+    /// </summary>
+    [SugarColumn(ColumnName = "F_WWC_TEXT5")]
+    public string? F_WWC_TEXT5 { get; set; }
+
+    /// <summary>
+    ///     娉ㄥ浠跺惃浣�
+    /// </summary>
+    [SugarColumn(ColumnName = "F_WWC_TEXT6")]
+    public string? F_WWC_TEXT6 { get; set; }
+
     [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
 }
\ No newline at end of file

--
Gitblit v1.9.3