From 6fd758e19542fe3879ac182ce30c0cd39af87237 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 18 十二月 2024 15:06:01 +0800
Subject: [PATCH] 11
---
MES.Service/Dto/webApi/ErpItems.cs | 2
MES.Service/Dto/webApi/ErpCAA.cs | 2
MES.Service/Modes/ProductionOrder.cs | 30 ++++++
MES.Service/service/WomcaaManager.cs | 4
MES.Service/Dto/webApi/ErpDepots.cs | 4
MES.Service/Modes/ProductionOrderSub.cs | 59 ++++++++++-
MES.Service/Modes/Womcaa.cs | 106 +++++++++++---------
MES.Service/Dto/webApi/ErpProductionOrderDto.cs | 5 +
MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs | 9 +
MES.Service/Modes/MesDepots.cs | 32 +++++-
MES.Service/service/BasicData/MesDepotsManager.cs | 4
MES.Service/service/BasicData/MesItemsManager.cs | 2
MES.Service/service/BasicData/ProductionOrderManager.cs | 21 ++++
13 files changed, 220 insertions(+), 60 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpCAA.cs b/MES.Service/Dto/webApi/ErpCAA.cs
index 117dbd8..f951d4e 100644
--- a/MES.Service/Dto/webApi/ErpCAA.cs
+++ b/MES.Service/Dto/webApi/ErpCAA.cs
@@ -45,4 +45,6 @@
public string? FEnTrustOrgId { get; set; }
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/ErpDepots.cs b/MES.Service/Dto/webApi/ErpDepots.cs
index 8339144..8b978a6 100644
--- a/MES.Service/Dto/webApi/ErpDepots.cs
+++ b/MES.Service/Dto/webApi/ErpDepots.cs
@@ -13,4 +13,8 @@
public string? Type { get; set; }
public string? FCreateOrgId { get; set; }
public string? FUseOrgId { get; set; }
+ public string? FSUPPLIERID { get; set; }
+ public string? ClientId { get; set; }
+ public string? Fdeptid { get; set; }
+ public string? Phone { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpItems.cs b/MES.Service/Dto/webApi/ErpItems.cs
index dc669cc..3e6b9d0 100644
--- a/MES.Service/Dto/webApi/ErpItems.cs
+++ b/MES.Service/Dto/webApi/ErpItems.cs
@@ -30,4 +30,6 @@
public string? Type { get; set; }
public string? FCreateOrgId { get; set; }
public string? FUseOrgId { get; set; }
+
+ public string? FMnemonicCode { 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 67f0221..51aba28 100644
--- a/MES.Service/Dto/webApi/ErpProductionOrderDto.cs
+++ b/MES.Service/Dto/webApi/ErpProductionOrderDto.cs
@@ -41,5 +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? 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 9bd1217..8e2e890 100644
--- a/MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs
+++ b/MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs
@@ -28,4 +28,13 @@
public string? FOwnerID2 { get; set; } // 璐т富
public string? FSUBENTRYID { get; set; } // ERP鐢熶骇璁㈠崟鍒嗗綍鍐呯爜
+
+ public string? FISGETSCRAP { get; set; }
+ public string? FISKEYCOMPONENT { get; set; }
+ public string? FSRCTRANSORGID { get; set; }
+ public string? FSRCTRANSSTOCKID { get; set; }
+ public string? FSTOCKSTATUSID { get; set; }
+ public string? FNEEDDATE { get; set; }
+ public string? FRESERVETYPE { get; set; }
+ public string? FMEMO { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesDepots.cs b/MES.Service/Modes/MesDepots.cs
index 26bcf40..022bcf5 100644
--- a/MES.Service/Modes/MesDepots.cs
+++ b/MES.Service/Modes/MesDepots.cs
@@ -3,7 +3,6 @@
namespace MES.Service.Modes;
/// <summary>
-/// 浠撳簱淇℃伅
/// </summary>
[SugarTable("MES_DEPOTS")]
public class MesDepots
@@ -192,17 +191,40 @@
public bool? CheckStatus { get; set; }
/// <summary>
- /// 浣跨敤绲勭箶
+ /// 鍒涘缓缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "Fumbrella")]
+ public string? Fumbrella { get; set; }
+
+ /// <summary>
+ /// 浣跨敤缁勭粐
/// </summary>
[SugarColumn(ColumnName = "FSubsidiary")]
public string? FSubsidiary { get; set; }
/// <summary>
- /// 鍓靛缓绲勭箶
+ /// 渚涘簲鍟�
/// </summary>
- [SugarColumn(ColumnName = "Fumbrella")]
- public string? Fumbrella { get; set; }
+ [SugarColumn(ColumnName = "SUPPLIER_ID")]
+ public string? SupplierId { get; set; }
+ /// <summary>
+ /// 瀹㈡埛
+ /// </summary>
+ [SugarColumn(ColumnName = "Client_Id")]
+ public string? ClientId { get; set; }
+
+ /// <summary>
+ /// 閮ㄩ棬
+ /// </summary>
+ [SugarColumn(ColumnName = "department")]
+ public string? Department { get; set; }
+
+ /// <summary>
+ /// 鑱旂郴鐢佃瘽
+ /// </summary>
+ [SugarColumn(ColumnName = "Phone")]
+ public string? Phone { get; set; }
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/ProductionOrder.cs b/MES.Service/Modes/ProductionOrder.cs
index 357987c..52fd9fe 100644
--- a/MES.Service/Modes/ProductionOrder.cs
+++ b/MES.Service/Modes/ProductionOrder.cs
@@ -327,4 +327,34 @@
/// </summary>
[SugarColumn(ColumnName = "PREPARE_COMP_FLAG")]
public int? PrepareCompFlag { get; set; }
+
+ /// <summary>
+ /// 璁″垝纭鏃堕棿锛堟墽琛屾棩鏈燂級
+ /// </summary>
+ [SugarColumn(ColumnName = "PLAN_CONFIRMATION")]
+ public DateTime? PlanConfirmation { get; set; }
+
+ /// <summary>
+ /// 闇�姹傛潵婧�
+ /// </summary>
+ [SugarColumn(ColumnName = "Req_Src")]
+ public string? ReqSrc { get; set; }
+
+ /// <summary>
+ /// 婧愭媶鍒嗚鍗曡鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "SRC_SPLIT_SEQ")]
+ public string? SrcSplitSeq { get; set; }
+
+ /// <summary>
+ /// 1锛屾柊澧烇紱2锛屽彉鏇�
+ /// </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 85e4c8f..8c28b81 100644
--- a/MES.Service/Modes/ProductionOrderSub.cs
+++ b/MES.Service/Modes/ProductionOrderSub.cs
@@ -105,12 +105,6 @@
public string? Unit { get; set; }
/// <summary>
- /// 瀛愰」鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "UNIT2")]
- public string? Unit2 { get; set; }
-
- /// <summary>
/// 渚涘簲绫诲瀷
/// </summary>
[SugarColumn(ColumnName = "SUPPLYING_TYPE")]
@@ -245,4 +239,57 @@
/// </summary>
[SugarColumn(ColumnName = "ERP_PRODUCTION_ENTRY_CODE")]
public string? ErpProductionEntryCode { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "UNIT2")]
+ public string? Unit2 { get; set; }
+
+ /// <summary>
+ /// 鏄惁鍙戞崯鑰�
+ /// </summary>
+ [SugarColumn(ColumnName = "FISGETSCRAP")]
+ public string? Fisgetscrap { get; set; }
+
+ /// <summary>
+ /// 鏄惁鍏抽敭浠�
+ /// </summary>
+ [SugarColumn(ColumnName = "FISKEYCOMPONENT")]
+ public string? Fiskeycomponent { get; set; }
+
+ /// <summary>
+ /// 鎷ㄥ嚭缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "FSRCTRANSORGID")]
+ public string? Fsrctransorgid { get; set; }
+
+ /// <summary>
+ /// 鎷ㄥ嚭浠撳簱
+ /// </summary>
+ [SugarColumn(ColumnName = "FSRCTRANSSTOCKID")]
+ public string? Fsrctransstockid { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "FSTOCKSTATUSID")]
+ public string? Fstockstatusid { get; set; }
+
+ /// <summary>
+ /// 闇�姹傛棩鏈�
+ /// </summary>
+ [SugarColumn(ColumnName = "FNEEDDATE")]
+ public DateTime? Fneeddate { get; set; }
+
+ /// <summary>
+ /// 棰勭暀绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "FRESERVETYPE")]
+ public string? Freservetype { get; set; }
+
+ /// <summary>
+ /// 鐢ㄦ枡娓呭崟澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "FMEMO")]
+ public string? Fmemo { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/Womcaa.cs b/MES.Service/Modes/Womcaa.cs
index 0dc869e..55f51da 100644
--- a/MES.Service/Modes/Womcaa.cs
+++ b/MES.Service/Modes/Womcaa.cs
@@ -24,43 +24,43 @@
/// 鍗曟嵁缂栧彿
/// </summary>
[SugarColumn(ColumnName = "CAA001")]
- public string Caa001 { get; set; }
+ public string? Caa001 { get; set; }
/// <summary>
/// 鍗曟嵁绫诲瀷("1銆佺洿鎺ュ叆搴�-鏅�氱敓浜� 2銆佺洿鎺ュ叆搴�-杩斿伐鐢熶骇 3銆佸伐搴忔眹鎶�-鏅�氱敓浜� 4銆佸伐搴忔眹鎶�-杩斿伐鐢熶骇")
/// </summary>
[SugarColumn(ColumnName = "CAA004")]
- public string Caa004 { get; set; }
+ public string? Caa004 { get; set; }
/// <summary>
/// 璁″垝涓嬭揪鏃ユ湡
/// </summary>
[SugarColumn(ColumnName = "CAA005")]
- public string Caa005 { get; set; }
+ public string? Caa005 { get; set; }
/// <summary>
/// 浜у搧ID
/// </summary>
[SugarColumn(ColumnName = "CAA006")]
- public string Caa006 { get; set; }
+ public string? Caa006 { get; set; }
/// <summary>
/// 鍗曚綅
/// </summary>
[SugarColumn(ColumnName = "CAA009")]
- public string Caa009 { get; set; }
+ public string? Caa009 { get; set; }
/// <summary>
/// 棰勮寮�宸ユ椂闂�
/// </summary>
[SugarColumn(ColumnName = "CAA010")]
- public string Caa010 { get; set; }
+ public string? Caa010 { get; set; }
/// <summary>
/// 棰勮瀹屽伐鏃堕棿
/// </summary>
[SugarColumn(ColumnName = "CAA011")]
- public string Caa011 { get; set; }
+ public string? Caa011 { get; set; }
/// <summary>
/// 宸ュ崟鏁伴噺
@@ -72,19 +72,19 @@
/// BOM鐗堟
/// </summary>
[SugarColumn(ColumnName = "CAA013")]
- public string Caa013 { get; set; }
+ public string? Caa013 { get; set; }
/// <summary>
/// 閿�鍞鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "CAA015")]
- public string Caa015 { get; set; }
+ public string? Caa015 { get; set; }
/// <summary>
/// 澶囨敞
/// </summary>
[SugarColumn(ColumnName = "CAA016")]
- public string Caa016 { get; set; }
+ public string? Caa016 { get; set; }
/// <summary>
/// 宸叉帓鏁伴噺锛堝純鐢級
@@ -108,13 +108,13 @@
/// ERP鐢熶骇璁㈠崟鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "CAA020")]
- public string Caa020 { get; set; }
+ public string? Caa020 { get; set; }
/// <summary>
/// 鐢熶骇杞﹂棿
/// </summary>
[SugarColumn(ColumnName = "CAA021")]
- public string Caa021 { get; set; }
+ public string? Caa021 { get; set; }
/// <summary>
/// 瀹℃牳鐮�
@@ -132,7 +132,7 @@
/// 瀹℃牳浜�
/// </summary>
[SugarColumn(ColumnName = "CHECK_USER")]
- public string CheckUser { get; set; }
+ public string? CheckUser { get; set; }
/// <summary>
/// 鏈帓鏁伴噺锛堝純鐢級
@@ -144,7 +144,7 @@
/// 涓氬姟鐘舵��("1锛岃鍒掞紝2銆佽鍒掔‘璁� 2銆佷笅杈� 4銆佸紑宸� 5銆佸畬宸� 6銆佺粨妗堬紝7銆佺粨绠�")
/// </summary>
[SugarColumn(ColumnName = "CAA023")]
- public string Caa023 { get; set; }
+ public string? Caa023 { get; set; }
/// <summary>
/// 宸插叆搴撴暟閲�
@@ -156,121 +156,121 @@
/// 宸ヨ壓璺嚎
/// </summary>
[SugarColumn(ColumnName = "ROUTING_ID")]
- public string RoutingId { get; set; }
+ public string? RoutingId { get; set; }
/// <summary>
/// 浜х嚎
/// </summary>
[SugarColumn(ColumnName = "WORK_SHOP_ID")]
- public string WorkShopId { get; set; }
+ public string? WorkShopId { get; set; }
/// <summary>
/// 浠撳簱
/// </summary>
[SugarColumn(ColumnName = "DEPOT_CODE")]
- public string DepotCode { get; set; }
+ public string? DepotCode { get; set; }
/// <summary>
/// 鍗曟嵁鏃ユ湡
/// </summary>
[SugarColumn(ColumnName = "CREATE_DATE")]
- public string CreateDate { get; set; }
+ public string? CreateDate { get; set; }
/// <summary>
/// 璁″垝缁�
/// </summary>
[SugarColumn(ColumnName = "WORK_GROUP_ID")]
- public string WorkGroupId { get; set; }
+ public string? WorkGroupId { get; set; }
/// <summary>
/// 璁″垝鍛�
/// </summary>
[SugarColumn(ColumnName = "PLAN_ID")]
- public string PlanId { get; set; }
+ public string? PlanId { get; set; }
/// <summary>
/// 鍏ュ簱涓婇檺
/// </summary>
[SugarColumn(ColumnName = "STOCK_INLIMITH")]
- public string StockInlimith { get; set; }
+ public string? StockInlimith { get; set; }
/// <summary>
/// 鍏ュ簱涓嬮檺
/// </summary>
[SugarColumn(ColumnName = "STOCK_INLIMITL")]
- public string StockInlimitl { get; set; }
+ public string? StockInlimitl { get; set; }
/// <summary>
/// 涓昏溅闂磋皟搴﹀崟
/// </summary>
[SugarColumn(ColumnName = "MTONO")]
- public string Mtono { get; set; }
+ public string? Mtono { get; set; }
/// <summary>
/// 鎵规
/// </summary>
[SugarColumn(ColumnName = "LOT")]
- public string Lot { get; set; }
+ public string? Lot { get; set; }
/// <summary>
/// 寮曠敤鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "CAA015_HEAD")]
- public string Caa015Head { get; set; }
+ public string? Caa015Head { get; set; }
/// <summary>
/// 鍒跺崟绫诲瀷
/// </summary>
[SugarColumn(ColumnName = "CREATE_TYPE")]
- public string CreateType { get; set; }
+ public string? CreateType { get; set; }
/// <summary>
/// 鏉ユ簮鍗曟嵁绫诲瀷
/// </summary>
[SugarColumn(ColumnName = "SRC_BILL_TYPE")]
- public string SrcBillType { get; set; }
+ public string? SrcBillType { get; set; }
/// <summary>
/// 鏉ユ簮鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "SRC_BILL_NO")]
- public string SrcBillNo { get; set; }
+ public string? SrcBillNo { get; set; }
/// <summary>
/// 鏉ユ簮琛屽彿
/// </summary>
[SugarColumn(ColumnName = "SRC_BILLENTRYSEQ")]
- public string SrcBillentryseq { get; set; }
+ public string? SrcBillentryseq { get; set; }
/// <summary>
/// 閿�鍞鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "SALE_ORDER_NO")]
- public string SaleOrderNo { get; set; }
+ public string? SaleOrderNo { get; set; }
/// <summary>
/// 閿�鍞鍗曡鍙�
/// </summary>
[SugarColumn(ColumnName = "SALE_ORDER_ENTRYSEQ")]
- public string SaleOrderEntryseq { get; set; }
+ public string? SaleOrderEntryseq { get; set; }
/// <summary>
/// 寮哄埗鍏抽棴浜�
/// </summary>
[SugarColumn(ColumnName = "FORCE_CLOSERID")]
- public string ForceCloserid { get; set; }
+ public string? ForceCloserid { get; set; }
/// <summary>
/// 鍏抽棴绫诲瀷
/// </summary>
[SugarColumn(ColumnName = "CLOSE_TYPE")]
- public string CloseType { get; set; }
+ public string? CloseType { get; set; }
/// <summary>
/// 鍒嗗崟鍙�
/// </summary>
[SugarColumn(ColumnName = "SRC_SPLIT_BILLNO")]
- public string SrcSplitBillno { get; set; }
+ public string? SrcSplitBillno { get; set; }
/// <summary>
/// 鏄惁绠℃帶
@@ -287,7 +287,7 @@
/// <summary>
/// </summary>
[SugarColumn(ColumnName = "MAIN_PRODUCT_NO")]
- public string MainProductNo { get; set; }
+ public string? MainProductNo { get; set; }
/// <summary>
/// </summary>
@@ -297,32 +297,32 @@
/// <summary>
/// </summary>
[SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")]
- public string CustomerItemNumber { get; set; }
+ public string? CustomerItemNumber { get; set; }
/// <summary>
/// </summary>
[SugarColumn(ColumnName = "PACKING_LIST_NUMBER")]
- public string PackingListNumber { get; set; }
+ public string? PackingListNumber { get; set; }
/// <summary>
/// </summary>
[SugarColumn(ColumnName = "CUSTOMER_NAME")]
- public string CustomerName { get; set; }
+ public string? CustomerName { get; set; }
/// <summary>
/// </summary>
[SugarColumn(ColumnName = "CUSTOMER")]
- public string Customer { get; set; }
+ public string? Customer { get; set; }
/// <summary>
/// </summary>
[SugarColumn(ColumnName = "TYPE")]
- public string Type { get; set; }
+ public string? Type { get; set; }
/// <summary>
/// </summary>
[SugarColumn(ColumnName = "JA_BS")]
- public string JaBs { get; set; }
+ public string? JaBs { get; set; }
/// <summary>
/// </summary>
@@ -337,7 +337,7 @@
/// <summary>
/// </summary>
[SugarColumn(ColumnName = "CAA011_1")]
- public string Caa0111 { get; set; }
+ public string? Caa0111 { get; set; }
/// <summary>
/// </summary>
@@ -389,29 +389,41 @@
/// 閲囪喘璁㈠崟鍙�
/// </summary>
[SugarColumn(ColumnName = "FPURORDERNO")]
- public string Fpurorderno { get; set; }
+ public string? Fpurorderno { get; set; }
/// <summary>
/// 閲囪喘璁㈠崟琛屽彿
/// </summary>
[SugarColumn(ColumnName = "FPURORDERENTRYSEQ")]
- public string Fpurorderentryseq { get; set; }
+ public string? Fpurorderentryseq { get; set; }
/// <summary>
/// 澶囨敞锛堣〃浣擄級
/// </summary>
[SugarColumn(ColumnName = "Btbz")]
- public string Btbz { get; set; }
+ public string? Btbz { get; set; }
/// <summary>
/// 婧愭媶鍒嗚鍗曠紪鍙�
/// </summary>
[SugarColumn(ColumnName = "fmoentryid")]
- public string Fmoentryid { get; set; }
+ public string? Fmoentryid { get; set; }
/// <summary>
/// 鎺掍骇绾垮埆
/// </summary>
[SugarColumn(ColumnName = "prod_line")]
- public string ProdLine { get; set; }
+ public string? ProdLine { get; set; }
+
+ /// <summary>
+ /// 1锛屾柊澧烇紱2锛屽彉鏇�
+ /// </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/service/BasicData/MesDepotsManager.cs b/MES.Service/service/BasicData/MesDepotsManager.cs
index 6f5da5a..2d93cf9 100644
--- a/MES.Service/service/BasicData/MesDepotsManager.cs
+++ b/MES.Service/service/BasicData/MesDepotsManager.cs
@@ -103,6 +103,10 @@
Fumbrella = depots.FCreateOrgId,
CreateDate = DateTime.Now,
LastupdateDate = DateTime.Now,
+ SupplierId = depots.FSUPPLIERID,
+ ClientId = depots.ClientId,
+ Department = depots.Fdeptid,
+ Phone = depots.Phone,
Company = "1000",
Factory = "1000"
};
diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index 22a076c..e405e58 100644
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/MES.Service/service/BasicData/MesItemsManager.cs
@@ -29,6 +29,7 @@
break;
case "2":
case "4":
+ case "5":
if (InsertOrUpdate(db, entity))
return 1;
break;
@@ -145,6 +146,7 @@
Fumbrella = item.FCreateOrgId,
LastupdateDate = DateTime.Now,
CreateDate = DateTime.Now,
+ MnemonicCode = item.FMnemonicCode,
Company = "1000",
Factory = "1000"
};
diff --git a/MES.Service/service/BasicData/ProductionOrderManager.cs b/MES.Service/service/BasicData/ProductionOrderManager.cs
index ccd6353..ac183be 100644
--- a/MES.Service/service/BasicData/ProductionOrderManager.cs
+++ b/MES.Service/service/BasicData/ProductionOrderManager.cs
@@ -148,7 +148,15 @@
Purchaseorderentryseq = Convert.ToInt32(erpDto.FPurOrderEntrySeq),
Stockinqty = Convert.ToDecimal(erpDto.FBaseStockInQty),
Nostockinqty = Convert.ToDecimal(erpDto.FBaseNoStockInQty),
- Stockowner = erpDto.FInStockOwnerId
+ Stockowner = erpDto.FInStockOwnerId,
+ PlanConfirmation = erpDto.PlanConfirmation != null
+ ? DateTime.ParseExact(erpDto.PlanConfirmation,
+ "yyyy-MM-dd HH:mm:ss", null)
+ : null,
+ ReqSrc = erpDto.FReqSrc,
+ SrcSplitSeq = erpDto.SrcSplitSeq,
+ Typeb = erpDto.TypeB,
+ Typea = erpDto.TypeA,
};
var single = base.GetSingle(it => it.ErpId == erpDto.FPPOMID);
@@ -190,6 +198,17 @@
ItemNo = erpDto.FReplaceGroup,
OwnerType = erpDto.FOwnerTypeId,
Owner = erpDto.FOwnerID2,
+ Fisgetscrap = erpDto.FISGETSCRAP,
+ Fiskeycomponent = erpDto.FISKEYCOMPONENT,
+ Fsrctransorgid = erpDto.FSRCTRANSORGID,
+ Fsrctransstockid = erpDto.FSRCTRANSSTOCKID,
+ Fstockstatusid = erpDto.FSTOCKSTATUSID,
+ Fneeddate = erpDto.FNEEDDATE != null
+ ? DateTime.ParseExact(erpDto.FNEEDDATE,
+ "yyyy-MM-dd HH:mm:ss", null)
+ : null,
+ Freservetype = erpDto.FRESERVETYPE,
+ Fmemo = erpDto.FMEMO,
ErpProductionEntryCode = erpDto.FSUBENTRYID
};
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index d681ae4..85badcc 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -143,7 +143,9 @@
// PackingListNumber = dto.F_XIFG_Text_yrr, /// 鍖呰鍗曞彿
// CustomerName = dto.F_XIFG_Text_qtr1, /// 瀹㈡埛鍚嶇О
// Customer = dto.F_XIFG_Base_83g1, /// 瀹㈡埛
- Caa0111 = dto.FPlanFinishDate /// 棰勮瀹屽伐鏃堕棿澶囦唤
+ Caa0111 = dto.FPlanFinishDate, /// 棰勮瀹屽伐鏃堕棿澶囦唤
+ Typea = dto.TypeA, /// 棰勮瀹屽伐鏃堕棿澶囦唤
+ Typeb = dto.TypeB /// 棰勮瀹屽伐鏃堕棿澶囦唤
};
var single = base.GetSingle(it => it.Erpid == entity.Erpid);
--
Gitblit v1.9.3