From cad9f911a2f0c7a14d62f1503aadd279423caccc Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期二, 22 七月 2025 16:40:32 +0800
Subject: [PATCH] 退料单接口BUG修复
---
StandardPda/MES.Service/Modes/MesItems.cs | 363 ++++++++++++++++++++++++++-------------------------
1 files changed, 187 insertions(+), 176 deletions(-)
diff --git a/StandardPda/MES.Service/Modes/MesItems.cs b/StandardPda/MES.Service/Modes/MesItems.cs
index a5b2101..e3a37e8 100644
--- a/StandardPda/MES.Service/Modes/MesItems.cs
+++ b/StandardPda/MES.Service/Modes/MesItems.cs
@@ -9,518 +9,529 @@
public class MesItems
{
/// <summary>
- /// 鐗╂枡ID
- ///</summary>
+ /// 鐗╂枡ID
+ /// </summary>
[SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
/// <summary>
- /// 宸ュ巶
- ///</summary>
+ /// 宸ュ巶
+ /// </summary>
[SugarColumn(ColumnName = "FACTORY")]
public string? Factory { get; set; }
/// <summary>
- /// 鍏徃缂栧彿
- ///</summary>
+ /// 鍏徃缂栧彿
+ /// </summary>
[SugarColumn(ColumnName = "COMPANY")]
public string? Company { get; set; }
/// <summary>
- /// 鐗╂枡缂栫爜
- ///</summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
[SugarColumn(ColumnName = "ITEM_NO")]
public string? ItemNo { get; set; }
/// <summary>
- /// 鐗╂枡鍚嶇О
- ///</summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
[SugarColumn(ColumnName = "ITEM_NAME")]
public string? ItemName { get; set; }
/// <summary>
- /// 鐗╂枡绠�绉�
- ///</summary>
+ /// 鐗╂枡绠�绉�
+ /// </summary>
[SugarColumn(ColumnName = "ITEM_SNAME")]
public string? ItemSname { get; set; }
/// <summary>
- /// 瑙勬牸鍨嬪彿
- ///</summary>
+ /// 瑙勬牸鍨嬪彿
+ /// </summary>
[SugarColumn(ColumnName = "ITEM_MODEL")]
public string? ItemModel { get; set; }
/// <summary>
- /// 鐗╂枡鎻忚堪
- ///</summary>
+ /// 鐗╂枡鎻忚堪
+ /// </summary>
[SugarColumn(ColumnName = "ITEM_DESCRIPTION")]
public string? ItemDescription { get; set; }
/// <summary>
- /// 鐗╂枡鍗曚綅
- ///</summary>
+ /// 鐗╂枡鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "ITEM_UNIT")]
public string? ItemUnit { get; set; }
/// <summary>
- /// 鐗╂枡绫诲瀷
- ///</summary>
+ /// 鐗╂枡绫诲瀷
+ /// </summary>
[SugarColumn(ColumnName = "ITEM_TYPE")]
public string? ItemType { get; set; }
/// <summary>
- /// 浜у搧鐗堟湰
- ///</summary>
+ /// 浜у搧鐗堟湰
+ /// </summary>
[SugarColumn(ColumnName = "ITEM_VERSION")]
public string? ItemVersion { get; set; }
/// <summary>
- /// 瀹㈡埛缂栧彿
- ///</summary>
+ /// 瀹㈡埛缂栧彿
+ /// </summary>
[SugarColumn(ColumnName = "CUST_NO")]
public string? CustNo { get; set; }
/// <summary>
- /// 鍒涘缓浜�
- ///</summary>
+ /// 鍒涘缓浜�
+ /// </summary>
[SugarColumn(ColumnName = "CREATE_BY")]
public string? CreateBy { get; set; }
/// <summary>
- /// 鍒涘缓鏃堕棿
- ///</summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
[SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- ///</summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ /// </summary>
[SugarColumn(ColumnName = "LASTUPDATE_BY")]
public string? LastupdateBy { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- ///</summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ /// </summary>
[SugarColumn(ColumnName = "LASTUPDATE_DATE")]
public DateTime? LastupdateDate { get; set; }
/// <summary>
- /// 鏈�浣庡簱瀛�
- ///</summary>
+ /// 鏈�浣庡簱瀛�
+ /// </summary>
[SugarColumn(ColumnName = "LOWLIMIT")]
public double? Lowlimit { get; set; }
/// <summary>
- /// 瀹夊叏搴撳瓨閲�
- ///</summary>
+ /// 瀹夊叏搴撳瓨閲�
+ /// </summary>
[SugarColumn(ColumnName = "Safe_Stock")]
public double? SafeStock { get; set; }
/// <summary>
- /// 鏈�澶у簱瀛�
- ///</summary>
+ /// 鏈�澶у簱瀛�
+ /// </summary>
[SugarColumn(ColumnName = "HIGHLIMIT")]
public double? Highlimit { get; set; }
/// <summary>
- /// 鏈�灏忓寘瑁呮暟
- ///</summary>
+ /// 鏈�灏忓寘瑁呮暟
+ /// </summary>
[SugarColumn(ColumnName = "PRD_PACK")]
public double? PrdPack { get; set; }
/// <summary>
- /// 璁㈠崟鍗曚綅
- ///</summary>
+ /// 璁㈠崟鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "ORDERUNIT")]
public string? Orderunit { get; set; }
/// <summary>
- /// 閿�鍞崟浣�
- ///</summary>
+ /// 閿�鍞崟浣�
+ /// </summary>
[SugarColumn(ColumnName = "SALEUNIT")]
public string? Saleunit { get; set; }
/// <summary>
- /// 搴撴埧鍗曚綅
- ///</summary>
+ /// 搴撴埧鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "STOREUNIT")]
public string? Storeunit { get; set; }
-
+
/// <summary>
- /// 鐗╂枡ID
- ///</summary>
+ /// 鐗╂枡ID
+ /// </summary>
[SugarColumn(ColumnName = "E_ITEM_ID")]
public decimal? EItemId { get; set; }
/// <summary>
- /// ERP鏂欏彿
- ///</summary>
+ /// ERP鏂欏彿
+ /// </summary>
[SugarColumn(ColumnName = "ERP_ITEM_NO")]
public string? ErpItemNo { get; set; }
/// <summary>
- /// 榛樿浠撳簱
- ///</summary>
+ /// 榛樿浠撳簱
+ /// </summary>
[SugarColumn(ColumnName = "DEPOT_CODE")]
public string? DepotCode { get; set; }
/// <summary>
- /// 鐗╂枡鍒嗙被缂栧彿
- ///</summary>
+ /// 鐗╂枡鍒嗙被缂栧彿
+ /// </summary>
[SugarColumn(ColumnName = "PPBOM00019124")]
public string? Ppbom00019124 { get; set; }
/// <summary>
- /// 鐗╂枡鍒嗙粍
- ///</summary>
+ /// 鐗╂枡鍒嗙粍
+ /// </summary>
[SugarColumn(ColumnName = "REMARKS")]
public string? Remarks { get; set; }
/// <summary>
- /// 閲囪喘鍛�
- ///</summary>
+ /// 閲囪喘鍛�
+ /// </summary>
[SugarColumn(ColumnName = "FPURCHASERID")]
public string? Fpurchaserid { get; set; }
/// <summary>
- /// 绂佺敤鐘舵��
- ///</summary>
+ /// 绂佺敤鐘舵��
+ /// </summary>
[SugarColumn(ColumnName = "FFORBIDSTATUS")]
public string? Fforbidstatus { get; set; }
/// <summary>
- /// 鐗╂枡鍒嗙粍
- ///</summary>
+ /// 鐗╂枡鍒嗙粍
+ /// </summary>
[SugarColumn(ColumnName = "FMATERIALGROUP")]
public string? Fmaterialgroup { get; set; }
/// <summary>
- /// 瀹屽伐瓒呮敹姣斾緥
- ///</summary>
+ /// 瀹屽伐瓒呮敹姣斾緥
+ /// </summary>
[SugarColumn(ColumnName = "FFINISHRECEIPTOVERRATE")]
public decimal? Ffinishreceiptoverrate { get; set; }
/// <summary>
- /// 鍙戞枡鏂瑰紡
- ///</summary>
+ /// 鍙戞枡鏂瑰紡
+ /// </summary>
[SugarColumn(ColumnName = "FISSUETYPE")]
public string? Fissuetype { get; set; }
/// <summary>
- /// 鍚敤鎵瑰彿绠＄悊
- ///</summary>
+ /// 鍚敤鎵瑰彿绠＄悊
+ /// </summary>
[SugarColumn(ColumnName = "FISBATCHMANAGE")]
public string? Fisbatchmanage { get; set; }
/// <summary>
- /// 閲囪喘鍗曚綅
- ///</summary>
+ /// 閲囪喘鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "FPURCHASEUNITID")]
public string? Fpurchaseunitid { get; set; }
/// <summary>
- /// 鍒涘缓缁勭粐
- ///</summary>
+ /// 鍒涘缓缁勭粐
+ /// </summary>
[SugarColumn(ColumnName = "CREATE_ORG")]
public decimal? CreateOrg { get; set; }
/// <summary>
- /// 浣跨敤缁勭粐
- ///</summary>
+ /// 浣跨敤缁勭粐
+ /// </summary>
[SugarColumn(ColumnName = "USE_ORG")]
public string? UseOrg { get; set; }
/// <summary>
- /// 鎹熻�楃巼
- ///</summary>
+ /// 鎹熻�楃巼
+ /// </summary>
[SugarColumn(ColumnName = "LOSS_PERCENT")]
public string? LossPercent { get; set; }
/// <summary>
- /// 鍔╄鐮�
- ///</summary>
+ /// 鍔╄鐮�
+ /// </summary>
[SugarColumn(ColumnName = "MNEMONIC_CODE")]
public string? MnemonicCode { get; set; }
/// <summary>
- /// 淇濊川鏈�
- ///</summary>
+ /// 淇濊川鏈�
+ /// </summary>
[SugarColumn(ColumnName = "EXP_PERIOD")]
public string? ExpPeriod { get; set; }
/// <summary>
- /// 鐢熶骇杞﹂棿
- ///</summary>
+ /// 鐢熶骇杞﹂棿
+ /// </summary>
[SugarColumn(ColumnName = "PRODUCTION_WORKSHOP")]
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>
+ /// 鐗╂枡灞炴�� 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; }
/// <summary>
- /// 鐢熶骇鍗曚綅
- ///</summary>
+ /// 鐢熶骇鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "PRODUCE_UNIT")]
public string? ProduceUnit { get; set; }
/// <summary>
- /// 濮斿鍗曚綅
- ///</summary>
+ /// 濮斿鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "SUBCON_UNIT")]
public string? SubconUnit { get; set; }
/// <summary>
- /// 鍥剧墖1
- ///</summary>
+ /// 鍥剧墖1
+ /// </summary>
[SugarColumn(ColumnName = "BZ06")]
public string? Bz06 { get; set; }
/// <summary>
- /// 鍥剧墖2
- ///</summary>
+ /// 鍥剧墖2
+ /// </summary>
[SugarColumn(ColumnName = "BZ07")]
public string? Bz07 { get; set; }
/// <summary>
- /// 鍥剧墖3
- ///</summary>
+ /// 鍥剧墖3
+ /// </summary>
[SugarColumn(ColumnName = "BZ08")]
public string? Bz08 { get; set; }
/// <summary>
- /// 鍥剧墖4
- ///</summary>
+ /// 鍥剧墖4
+ /// </summary>
[SugarColumn(ColumnName = "BZ09")]
public string? Bz09 { get; set; }
/// <summary>
- /// 鍥剧墖5
- ///</summary>
+ /// 鍥剧墖5
+ /// </summary>
[SugarColumn(ColumnName = "BZ10")]
public string? Bz10 { get; set; }
/// <summary>
- /// QC鍒嗙粍ID
- ///</summary>
+ /// QC鍒嗙粍ID
+ /// </summary>
[SugarColumn(ColumnName = "QC_TEAMID")]
public string? QcTeamid { get; set; }
/// <summary>
- /// 鐗╂枡ID
- ///</summary>
+ /// 鐗╂枡ID
+ /// </summary>
[SugarColumn(ColumnName = "ITEM_ID")]
public decimal? ItemId { get; set; }
/// <summary>
- /// 棰滆壊
- ///</summary>
+ /// 棰滆壊
+ /// </summary>
[SugarColumn(ColumnName = "COLOR_NAME")]
public string? ColorName { get; set; }
/// <summary>
- /// 璁惧
- ///</summary>
+ /// 璁惧
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_TEXT8")]
public string? FWwcText8 { get; set; }
/// <summary>
- /// 鍔熺巼
- ///</summary>
+ /// 鍔熺巼
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_DECIMAL")]
public string? FWwcDecimal { get; set; }
/// <summary>
- /// 鍗曞皬鏃朵骇鑳�
- ///</summary>
+ /// 鍗曞皬鏃朵骇鑳�
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_DECIMAL1")]
public string? FWwcDecimal1 { get; set; }
/// <summary>
- /// 浜烘暟
- ///</summary>
+ /// 浜烘暟
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_DECIMAL2")]
public string? FWwcDecimal2 { get; set; }
/// <summary>
- /// 浜哄伐灏忔椂宸ヨ祫
- ///</summary>
+ /// 浜哄伐灏忔椂宸ヨ祫
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_DECIMAL3")]
public string? FWwcDecimal3 { get; set; }
/// <summary>
- /// 浜哄伐瀹氶
- ///</summary>
+ /// 浜哄伐瀹氶
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_DECIMAL4")]
public string? FWwcDecimal4 { get; set; }
/// <summary>
- /// 鏍囧噯浜ц兘
- ///</summary>
+ /// 鏍囧噯浜ц兘
+ /// </summary>
[SugarColumn(ColumnName = "FBCN")]
public string? Fbcn { get; set; }
/// <summary>
- /// 閽㈢綉
- ///</summary>
+ /// 閽㈢綉
+ /// </summary>
[SugarColumn(ColumnName = "FGW")]
public string? Fgw { get; set; }
/// <summary>
- /// 娌诲叿
- ///</summary>
+ /// 娌诲叿
+ /// </summary>
[SugarColumn(ColumnName = "FYJ")]
public string? Fyj { get; set; }
/// <summary>
- /// 璁惧
- ///</summary>
+ /// 璁惧
+ /// </summary>
[SugarColumn(ColumnName = "FSB")]
public string? Fsb { get; set; }
/// <summary>
- /// 鍥惧彿
- ///</summary>
+ /// 鍥惧彿
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_TEXT1")]
public string? FWwcText1 { get; set; }
/// <summary>
- /// 妯″叿缂栧彿
- ///</summary>
+ /// 妯″叿缂栧彿
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_TEXT2")]
public string? FWwcText2 { get; set; }
/// <summary>
- /// 妯″叿鍑烘暟
- ///</summary>
+ /// 妯″叿鍑烘暟
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_TEXT3")]
public string? FWwcText3 { get; set; }
/// <summary>
- /// 娉ㄥ鍛ㄦ湡
- ///</summary>
+ /// 娉ㄥ鍛ㄦ湡
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_TEXT4")]
public string? FWwcText4 { get; set; }
/// <summary>
- /// 鍗曞弻鑹�
- ///</summary>
+ /// 鍗曞弻鑹�
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_TEXT5")]
public string? FWwcText5 { get; set; }
/// <summary>
- /// 娉ㄥ浠跺惃浣�
- ///</summary>
+ /// 娉ㄥ浠跺惃浣�
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_TEXT6")]
public string? FWwcText6 { get; set; }
/// <summary>
- /// 澶栭儴鏂欏彿
- ///</summary>
+ /// 澶栭儴鏂欏彿
+ /// </summary>
[SugarColumn(ColumnName = "CATALOG_NO")]
public string? CatalogNo { get; set; }
-
/// <summary>
- /// 棰嗘枡鍗曚綅
- ///</summary>
+ /// 棰嗘枡鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "MATERIAL_OUT_UOMID")]
public string? MaterialOutUomid { get; set; }
/// <summary>
- /// 鐢熶骇閮ㄩ棬
- ///</summary>
+ /// 鐢熶骇閮ㄩ棬
+ /// </summary>
[SugarColumn(ColumnName = "PUB_DESC_SEG38")]
public string? PubDescSeg38 { get; set; }
/// <summary>
- /// 椤圭洰锛堢爺鍙戯級
- ///</summary>
+ /// 椤圭洰锛堢爺鍙戯級
+ /// </summary>
[SugarColumn(ColumnName = "DESCRIPTION")]
public string? Description { get; set; }
/// <summary>
- /// 椤圭洰锛堟姤琛級
- ///</summary>
+ /// 椤圭洰锛堟姤琛級
+ /// </summary>
[SugarColumn(ColumnName = "PRIVATE_DESC_SEG4")]
public string? PrivateDescSeg4 { get; set; }
/// <summary>
- /// 鎶ヨ〃椤圭洰锛堟眹鎬伙級
- ///</summary>
+ /// 鎶ヨ〃椤圭洰锛堟眹鎬伙級
+ /// </summary>
[SugarColumn(ColumnName = "PRIVATE_DESC_SEG9")]
public string? PrivateDescSeg9 { get; set; }
/// <summary>
- /// 鍙屾暟閲�
- ///</summary>
+ /// 鍙屾暟閲�
+ /// </summary>
[SugarColumn(ColumnName = "IS_DUAL_QUANTITY")]
public string? IsDualQuantity { get; set; }
/// <summary>
- /// 鍙屽崟浣�
- ///</summary>
+ /// 鍙屽崟浣�
+ /// </summary>
[SugarColumn(ColumnName = "IS_DUAL_UOM")]
public string? IsDualUom { get; set; }
/// <summary>
- /// 澶氬崟浣�
- ///</summary>
+ /// 澶氬崟浣�
+ /// </summary>
[SugarColumn(ColumnName = "IS_MULTY_UOM")]
public string? IsMultyUom { get; set; }
/// <summary>
- /// 鍥哄畾杞崲鐜�
- ///</summary>
+ /// 鍥哄畾杞崲鐜�
+ /// </summary>
[SugarColumn(ColumnName = "IS_VAR_RATIO")]
public string? IsVarRatio { get; set; }
/// <summary>
- /// 杞崲鐜囩瓥鐣�
- ///</summary>
+ /// 杞崲鐜囩瓥鐣�
+ /// </summary>
[SugarColumn(ColumnName = "CONVER_RATIO_RULE")]
public string? ConverRatioRule { get; set; }
/// <summary>
- /// 鏍囧噯搴撳懆
- ///</summary>
+ /// 鏍囧噯搴撳懆
+ /// </summary>
[SugarColumn(ColumnName = "PRIVATE_DESC_SEG11")]
public string? PrivateDescSeg11 { get; set; }
/// <summary>
- /// 鍝佺墝鍒嗙被
- ///</summary>
+ /// 鍝佺墝鍒嗙被
+ /// </summary>
[SugarColumn(ColumnName = "PRIVATE_DESC_SEG7")]
public string? PrivateDescSeg7 { get; set; }
/// <summary>
- /// BU锛堜笟鍔″崟鍏冿級
- ///</summary>
+ /// BU锛堜笟鍔″崟鍏冿級
+ /// </summary>
[SugarColumn(ColumnName = "PRIVATE_DESC_SEG2")]
public string? PrivateDescSeg2 { get; set; }
/// <summary>
- /// BU锛堜笟鍔″崟鍏冿級
- ///</summary>
+ /// BU锛堜笟鍔″崟鍏冿級
+ /// </summary>
[SugarColumn(ColumnName = "DOCUMENT_STATUS")]
public string? DocumentStatus { get; set; }
/// <summary>
- /// 鏄惁鐢熸晥
- ///</summary>
+ /// 鏄惁鐢熸晥
+ /// </summary>
[SugarColumn(ColumnName = "FORBID_STATUS")]
public string? ForbidStatus { get; set; }
/// <summary>
- /// 鏃х墿鏂欑紪鐮�
- ///</summary>
+ /// 鏃х墿鏂欑紪鐮�
+ /// </summary>
[SugarColumn(ColumnName = "Old_ITEM_NO")]
public string? OldItemNo { get; set; }
+
+ /// <summary>
+ /// 閲囪喘涓氬姟鍛�
+ /// </summary>
+ [SugarColumn(ColumnName = "MERCHANDISER")]
+ public string? Merchandiser { get; set; }
+
+ /// <summary>
+ /// 浠撶鍛�
+ /// </summary>
+ [SugarColumn(ColumnName = "WAREHOUSEKEEPER")]
+ public string? WarehouseKeeper { get; set; }
}
\ No newline at end of file
--
Gitblit v1.9.3