From 06a8b6963d6d4f229d4e196b4b09ce57e2cbf2dd Mon Sep 17 00:00:00 2001
From: 杨前锦 <1010338399@qq.com>
Date: 星期四, 24 七月 2025 17:21:40 +0800
Subject: [PATCH] 印尼佳通-GT服务开发

---
 HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP_GT/core/Monitor.cs |   72 ++++++++++++++++++-----------------
 1 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP_GT/core/Monitor.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP_GT/core/Monitor.cs
index 133a1e4..23bb282 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP_GT/core/Monitor.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP_GT/core/Monitor.cs
@@ -29,27 +29,29 @@
         /// <summary>
         /// 鍚屾鐗╂枡鏉$爜淇℃伅琛�         /// 1.鏌ヨ涓婃璁板綍鏃堕棿
-        /// 2.鏍规嵁璁板綍鏃堕棿锛屾煡璇㈠ぇ浜庣瓑浜庤褰曟椂闂寸殑鐗╂枡鏉$爜淇℃伅,骞惰绠楁渶灏忓瓨鏀炬椂闂�鍜�鏈�ぇ瀛樻斁鏃堕棿
+        /// 2.鏍规嵁璁板綍鏃堕棿锛屾煡璇㈠ぇ浜庣瓑浜庤褰曟椂闂寸殑鐗╂枡鏉$爜淇℃伅
         /// 3.灏嗙墿鏂欐潯鐮佷俊鎭悓姝ュ埌wms
