From 2bcf62867f78cd6b04b1ce97da0d9389312d6f31 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 10 七月 2024 10:33:40 +0800
Subject: [PATCH] erp接口更新
---
MESApplication/bin/Release/net8.0/MESApplication.exe | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb | 0
MES.Service/Modes/MesRohInData.cs | 24 ++++++++++++++++++++++++
MES.Service/service/BasicData/MesRohInManager.cs | 4 ++++
MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.dll | 0
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MESApplication/bin/Debug/net8.0/MESApplication.pdb | 0
MESApplication/bin/Release/net8.0/MES.Service.dll | 0
MESApplication/bin/Release/net8.0/MESApplication.dll | 0
MESApplication/bin/Release/net8.0/publish/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.exe | 0
MES.Service/Dto/webApi/ErpRohinData.cs | 4 ++++
MESApplication/bin/Release/net8.0/MESApplication.pdb | 0
MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MES.Service.dll | 0
MES.Service/Dto/webApi/ErpItems.cs | 7 +++++--
MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/Modes/MesItems.cs | 10 ++++++++--
MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
MES.Service/bin/Release/net8.0/MES.Service.dll | 0
MES.Service/bin/Release/net8.0/MES.Service.pdb | 0
MES.Service/service/BasicData/MesItemsManager.cs | 2 ++
25 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpItems.cs b/MES.Service/Dto/webApi/ErpItems.cs
index 32978aa..ca68e49 100644
--- a/MES.Service/Dto/webApi/ErpItems.cs
+++ b/MES.Service/Dto/webApi/ErpItems.cs
@@ -8,8 +8,8 @@
public string? FName { get; set; }
public string? FSpecification { get; set; }
public string? FBaseUnitId { get; set; }
- public int? FSafeStock { get; set; }
- public int? FMaxStock { get; set; }
+ public double? FSafeStock { get; set; }
+ public double? FMaxStock { get; set; }
public double? FMinPackCount { get; set; }
public string? FStockId { get; set; }
public string? PPBOM00019124 { get; set; }
@@ -25,4 +25,7 @@
public string? FForbidStatus { get; set; }
public string? FErpClsID { get; set; }
public string? FWorkShopId { get; set; }
+
+ public string? FPRODUCEUNITID { get; set; }
+ public string? FSUBCONUNITID { 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 8a6c5dd..70cd6a6 100644
--- a/MES.Service/Dto/webApi/ErpRohinData.cs
+++ b/MES.Service/Dto/webApi/ErpRohinData.cs
@@ -45,4 +45,8 @@
public string? FDEMANDTYPE { get; set; }
public string? FDEMANDBILLNO { get; set; }
public string? FDEMANDBILLENTRYSEQ { get; set; }
+ public string? PurchaseOrderLineNumber { get; set; }
+ public string? Demand { get; set; }
+ public string? Receiving { get; set; }
+ public string? Settlement { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesItems.cs b/MES.Service/Modes/MesItems.cs
index 9fd6c4c..809dcb8 100644
--- a/MES.Service/Modes/MesItems.cs
+++ b/MES.Service/Modes/MesItems.cs
@@ -108,13 +108,13 @@
/// 鏈�浣庡簱瀛�
/// </summary>
[SugarColumn(ColumnName = "LOWLIMIT")]
- public decimal? Lowlimit { get; set; }
+ public double? Lowlimit { get; set; }
/// <summary>
/// 鏈�澶у簱瀛�
/// </summary>
[SugarColumn(ColumnName = "HIGHLIMIT")]
- public decimal? Highlimit { get; set; }
+ public double? Highlimit { get; set; }
/// <summary>
/// 鏈�灏忓寘瑁呮暟
@@ -260,5 +260,11 @@
[SugarColumn(ColumnName = "MATERIAL_PROPERTI")]
public string? MaterialProperti { get; set; }
+ [SugarColumn(ColumnName = "PRODUCE_UNIT")]
+ public string? ProduceUnit { get; set; }
+
+ [SugarColumn(ColumnName = "SUBCON_UNIT")]
+ public string? SubconUnit { get; set; }
+
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesRohInData.cs b/MES.Service/Modes/MesRohInData.cs
index b2383e7..da6d2ac 100644
--- a/MES.Service/Modes/MesRohInData.cs
+++ b/MES.Service/Modes/MesRohInData.cs
@@ -323,4 +323,28 @@
/// </summary>
[SugarColumn(ColumnName = "ERP_ID")]
public decimal? ErpId { get; set; }
+
+ /// <summary>
+ /// 閲囪喘璁㈠崟琛屽彿
+ /// </summary>
+ [SugarColumn(ColumnName = "purchase_order_line_number")]
+ public string? PurchaseOrderLineNumber { get; set; }
+
+ /// <summary>
+ /// 闇�姹傜粍缁�
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_ID")]
+ public string? Demand { get; set; }
+
+ /// <summary>
+ /// 鏀舵枡缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_ID")]
+ public string? Receiving { get; set; }
+
+ /// <summary>
+ /// 缁撶畻缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_ID")]
+ public string? Settlement { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.dll b/MES.Service/bin/Debug/net8.0/MES.Service.dll
index 1eef955..5890005 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.pdb b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
index 00db7ba..004089e 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.dll b/MES.Service/bin/Release/net8.0/MES.Service.dll
index 7d8af95..5ef17a8 100644
--- a/MES.Service/bin/Release/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Release/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.pdb b/MES.Service/bin/Release/net8.0/MES.Service.pdb
index 5962411..2edfdce 100644
--- a/MES.Service/bin/Release/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Release/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index 87455c0..a90c981 100644
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/MES.Service/service/BasicData/MesItemsManager.cs
@@ -141,6 +141,8 @@
Fforbidstatus = item.FForbidStatus,
MaterialProperti = item.FErpClsID,
ProductionWorkshop = item.FWorkShopId,
+ ProduceUnit = item.FPRODUCEUNITID,
+ SubconUnit = item.FSUBCONUNITID,
Company = "1000",
Factory = "1000"
};
diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index a9fb76a..32dbef1 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -213,6 +213,10 @@
entity.DemandSource = s.FDEMANDTYPE;
entity.DemandDocumentId = s.FDEMANDBILLNO;
entity.DemandDocumentLineId = s.FDEMANDBILLENTRYSEQ;
+ entity.PurchaseOrderLineNumber = s.PurchaseOrderLineNumber;
+ entity.Demand = s.Demand;
+ entity.Receiving = s.Receiving;
+ entity.Settlement = s.Settlement;
list.Add(entity);
});
return list;
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index 1eef955..5890005 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.pdb b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
index 00db7ba..004089e 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.dll b/MESApplication/bin/Debug/net8.0/MESApplication.dll
index 2d2f3ef..25bb384 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.exe b/MESApplication/bin/Debug/net8.0/MESApplication.exe
index 5cd3292..d55d99f 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.pdb b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
index 2c17eb7..32b92ef 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.dll b/MESApplication/bin/Release/net8.0/MES.Service.dll
index 7d8af95..5ef17a8 100644
--- a/MESApplication/bin/Release/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Release/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.pdb b/MESApplication/bin/Release/net8.0/MES.Service.pdb
index 5962411..2edfdce 100644
--- a/MESApplication/bin/Release/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Release/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.dll b/MESApplication/bin/Release/net8.0/MESApplication.dll
index 5212b66..af8e0ea 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Release/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.exe b/MESApplication/bin/Release/net8.0/MESApplication.exe
index 5cd3292..d55d99f 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Release/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.pdb b/MESApplication/bin/Release/net8.0/MESApplication.pdb
index d911793..fa795c3 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
index 7d8af95..5ef17a8 100644
--- a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
+++ b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb b/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
index 5962411..2edfdce 100644
--- a/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
index 5212b66..af8e0ea 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.exe b/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
index 5cd3292..d55d99f 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
index d911793..fa795c3 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
Binary files differ
--
Gitblit v1.9.3