From 7d66f12e74e6b0566331a0406da020bce387c807 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期二, 18 三月 2025 15:20:46 +0800
Subject: [PATCH] ERP生产订单接口字段完善
---
StandardPda/MES.Service/service/WomcaaManager.cs | 16 ++++++++--------
StandardPda/MES.Service/Modes/Womcab.cs | 32 ++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/StandardPda/MES.Service/Modes/Womcab.cs b/StandardPda/MES.Service/Modes/Womcab.cs
index cb15d19..970af7d 100644
--- a/StandardPda/MES.Service/Modes/Womcab.cs
+++ b/StandardPda/MES.Service/Modes/Womcab.cs
@@ -199,4 +199,36 @@
/// </summary>
[SugarColumn(ColumnName = "FMATERIALTYPE")]
public decimal? Fmaterialtype { get; set; }
+
+
+ /// <summary>
+ /// 搴斿彂鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "MUST_QTY", ColumnDataType = "NUMBER(18,3)")]
+ public decimal? MustQty { get; set; }
+
+ /// <summary>
+ /// 鐢ㄦ枡娓呭崟鐘舵�侊紙A-鍒涘缓锛孊-瀹℃牳涓紝C-宸插鏍革紝D-閲嶆柊瀹℃牳锛孼-鏆傚瓨锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "TYPEB", Length = 2)]
+ public string? TypeB { get; set; }
+
+
+ /// <summary>
+ /// 瀛愰」绫诲瀷锛�1-鏍囧噯浠� 2-杩旇繕浠� 3-鏇夸唬浠讹級
+ /// </summary>
+ [SugarColumn(ColumnName = "MATERIAL_TYPE", Length = 1)]
+ public string? MaterialType { get; set; }
+
+ /// <summary>
+ /// 浣跨敤姣斾緥锛�%锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "USE_RATE", ColumnDataType = "NUMBER(5,2)")]
+ public decimal? UseRate { get; set; }
+
+ /// <summary>
+ /// 椤规
+ /// </summary>
+ [SugarColumn(ColumnName = "FREPLACEGROUP", ColumnDataType = "NUMBER(5,2)")]
+ public decimal? FreplaceGroup { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/service/WomcaaManager.cs b/StandardPda/MES.Service/service/WomcaaManager.cs
index 91db2b7..12dfdad 100644
--- a/StandardPda/MES.Service/service/WomcaaManager.cs
+++ b/StandardPda/MES.Service/service/WomcaaManager.cs
@@ -144,7 +144,7 @@
Cab002 = dto.FSeq,
Cab003 = dto.FMaterialID,
Cab006 = Convert.ToDecimal(dto.FNeedQty),
- //MustQty = Convert.ToDecimal(dto.FMustQty),
+ MustQty = Convert.ToDecimal(dto.FMustQty),
Cab007 = Convert.ToDecimal(dto.FPickedQty),
PositionNo = dto.FPositionNO,
SupplyOrganization = dto.FChildSupplyOrgId,
@@ -157,17 +157,17 @@
Cab009 = dto.FUnitID,
SupplyType = dto.FSupplyType,
Cab012 = Convert.ToDecimal(dto.FStdQty),
- // Freplacegroup = Convert.ToInt32(dto.FReplaceGroup),
- // UseRate = Convert.ToDecimal(dto.FUseRate),
- // MaterialType = dto.FMaterialType,
+ FreplaceGroup = Convert.ToInt32(dto.FReplaceGroup),
+ UseRate = Convert.ToDecimal(dto.FUseRate),
+ MaterialType = dto.FMaterialType,
Cab014 = Convert.ToInt32(dto.FIsKeyItem),
Numerator = Convert.ToDecimal(dto.FNumerator),
Denominator = Convert.ToDecimal(dto.FDenominator),
Pid = Convert.ToDecimal(dto.FID),
- Eid = Convert.ToDecimal(dto.FID)
- // SCRAPQTY = Convert.ToDecimal(dto.FFixScrapQty),
- // SCRAPRATE = Convert.ToDecimal(dto.FScrapRate),
- // Typeb = dto.TypeB,
+ Eid = Convert.ToDecimal(dto.FID),
+ Scrapqty = Convert.ToDecimal(dto.FFixScrapQty),
+ Scraprate = Convert.ToDecimal(dto.FScrapRate),
+ TypeB = dto.TypeB
// WR_F_XIFG_Base_qtr = dto.F_XIFG_Base_qtr,
// WR_F_XIFG_Base_83g = dto.F_XIFG_Base_83g
};
--
Gitblit v1.9.3