From 4f0cb973a7db26a9e65247033a95d9a8b3380d4b Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 29 十月 2024 17:26:37 +0800
Subject: [PATCH] 基础信息和采购订单接口更新
---
MES.Service/Dto/webApi/ErpSupplier.cs | 5
MES.Service/service/BasicData/MesStaffManager.cs | 15
MES.Service/Modes/MesRohInData.cs | 266 +++++++++++------------
MES.Service/service/BasicData/MesRohInManager.cs | 54 ++--
MES.Service/Dto/webApi/ErpRohIn.cs | 15 +
MES.Service/service/BasicData/MesSupplierManager.cs | 5
MES.Service/Dto/webApi/ErpRohinData.cs | 27 +-
MES.Service/Modes/MesRohIn.cs | 225 +++++++++++--------
8 files changed, 315 insertions(+), 297 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpRohIn.cs b/MES.Service/Dto/webApi/ErpRohIn.cs
index 885e3eb..9140ed1 100644
--- a/MES.Service/Dto/webApi/ErpRohIn.cs
+++ b/MES.Service/Dto/webApi/ErpRohIn.cs
@@ -18,7 +18,7 @@
public string? FSettleId { get; set; }
public string? FChargeId { get; set; }
public string? FProviderEMail { get; set; }
- public string? F_XIFG_Text_qtr1 { get; set; }
+ public string? Remarks { get; set; }
public string? FCancelStatus { get; set; }
public string? FCancellerId { get; set; }
public string? FCancelDate { get; set; }
@@ -29,7 +29,16 @@
public string? FApproverId { get; set; }
public string? FApproveDate { get; set; }
public string? FChangeReason { get; set; }
- public string? FPREARRIVALDATE { get; set; }
+ public string? Prearrivaldate { get; set; }
public string? FReceiveOrgId { get; set; }
- public string? F_XIFG_PrintTimes_qtr { get; set; }
+ public string? FProviderId { get; set; }
+
+ public string? FTContact { get; set; }
+ public string? Fmobilephone { get; set; }
+
+ public string? FixedTelephone { get; set; }
+
+ public string? Address { get; set; }
+
+ public string? Acctype { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpRohinData.cs b/MES.Service/Dto/webApi/ErpRohinData.cs
index bb5acf0..4a6d0ab 100644
--- a/MES.Service/Dto/webApi/ErpRohinData.cs
+++ b/MES.Service/Dto/webApi/ErpRohinData.cs
@@ -5,14 +5,13 @@
public string id { get; set; }
public string Eid { get; set; }
public string? FBillNo { get; set; }
- public string? F_XIFG_Text_k79 { get; set; }
+ public string? FDEMANDBILLNO { get; set; }
+ public string? FSEQ { get; set; }
public string? FMaterialId { get; set; }
public string? FUnitId { get; set; }
public string? FQty { get; set; }
public string? FStockUnitID { get; set; }
-
public string? FPriceUnitId { get; set; }
-
public string? FPriceUnitQty { get; set; }
public string? FDeliveryDate { get; set; }
public string? FDeliveryEarlyDate { get; set; }
@@ -21,8 +20,9 @@
public string? FRequireDeptId { get; set; }
public string? FReceiveOrgId { get; set; }
public string? FReceiveDeptId { get; set; }
- public string? FEntrySettleOrgId { get; set; }
+ public string? FSETTLEORGID { get; set; }
public string? FGiveAway { get; set; }
+ public string? Fnote { get; set; }
public string? FEntryNote { get; set; }
public string? FSupMatId { get; set; }
public string? FSupMatName { get; set; }
@@ -35,24 +35,21 @@
public string? FMRPTerminateStatus { get; set; }
public string? FTerminaterId { get; set; }
public string? FTerminateDate { get; set; }
- public string? FBASERECEIVEQTY { get; set; }
+ public string? FEntrySettleOrgId { get; set; }
public string? FRemainReceiveQty { get; set; }
- public string? FBASESTOCKINQTY { get; set; }
+ public string? FReceiveQty { get; set; } //绱鏀舵枡
public string? FRemainStockINQty { get; set; }
public string? FMrbQty { get; set; }
- public string? FBASECHECKRETQTY { get; set; }
- public string? FBASESTOCKRETQTY { get; set; }
+ public string? FStockInQty { get; set; } //绱鍏ュ簱鏁�
+ public string? FCHECKRETQTY { get; set; } //鏀舵枡鍙��鏁�
+ public string? FSTOCKRETQTY { get; set; } //搴撳瓨鍙��鏁�
public string? FSrcBillTypeId { get; set; }
- public string? FSourceBillNo { get; set; }
+ public string? FSrcBillNo { get; set; }
public string? FReqTraceNo { get; set; }
public string? FMtoNo { get; set; }
public string? FChangeFlag { get; set; }
+
public string? FDEMANDTYPE { get; set; }
- public string? FDEMANDBILLNO { get; set; }
+
public string? FDEMANDBILLENTRYSEQ { get; set; }
- public string? FPREARRIVALDATE { get; set; }
- public string? F_XIFG_Text_ne1 { get; set; }
- public string? F_XIFG_Text_6oq { get; set; }
- public string? F_XIFG_Base_c1c { get; set; }
- public string? F_XIFG_Text_qtr4 { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpSupplier.cs b/MES.Service/Dto/webApi/ErpSupplier.cs
index 239dd48..f5c74dc 100644
--- a/MES.Service/Dto/webApi/ErpSupplier.cs
+++ b/MES.Service/Dto/webApi/ErpSupplier.cs
@@ -7,11 +7,10 @@
public string? FNumber { get; set; }
public string? FShortName { get; set; }
public string? FName { get; set; }
- public string? FContact { get; set; }
- public string? FTel { get; set; }
+ public string? FTContact { get; set; }
+ public string? Fmobilephone { get; set; }
public string? FStaffId { get; set; }
public string? FForbidStatus { get; set; }
public string? FUseOrgId { get; set; }
public string? FCreateOrgId { get; set; }
- public string? FDescription { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesRohIn.cs b/MES.Service/Modes/MesRohIn.cs
index 19738bc..ca621c7 100644
--- a/MES.Service/Modes/MesRohIn.cs
+++ b/MES.Service/Modes/MesRohIn.cs
@@ -9,274 +9,303 @@
public class MesRohIn
{
/// <summary>
- /// 涓婚敭
- /// 榛樿鍊�: (newid())
- /// </summary>
+ /// 涓婚敭
+ /// 榛樿鍊�: (newid())
+ ///</summary>
[SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
public Guid Guid { get; set; }
/// <summary>
- /// SEQ_BASEINFO_ID
- /// </summary>
+ /// SEQ_BASEINFO_ID
+ ///</summary>
[SugarColumn(ColumnName = "ID")]
- public long Id { get; set; }
+ public long? Id { get; set; }
/// <summary>
- /// 閲囪喘鍗曞彿
- /// </summary>
+ /// 閲囪喘鍗曞彿
+ ///</summary>
[SugarColumn(ColumnName = "BILL_NO")]
public string? BillNo { get; set; }
/// <summary>
- /// 鍗曟嵁鐘舵��
- /// </summary>
+ /// 鍗曟嵁鐘舵��
+ ///</summary>
[SugarColumn(ColumnName = "DOCUMENT_STATUS")]
public string? DocumentStatus { get; set; }
/// <summary>
- /// 鍗曟嵁绫诲瀷
- /// </summary>
+ /// 鍗曟嵁绫诲瀷
+ ///</summary>
[SugarColumn(ColumnName = "DOCUMENT_TYPE")]
public string? DocumentType { get; set; }
/// <summary>
- /// 涓氬姟绫诲瀷
- /// </summary>
+ /// 涓氬姟绫诲瀷
+ ///</summary>
[SugarColumn(ColumnName = "BUSINESS_TYPE")]
public string? BusinessType { get; set; }
/// <summary>
- /// 閲囪喘鏃ユ湡
- /// </summary>
+ /// 閲囪喘鏃ユ湡
+ ///</summary>
[SugarColumn(ColumnName = "PURCHASE_DATE")]
public DateTime? PurchaseDate { get; set; }
/// <summary>
- /// 渚涘簲鍟�
- /// </summary>
+ /// 渚涘簲鍟�
+ ///</summary>
[SugarColumn(ColumnName = "SUPPLIER")]
public string? Supplier { get; set; }
/// <summary>
- /// 鍏抽棴鐘舵��
- /// </summary>
+ /// 鍏抽棴鐘舵��
+ ///</summary>
[SugarColumn(ColumnName = "CLOSE_STATUS")]
public string? CloseStatus { get; set; }
/// <summary>
- /// 閲囪喘缁勭粐
- /// </summary>
+ /// 閲囪喘缁勭粐
+ ///</summary>
[SugarColumn(ColumnName = "PURCHASE_ORG")]
public string? PurchaseOrg { get; set; }
/// <summary>
- /// 閲囪喘閮ㄩ棬
- /// </summary>
+ /// 閲囪喘閮ㄩ棬
+ ///</summary>
[SugarColumn(ColumnName = "PURCHASE_DEPT")]
public string? PurchaseDept { get; set; }
/// <summary>
- /// 閲囪喘缁�
- /// </summary>
+ /// 閲囪喘缁�
+ ///</summary>
[SugarColumn(ColumnName = "PURCHASE_GROUP")]
public string? PurchaseGroup { get; set; }
/// <summary>
- /// 鏁伴噺楠屾敹
- /// </summary>
+ /// 鏁伴噺楠屾敹
+ ///</summary>
[SugarColumn(ColumnName = "QTY_ACCEPTANCE")]
public string? QtyAcceptance { get; set; }
/// <summary>
- /// 閲囪喘鍛�
- /// </summary>
+ /// 閲囪喘鍛�
+ ///</summary>
[SugarColumn(ColumnName = "PURCHASER")]
public string? Purchaser { get; set; }
/// <summary>
- /// 璐ㄩ噺瑕佹眰
- /// </summary>
+ /// 璐ㄩ噺瑕佹眰
+ ///</summary>
[SugarColumn(ColumnName = "QUALITY_REQ")]
public string? QualityReq { get; set; }
/// <summary>
- /// 缁撶畻鏂�
- /// </summary>
+ /// 缁撶畻鏂�
+ ///</summary>
[SugarColumn(ColumnName = "SETTLEMENT_PARTY")]
public string? SettlementParty { get; set; }
/// <summary>
- /// 鏀舵鏂�
- /// </summary>
+ /// 鏀舵鏂�
+ ///</summary>
[SugarColumn(ColumnName = "PAYMENT_PARTY")]
public string? PaymentParty { get; set; }
/// <summary>
- /// 閭
- /// </summary>
+ /// 閭
+ ///</summary>
[SugarColumn(ColumnName = "EMAIL")]
public string? Email { get; set; }
/// <summary>
- /// 杩愯緭鏂瑰紡
- /// </summary>
+ /// 杩愯緭鏂瑰紡
+ ///</summary>
[SugarColumn(ColumnName = "TRANSPORT_METHOD")]
public string? TransportMethod { get; set; }
/// <summary>
- /// 澶囨敞
- /// </summary>
+ /// 澶囨敞
+ ///</summary>
[SugarColumn(ColumnName = "REMARKS")]
public string? Remarks { get; set; }
/// <summary>
- /// 娌诲叿涓舵ā鍏峰姞宸ュ強閲囪喘
- /// </summary>
+ /// 娌诲叿涓舵ā鍏峰姞宸ュ強閲囪喘
+ ///</summary>
[SugarColumn(ColumnName = "FIXTURE_MOLD_PROCUREMENT")]
public string? FixtureMoldProcurement { get; set; }
/// <summary>
- /// 浣滃簾鐘舵��
- /// </summary>
+ /// 浣滃簾鐘舵��
+ ///</summary>
[SugarColumn(ColumnName = "CANCELLATION_STATUS")]
public string? CancellationStatus { get; set; }
/// <summary>
- /// 浣滃簾浜�
- /// </summary>
+ /// 浣滃簾浜�
+ ///</summary>
[SugarColumn(ColumnName = "CANCELLATION_PERSON")]
public string? CancellationPerson { get; set; }
/// <summary>
- /// 浣滃簾鏃ユ湡
- /// </summary>
+ /// 浣滃簾鏃ユ湡
+ ///</summary>
[SugarColumn(ColumnName = "CANCELLATION_DATE")]
public DateTime? CancellationDate { 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_DATE")]
public DateTime? LastupdateDate { get; set; }
/// <summary>
- /// 鏈�鍚庝慨鏀逛汉
- /// </summary>
+ /// 鏈�鍚庝慨鏀逛汉
+ ///</summary>
[SugarColumn(ColumnName = "LASTUPDATE_BY")]
public string? LastupdateBy { get; set; }
/// <summary>
- /// 瀹℃牳浜�
- /// </summary>
+ /// 瀹℃牳浜�
+ ///</summary>
[SugarColumn(ColumnName = "ERP_CHECK_BY")]
public string? ErpCheckBy { get; set; }
/// <summary>
- /// 瀹℃牳鏃堕棿
- /// </summary>
+ /// 瀹℃牳鏃堕棿
+ ///</summary>
[SugarColumn(ColumnName = "ERP_CHECK_DATE")]
public string? ErpCheckDate { get; set; }
/// <summary>
- /// ERP鐨処D鍙�
- /// </summary>
+ /// ERP鐨処D鍙�
+ ///</summary>
[SugarColumn(ColumnName = "EBELN_K3ID")]
public long? EbelnK3id { get; set; }
/// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
+ /// 瀹℃牳鏃ユ湡
+ ///</summary>
[SugarColumn(ColumnName = "CHECK_DATE")]
public DateTime? CheckDate { get; set; }
/// <summary>
- /// 瀹℃牳浜�
- /// </summary>
+ /// 瀹℃牳浜�
+ ///</summary>
[SugarColumn(ColumnName = "CHECK_BY")]
public string? CheckBy { get; set; }
/// <summary>
- /// 瀹℃牳鏍囪瘑
- /// 榛樿鍊�: ((0))
- /// </summary>
+ /// 瀹℃牳鏍囪瘑
+ ///</summary>
[SugarColumn(ColumnName = "CHECK_FALG")]
- public bool? CheckFalg { get; set; }
+ public int? CheckFalg { get; set; }
/// <summary>
- /// 鎵撳嵃娆℃暟
- /// </summary>
+ /// 鎵撳嵃娆℃暟
+ ///</summary>
[SugarColumn(ColumnName = "REMARK1")]
public string? Remark1 { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�2
- /// </summary>
+ /// 鑷畾涔夊瓧娈�2
+ ///</summary>
[SugarColumn(ColumnName = "REMARK2")]
public string? Remark2 { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�3
- /// </summary>
+ /// 鑷畾涔夊瓧娈�3
+ ///</summary>
[SugarColumn(ColumnName = "REMARK3")]
public string? Remark3 { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�4
- /// </summary>
+ /// 鑷畾涔夊瓧娈�4
+ ///</summary>
[SugarColumn(ColumnName = "REMARK4")]
public string? Remark4 { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�5
- /// </summary>
+ /// 鑷畾涔夊瓧娈�5
+ ///</summary>
[SugarColumn(ColumnName = "REMARK5")]
public string? Remark5 { get; set; }
/// <summary>
- /// 鍙樻洿鍘熷洜
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "CHANGEREASON")]
public string? Changereason { 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>
- [SugarColumn(ColumnName = "EMAIL")]
- public string? Emall { get; set; }
-
- /// <summary>
- /// 鍒拌揣鏃ユ湡
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "Prearrivaldate")]
public DateTime? Prearrivaldate { get; set; }
/// <summary>
- /// 鏀舵枡缁勭粐
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "ReceiveOrgId")]
public string? ReceiveOrgId { get; set; }
+
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "Provider_Id")]
+ public string? ProviderId { get; set; }
+
+ /// <summary>
+ /// 鑱旂郴浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "anred")]
+ public string? Anred { get; set; }
+
+ /// <summary>
+ /// 鐢佃瘽
+ ///</summary>
+ [SugarColumn(ColumnName = "telf1")]
+ public string? Telf1 { get; set; }
+
+ /// <summary>
+ /// 鍥哄畾鐢佃瘽
+ ///</summary>
+ [SugarColumn(ColumnName = "Fixed_Telephone")]
+ public string? FixedTelephone { get; set; }
+
+ /// <summary>
+ /// 閫氳鍦板潃
+ ///</summary>
+ [SugarColumn(ColumnName = "Address")]
+ public string? Address { get; set; }
+
+ /// <summary>
+ /// 楠屾敹鏂瑰紡
+ ///</summary>
+ [SugarColumn(ColumnName = "Acctype")]
+ public string? Acctype { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesRohInData.cs b/MES.Service/Modes/MesRohInData.cs
index 4c09c4c..62a7b64 100644
--- a/MES.Service/Modes/MesRohInData.cs
+++ b/MES.Service/Modes/MesRohInData.cs
@@ -9,364 +9,346 @@
public class MesRohInData
{
/// <summary>
- /// 涓婚敭
- /// 榛樿鍊�: (newid())
- /// </summary>
+ ///
+ /// 榛樿鍊�: (newid())
+ ///</summary>
[SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
public Guid Guid { get; set; }
/// <summary>
- /// 閲囪喘鍗曞彿
- /// </summary>
+ /// 閲囪喘鍗曞彿
+ ///</summary>
[SugarColumn(ColumnName = "BILL_NO")]
public string? BillNo { get; set; }
/// <summary>
- /// 閿�鍞鍗曞彿
- /// </summary>
+ /// 閿�鍞鍗曞彿
+ ///</summary>
[SugarColumn(ColumnName = "SALES_ORDER_ID")]
public string? SalesOrderId { get; set; }
/// <summary>
- /// 閲囪喘璁㈠崟琛屽彿
- /// </summary>
+ /// 閲囪喘璁㈠崟琛屽彿
+ ///</summary>
[SugarColumn(ColumnName = "ORDER_LINE_ID")]
public string? OrderLineId { get; set; }
/// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
+ /// 鐗╂枡缂栫爜
+ ///</summary>
[SugarColumn(ColumnName = "ITEM_ID")]
public string? ItemId { get; set; }
/// <summary>
- /// 閲囪喘鍗曚綅
- /// </summary>
+ /// 閲囪喘鍗曚綅
+ ///</summary>
[SugarColumn(ColumnName = "PURCHASE_UNIT")]
public string? PurchaseUnit { get; set; }
/// <summary>
- /// 閲囪喘鏁伴噺
- /// </summary>
+ /// 閲囪喘鏁伴噺
+ ///</summary>
[SugarColumn(ColumnName = "PURCHASE_QTY")]
public decimal? PurchaseQty { get; set; }
/// <summary>
- /// 搴撳瓨鍗曚綅
- /// </summary>
+ /// 搴撳瓨鍗曚綅
+ ///</summary>
[SugarColumn(ColumnName = "INVENTORY_UNIT")]
public string? InventoryUnit { get; set; }
/// <summary>
- /// 璁′环鍗曚綅
- /// </summary>
+ /// 璁′环鍗曚綅
+ ///</summary>
[SugarColumn(ColumnName = "PRICING_UNIT")]
public string? PricingUnit { get; set; }
/// <summary>
- /// 璁′环鏁伴噺
- /// </summary>
+ /// 璁′环鏁伴噺
+ ///</summary>
[SugarColumn(ColumnName = "PRICING_QTY")]
public decimal? PricingQty { get; set; }
/// <summary>
- /// 浜よ揣鏃ユ湡
- /// </summary>
+ /// 浜よ揣鏃ユ湡
+ ///</summary>
[SugarColumn(ColumnName = "DELIVERY_DATE")]
public DateTime? DeliveryDate { get; set; }
/// <summary>
- /// 鏈�鏃╀氦璐ф棩鏈�
- /// </summary>
+ /// 鏈�鏃╀氦璐ф棩鏈�
+ ///</summary>
[SugarColumn(ColumnName = "EARLIEST_DELIVERY_DATE")]
public DateTime? EarliestDeliveryDate { get; set; }
/// <summary>
- /// 鏈�鏅氫氦璐ф棩鏈�
- /// </summary>
+ /// 鏈�鏅氫氦璐ф棩鏈�
+ ///</summary>
[SugarColumn(ColumnName = "LATEST_DELIVERY_DATE")]
public DateTime? LatestDeliveryDate { get; set; }
/// <summary>
- /// 闇�姹傜粍缁�
- /// </summary>
+ /// 闇�姹傜粍缁�
+ ///</summary>
[SugarColumn(ColumnName = "DEMAND_ORG")]
public string? DemandOrg { get; set; }
/// <summary>
- /// 鏀舵枡缁勭粐
- /// </summary>
+ /// 鏀舵枡缁勭粐
+ ///</summary>
[SugarColumn(ColumnName = "RECEIVING_ORG")]
public string? ReceivingOrg { get; set; }
/// <summary>
- /// 缁撶畻缁勭粐
- /// </summary>
+ /// 缁撶畻缁勭粐
+ ///</summary>
[SugarColumn(ColumnName = "SETTLEMENT_ORG")]
public string? SettlementOrg { get; set; }
/// <summary>
- /// 鏄惁璧犲搧
- /// </summary>
+ /// 鏄惁璧犲搧
+ ///</summary>
[SugarColumn(ColumnName = "IS_GIFT")]
public string? IsGift { get; set; }
/// <summary>
- /// 澶囨敞
- /// </summary>
+ /// 澶囨敞
+ ///</summary>
[SugarColumn(ColumnName = "REMARKS")]
public string? Remarks { get; set; }
/// <summary>
- /// 渚涘簲鍟嗙墿鏂欑紪鐮�
- /// </summary>
+ /// 渚涘簲鍟嗙墿鏂欑紪鐮�
+ ///</summary>
[SugarColumn(ColumnName = "SUPPLIER_ITEM_CODE")]
public string? SupplierItemCode { get; set; }
/// <summary>
- /// 渚涘簲鍟嗙墿鏂欏悕绉�
- /// </summary>
+ /// 渚涘簲鍟嗙墿鏂欏悕绉�
+ ///</summary>
[SugarColumn(ColumnName = "SUPPLIER_ITEM_NAME")]
public string? SupplierItemName { get; set; }
/// <summary>
- /// 濮斿璁㈠崟鍙�
- /// </summary>
+ /// 濮斿璁㈠崟缂栧彿
+ ///</summary>
[SugarColumn(ColumnName = "OUTSOURCING_ORDER_ID")]
public string? OutsourcingOrderId { get; set; }
/// <summary>
- /// 鎵规鍙�
- /// </summary>
+ /// 鎵瑰彿
+ ///</summary>
[SugarColumn(ColumnName = "BATCH_NUMBER")]
public string? BatchNumber { get; set; }
/// <summary>
- /// 涓氬姟鍏抽棴鏍囪瘑
- /// </summary>
+ /// 涓氬姟鍏抽棴
+ ///</summary>
[SugarColumn(ColumnName = "BUSINESS_CLOSE")]
public string? BusinessClose { get; set; }
/// <summary>
- /// 涓氬姟鍐荤粨鏍囪瘑
- /// </summary>
+ /// 涓氬姟鍐荤粨
+ ///</summary>
[SugarColumn(ColumnName = "BUSINESS_FREEZE")]
public string? BusinessFreeze { get; set; }
/// <summary>
- /// 鍐荤粨浜�
- /// </summary>
+ /// 鍐荤粨浜�
+ ///</summary>
[SugarColumn(ColumnName = "FREEZER")]
public string? Freezer { get; set; }
/// <summary>
- /// 鍐荤粨鏃堕棿
- /// </summary>
+ /// 鍐荤粨鏃堕棿
+ ///</summary>
[SugarColumn(ColumnName = "FREEZE_TIME")]
public DateTime? FreezeTime { get; set; }
/// <summary>
- /// 涓氬姟缁堟鏍囪瘑
- /// </summary>
+ /// 涓氬姟缁堟
+ ///</summary>
[SugarColumn(ColumnName = "BUSINESS_TERMINATE")]
public string? BusinessTerminate { get; set; }
/// <summary>
- /// 缁堟浜�
- /// </summary>
+ /// 缁堟浜�
+ ///</summary>
[SugarColumn(ColumnName = "TERMINATOR")]
public string? Terminator { get; set; }
/// <summary>
- /// 缁堟鏃堕棿
- /// </summary>
+ /// 缁堟鏃堕棿
+ ///</summary>
[SugarColumn(ColumnName = "TERMINATE_TIME")]
public DateTime? TerminateTime { get; set; }
/// <summary>
- /// 鎬诲凡鏀舵暟閲�
- /// </summary>
+ /// 绱鏀舵枡鏁伴噺
+ ///</summary>
[SugarColumn(ColumnName = "TOTAL_RECEIVED_QTY")]
public decimal? TotalReceivedQty { get; set; }
/// <summary>
- /// 鍓╀綑鏀惰揣鏁伴噺
- /// </summary>
+ /// 鍓╀綑鏀舵枡鏁伴噺
+ ///</summary>
[SugarColumn(ColumnName = "REMAINING_RECEIVED_QTY")]
public decimal? RemainingReceivedQty { get; set; }
/// <summary>
- /// 鎬诲凡鍏ュ簱鏁伴噺
- /// </summary>
+ /// 绱鍏ュ簱鏁伴噺
+ ///</summary>
[SugarColumn(ColumnName = "TOTAL_STORED_QTY")]
public decimal? TotalStoredQty { get; set; }
/// <summary>
- /// 鍓╀綑鍏ュ簱鏁伴噺
- /// </summary>
+ /// 鍓╀綑鍏ュ簱鏁伴噺
+ ///</summary>
[SugarColumn(ColumnName = "REMAINING_STORED_QTY")]
public decimal? RemainingStoredQty { get; set; }
/// <summary>
- /// 鎬婚��璐ф暟閲�
- /// </summary>
+ /// 绱閫�鏂欐暟閲�
+ ///</summary>
[SugarColumn(ColumnName = "TOTAL_RETURNED_QTY")]
public decimal? TotalReturnedQty { get; set; }
/// <summary>
- /// 鍙��鏀惰揣鏁伴噺
- /// </summary>
+ /// 鏀舵枡鍙��鏁伴噺
+ ///</summary>
[SugarColumn(ColumnName = "RETURNABLE_RECEIVED_QTY")]
public decimal? ReturnableReceivedQty { get; set; }
/// <summary>
- /// 鍙��鍏ュ簱鏁伴噺
- /// </summary>
+ /// 搴撳瓨鍙��鏁伴噺
+ ///</summary>
[SugarColumn(ColumnName = "RETURNABLE_STORED_QTY")]
public decimal? ReturnableStoredQty { get; set; }
/// <summary>
- /// 鏉ユ簮鍗曟嵁绫诲瀷
- /// </summary>
+ /// 婧愬崟绫诲瀷
+ ///</summary>
[SugarColumn(ColumnName = "SOURCE_DOCUMENT_TYPE")]
public string? SourceDocumentType { get; set; }
/// <summary>
- /// 鏉ユ簮鍗曟嵁鍙�
- /// </summary>
+ /// 婧愬崟鍗曞彿
+ ///</summary>
[SugarColumn(ColumnName = "SOURCE_DOCUMENT_ID")]
public string? SourceDocumentId { get; set; }
/// <summary>
- /// 闇�姹傝窡韪彿
- /// </summary>
+ /// 闇�姹傝窡韪彿
+ ///</summary>
[SugarColumn(ColumnName = "DEMAND_TRACKING_ID")]
public string? DemandTrackingId { get; set; }
/// <summary>
- /// 璁″垝璺熻釜鍙�
- /// </summary>
+ /// 璁″垝璺熻釜鍙�
+ ///</summary>
[SugarColumn(ColumnName = "PLAN_TRACKING_ID")]
public string? PlanTrackingId { get; set; }
/// <summary>
- /// 鍙樻洿鏍囪瘑
- /// </summary>
+ /// 鍙樻洿鏍囧織
+ ///</summary>
[SugarColumn(ColumnName = "CHANGE_FLAG")]
public string? ChangeFlag { get; set; }
/// <summary>
- /// 闇�姹傛潵婧�
- /// </summary>
+ /// 闇�姹傛潵婧�
+ ///</summary>
[SugarColumn(ColumnName = "DEMAND_SOURCE")]
public string? DemandSource { get; set; }
/// <summary>
- /// 闇�姹傚崟鎹彿
- /// </summary>
+ /// 闇�姹傚崟鎹紪鍙�
+ ///</summary>
[SugarColumn(ColumnName = "DEMAND_DOCUMENT_ID")]
public string? DemandDocumentId { get; set; }
/// <summary>
- /// 闇�姹傚崟鎹鍙�
- /// </summary>
+ /// 闇�姹傚崟鎹鍙�
+ ///</summary>
[SugarColumn(ColumnName = "DEMAND_DOCUMENT_LINE_ID")]
public string? DemandDocumentLineId { get; set; }
/// <summary>
- /// 閲囪喘璁㈠崟琛屽彿锛圞3绯荤粺锛�
- /// </summary>
+ /// ERP鐨処D鍙�
+ ///</summary>
[SugarColumn(ColumnName = "EBELN_K3ID")]
public decimal? EbelnK3id { get; set; }
/// <summary>
- /// 澶囨敞1
- /// </summary>
+ /// 瀹㈡埛璐у彿
+ ///</summary>
[SugarColumn(ColumnName = "REMARK1")]
public string? Remark1 { get; set; }
/// <summary>
- /// 澶囨敞2
- /// </summary>
+ /// 鍖呰鍗曞彿
+ ///</summary>
[SugarColumn(ColumnName = "REMARK2")]
public string? Remark2 { get; set; }
/// <summary>
- /// 澶囨敞3
- /// </summary>
+ /// 涓讳骇鍝�
+ ///</summary>
[SugarColumn(ColumnName = "REMARK3")]
public string? Remark3 { get; set; }
/// <summary>
- /// 澶囨敞4
- /// </summary>
+ /// SMT澶囨敞
+ ///</summary>
[SugarColumn(ColumnName = "REMARK4")]
public string? Remark4 { get; set; }
/// <summary>
- /// 澶囨敞5
- /// </summary>
- [SugarColumn(ColumnName = "REMARK5")]
- public string? Remark5 { get; set; }
-
- /// <summary>
- /// 涓婚敭ID
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "ID")]
- public long Id { get; set; }
+ public decimal? Id { get; set; }
/// <summary>
- /// ERP绯荤粺涓殑ID
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "ERP_ID")]
public decimal? ErpId { get; set; }
/// <summary>
- /// 閲囪喘璁㈠崟琛屽彿
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "PURCHASE_ORDER_LINE_NUMBER")]
public string? PurchaseOrderLineNumber { get; set; }
/// <summary>
- /// 闇�姹傜粍缁囷紙鎵╁睍锛�
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "DEMAND")]
public string? Demand { get; set; }
/// <summary>
- /// 鏀舵枡缁勭粐锛堟墿灞曪級
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "RECEIVING")]
public string? Receiving { get; set; }
/// <summary>
- /// 缁撶畻缁勭粐锛堟墿灞曪級
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "SETTLEMENT")]
public string? Settlement { get; set; }
/// <summary>
- /// 棰勭暀瀛楁CGB014
- /// 榛樿鍊�: ((0))
- /// </summary>
+ ///
+ /// 榛樿鍊�: ((0))
+ ///</summary>
[SugarColumn(ColumnName = "CGB014")]
public decimal? Cgb014 { get; set; }
/// <summary>
- /// 宸ュ巶
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
- public string? Factory { get; set; }
-
- /// <summary>
- /// 鍏徃缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
- public string? Company { get; set; }
-
- /// <summary>
- /// 闇�姹傞儴闂�
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "DEMAND_DEPARTMENT")]
public string? DemandDepartment { get; set; }
@@ -377,8 +359,14 @@
public string? ReceivingDepartment { get; set; }
/// <summary>
- /// 棰勮鍒拌揣鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "prearrivaldate")]
- public DateTime? prearrivaldate { get; set; }
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "FPREARRIVALDATE")]
+ public DateTime? Fprearrivaldate { get; set; }
+
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "FDEMANDBILLNO_LINE")]
+ public string? FdemandbillnoLine { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index f4ccdef..6509483 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -104,8 +104,8 @@
mesRohIn.Purchaser = rohIn.FPurchaserId;
mesRohIn.SettlementParty = rohIn.FSettleId;
mesRohIn.PaymentParty = rohIn.FChargeId;
- mesRohIn.Emall = rohIn.FProviderEMail;
- mesRohIn.Remarks = rohIn.F_XIFG_Text_qtr1;
+ mesRohIn.Email = rohIn.FProviderEMail;
+ mesRohIn.Remarks = rohIn.Remarks;
mesRohIn.CancellationStatus = rohIn.FCancelStatus;
mesRohIn.CancellationPerson = rohIn.FCancellerId;
@@ -129,14 +129,20 @@
mesRohIn.ErpCheckBy = rohIn.FApproverId;
mesRohIn.ErpCheckDate = rohIn.FApproveDate;
mesRohIn.Changereason = rohIn.FChangeReason;
- mesRohIn.Prearrivaldate = rohIn.FPREARRIVALDATE != null
- ? DateTime.ParseExact(rohIn.FPREARRIVALDATE,
+ mesRohIn.Prearrivaldate = rohIn.Prearrivaldate != null
+ ? DateTime.ParseExact(rohIn.Prearrivaldate,
"yyyy-MM-dd HH:mm:ss", null)
: null;
mesRohIn.ReceiveOrgId = rohIn.FReceiveOrgId;
+ mesRohIn.ProviderId = rohIn.FProviderId;
- mesRohIn.Remark1 = rohIn.F_XIFG_PrintTimes_qtr;
+ mesRohIn.Anred = rohIn.FTContact;
+ mesRohIn.Telf1 = rohIn.Fmobilephone;
+ mesRohIn.FixedTelephone = rohIn.FixedTelephone;
+ mesRohIn.Address = rohIn.Address;
+ mesRohIn.Acctype = rohIn.Acctype;
+
return mesRohIn;
}
@@ -149,17 +155,15 @@
{
var entity = new MesRohInData
{
- EbelnK3id = Convert.ToDecimal(s.id),
+ EbelnK3id = Convert.ToDecimal(s.id),
ErpId = Convert.ToDecimal(s.Eid),
BillNo = s.FBillNo,
- SalesOrderId = s.F_XIFG_Text_k79,
ItemId = s.FMaterialId,
PurchaseUnit = s.FUnitId,
PurchaseQty = Convert.ToDecimal(s.FQty),
InventoryUnit = s.FStockUnitID,
PricingUnit = s.FPriceUnitId,
PricingQty = Convert.ToDecimal(s.FPriceUnitQty),
-
DeliveryDate = s.FDeliveryDate != null
? DateTime.ParseExact(s.FDeliveryDate,
"yyyy-MM-dd HH:mm:ss", null)
@@ -172,11 +176,6 @@
? DateTime.ParseExact(s.FDeliveryLastDate,
"yyyy-MM-dd HH:mm:ss", null)
: null,
- DemandOrg = s.FRequireOrgId,
- DemandDepartment = s.FRequireDeptId,
- ReceivingOrg = s.FReceiveOrgId,
- ReceivingDepartment = s.FReceiveDeptId,
- SettlementOrg = s.FEntrySettleOrgId,
IsGift = s.FGiveAway,
Remarks = s.FEntryNote,
SupplierItemCode = s.FSupMatId,
@@ -196,32 +195,31 @@
? DateTime.ParseExact(s.FTerminateDate,
"yyyy-MM-dd HH:mm:ss", null)
: null,
- TotalReceivedQty = Convert.ToDecimal(s.FBASERECEIVEQTY), //绱鏀舵枡鏁�
+ TotalReceivedQty = Convert.ToDecimal(s.FReceiveQty), //绱鏀舵枡鏁�
RemainingReceivedQty =
Convert.ToDecimal(s.FRemainReceiveQty),
- TotalStoredQty = Convert.ToDecimal(s.FBASESTOCKINQTY), //绱鍏ュ簱鏁�
+ TotalStoredQty = Convert.ToDecimal(s.FStockInQty), //绱鍏ュ簱鏁�
RemainingStoredQty = Convert.ToDecimal(s.FRemainStockINQty),
TotalReturnedQty = Convert.ToDecimal(s.FMrbQty),
- ReturnableReceivedQty =
- Convert.ToDecimal(s.FBASECHECKRETQTY), //鏀舵枡鍙��鏁�
- ReturnableStoredQty =
- Convert.ToDecimal(s.FBASESTOCKRETQTY), //搴撳瓨鍙��鏁�
+ ReturnableReceivedQty = Convert.ToDecimal(s.FCHECKRETQTY), //鏀舵枡鍙��鏁�
+ ReturnableStoredQty = Convert.ToDecimal(s.FSTOCKRETQTY), //搴撳瓨鍙��鏁�
SourceDocumentType = s.FSrcBillTypeId,
- SourceDocumentId = s.FSourceBillNo,
+ SourceDocumentId = s.FSrcBillNo,
DemandTrackingId = s.FReqTraceNo,
PlanTrackingId = s.FMtoNo,
ChangeFlag = s.FChangeFlag,
DemandSource = s.FDEMANDTYPE,
DemandDocumentId = s.FDEMANDBILLNO,
DemandDocumentLineId = s.FDEMANDBILLENTRYSEQ,
- prearrivaldate = s.FTerminateDate != null
- ? DateTime.ParseExact(s.FPREARRIVALDATE,
- "yyyy-MM-dd HH:mm:ss", null)
- : null,
- Remark1 = s.F_XIFG_Text_ne1,
- Remark2 = s.F_XIFG_Text_6oq,
- Remark3 = s.F_XIFG_Base_c1c,
- Remark4 = s.F_XIFG_Text_qtr4
+ DemandOrg = s.FRequireOrgId,
+ ReceivingOrg = s.FReceiveOrgId,
+ SettlementOrg = s.FEntrySettleOrgId,
+ PurchaseOrderLineNumber = s.FSEQ,
+ Demand = s.FRequireOrgId,
+ Receiving = s.FReceiveOrgId,
+ Settlement = s.FSETTLEORGID,
+ DemandDepartment = s.FRequireDeptId,
+ ReceivingDepartment = s.FReceiveDeptId
};
var single = rohInDataManager.GetSingle(it =>
diff --git a/MES.Service/service/BasicData/MesStaffManager.cs b/MES.Service/service/BasicData/MesStaffManager.cs
index 25fb3a1..e1d0ea8 100644
--- a/MES.Service/service/BasicData/MesStaffManager.cs
+++ b/MES.Service/service/BasicData/MesStaffManager.cs
@@ -27,7 +27,6 @@
break;
case "2":
case "4":
- DeleteStaff(db, sysUser, entity.Id);
if (InsertOrUpdateStaff(db, sysUser, entity)) // 鎻掑叆鎴栨洿鏂板憳宸�
return 1;
break;
@@ -62,6 +61,12 @@
private bool InsertOrUpdateStaff(SqlSugarScope db, SysUser sysUser,
MesStaff entity)
{
+ db.Deleteable<SysUser>()
+ .Where(s => s.Account == sysUser.Account).ExecuteCommand();
+
+ db.Deleteable<MesStaff>()
+ .Where(s => s.Id == entity.Id).ExecuteCommand();
+
var insertUser = db.Insertable(sysUser).ExecuteCommand();
if (insertUser <= 0) return false;
var insertStaff = db.Insertable(entity).ExecuteCommand();
@@ -231,12 +236,6 @@
private bool InsertOrUpdateBatch(SqlSugarScope db, List<SysUser> userList,
List<MesStaff> staffList)
{
- foreach (var sysUser in userList)
- {
- var entity = staffList.First(s => s.StaffNo == sysUser.Account);
- if (!InsertOrUpdateStaff(db, sysUser, entity)) return false;
- }
-
- return true;
+ return !(from sysUser in userList let entity = staffList.First(s => s.StaffNo == sysUser.Account) where !InsertOrUpdateStaff(db, sysUser, entity) select sysUser).Any();
}
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesSupplierManager.cs b/MES.Service/service/BasicData/MesSupplierManager.cs
index e4f9557..c1c416e 100644
--- a/MES.Service/service/BasicData/MesSupplierManager.cs
+++ b/MES.Service/service/BasicData/MesSupplierManager.cs
@@ -123,12 +123,11 @@
SuppNo = supplier.FNumber,
SuppSname = supplier.FShortName,
SuppName = supplier.FName,
- Lxr = supplier.FContact,
- Telf1 = supplier.FTel,
+ Lxr = supplier.FTContact,
+ Telf1 = supplier.Fmobilephone,
Fstaffid = supplier.FStaffId,
Fforbidstatus = supplier.FForbidStatus,
Type = supplier.Type,
- Remark = supplier.FDescription,
FSubsidiary = supplier.FUseOrgId,
Fumbrella = supplier.FCreateOrgId,
CreateDate = DateTime.Now,
--
Gitblit v1.9.3