From 3471985a65fe86eeaa671ea2b6ebd5e7016de38a Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 23 十二月 2024 08:27:15 +0800
Subject: [PATCH] 111
---
MES.Service/Modes/Womcab.cs | 324 +++++++++++++++++++++++----------------------
MES.Service/Modes/ProductionOrderSub.cs | 6
MES.Service/Dto/webApi/ErpCAB.cs | 2
MES.Service/Modes/Womcaa.cs | 6
MES.Service/Dto/webApi/ErpCAA.cs | 1
MES.Service/Dto/webApi/ErpProductionOrderDto.cs | 10
MES.Service/Modes/ProductionOrder.cs | 6
MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs | 2
MES.Service/service/WomcaaManager.cs | 7
MES.Service/service/BasicData/ProductionOrderManager.cs | 2
10 files changed, 185 insertions(+), 181 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpCAA.cs b/MES.Service/Dto/webApi/ErpCAA.cs
index f951d4e..5851070 100644
--- a/MES.Service/Dto/webApi/ErpCAA.cs
+++ b/MES.Service/Dto/webApi/ErpCAA.cs
@@ -46,5 +46,4 @@
public string? Btbz { get; set; }
public string? TypeA { get; set; }
- public string? TypeB { 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 d1620c8..7948eea 100644
--- a/MES.Service/Dto/webApi/ErpCAB.cs
+++ b/MES.Service/Dto/webApi/ErpCAB.cs
@@ -34,4 +34,6 @@
public string? FUseRate { get; set; }
public string? FMaterialType { get; set; }
public string? FMustQty { get; set; }
+
+ public string? TypeB { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpProductionOrderDto.cs b/MES.Service/Dto/webApi/ErpProductionOrderDto.cs
index 51aba28..c61d444 100644
--- a/MES.Service/Dto/webApi/ErpProductionOrderDto.cs
+++ b/MES.Service/Dto/webApi/ErpProductionOrderDto.cs
@@ -41,10 +41,10 @@
public string? FBaseNoStockInQty { get; set; } // 鏈叆搴撴暟閲�
public string? FInStockOwnerId { get; set; } // 鍏ュ簱璐т富
- public string? PlanConfirmation { get; set; }
- public string? FReqSrc { get; set; }
- public string? SrcSplitSeq { get; set; }
- public string? TypeA { get; set; }
- public string? TypeB { get; set; }
+ public string? PlanConfirmation { get; set; }
+ public string? FReqSrc { get; set; }
+ public string? SrcSplitSeq { get; set; }
+ public string? TypeA { get; set; }
+
// public string? FSUPPLIERID { get; set; } // 渚涘簲鍟咺D
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs b/MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs
index 8e2e890..895b238 100644
--- a/MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs
+++ b/MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs
@@ -37,4 +37,6 @@
public string? FNEEDDATE { get; set; }
public string? FRESERVETYPE { get; set; }
public string? FMEMO { get; set; }
+
+ public string? TypeB { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/ProductionOrder.cs b/MES.Service/Modes/ProductionOrder.cs
index 52fd9fe..8217687 100644
--- a/MES.Service/Modes/ProductionOrder.cs
+++ b/MES.Service/Modes/ProductionOrder.cs
@@ -351,10 +351,4 @@
/// </summary>
[SugarColumn(ColumnName = "TYPEA")]
public string? Typea { get; set; }
-
- /// <summary>
- /// A锛屽垱寤� B锛屽鏍镐腑 C锛屽凡瀹℃牳 D锛岄噸鏂板鏍� Z锛屾殏瀛�
- /// </summary>
- [SugarColumn(ColumnName = "TYPEB")]
- public string? Typeb { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/ProductionOrderSub.cs b/MES.Service/Modes/ProductionOrderSub.cs
index 8c28b81..33452b3 100644
--- a/MES.Service/Modes/ProductionOrderSub.cs
+++ b/MES.Service/Modes/ProductionOrderSub.cs
@@ -292,4 +292,10 @@
/// </summary>
[SugarColumn(ColumnName = "FMEMO")]
public string? Fmemo { get; set; }
+
+ /// <summary>
+ /// A锛屽垱寤� B锛屽鏍镐腑 C锛屽凡瀹℃牳 D锛岄噸鏂板鏍� Z锛屾殏瀛�
+ /// </summary>
+ [SugarColumn(ColumnName = "TYPEB")]
+ public string? Typeb { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/Womcaa.cs b/MES.Service/Modes/Womcaa.cs
index 55f51da..85694b4 100644
--- a/MES.Service/Modes/Womcaa.cs
+++ b/MES.Service/Modes/Womcaa.cs
@@ -420,10 +420,4 @@
/// </summary>
[SugarColumn(ColumnName = "TYPEA")]
public string? Typea { get; set; }
-
- /// <summary>
- /// A锛屽垱寤� B锛屽鏍镐腑 C锛屽凡瀹℃牳 D锛岄噸鏂板鏍� Z锛屾殏瀛�
- /// </summary>
- [SugarColumn(ColumnName = "TYPEB")]
- public string? Typeb { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/Womcab.cs b/MES.Service/Modes/Womcab.cs
index 46ec80d..5288f84 100644
--- a/MES.Service/Modes/Womcab.cs
+++ b/MES.Service/Modes/Womcab.cs
@@ -8,242 +8,248 @@
[SugarTable("WOMCAB")]
public class Womcab
{
- /// <summary>
- /// 榛樿鍊�: (newid())
- /// </summary>
- [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
+ /// <summary>
+ /// 榛樿鍊�: (newid())
+ /// </summary>
+ [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
public Guid Guid { get; set; }
- /// <summary>
- /// ERPID
- /// </summary>
- [SugarColumn(ColumnName = "ERPID")]
+ /// <summary>
+ /// ERPID
+ /// </summary>
+ [SugarColumn(ColumnName = "ERPID")]
public int? Erpid { get; set; }
- /// <summary>
- /// 宸ュ崟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "CAB001")]
+ /// <summary>
+ /// 宸ュ崟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CAB001")]
public string Cab001 { get; set; }
- /// <summary>
- /// 搴忓彿
- /// </summary>
- [SugarColumn(ColumnName = "CAB002")]
+ /// <summary>
+ /// 搴忓彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CAB002")]
public int? Cab002 { get; set; }
- /// <summary>
- /// 鏉愭枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "CAB003")]
+ /// <summary>
+ /// 鏉愭枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "CAB003")]
public string Cab003 { get; set; }
- /// <summary>
- /// 闇�棰嗙敤閲�
- /// </summary>
- [SugarColumn(ColumnName = "CAB006")]
+ /// <summary>
+ /// 闇�棰嗙敤閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "CAB006")]
public decimal? Cab006 { get; set; }
- /// <summary>
- /// 宸查鐢ㄩ噺
- /// </summary>
- [SugarColumn(ColumnName = "CAB007")]
+ /// <summary>
+ /// 宸查鐢ㄩ噺
+ /// </summary>
+ [SugarColumn(ColumnName = "CAB007")]
public decimal? Cab007 { get; set; }
- /// <summary>
- /// 宸ヨ壓
- /// </summary>
- [SugarColumn(ColumnName = "CAB008")]
+ /// <summary>
+ /// 宸ヨ壓
+ /// </summary>
+ [SugarColumn(ColumnName = "CAB008")]
public string Cab008 { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "CAB009")]
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "CAB009")]
public string Cab009 { get; set; }
- /// <summary>
- /// 缁勬垚鐢ㄩ噺
- /// </summary>
- [SugarColumn(ColumnName = "CAB012")]
+ /// <summary>
+ /// 缁勬垚鐢ㄩ噺
+ /// </summary>
+ [SugarColumn(ColumnName = "CAB012")]
public decimal? Cab012 { get; set; }
- /// <summary>
- /// 鏄惁鏇挎枡
- /// </summary>
- [SugarColumn(ColumnName = "CAB014")]
+ /// <summary>
+ /// 鏄惁鏇挎枡
+ /// </summary>
+ [SugarColumn(ColumnName = "CAB014")]
public string Cab014 { get; set; }
- /// <summary>
- /// PID
- /// </summary>
- [SugarColumn(ColumnName = "PID")]
+ /// <summary>
+ /// PID
+ /// </summary>
+ [SugarColumn(ColumnName = "PID")]
public int? Pid { get; set; }
- /// <summary>
- /// ERP澶碔D
- /// </summary>
- [SugarColumn(ColumnName = "EID")]
+ /// <summary>
+ /// ERP澶碔D
+ /// </summary>
+ [SugarColumn(ColumnName = "EID")]
public int? Eid { get; set; }
- /// <summary>
- /// 浣嶇疆鍙�
- /// </summary>
- [SugarColumn(ColumnName = "POSITION_NO")]
+ /// <summary>
+ /// 浣嶇疆鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "POSITION_NO")]
public string PositionNo { get; set; }
- /// <summary>
- /// 鍙戞枡缁勭粐
- /// </summary>
- [SugarColumn(ColumnName = "ISSUING_ORGANIZATION")]
+ /// <summary>
+ /// 鍙戞枡缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "ISSUING_ORGANIZATION")]
public string IssuingOrganization { get; set; }
- /// <summary>
- /// 渚涘簲缁勭粐
- /// </summary>
- [SugarColumn(ColumnName = "SUPPLY_ORGANIZATION")]
+ /// <summary>
+ /// 渚涘簲缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPPLY_ORGANIZATION")]
public string SupplyOrganization { get; set; }
- /// <summary>
- /// 璐т富
- /// </summary>
- [SugarColumn(ColumnName = "OWNER_ID")]
+ /// <summary>
+ /// 璐т富
+ /// </summary>
+ [SugarColumn(ColumnName = "OWNER_ID")]
public string OwnerId { get; set; }
- /// <summary>
- /// 璁″垝璺熻釜鍙�
- /// </summary>
- [SugarColumn(ColumnName = "MTONO")]
+ /// <summary>
+ /// 璁″垝璺熻釜鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "MTONO")]
public string Mtono { get; set; }
- /// <summary>
- /// 鎵瑰彿
- /// </summary>
- [SugarColumn(ColumnName = "LOT")]
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT")]
public string Lot { get; set; }
- /// <summary>
- /// 浠撳簱
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_CODE")]
+ /// <summary>
+ /// 浠撳簱
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOT_CODE")]
public string DepotCode { get; set; }
- /// <summary>
- /// 鍙戞枡鏂瑰紡
- /// </summary>
- [SugarColumn(ColumnName = "ISSUE_TYPE")]
+ /// <summary>
+ /// 鍙戞枡鏂瑰紡
+ /// </summary>
+ [SugarColumn(ColumnName = "ISSUE_TYPE")]
public string IssueType { get; set; }
- /// <summary>
- /// 渚涘簲绫诲瀷(C閲囪喘 Z鑷埗 W濮斿)
- /// </summary>
- [SugarColumn(ColumnName = "SUPPLY_TYPE")]
+ /// <summary>
+ /// 渚涘簲绫诲瀷(C閲囪喘 Z鑷埗 W濮斿)
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPPLY_TYPE")]
public string SupplyType { get; set; }
- /// <summary>
- /// 鍒嗗瓙
- /// </summary>
- [SugarColumn(ColumnName = "NUMERATOR")]
+ /// <summary>
+ /// 鍒嗗瓙
+ /// </summary>
+ [SugarColumn(ColumnName = "NUMERATOR")]
public string Numerator { get; set; }
- /// <summary>
- /// 鍒嗘瘝
- /// </summary>
- [SugarColumn(ColumnName = "DENOMINATOR")]
+ /// <summary>
+ /// 鍒嗘瘝
+ /// </summary>
+ [SugarColumn(ColumnName = "DENOMINATOR")]
public string Denominator { get; set; }
- /// <summary>
- /// 鍥哄畾鎹熻��
- /// </summary>
- [SugarColumn(ColumnName = "SCRAPQTY")]
+ /// <summary>
+ /// 鍥哄畾鎹熻��
+ /// </summary>
+ [SugarColumn(ColumnName = "SCRAPQTY")]
public string Scrapqty { get; set; }
- /// <summary>
- /// 鍙樺姩鎹熻�楃巼
- /// </summary>
- [SugarColumn(ColumnName = "SCRAPRATE")]
+ /// <summary>
+ /// 鍙樺姩鎹熻�楃巼
+ /// </summary>
+ [SugarColumn(ColumnName = "SCRAPRATE")]
public string Scraprate { get; set; }
- /// <summary>
- /// 瀹㈡埛璐у彿
- /// </summary>
- [SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")]
+ /// <summary>
+ /// 瀹㈡埛璐у彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")]
public string CustomerItemNumber { get; set; }
- /// <summary>
- /// 鍖呰鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "PACKING_LIST_NUMBER")]
+ /// <summary>
+ /// 鍖呰鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "PACKING_LIST_NUMBER")]
public string PackingListNumber { get; set; }
- /// <summary>
- /// 涓讳骇鍝�
- /// </summary>
- [SugarColumn(ColumnName = "MAIN_PRODUCT")]
+ /// <summary>
+ /// 涓讳骇鍝�
+ /// </summary>
+ [SugarColumn(ColumnName = "MAIN_PRODUCT")]
public string MainProduct { get; set; }
- /// <summary>
- /// 涓讳骇鍝佹暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "MAIN_PRODUCT_QTY")]
+ /// <summary>
+ /// 涓讳骇鍝佹暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "MAIN_PRODUCT_QTY")]
public int? MainProductQty { get; set; }
- /// <summary>
- /// 鐖堕」鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "PARENT_ITEM_NAME")]
+ /// <summary>
+ /// 鐖堕」鐗╂枡鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "PARENT_ITEM_NAME")]
public string ParentItemName { get; set; }
- /// <summary>
- /// 閿�鍞鍗�
- /// </summary>
- [SugarColumn(ColumnName = "FSALEORDERNO")]
+ /// <summary>
+ /// 閿�鍞鍗�
+ /// </summary>
+ [SugarColumn(ColumnName = "FSALEORDERNO")]
public string Fsaleorderno { get; set; }
- /// <summary>
- /// 璐т富绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "FOWNERTYPEID")]
+ /// <summary>
+ /// 璐т富绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "FOWNERTYPEID")]
public string Fownertypeid { get; set; }
- /// <summary>
- /// 椤规鍙�
- /// </summary>
- [SugarColumn(ColumnName = "FREPLACEGROUP")]
+ /// <summary>
+ /// 椤规鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "FREPLACEGROUP")]
public int? Freplacegroup { get; set; }
- /// <summary>
- /// 閿�鍞鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "ERP_XSDDH")]
+ /// <summary>
+ /// 閿�鍞鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_XSDDH")]
public string ErpXsddh { get; set; }
- /// <summary>
- /// 瀛愰」绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "FMATERIALTYPE")]
+ /// <summary>
+ /// 瀛愰」绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "FMATERIALTYPE")]
public string Fmaterialtype { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "FUNITID")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "FUNITID")]
public string Funitid { get; set; }
- /// <summary>
- /// 搴斿彂鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "Must_Qty")]
+ /// <summary>
+ /// 搴斿彂鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "Must_Qty")]
public decimal? MustQty { get; set; }
- /// <summary>
- /// 浣跨敤姣斾緥锛�%锛�
- /// </summary>
- [SugarColumn(ColumnName = "Use_Rate")]
+ /// <summary>
+ /// 浣跨敤姣斾緥锛�%锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "Use_Rate")]
public decimal? UseRate { get; set; }
- /// <summary>
- /// 瀛愰」绫诲瀷 1鏍囧噯浠� 2杩旇繕浠� 3鏇夸唬浠�
- /// </summary>
- [SugarColumn(ColumnName = "Material_Type")]
+ /// <summary>
+ /// 瀛愰」绫诲瀷 1鏍囧噯浠� 2杩旇繕浠� 3鏇夸唬浠�
+ /// </summary>
+ [SugarColumn(ColumnName = "Material_Type")]
public string MaterialType { get; set; }
+
+ /// <summary>
+ /// A锛屽垱寤� B锛屽鏍镐腑 C锛屽凡瀹℃牳 D锛岄噸鏂板鏍� Z锛屾殏瀛�
+ /// </summary>
+ [SugarColumn(ColumnName = "TYPEB")]
+ public string? Typeb { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/ProductionOrderManager.cs b/MES.Service/service/BasicData/ProductionOrderManager.cs
index ac183be..5659a47 100644
--- a/MES.Service/service/BasicData/ProductionOrderManager.cs
+++ b/MES.Service/service/BasicData/ProductionOrderManager.cs
@@ -155,7 +155,6 @@
: null,
ReqSrc = erpDto.FReqSrc,
SrcSplitSeq = erpDto.SrcSplitSeq,
- Typeb = erpDto.TypeB,
Typea = erpDto.TypeA,
};
@@ -209,6 +208,7 @@
: null,
Freservetype = erpDto.FRESERVETYPE,
Fmemo = erpDto.FMEMO,
+ Typeb = erpDto.TypeB,
ErpProductionEntryCode = erpDto.FSUBENTRYID
};
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 85badcc..e88f9fb 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -144,8 +144,8 @@
// CustomerName = dto.F_XIFG_Text_qtr1, /// 瀹㈡埛鍚嶇О
// Customer = dto.F_XIFG_Base_83g1, /// 瀹㈡埛
Caa0111 = dto.FPlanFinishDate, /// 棰勮瀹屽伐鏃堕棿澶囦唤
- Typea = dto.TypeA, /// 棰勮瀹屽伐鏃堕棿澶囦唤
- Typeb = dto.TypeB /// 棰勮瀹屽伐鏃堕棿澶囦唤
+ Typea = dto.TypeA /// 棰勮瀹屽伐鏃堕棿澶囦唤
+ //Typeb = dto.TypeB /// 棰勮瀹屽伐鏃堕棿澶囦唤
};
var single = base.GetSingle(it => it.Erpid == entity.Erpid);
@@ -197,7 +197,8 @@
Freplacegroup = Convert.ToInt32(dto.FReplaceGroup),
UseRate = Convert.ToDecimal(dto.FUseRate),
MaterialType = dto.FMaterialType,
- MustQty = Convert.ToDecimal(dto.FMustQty)
+ MustQty = Convert.ToDecimal(dto.FMustQty),
+ Typeb = dto.TypeB
// Fsaleorderno = dto.FSALEORDERNO, /// 閿�鍞鍗�
//
// CustomerItemNumber = dto.F_XIFG_Text_re5, /// 瀹㈡埛璐у彿
--
Gitblit v1.9.3