From c3bb5047c194a0145caca7681f0df5a8feeaaa9b Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 18 四月 2025 16:30:40 +0800
Subject: [PATCH] 收货单增加选择单据
---
Tiger.Business.WMS/Common/Barcode/Barcode.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Tiger.Business.WMS/Common/Barcode/Barcode.cs b/Tiger.Business.WMS/Common/Barcode/Barcode.cs
index 385bb5a..9e0e92a 100644
--- a/Tiger.Business.WMS/Common/Barcode/Barcode.cs
+++ b/Tiger.Business.WMS/Common/Barcode/Barcode.cs
@@ -21,6 +21,16 @@
}
/// <summary>
+ /// 璁剧疆鏉＄爜鍒嗘瀽楠岃瘉瑙勫垯
+ /// </summary>
+ public void SetAnalysisRule()
+ {
+ Analyses.Clear();
+ Analyses.Add(new YadaBarcode());
+ //Analyses.Add(new BarcodeAnalysis());
+ }
+
+ /// <summary>
/// 鏉＄爜锛堣В鏋愬悗鐨勬潯鐮侊級
/// </summary>
private List<BarcodeAnalysis> Analyses { get; set; } = new();
@@ -59,7 +69,7 @@
/// <summary>
/// 鐢熶骇鏃ユ湡
/// </summary>
- public DateTime? ProdDate { get => BarcodeAnalysis.GetDateTime(ProdDateStr) ?? BarcodeAnalysis.GetDateTime(PrintDateStr); }
+ public DateTime? ProdDate { get => BarcodeAnalysis.GetDateTime(ProdDateStr); }
/// <summary>
/// 鎵撳嵃鏃ユ湡
/// </summary>
@@ -109,7 +119,7 @@
/// <summary>
/// 鏁伴噺
/// </summary>
- public decimal? Qty { get => Convert.ToDecimal(BarcodeAnalysis.GetDouble(QtyStr)); }
+ public double? Qty { get => BarcodeAnalysis.GetDouble(QtyStr); }
/// <summary>
/// 姣涢噸
@@ -237,16 +247,6 @@
SubsidiaryMaterial,
[Description("鍘熸潗鏂�")]
RawMaterial,
- }
-
- /// <summary>
- /// 璁剧疆鏉＄爜鍒嗘瀽楠岃瘉瑙勫垯
- /// </summary>
- public void SetAnalysisRule()
- {
- Analyses.Clear();
- Analyses.Add(new YadaBarcode());
- //Analyses.Add(new BarcodeAnalysis());
}
/// <summary>
--
Gitblit v1.9.3