From d2f14f6bb44c6dd19cc0816a033452b6de56184b Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期日, 06 四月 2025 18:09:45 +0800
Subject: [PATCH] 增加备料任务调用U9接口方法

---
 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 708e6e6..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>
+        /// 缁勭粐浠g爜
+        /// </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