From 5f3963706bf5e87556aa467834d2ca49b274e638 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期四, 31 十月 2024 12:18:55 +0800
Subject: [PATCH] 采购订单更新
---
MES.Service/Modes/MesRohInData.cs | 232 +++++++++++++---------------
MES.Service/service/BasicData/MesRohInManager.cs | 30 ++-
MES.Service/Modes/MesRohIn.cs | 198 +++++++++++-------------
3 files changed, 220 insertions(+), 240 deletions(-)
diff --git a/MES.Service/Modes/MesRohIn.cs b/MES.Service/Modes/MesRohIn.cs
index ca621c7..1a38774 100644
--- a/MES.Service/Modes/MesRohIn.cs
+++ b/MES.Service/Modes/MesRohIn.cs
@@ -9,303 +9,291 @@
public class MesRohIn
{
/// <summary>
- /// 涓婚敭
- /// 榛樿鍊�: (newid())
- ///</summary>
+ /// 涓婚敭
+ /// 榛樿鍊�: (newid())
+ /// </summary>
[SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
public Guid Guid { get; set; }
/// <summary>
- /// SEQ_BASEINFO_ID
- ///</summary>
- [SugarColumn(ColumnName = "ID")]
- 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>
- /// 瀹℃牳鏍囪瘑
- ///</summary>
+ /// 瀹℃牳鏍囪瘑
+ /// </summary>
[SugarColumn(ColumnName = "CHECK_FALG")]
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>
+ /// </summary>
[SugarColumn(ColumnName = "Prearrivaldate")]
public DateTime? Prearrivaldate { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "ReceiveOrgId")]
public string? ReceiveOrgId { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "Provider_Id")]
public string? ProviderId { get; set; }
/// <summary>
- /// 鑱旂郴浜�
- ///</summary>
+ /// 鑱旂郴浜�
+ /// </summary>
[SugarColumn(ColumnName = "anred")]
public string? Anred { get; set; }
/// <summary>
- /// 鐢佃瘽
- ///</summary>
+ /// 鐢佃瘽
+ /// </summary>
[SugarColumn(ColumnName = "telf1")]
public string? Telf1 { get; set; }
/// <summary>
- /// 鍥哄畾鐢佃瘽
- ///</summary>
+ /// 鍥哄畾鐢佃瘽
+ /// </summary>
[SugarColumn(ColumnName = "Fixed_Telephone")]
public string? FixedTelephone { get; set; }
/// <summary>
- /// 閫氳鍦板潃
- ///</summary>
+ /// 閫氳鍦板潃
+ /// </summary>
[SugarColumn(ColumnName = "Address")]
public string? Address { get; set; }
/// <summary>
- /// 楠屾敹鏂瑰紡
- ///</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 62a7b64..c9e1bd5 100644
--- a/MES.Service/Modes/MesRohInData.cs
+++ b/MES.Service/Modes/MesRohInData.cs
@@ -9,346 +9,332 @@
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>
- /// ERP鐨処D鍙�
- ///</summary>
+ /// ERP鐨処D鍙�
+ /// </summary>
[SugarColumn(ColumnName = "EBELN_K3ID")]
public decimal? EbelnK3id { get; set; }
/// <summary>
- /// 瀹㈡埛璐у彿
- ///</summary>
+ /// 瀹㈡埛璐у彿
+ /// </summary>
[SugarColumn(ColumnName = "REMARK1")]
public string? Remark1 { get; set; }
/// <summary>
- /// 鍖呰鍗曞彿
- ///</summary>
+ /// 鍖呰鍗曞彿
+ /// </summary>
[SugarColumn(ColumnName = "REMARK2")]
public string? Remark2 { get; set; }
/// <summary>
- /// 涓讳骇鍝�
- ///</summary>
+ /// 涓讳骇鍝�
+ /// </summary>
[SugarColumn(ColumnName = "REMARK3")]
public string? Remark3 { get; set; }
/// <summary>
- /// SMT澶囨敞
- ///</summary>
+ /// SMT澶囨敞
+ /// </summary>
[SugarColumn(ColumnName = "REMARK4")]
public string? Remark4 { get; set; }
/// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "ID")]
- public decimal? Id { get; set; }
-
- /// <summary>
- ///
- ///</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>
- ///
- /// 榛樿鍊�: ((0))
- ///</summary>
+ /// 榛樿鍊�: ((0))
+ /// </summary>
[SugarColumn(ColumnName = "CGB014")]
public decimal? Cgb014 { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "DEMAND_DEPARTMENT")]
public string? DemandDepartment { get; set; }
@@ -359,14 +345,12 @@
public string? ReceivingDepartment { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "FPREARRIVALDATE")]
public DateTime? Fprearrivaldate { get; set; }
/// <summary>
- ///
- ///</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 6509483..b8853e7 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -37,15 +37,15 @@
private bool UpdateData(SqlSugarScope db, MesRohIn mesRohIn,
List<MesRohInData> mesRohInDatas)
{
- var decimals = mesRohInDatas.Select(s => s.Id).ToArray();
+ var decimals = mesRohInDatas.Select(s => s.Guid).ToArray();
var update = db.Deleteable<MesRohIn>()
- .Where(a => a.Id == mesRohIn.Id)
+ .Where(a => a.Guid == mesRohIn.Guid)
.ExecuteCommand() > 0;
var insertOrUpdate = db
.Deleteable<MesRohInData>()
- .Where(s => decimals.Contains(s.Id))
+ .Where(s => decimals.Contains(s.Guid))
.ExecuteCommand() > 0;
if (update && insertOrUpdate) return true;
@@ -56,16 +56,22 @@
private bool SaveOrUpdateData(SqlSugarScope db, MesRohIn mesRohIn,
List<MesRohInData> mesRohInDatas)
{
- if (mesRohIn.Id != null)
- db.Deleteable<MesRohIn>().Where(s => s.Id == mesRohIn.Id)
+ if (mesRohIn.Guid != null)
+ db.Deleteable<MesRohIn>().Where(s => s.Guid == mesRohIn.Guid)
.ExecuteCommand();
if (mesRohInDatas.Count > 0)
db.Deleteable<MesRohInData>()
.Where(s => s.ErpId == mesRohIn.EbelnK3id).ExecuteCommand();
- var orUpdate = base.Insert(mesRohIn);
- var baOrUpdate = rohInDataManager.InsertRange(mesRohInDatas);
+ var orUpdate = db.Insertable(mesRohIn)
+ .IgnoreColumns(true).ExecuteCommand() > 0;
+
+
+ var baOrUpdate = db.Insertable(mesRohInDatas).PageSize(1)
+ .IgnoreColumnsNull()
+ .ExecuteCommand() > 0;
+
if (orUpdate && baOrUpdate) return true;
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
@@ -83,8 +89,9 @@
var eid = long.Parse(rohIn.id);
var mesRohIn = new MesRohIn();
+
var single = base.GetSingle(it => it.EbelnK3id == eid);
- if (single != null) mesRohIn.Id = single.Id;
+ if (single != null) mesRohIn.Guid = single.Guid;
mesRohIn.EbelnK3id = eid;
mesRohIn.BillNo = rohIn.FBillNo;
@@ -155,7 +162,7 @@
{
var entity = new MesRohInData
{
- EbelnK3id = Convert.ToDecimal(s.id),
+ EbelnK3id = Convert.ToDecimal(s.id),
ErpId = Convert.ToDecimal(s.Eid),
BillNo = s.FBillNo,
ItemId = s.FMaterialId,
@@ -201,7 +208,8 @@
TotalStoredQty = Convert.ToDecimal(s.FStockInQty), //绱鍏ュ簱鏁�
RemainingStoredQty = Convert.ToDecimal(s.FRemainStockINQty),
TotalReturnedQty = Convert.ToDecimal(s.FMrbQty),
- ReturnableReceivedQty = Convert.ToDecimal(s.FCHECKRETQTY), //鏀舵枡鍙��鏁�
+ ReturnableReceivedQty =
+ Convert.ToDecimal(s.FCHECKRETQTY), //鏀舵枡鍙��鏁�
ReturnableStoredQty = Convert.ToDecimal(s.FSTOCKRETQTY), //搴撳瓨鍙��鏁�
SourceDocumentType = s.FSrcBillTypeId,
SourceDocumentId = s.FSrcBillNo,
@@ -224,7 +232,7 @@
var single = rohInDataManager.GetSingle(it =>
it.EbelnK3id == entity.EbelnK3id);
- if (single != null) entity.Id = single.Id;
+ if (single != null) entity.Guid = single.Guid;
return entity;
}).ToList();
--
Gitblit v1.9.3