From 36746596927952a6b860129a62eec9059bf083a7 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期六, 26 四月 2025 18:06:27 +0800
Subject: [PATCH] 优化了备料逻辑
---
Tiger.Model.Net/Entitys/WMS/WMS_ITEM.cs | 41 ++++++++++-------------------------------
1 files changed, 10 insertions(+), 31 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/WMS/WMS_ITEM.cs b/Tiger.Model.Net/Entitys/WMS/WMS_ITEM.cs
index ae775ba..9732beb 100644
--- a/Tiger.Model.Net/Entitys/WMS/WMS_ITEM.cs
+++ b/Tiger.Model.Net/Entitys/WMS/WMS_ITEM.cs
@@ -45,14 +45,14 @@
public string SN_TYPE { get; set; }
/// <summary>
- /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
+ /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍21Rejected闇�閫�璐30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤65Received琚帴鏀秥70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
/// </summary>
public int STATUS { get; set; }
/// <summary>
/// 鏁伴噺
/// </summary>
- public decimal QTY { get; set; }
+ public double QTY { get; set; }
/// <summary>
/// 鍗曚綅
@@ -172,7 +172,7 @@
/// <summary>
/// 寤舵湡鏃堕棿
/// </summary>
- public decimal PostponeDays { get; set; }
+ //public double PostponeDays { get; set; }
#endregion 鍏叡灞炴��
@@ -204,7 +204,7 @@
#region 鏋氫妇鍙橀噺
/// <summary>
- /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
+ /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍21Rejected闇�閫�璐30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤65Received琚帴鏀秥70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
/// </summary>
public enum STATUSs
{
@@ -220,6 +220,9 @@
[Description("寰呮楠�")]
WaitTest = 20,
+ [Description("闇�閫�璐�")]
+ Rejected = 22,
+
[Description("寰呭叆搴�")]
WaitIn = 30,
@@ -231,6 +234,9 @@
[Description("宸插彂鏂�")]
Sended = 60,
+
+ [Description("琚帴鏀�")]
+ Received = 65,
[Description("宸蹭笂鏂�")]
Loaded = 70,
@@ -250,33 +256,6 @@
#endregion 鏋氫妇鍙橀噺
}//endClass
-
- /// <summary>
- /// 鏉＄爜搴撳瓨淇℃伅锛屽寘鎷粨搴擄紝鍌ㄥ尯锛岃揣鏋讹紝鍌ㄤ綅锛岀埗鏉＄爜锛屽寘瑁呮槑缁嗙瓑
- /// </summary>
- public class Inventory
- {
- public string SN { get; set; }
- public Barcode Barcode { get; set; }
- public bool IsQRCode => Barcode.IsQRCode;
- public WMS_ITEM_EXT ExtInfo { get; set; }
- public BAS_ITEM ItemInfo { get; set; }
- public WMS_WAREHOUSE Warehouse { get; set; }
- public WMS_REGION Region { get; set; }
- public WMS_SHELF Shelf { get; set; }
- public WMS_LOCATION Location { get; set; }
- public WMS_ITEM_PKG ParentPkg { get; set; }
- public List<WMS_ITEM_PKG> Packages { get; set; } = new List<WMS_ITEM_PKG>();
- public List<WMS_ITEM> Items { get; set; } = new List<WMS_ITEM>();
- public List<WMS_ITEM_EXT> ItemsExt { get; set; } = new List<WMS_ITEM_EXT>();
- public List<WMS_ITEM_HIS> History { get; set; } = new List<WMS_ITEM_HIS>();
- public List<WMS_ITEM.STATUSs> StatusList => Items.GroupBy(q => q.STATUS).Select(q => new { Status = q.Key.GetEnum<WMS_ITEM.STATUSs>(), Count = q.Count() }).OrderByDescending(q => q.Count).Select(q => q.Status).ToList();
- public bool isNormalStatus => Items.Select(q => q.STATUS).Distinct().Count() == 1;
- public WMS_ITEM.STATUSs Status => StatusList?.FirstOrDefault() ?? WMS_ITEM.STATUSs.NotExists;
- public WMS_ITEM_PKG CurPkg => Packages.FirstOrDefault(q => q.SN == SN);
- public bool isExists => CurPkg != null;
- public bool isMinPackage => Items.Count == 1 && Items.Single().SN == SN;
- }
/// <summary>
/// 涓婃灦鎵ц淇℃伅
--
Gitblit v1.9.3