-        /// 4.鍚屾鎴愬姛锛岃褰曟渶鍚庝竴鏉℃暟鎹殑鏇存柊鏃堕棿
         /// </summary>
         internal static void MonitorMatlBarcode() {
             try
             {
-                var synDataTimeRecord = WMSDispatch.findLastDataSynTime(new RecordDataSynTimeModel() { recordTable = "1" });
-                if (synDataTimeRecord != null)
+                var lastTimeStr = WMSDispatch.findDataLastSynTime(new SynTableModel() { tableType = 1 });
+                if (lastTimeStr != null)
                 {
-                   /* CultureInfo enGB = new CultureInfo("en-GB");*/
-                    var maltInformations = WMSHelper.getMaltInfoList(DateTime.Parse(synDataTimeRecord.RECORD_TABLE));
-                    if (maltInformations != null && maltInformations.Count > 0) 
+                    if (DateTime.TryParse(lastTimeStr, out DateTime lastTime))
                     {
-                        bool bo = WMSDispatch.synMatlInformation(new SynMatlInformationModel() { matlInformationList = maltInformations });
-                        if (bo)
+                        /* CultureInfo enGB = new CultureInfo("en-GB");*/
+                        var maltInformations = WMSHelper.getMaltInfoList(lastTime);
+                        if (maltInformations != null && maltInformations.Count > 0)
                         {
-                            WMSDispatch.recordDataSynTime(new RecordDataSynTimeModel() { sysTime = maltInformations[0].last_modify_time.ToString("yyyy-MM-dd HH:mm:ss:ff"), synNum = maltInformations.Count, recordTable = "1" });
+                            WMSDispatch.synMatlInformation(new SynMatlInformationModel() { matlInformationList = maltInformations });
                         }
                     }
-                }
+                    else 
+                    {
+                        LogHelper.Info($"鍚屾鐗╂枡鏉$爜淇℃伅閿欒锛岄敊璇師鍥狅細鏃ユ湡瑙f瀽閿欒", "WMS");
+                    }
+                }      
             }
             catch (Exception ex)
             {
@@ -62,25 +64,26 @@
         /// 1.鏌ヨ涓婃璁板綍鏃堕棿
         /// 2.鏍规嵁璁板綍鏃堕棿锛屾煡璇㈠ぇ浜庣瓑浜庤褰曟椂闂达紝涓旂鍚堟潯浠剁殑鐗╂枡鐘舵�淇℃伅
         /// 3.灏嗙墿鏂欐潯鐮佷俊鎭悓姝ュ埌wms
-        /// 4.鍚屾鎴愬姛锛岃褰曟渶鍚庝竴鏉℃暟鎹殑鏇存柊鏃堕棿
         /// </summary>
         internal static void MonitorMatlStatus()
         {
             try
             {
-                var synDataTimeRecord = WMSDispatch.findLastDataSynTime(new RecordDataSynTimeModel() { recordTable = "2" });
-                if (synDataTimeRecord != null)
+                var lastTimeStr = WMSDispatch.findDataLastSynTime(new SynTableModel() { tableType = 2 });
+                if (lastTimeStr != null)
                 {
-                    /* CultureInfo enGB = new CultureInfo("en-GB");*/
-                    var barcodeStatuses = WMSHelper.getMaltStatusList(DateTime.Parse(synDataTimeRecord.RECORD_TABLE));
-                    if (barcodeStatuses != null && barcodeStatuses.Count > 0)
+                    if (DateTime.TryParse(lastTimeStr, out DateTime lastTime))
                     {
-                        var updateMatlStatuses = barcodeStatuses.Select(a => new UpdateMatlStatus {bc_entried = a.bc_entried ,jdge = a.jdge }).ToList();
-                        bool bo = WMSDispatch.synUpdateMatlStatus(new SynUpdateMatlStatusModel() { updateMatlStatuses = updateMatlStatuses });
-                        if (bo)
+                        /* CultureInfo enGB = new CultureInfo("en-GB");*/
+                        var barcodeStatuses = WMSHelper.getMaltStatusList(lastTime);
+                        if (barcodeStatuses != null && barcodeStatuses.Count > 0)
                         {
-                            WMSDispatch.recordDataSynTime(new RecordDataSynTimeModel() { sysTime = barcodeStatuses[0].last_modify_time.ToString("yyyy-MM-dd HH:mm:ss:ff"), synNum = barcodeStatuses.Count, recordTable = "2" });
+                            WMSDispatch.synUpdateMatlStatus(new SynBarcodeStatusModel() { barcodeStatusList = barcodeStatuses });
                         }
+                    }
+                    else 
+                    {
+                        LogHelper.Info($"鍚屾鍗婂埗鍝佺墿鏂欑姸鎬侀敊璇紝閿欒鍘熷洜锛氭棩鏈熻В鏋愰敊璇�, "WMS");
                     }
                 }
             }
@@ -91,29 +94,28 @@
         }
 
         /// <summary>
-        /// 鍚屾鍗婂埗鍝佺墿鏂欑姸鎬�-        /// 1.鏌ヨ涓婃璁板綍鏃堕棿
-        /// 2.鏍规嵁璁板綍鏃堕棿锛屾煡璇㈠ぇ浜庣瓑浜庤褰曟椂闂达紝涓旂鍚堟潯浠剁殑鐗╂枡鐘舵�淇℃伅
-        /// 3.灏嗙墿鏂欐潯鐮佷俊鎭悓姝ュ埌wms
-        /// 4.鍚屾鎴愬姛锛岃褰曟渶鍚庝竴鏉℃暟鎹殑鏇存柊鏃堕棿
+        /// 鍚屾鍗婂埗鍝佹娊妫�墿鏂欑姸鎬�         /// </summary>
-        internal static void MonitorMatlTimeConfig()
+        internal static void MonitorSpotCheckMatlStatus()
         {
             try
             {
-                var synDataTimeRecord = WMSDispatch.findLastDataSynTime(new RecordDataSynTimeModel() { recordTable = "3" });
-                if (synDataTimeRecord != null)
+                var lastTimeStr = WMSDispatch.findDataLastSynTime(new SynTableModel() { tableType = 3 });
+                if (lastTimeStr != null)
                 {
-                    /* CultureInfo enGB = new CultureInfo("en-GB");*/
-                    var overages = WMSHelper.getOverageList(DateTime.Parse(synDataTimeRecord.RECORD_TABLE));
-                    if (overages != null && overages.Count > 0)
+                    if (DateTime.TryParse(lastTimeStr, out DateTime lastTime))
                     {
-                       bool bo = WMSDispatch.synUpdateMatlTimeConfig(new MatlTimeConfigModel() { overages = overages });
-                        if (bo)
+                        /* CultureInfo enGB = new CultureInfo("en-GB");*/
+                        var sampleStatuses = WMSHelper.getSampleMaltStatusList(lastTime);
+                        if (sampleStatuses != null && sampleStatuses.Count > 0)
                         {
-                            WMSDispatch.recordDataSynTime(new RecordDataSynTimeModel() { sysTime = overages[0].last_modify_time.ToString("yyyy-MM-dd HH:mm:ss:ff"), synNum = overages.Count, recordTable = "3" });
+                            WMSDispatch.synUpdateSampleMatlStatus(new SynSampleStatusModel() { sampleStatusList = sampleStatuses });
                         }
                     }
+                    else
+                    {
+                        LogHelper.Info($"鍚屾鍗婂埗鍝佹娊妫�墿鏂欑姸鎬侀敊璇紝閿欒鍘熷洜锛氭棩鏈熻В鏋愰敊璇�, "WMS");
+                    }
                 }
             }
             catch (Exception ex)

--
Gitblit v1.9.1