From fe4a8ec610b23d33c697dbb76c298ff3b2e31ef1 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 29 四月 2025 01:14:39 +0800
Subject: [PATCH] 来料打印更新
---
Tiger.Business.WMS/Common/Barcode/Barcode.cs | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/Tiger.Business.WMS/Common/Barcode/Barcode.cs b/Tiger.Business.WMS/Common/Barcode/Barcode.cs
index 2d7878a..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>
@@ -72,6 +82,10 @@
/// 鎵规鍙�
/// </summary>
public string LotNo { get; set; }
+ /// <summary>
+ /// 缁勭粐浠ｇ爜
+ /// </summary>
+ public string Organization { get; set; }
/// <summary>
/// 璁㈠崟鍙�
/// </summary>
@@ -105,7 +119,7 @@
/// <summary>
/// 鏁伴噺
/// </summary>
- public decimal? Qty { get => Convert.ToDecimal(BarcodeAnalysis.GetDouble(QtyStr)); }
+ public double? Qty { get => BarcodeAnalysis.GetDouble(QtyStr); }
/// <summary>
/// 姣涢噸
@@ -115,11 +129,14 @@
/// 姣涢噸
/// </summary>
public double? GrossWeight { get => BarcodeAnalysis.GetDouble(GrossWeightStr); }
-
/// <summary>
- /// 鏂欏彿闀垮害
+ /// 浠撳簱
/// </summary>
- public int ItemLength { get; set; }
+ public string Warehouse { get; set; }
+ /// <summary>
+ /// 鍌ㄤ綅
+ /// </summary>
+ public string Location { get; set; }
/// <summary>
/// 鏉＄爜鍒嗘瀽寮傚父淇℃伅
@@ -175,6 +192,7 @@
/// </summary>
public bool IsQRCode => MetaSn.Contains(",");
+
public enum Types
{
/// <summary>
@@ -229,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