From b646b9bee3991eb91fb916a290e5efb33eb5f68c Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期五, 18 四月 2025 19:13:40 +0800
Subject: [PATCH] 代码提交
---
StandardPda/MES.Service/Modes/MesItems.cs | 295 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 215 insertions(+), 80 deletions(-)
diff --git a/StandardPda/MES.Service/Modes/MesItems.cs b/StandardPda/MES.Service/Modes/MesItems.cs
index 71834a9..671fa72 100644
--- a/StandardPda/MES.Service/Modes/MesItems.cs
+++ b/StandardPda/MES.Service/Modes/MesItems.cs
@@ -27,7 +27,7 @@
public string? Company { get; set; }
/// <summary>
- /// 鐗╂枡缂栫爜 = ERP鐗╂枡缂栧彿||棰滆壊缂栧彿
+ /// 鐗╂枡缂栫爜
/// </summary>
[SugarColumn(ColumnName = "ITEM_NO")]
public string? ItemNo { get; set; }
@@ -111,6 +111,12 @@
public double? Lowlimit { get; set; }
/// <summary>
+ /// 瀹夊叏搴撳瓨閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "Safe_Stock")]
+ public double? SafeStock { get; set; }
+
+ /// <summary>
/// 鏈�澶у簱瀛�
/// </summary>
[SugarColumn(ColumnName = "HIGHLIMIT")]
@@ -141,12 +147,6 @@
public string? Storeunit { get; set; }
/// <summary>
- /// 鐢熶骇鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "PRODUCTUNIT")]
- public string? Productunit { get; set; }
-
- /// <summary>
/// 鐗╂枡ID
/// </summary>
[SugarColumn(ColumnName = "E_ITEM_ID")]
@@ -156,7 +156,7 @@
/// ERP鏂欏彿
/// </summary>
[SugarColumn(ColumnName = "ERP_ITEM_NO")]
- public string? ErpItemNo { get; set; }
+ public string? ErpItemNo { get; set; }
/// <summary>
/// 榛樿浠撳簱
@@ -210,7 +210,7 @@
/// 鍚敤鎵瑰彿绠＄悊
/// </summary>
[SugarColumn(ColumnName = "FISBATCHMANAGE")]
- public decimal? Fisbatchmanage { get; set; }
+ public string? Fisbatchmanage { get; set; }
/// <summary>
/// 閲囪喘鍗曚綅
@@ -222,13 +222,13 @@
/// 鍒涘缓缁勭粐
/// </summary>
[SugarColumn(ColumnName = "CREATE_ORG")]
- public decimal CreateOrg { get; set; }
+ public decimal? CreateOrg { get; set; }
/// <summary>
/// 浣跨敤缁勭粐
/// </summary>
[SugarColumn(ColumnName = "USE_ORG")]
- public decimal UseOrg { get; set; }
+ public string? UseOrg { get; set; }
/// <summary>
/// 鎹熻�楃巼
@@ -255,7 +255,11 @@
public string? ProductionWorkshop { get; set; }
/// <summary>
- /// 鐗╂枡灞炴��
+ /// 鐗╂枡灞炴�� 0=妯″瀷锛�1=鎸夎鍗曟嫞璐э紝2=鎸夎鍗曡閰嶏紝3=鍙�夌被锛�4=濮斿鍔犲伐浠讹紝
+ /// 5=宸ュ簭濮斿浠讹紝6=铏氭嫙锛�7=璁″垝锛�8=绯诲垪锛�9=閲囪喘浠讹紝10=鍒堕�犱欢锛�
+ /// 11=鏈�缁堣閰嶄欢锛�12=濂椾欢锛�13=宸ヨ壓锛�14=浣庡�兼槗鑰楀搧锛�15=鍟嗗搧锛�
+ /// 16=鏉傞」鏂欏搧锛�17=鏈嶅姟锛�18=璧勪骇锛�19=澶囦欢锛�20=閰嶆柟锛�
+ /// 21=閲嶅锛�22=璐圭敤鎬ф枡鍝�
/// </summary>
[SugarColumn(ColumnName = "MATERIAL_PROPERTI")]
public string? MaterialProperti { get; set; }
@@ -320,82 +324,213 @@
[SugarColumn(ColumnName = "COLOR_NAME")]
public string? ColorName { get; set; }
- [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
+ /// <summary>
+ /// 璁惧
+ /// </summary>
+ [SugarColumn(ColumnName = "F_WWC_TEXT8")]
+ public string? FWwcText8 { get; set; }
/// <summary>
- /// 鎺ュ彛瀛楁璋冩暣锛氭爣鍑嗙増鎺ュ彛鏂板瀛楁銆�
+ /// 鍔熺巼
/// </summary>
- /// <remarks>
- /// 淇敼浜猴細<姹犲崡楠�>
- /// 淇敼鏃ユ湡锛�<2024-12-31>
- /// 淇敼璇存槑锛�
- /// - 鍘熶唬鐮侊細绌�
- /// - 鏂板锛�
- /// </remarks>
+ [SugarColumn(ColumnName = "F_WWC_DECIMAL")]
+ public string? FWwcDecimal { get; set; }
+
+ /// <summary>
+ /// 鍗曞皬鏃朵骇鑳�
+ /// </summary>
+ [SugarColumn(ColumnName = "F_WWC_DECIMAL1")]
+ public string? FWwcDecimal1 { get; set; }
+
+ /// <summary>
+ /// 浜烘暟
+ /// </summary>
+ [SugarColumn(ColumnName = "F_WWC_DECIMAL2")]
+ public string? FWwcDecimal2 { get; set; }
+
+ /// <summary>
+ /// 浜哄伐灏忔椂宸ヨ祫
+ /// </summary>
+ [SugarColumn(ColumnName = "F_WWC_DECIMAL3")]
+ public string? FWwcDecimal3 { get; set; }
+
+ /// <summary>
+ /// 浜哄伐瀹氶
+ /// </summary>
+ [SugarColumn(ColumnName = "F_WWC_DECIMAL4")]
+ public string? FWwcDecimal4 { 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? FWwcText1 { get; set; }
+
+ /// <summary>
+ /// 妯″叿缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "F_WWC_TEXT2")]
+ public string? FWwcText2 { get; set; }
+
+ /// <summary>
+ /// 妯″叿鍑烘暟
+ /// </summary>
+ [SugarColumn(ColumnName = "F_WWC_TEXT3")]
+ public string? FWwcText3 { get; set; }
+
+ /// <summary>
+ /// 娉ㄥ鍛ㄦ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "F_WWC_TEXT4")]
+ public string? FWwcText4 { get; set; }
+
+ /// <summary>
+ /// 鍗曞弻鑹�
+ /// </summary>
+ [SugarColumn(ColumnName = "F_WWC_TEXT5")]
+ public string? FWwcText5 { get; set; }
+
+ /// <summary>
+ /// 娉ㄥ浠跺惃浣�
+ /// </summary>
+ [SugarColumn(ColumnName = "F_WWC_TEXT6")]
+ public string? FWwcText6 { get; set; }
+
+ /// <summary>
+ /// 澶栭儴鏂欏彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CATALOG_NO")]
+ public string? CatalogNo { get; set; }
+
+
+ /// <summary>
+ /// 棰嗘枡鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "MATERIAL_OUT_UOMID")]
+ public string? MaterialOutUomid { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇閮ㄩ棬
+ /// </summary>
+ [SugarColumn(ColumnName = "PUB_DESC_SEG38")]
+ public string? PubDescSeg38 { get; set; }
+
+ /// <summary>
+ /// 椤圭洰锛堢爺鍙戯級
+ /// </summary>
+ [SugarColumn(ColumnName = "DESCRIPTION")]
+ public string? Description { get; set; }
+
+ /// <summary>
+ /// 椤圭洰锛堟姤琛級
+ /// </summary>
+ [SugarColumn(ColumnName = "PRIVATE_DESC_SEG4")]
+ public string? PrivateDescSeg4 { get; set; }
+
+ /// <summary>
+ /// 鎶ヨ〃椤圭洰锛堟眹鎬伙級
+ /// </summary>
+ [SugarColumn(ColumnName = "PRIVATE_DESC_SEG9")]
+ public string? PrivateDescSeg9 { get; set; }
+
+ /// <summary>
+ /// 鍙屾暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "IS_DUAL_QUANTITY")]
+ public string? IsDualQuantity { get; set; }
+
+ /// <summary>
+ /// 鍙屽崟浣�
+ /// </summary>
+ [SugarColumn(ColumnName = "IS_DUAL_UOM")]
+ public string? IsDualUom { get; set; }
+
+ /// <summary>
+ /// 澶氬崟浣�
+ /// </summary>
+ [SugarColumn(ColumnName = "IS_MULTY_UOM")]
+ public string? IsMultyUom { get; set; }
+
+ /// <summary>
+ /// 鍥哄畾杞崲鐜�
+ /// </summary>
+ [SugarColumn(ColumnName = "IS_VAR_RATIO")]
+ public string? IsVarRatio { get; set; }
+
+ /// <summary>
+ /// 杞崲鐜囩瓥鐣�
+ /// </summary>
+ [SugarColumn(ColumnName = "CONVER_RATIO_RULE")]
+ public string? ConverRatioRule { get; set; }
+
+ /// <summary>
+ /// 鏍囧噯搴撳懆
+ /// </summary>
+ [SugarColumn(ColumnName = "PRIVATE_DESC_SEG11")]
+ public string? PrivateDescSeg11 { get; set; }
+
+ /// <summary>
+ /// 鍝佺墝鍒嗙被
+ /// </summary>
+ [SugarColumn(ColumnName = "PRIVATE_DESC_SEG7")]
+ public string? PrivateDescSeg7 { get; set; }
+
+ /// <summary>
+ /// BU锛堜笟鍔″崟鍏冿級
+ /// </summary>
+ [SugarColumn(ColumnName = "PRIVATE_DESC_SEG2")]
+ public string? PrivateDescSeg2 { get; set; }
+
+ /// <summary>
+ /// BU锛堜笟鍔″崟鍏冿級
+ /// </summary>
+ [SugarColumn(ColumnName = "DOCUMENT_STATUS")]
+ public string? DocumentStatus { get; set; }
+
+ /// <summary>
+ /// 鏄惁鐢熸晥
+ /// </summary>
+ [SugarColumn(ColumnName = "FORBID_STATUS")]
+ public string? ForbidStatus { get; set; }
/// <summary>
/// 鏃х墿鏂欑紪鐮�
/// </summary>
- [SugarColumn(ColumnName = "FOLDNUMBER")]
- public string? FOLDNUMBER { get; set; }
+ [SugarColumn(ColumnName = "Old_ITEM_NO")]
+ public string? OldItemNo { get; set; }
+ /// <summary>
+ /// 閲囪喘涓氬姟鍛�
+ /// </summary>
+ [SugarColumn(ColumnName = "MERCHANDISER")]
+ public string? Merchandiser { get; set; }
/// <summary>
- /// 鏈�灏忓簱瀛�
+ /// 浠撶鍛�
/// </summary>
- [SugarColumn(ColumnName = "FMINSTOCK")]
- public double? FMINSTOCK { get; set; }
-
- /// <summary>
- /// 鍏ュ簱娆犳敹姣斾緥(%)
- /// </summary>
- [SugarColumn(ColumnName = "FFINISHRECEIPTSHORTRATE")]
- public decimal? FFINISHRECEIPTSHORTRATE { get; set; }
-
- /// <summary>
- /// 榛樿渚涘簲鍟�
- /// </summary>
- [SugarColumn(ColumnName = "FDEFAULTVENDOR")]
- public string? FDEFAULTVENDOR { get; set; }
-
- /// <summary>
- /// 鏁版嵁鐘舵��(Z=鏆傚瓨,A=鍒涘缓,B=瀹℃牳涓�,C=宸插鏍�,D=閲嶆柊瀹℃牳)
- /// </summary>
- [SugarColumn(ColumnName = "FDOCUMENTSTATUS")]
- public string? FDOCUMENTSTATUS { get; set; }
-
- /// <summary>
- /// 鍒堕�犵瓥鐣�
- /// </summary>
- [SugarColumn(ColumnName = "FMFGPOLICYID")]
- public string? FMFGPOLICYID { get; set; }
-
- /// <summary>
- /// 瀛愰」鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "FBOMUNITID")]
- public string? FBOMUNITID { get; set; }
-
- /// <summary>
- /// 鏄惁鍏抽敭浠�
- /// </summary>
- [SugarColumn(ColumnName = "FISKITTING")]
- public string? FISKITTING { get; set; }
-
- /// <summary>
- /// 鍙负鑱斿壇浜у搧
- /// </summary>
- [SugarColumn(ColumnName = "FISCOBY")]
- public string? FISCOBY { get; set; }
-
- /// <summary>
- /// 瓒呭彂鎺у埗鏂瑰紡
- /// </summary>
- [SugarColumn(ColumnName = "FOVERCONTROLMODE")]
- public string? FOVERCONTROLMODE { get; set; }
- /// <summary>
- /// 妯″叿缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "F_MJBH")]
- public string? F_MJBH { get; set; }
-
+ [SugarColumn(ColumnName = "WAREHOUSEKEEPER")]
+ public string? WarehouseKeeper { get; set; }
}
\ No newline at end of file
--
Gitblit v1.9.3