From 6ceea5f0d142f3c1fe9c9eff8c497df02fa8f2ad Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 05 十一月 2024 13:01:41 +0800
Subject: [PATCH] 11
---
MES.Service/Modes/Womcab.cs | 20 +++++++++++++++++++-
MES.Service/Dto/webApi/ErpCAB.cs | 11 ++++++++---
MES.Service/Modes/Womcaa.cs | 12 +++---------
MES.Service/Dto/webApi/ErpCAA.cs | 2 ++
MES.Service/service/WomcaaManager.cs | 9 +++++++--
5 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpCAA.cs b/MES.Service/Dto/webApi/ErpCAA.cs
index a53041f..117dbd8 100644
--- a/MES.Service/Dto/webApi/ErpCAA.cs
+++ b/MES.Service/Dto/webApi/ErpCAA.cs
@@ -43,4 +43,6 @@
public string? PLAN_NUM { get; set; }
public string? FPrdOrgId { get; set; }
public string? FEnTrustOrgId { get; set; }
+
+ public string? Btbz { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpCAB.cs b/MES.Service/Dto/webApi/ErpCAB.cs
index e5d06ed..c8d16d8 100644
--- a/MES.Service/Dto/webApi/ErpCAB.cs
+++ b/MES.Service/Dto/webApi/ErpCAB.cs
@@ -13,7 +13,7 @@
public string? FMTONO { get; set; }
public string? FLot { get; set; }
public string? FStockID { get; set; }
- public string? FIssueType { get; set; }
+ public string? FIssueType { get; set; }
public string? FUnitID { get; set; }
public string? FSupplyType { get; set; }
public string? FStdQty { get; set; }
@@ -21,9 +21,9 @@
public string? FNumerator { get; set; }
public string? FDenominator { get; set; }
public string? FENTRYID { get; set; }
-
+
public string? PID { get; set; }
-
+
public string Id { get; set; }
public string? FSeq { get; set; }
@@ -31,4 +31,9 @@
public string? FFixScrapQty { get; set; }
public string? FScrapRate { get; set; }
+
+ public string? FReplaceGroup { get; set; }
+ public string? FUseRate { get; set; }
+ public string? FMaterialType { get; set; }
+ public string? FMustQty { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/Womcaa.cs b/MES.Service/Modes/Womcaa.cs
index 7201ad1..8cd3042 100644
--- a/MES.Service/Modes/Womcaa.cs
+++ b/MES.Service/Modes/Womcaa.cs
@@ -399,14 +399,8 @@
public string? Fpurorderentryseq { get; set; }
/// <summary>
- /// 鐢垫皵浜у搧鍨嬪彿
+ /// 澶囨敞锛堣〃浣擄級
/// </summary>
- [SugarColumn(ColumnName = "ELECTRICAL_PRODUCT_MODEL")]
- public string? ElectricalProductModel { get; set; }
-
- /// <summary>
- /// 鐢垫皵浜у搧鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "ELECTRICAL_PRODUCT_NAME")]
- public string? ElectricalProductName { get; set; }
+ [SugarColumn(ColumnName = "Btbz")]
+ public string? Btbz { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/Womcab.cs b/MES.Service/Modes/Womcab.cs
index e8c82a6..cf9139a 100644
--- a/MES.Service/Modes/Womcab.cs
+++ b/MES.Service/Modes/Womcab.cs
@@ -48,7 +48,7 @@
/// 宸查鐢ㄩ噺
/// </summary>
[SugarColumn(ColumnName = "CAB007")]
- public int? Cab007 { get; set; }
+ public decimal? Cab007 { get; set; }
/// <summary>
/// 宸ヨ壓
@@ -228,4 +228,22 @@
/// </summary>
[SugarColumn(ColumnName = "FUNITID")]
public string? Funitid { get; set; }
+
+ /// <summary>
+ /// 搴斿彂鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "Must_Qty")]
+ public decimal? MustQty { get; set; }
+
+ /// <summary>
+ /// 浣跨敤姣斾緥锛�%锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "Use_Rate")]
+ public decimal? UseRate { get; set; }
+
+ /// <summary>
+ /// 瀛愰」绫诲瀷 1鏍囧噯浠� 2杩旇繕浠� 3鏇夸唬浠�
+ /// </summary>
+ [SugarColumn(ColumnName = "Material_Type")]
+ public string? MaterialType { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index f8396d6..d7df90b 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -65,7 +65,7 @@
var baOrUpdate = db.Insertable(mesWomcabs).PageSize(1)
.IgnoreColumnsNull()
.ExecuteCommand() > 0;
-
+
if (orUpdate && baOrUpdate) return true;
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
@@ -133,6 +133,7 @@
//Caa015 = dto.F_UNW_Text_xsddh, /// 閿�鍞鍗曞彿
ErpSczz = Convert.ToInt32(dto.FPrdOrgId), /// 鐢熶骇缁勭粐ID
ErpWtzz = Convert.ToInt32(dto.FEnTrustOrgId), /// 濮旀墭缁勭粐ID
+ Btbz = dto.Btbz, /// 濮旀墭缁勭粐ID
//Caa015Head = dto.F_XIFG_Integer_tzk, /// 閿�鍞鍗曡鍙�
//MainProductNo = dto.F_XIFG_Base_w5c, /// 涓讳骇鍝佺紪鐮�
// MainProductQty =
@@ -189,7 +190,11 @@
Eid = Convert.ToInt32(dto.Id), /// ERP ID
Scrapqty = dto.FFixScrapQty, /// 鍥哄畾鎹熻��
- Scraprate = dto.FScrapRate /// 鍙樺姩鎹熻�楃巼
+ Scraprate = dto.FScrapRate, /// 鍙樺姩鎹熻�楃巼
+ Freplacegroup = dto.FReplaceGroup,
+ UseRate = Convert.ToDecimal(dto.FUseRate),
+ MaterialType = dto.FMaterialType,
+ MustQty = Convert.ToDecimal(dto.FMustQty)
// Fsaleorderno = dto.FSALEORDERNO, /// 閿�鍞鍗�
//
// CustomerItemNumber = dto.F_XIFG_Text_re5, /// 瀹㈡埛璐у彿
--
Gitblit v1.9.3