From 075c5319285ab9896a74655c82cec7c1ae0e0196 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期五, 12 十二月 2025 14:13:46 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_PickingRecord.cs | 362 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 313 insertions(+), 49 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_PickingRecord.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_PickingRecord.cs"
index 7344ede..1a5dba9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_PickingRecord.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_PickingRecord.cs"
@@ -8,53 +8,171 @@
namespace WIDESEA_Model.Models
{
-
+
/// <summary>
/// 鎷ｉ�夎褰曡〃
/// </summary>
-
- [SugarTable(nameof(Dt_PickingRecord), "鎷ｉ�夎褰曡〃")]
-
- public class Dt_PickingRecord : BaseEntity
+ [SugarTable("Dt_PickingRecord")]
+ public class Dt_PickingRecord : BaseEntity
{
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+ /// <summary>
+ /// 涓婚敭ID
+ /// </summary>
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "")]
public int Id { get; set; }
- public int TaskNo { get; set; }
- public string OrderNo { get; set; }
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "")]
+ public int TaskNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鏉＄爜
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鐗╂枡鏉＄爜")]
+ public string Barcode { get; set; }
+
+
+ /// <summary>
+ /// 鍑哄簱璇︽儏ID
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鍑哄簱璇︽儏ID")]
public int OrderDetailId { get; set; }
- public string PalletCode { get; set; }
-
- public int OutStockLockId { get; set; }
- public string MaterielCode { get; set; }
-
- [SugarColumn(Length = 100)]
- public string Barcode { get; set; }
-
+ /// <summary>
+ /// 鏈鎷ｉ�夋暟閲�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鏈鎷ｉ�夋暟閲�")]
public decimal PickQuantity { get; set; }
- public DateTime PickTime { get; set; } = DateTime.Now;
+ /// <summary>
+ /// 鎷ｉ�夋椂闂�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鎷ｉ�夋椂闂�")]
+ public DateTime PickTime { get; set; }
- [SugarColumn(Length = 50)]
- public string Operator { get; set; }
-
- [SugarColumn(Length = 50)]
+ /// <summary>
+ /// 鎷ｉ�夊簱浣�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鎷ｉ�夊簱浣�")]
public string LocationCode { get; set; }
+ /// <summary>
+ /// 鎵樼洏缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鎵樼洏缂栧彿")]
public int StockId { get; set; }
+ /// <summary>
+ /// 鎿嶄綔绫诲瀷锛�0-鎷ｉ�� 1-鍥炲簱
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鎿嶄綔绫诲瀷锛�0-鎷ｉ�� 1-鍥炲簱")]
+ public string Operator { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "璁㈠崟鍙�")]
+ public string OrderNo { get; set; }
+
+ /// <summary>
+ /// 鏂欑鍙�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鏂欑鍙�")]
+ public string PalletCode { get; set; }
+
+ /// <summary>
+ /// 鍑哄簱閿佸畾ID
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鍑哄簱閿佸畾ID")]
+ public int? OutStockLockId { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鐗╂枡缂栧彿")]
+ public string MaterielCode { get; set; }
+
+ /// <summary>
+ /// 鍘傚尯
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鍘傚尯")]
+ public string FactoryArea { get; set; }
+
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鎵规鍙�")]
public string BatchNo { get; set; }
+ /// <summary>
+ /// 鏄惁鍙栨秷鎷ｉ��
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鏄惁鍙栨秷鎷ｉ��")]
public bool IsCancelled { get; set; }
+ /// <summary>
+ /// 鍙栨秷鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鍙栨秷鏃堕棿")]
public DateTime? CancelTime { get; set; }
+ /// <summary>
+ /// 鍙栨秷浜�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鍙栨秷浜�")]
public string CancelOperator { get; set; }
- public string FactoryArea { get; set; }
- }
-
+ /// <summary>
+ /// 浠撳簱缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnDescription = "浠撳簱缂栧彿")]
+ public string WarehouseCode { get; set; }
+
+ /// <summary>
+ /// 琛屽彿
+ /// </summary>
+ [SugarColumn(ColumnDescription = "琛屽彿")]
+ public string lineNo { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟嗙紪鍙�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "渚涘簲鍟嗙紪鍙�")]
+ public string SupplyCode { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鐗╂枡鏁伴噺")]
+ public decimal BarcodeQty { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鐗╂枡鍗曚綅")]
+ public string BarcodeUnit { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鎸枡鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鐗╂枡鎸枡鏁伴噺")]
+ public decimal BarcodeMoveQty { get; set; }
+
+ /// <summary>
+ /// 鍥炰紶MES
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鍥炰紶MES")]
+ public int ReturnToMESStatus { get; set; }
+
+ /// <summary>
+ /// 鍥炰紶MES鍞竴鍙�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鍥炰紶MES鍞竴鍙�")]
+ public string FeedBackMesDocumentNo { get; set; }
+ }
+
/// <summary>
/// 鍥炲簱璁板綍琛�
/// </summary>
@@ -73,7 +191,7 @@
/// 鍥炲簱鏁伴噺
/// </summary>
public decimal ReturnQty { get; set; }
-
+
public DateTime ReturnTime { get; set; }
/// <summary>
/// 0-寰呭洖搴� 1-宸插洖搴�
@@ -84,44 +202,190 @@
/// <summary>
/// 鎷嗗寘璁板綍琛�
/// </summary>
- [SugarTable("Dt_SplitPackageRecord")]
- public class Dt_SplitPackageRecord: BaseEntity
+ [SugarTable("Dt_SplitPackageRecord")] // 鏄惧紡鎸囧畾琛ㄥ悕锛屼笌鏁版嵁搴撲竴鑷�
+ public class Dt_SplitPackageRecord : BaseEntity
{
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
- public int Id { get; set; }
- public string OrderNo { get; set; }
- public int? TaskNum { get; set; }
- public string PalletCode { get; set; }
- public int StockId { get; set; }
- public bool IsReverted { get; set; } = false;
- public int OutStockLockInfoId { get; set; } // 鍏宠仈鐨勫嚭搴撻攣瀹氫俊鎭�
- public string OriginalBarcode { get; set; } // 鍘熸潯鐮�
- public string NewBarcode { get; set; } // 鏂版潯鐮�
-
- public string FactoryArea { get; set; }
+ /// <summary>
+ /// 涓婚敭ID
+ /// </summary>
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "")]
+ public long Id { get; set; }
+
+ /// <summary>
+ /// 鍘熸潯鐮�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鍘熸潯鐮�")]
+ public string OriginalBarcode { get; set; }
+
+ /// <summary>
+ /// 鏂版潯鐮�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鏂版潯鐮�")]
+ public string NewBarcode { get; set; }
+
+ /// <summary>
+ /// 鍘熸暟閲�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鍘熸暟閲�")]
+ public decimal OriginalQty { get; set; }
+
/// <summary>
/// 鎷嗗垎鏁伴噺锛堟柊鏉＄爜鏁伴噺锛�
/// </summary>
+ [SugarColumn(ColumnDescription = "鎷嗗垎鏁伴噺锛堟柊鏉＄爜鏁伴噺锛�")]
public decimal SplitQty { get; set; }
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鎵规鍙�")]
+ public string BatchNo { get; set; }
+
+ /// <summary>
+ /// 搴撲綅缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnDescription = "搴撲綅缂栧彿")]
+ public string LocationId { get; set; }
+
+ /// <summary>
+ /// 鎷嗗寘鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鎷嗗寘鏃堕棿")]
+ public DateTime SplitTime { get; set; }
+
+ /// <summary>
+ /// 鐘舵�侊細0-宸叉媶鍒� 1-鏂版潯鐮佸凡鍥炰紶MES
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鐘舵�侊細0-宸叉媶鍒� 1-鏂版潯鐮佸凡鍥炰紶MES")]
+ public int Status { get; set; }
+
+
+
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "浠诲姟鍙�")]
+ public int? TaskNum { get; set; }
+
+ /// <summary>
+ /// 鍓╀綑鏁伴噺锛堝師鏉＄爜鍓╀綑锛�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鍓╀綑鏁伴噺锛堝師鏉＄爜鍓╀綑锛�")]
public decimal RemainQuantity { get; set; }
- public string MaterielCode { get; set; } // 鐗╂枡缂栫爜
- public DateTime SplitTime { get; set; } = DateTime.Now;
- public string Operator { get; set; } // 鎿嶄綔浜�
- public int Status { get; set; } // 鐘舵�侊細1-宸叉媶鍖� 2-宸叉嫞閫� 3-宸插洖搴�
+ /// <summary>
+ /// 鐗╂枡缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鐗╂枡缂栧彿")]
+ public string MaterielCode { get; set; }
- public DateTime RevertTime { get; set; }
+ /// <summary>
+ /// 鎵樼洏缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鎵樼洏缂栧彿")]
+ public string PalletCode { get; set; }
- public string RevertOperator { get; set; }
+ /// <summary>
+ /// 鎾ら攢鎷嗗寘
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鎾ら攢鎷嗗寘")]
+ public bool IsReverted { get; set; }
+
+ /// <summary>
+ /// 閿佸畾璁板綍Id
+ /// </summary>
+ [SugarColumn(ColumnDescription = "閿佸畾璁板綍Id")]
+ public int OutStockLockInfoId { get; set; }
+
+ /// <summary>
+ /// 鎿嶄綔浜�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鎿嶄綔浜�")]
+ public string Operator { get; set; }
+
+ /// <summary>
+ /// 鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鍗曞彿")]
+ public string OrderNo { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨id
+ /// </summary>
+ [SugarColumn(ColumnDescription = "搴撳瓨id")]
+ public int StockId { get; set; }
+
+ /// <summary>
+ /// 鍘傚尯
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鍘傚尯")]
+ public string FactoryArea { get; set; }
+
+ /// <summary>
+ /// 鎾ら攢鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鎾ら攢鏃堕棿")]
+ public DateTime? RevertTime { get; set; }
+
+ /// <summary>
+ /// 涓婁竴鏉℃媶鍒嗚褰旾D
+ /// </summary>
+ [SugarColumn(ColumnDescription = "")]
public int PreviousSplitRecordId { get; set; }
- [SugarColumn(IsNullable = true)]
- public decimal? OriginalStockQuantity { get; set; }
+ /// <summary>
+ /// 搴撳瓨鏁�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "搴撳瓨鏁�")]
+ public decimal OriginalStockQuantity { get; set; }
- public decimal StockBeforeSplit { get; set; }
+ /// <summary>
+ /// 鎷嗗寘鍓嶇殑搴撳瓨鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鎷嗗寘鍓嶇殑搴撳瓨鏁伴噺")]
+ public decimal StockBeforeSplit { get; set; }
+
+ /// <summary>
+ /// 鎷嗗寘鍓嶅垎閰嶆暟
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鎷嗗寘鍓嶅垎閰嶆暟")]
public decimal AssignBeforeSplit { get; set; }
+
+ /// <summary>
+ /// 鎾ら攢鎿嶄綔浜�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "")]
+ public string RevertOperator { get; set; }
+
+ /// <summary>
+ /// 鏄惁鑷姩鎷嗗寘
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鏄惁鑷姩鎷嗗寘")]
+ public bool IsAutoSplit { get; set; }
}
-
+
+
+
+ /// <summary>
+ /// 绌虹鍙栬蛋璁板綍琛�
+ /// </summary>
+ public class Dt_EmptyPalletRemoval
+ {
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+ public int Id { get; set; }
+
+ public string OrderNo { get; set; }
+
+ public string PalletCode { get; set; }
+
+ public DateTime RemovalTime { get; set; }
+
+ public string Operator { get; set; }
+
+ public int CompletedItemsCount { get; set; }
+
+ public decimal TotalPickedQuantity { get; set; }
+ }
+
}
--
Gitblit v1.9.3