From a4ae3bf5f1826e8e29a95da3dc2c947d713d4ebb Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 06 六月 2025 15:38:14 +0800
Subject: [PATCH] 1.仓库信息储存逻辑调整 2.生产订单接口优化。
---
MES.Service/Modes/MesRohInData.cs | 101 ++++++++++++++++++++++++--------------------------
1 files changed, 48 insertions(+), 53 deletions(-)
diff --git a/MES.Service/Modes/MesRohInData.cs b/MES.Service/Modes/MesRohInData.cs
index 61ae226..c9e1bd5 100644
--- a/MES.Service/Modes/MesRohInData.cs
+++ b/MES.Service/Modes/MesRohInData.cs
@@ -9,6 +9,12 @@
public class MesRohInData
{
/// <summary>
+ /// 榛樿鍊�: (newid())
+ /// </summary>
+ [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
+ public Guid Guid { get; set; }
+
+ /// <summary>
/// 閲囪喘鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "BILL_NO")]
@@ -32,7 +38,6 @@
[SugarColumn(ColumnName = "ITEM_ID")]
public string? ItemId { get; set; }
-
/// <summary>
/// 閲囪喘鍗曚綅
/// </summary>
@@ -51,6 +56,17 @@
[SugarColumn(ColumnName = "INVENTORY_UNIT")]
public string? InventoryUnit { get; set; }
+ /// <summary>
+ /// 璁′环鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "PRICING_UNIT")]
+ public string? PricingUnit { get; set; }
+
+ /// <summary>
+ /// 璁′环鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "PRICING_QTY")]
+ public decimal? PricingQty { get; set; }
/// <summary>
/// 浜よ揣鏃ユ湡
@@ -125,13 +141,13 @@
public string? BatchNumber { get; set; }
/// <summary>
- /// 涓氬姟鍏抽棴 A:姝ｅ父锛孊:涓氬姟缁堟
+ /// 涓氬姟鍏抽棴
/// </summary>
[SugarColumn(ColumnName = "BUSINESS_CLOSE")]
public string? BusinessClose { get; set; }
/// <summary>
- /// 涓氬姟鍐荤粨 A:姝ｅ父锛孊:涓氬姟缁堟
+ /// 涓氬姟鍐荤粨
/// </summary>
[SugarColumn(ColumnName = "BUSINESS_FREEZE")]
public string? BusinessFreeze { get; set; }
@@ -263,44 +279,61 @@
public decimal? EbelnK3id { get; set; }
/// <summary>
- /// SEQ_BASEINFO_ID
+ /// 瀹㈡埛璐у彿
/// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_BASEINFO_ID",
- IsPrimaryKey = true)]
- public decimal Id { get; set; }
+ [SugarColumn(ColumnName = "REMARK1")]
+ public string? Remark1 { get; set; }
/// <summary>
- /// ERP澶碔D
+ /// 鍖呰鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK2")]
+ public string? Remark2 { get; set; }
+
+ /// <summary>
+ /// 涓讳骇鍝�
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK3")]
+ public string? Remark3 { get; set; }
+
+ /// <summary>
+ /// SMT澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK4")]
+ public string? Remark4 { get; set; }
+
+ /// <summary>
/// </summary>
[SugarColumn(ColumnName = "ERP_ID")]
public decimal? ErpId { get; set; }
/// <summary>
- /// 閲囪喘璁㈠崟琛屽彿
/// </summary>
- [SugarColumn(ColumnName = "purchase_order_line_number")]
+ [SugarColumn(ColumnName = "PURCHASE_ORDER_LINE_NUMBER")]
public string? PurchaseOrderLineNumber { get; set; }
/// <summary>
- /// 闇�姹傜粍缁�
/// </summary>
[SugarColumn(ColumnName = "DEMAND")]
public string? Demand { get; set; }
/// <summary>
- /// 鏀舵枡缁勭粐
/// </summary>
[SugarColumn(ColumnName = "RECEIVING")]
public string? Receiving { get; set; }
/// <summary>
- /// 缁撶畻缁勭粐
/// </summary>
[SugarColumn(ColumnName = "SETTLEMENT")]
public string? Settlement { get; set; }
/// <summary>
- /// 闇�姹傞儴闂�
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "CGB014")]
+ public decimal? Cgb014 { get; set; }
+
+ /// <summary>
/// </summary>
[SugarColumn(ColumnName = "DEMAND_DEPARTMENT")]
public string? DemandDepartment { get; set; }
@@ -312,50 +345,12 @@
public string? ReceivingDepartment { get; set; }
/// <summary>
- /// 棰勮鍒拌揣鏃堕棿
/// </summary>
[SugarColumn(ColumnName = "FPREARRIVALDATE")]
- public DateTime? FPREARRIVALDATE { get; set; }
+ public DateTime? Fprearrivaldate { get; set; }
/// <summary>
- /// 瀹㈡埛璐у彿
- /// </summary>
- [SugarColumn(ColumnName = "REMARK1")]
- public string? Remark1 { get; set; }
-
- /// <summary>
- /// 鍖呰鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "REMARK2")]
- public string? Remark2 { get; set; }
-
- /// <summary>
- /// 涓讳骇鍝�
- /// </summary>
- [SugarColumn(ColumnName = "REMARK3")]
- public string? Remark3 { get; set; }
-
- /// <summary>
- /// SMT澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARK4")]
- public string? Remark4 { get; set; }
-
- /// <summary>
- /// 閿�鍞鍗曡鍙�
/// </summary>
[SugarColumn(ColumnName = "FDEMANDBILLNO_LINE")]
public string? FdemandbillnoLine { get; set; }
-
- /// <summary>
- /// 鐢垫皵鎴愬搧鍨嬪彿
- /// </summary>
- [SugarColumn(ColumnName = "ELECTRICAL_PRODUCT_MODEL")]
- public string? ElectricalProductModel { get; set; }
-
- /// <summary>
- /// 鐢垫皵鎴愬搧鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "ELECTRICAL_PRODUCT_NAME")]
- public string? ElectricalProductName { get; set; }
}
\ No newline at end of file
--
Gitblit v1.9.3