From a0a0df2e824b6fe7e5a3c0afce78127fecf84fc9 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 03 十一月 2025 08:23:05 +0800
Subject: [PATCH] ERP接口代码更新，WCS代码优化，出入库分配优化
---
项目代码/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_StockInfo.cs | 142 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 127 insertions(+), 15 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_StockInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_StockInfo.cs"
index 73cc45c..64d059a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_StockInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_StockInfo.cs"
@@ -9,9 +9,10 @@
namespace WIDESEA_Model.Models
{
/// <summary>
- /// 搴撳瓨淇℃伅
+ /// 鍘熸枡/鍗婃垚鍝佺焊鍗峰簱瀛樹俊鎭�
/// </summary>
- [SugarTable(nameof(Dt_StockInfo), "搴撳瓨淇℃伅")]
+ [SugarTable(nameof(Dt_StockInfo), "鍘熸枡/鍗婃垚鍝佺焊鍗峰簱瀛樹俊鎭�")]
+ [SugarIndex("unique_stockinfo_stockcode", nameof(PalletCode), OrderByType.Asc, true)]
public class Dt_StockInfo : BaseEntity
{
/// <summary>
@@ -21,10 +22,16 @@
public int Id { get; set; }
/// <summary>
- /// 鎵樼洏缂栧彿
+ /// 鏉＄爜缂栧彿
/// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵樼洏缂栧彿")]
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鏉＄爜缂栧彿")]
public string PalletCode { get; set; }
+
+ /// <summary>
+ /// RFID淇℃伅
+ /// </summary>
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "RFID淇℃伅")]
+ public string RfidCode { get; set; }
/// <summary>
/// 鎵樼洏绫诲瀷
@@ -45,26 +52,131 @@
public int WarehouseId { get; set; }
/// <summary>
+ /// 搴撳瓨缁勭粐
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨缁勭粐")]
+ public int MaterielInvOrgId { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨灞炴��(鍘熺焊,鍗婃垚...)
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨灞炴��")]
+ public int StockAttribute { get; set; }
+
+ /// <summary>
/// 搴撳瓨鐘舵��
/// </summary>
[SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨鐘舵��")]
public int StockStatus { get; set; }
/// <summary>
+ /// 鐗╂枡Id
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡Id")]
+ public int MaterielId { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栧彿
+ /// </summary>
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
+ public string MaterielCode { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
+ public string MaterielName { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鐗╂枡瑙勬牸")]
+ public string MaterielSpec { get; set; }
+
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 100, ColumnDescription = "鎵规鍙�")]
+ public string BatchNo { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鍙�
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 100, ColumnDescription = "璁㈠崟鍙�")]
+ public string OrderNo { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鐗╂枡鎬婚暱(m)
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "搴撳瓨鐗╂枡鎬婚暱(m)")]
+ public decimal StockLength { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡閲嶉噺
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡閲嶉噺")]
+ public decimal? MaterielWeight { get; set; }
+
+ /// <summary>
+ /// 妫�娴嬮噸閲�
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "妫�娴嬮噸閲�")]
+ public decimal? CheckWeight { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鐩村緞/楂樺害
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡鐩村緞/楂樺害")]
+ public decimal? MaterielThickness { get; set; }
+
+ /// <summary>
+ /// 妫�娴嬬洿寰�
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "妫�娴嬬洿寰�")]
+ public decimal? CheckThickness { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡渚ч潰骞呭(m)
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡渚ч潰骞呭(m)")]
+ public decimal? MaterielWide { get; set; }
+
+ /// <summary>
+ /// 妫�娴嬪箙瀹�
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "妫�娴嬪箙瀹�")]
+ public decimal? CheckWide { get; set; }
+
+ /// <summary>
+ /// 鍑哄簱鐗╂枡鏁伴噺
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "鍑哄簱鐗╂枡鏁伴噺", DefaultValue = "0")]
+ public decimal StockOutLength { get; set; }
+
+ /// <summary>
+ /// 鏁村嵎/娈嬪嵎
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "鏁村嵎/娈嬪嵎", DefaultValue = "0")]
+ public int IsFull { get; set; }
+
+ /// <summary>
+ /// 鏄惁棰嗘枡<br/>
+ /// 0 鍚�<br/>
+ /// 1 鏄�<br/>
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "鏄惁棰嗘枡", DefaultValue = "0")]
+ public int IsPick { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍗曚綅")]
+ public string Unit { get; set; }
+
+ /// <summary>
/// 澶囨敞
/// </summary>
[SugarColumn(IsNullable = true, ColumnDescription = "澶囨敞")]
public string Remark { get; set; }
- /// <summary>
- /// 搴撳瓨鐗╂枡闀垮害GM/PP
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "搴撳瓨鐗╂枡闀垮害")]
- public int StockLength { get; set; }
-
- /// <summary>
- /// 搴撳瓨鏄庣粏
- /// </summary>
- [Navigate(NavigateType.OneToMany, nameof(Dt_StockInfoDetail.StockId), nameof(Id))]
- public List<Dt_StockInfoDetail> Details { get; set; }
}
}
--
Gitblit v1.9.3