From 0fc71730109bb5904ded8e1a14c945e45b289c50 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期四, 03 七月 2025 18:24:05 +0800
Subject: [PATCH] 111

---
 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs |   44 ++++++++++++++++++++++++++------------------
 1 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs
index fe87d5a..9f783b6 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs
@@ -2046,7 +2046,7 @@
             {
                 //閫氳繃鎵樼洏鍙疯皟鐢╳ms鎺ュ彛鑾峰彇鐗╂枡淇℃伅
 
-                CMMLog.Info("SendErpTaskInfoTableDG 琛�寮�:" + startBit);
+                CMMLog.Info("SendErpTaskInfoTableDG 琛ㄦ煡璇�寮�:" + startBit);
                 var url = hao.WebUrl + "GlmTrayItemSet";
                 var erpInfo = MongoDBSingleton.Instance.FindOne<SendErpTaskInfoTableDG>(Query.EQ("Bit", startBit), "SendErpTaskInfoTableDG");
                 if (erpInfo == null)
@@ -2072,34 +2072,42 @@
                         var wmsResponse = JsonConvert.DeserializeObject<LKInfoResModel>(feedback);
                         if (wmsResponse.Success == true)
                         {
-                            materiCode = wmsResponse.Data.CN_S_MATERI_CODE;
+                            materiCode = wmsResponse.Data.CN_S_ITEM_CODE;
                             lotCode = wmsResponse.Data.CN_S_LOT_NO;
-                            totalWeight = wmsResponse.Data.CN_N_WEIGHT;
-                            productTime = wmsResponse.Data.CN_S_Data;
+                            totalWeight = (int)wmsResponse.Data.CN_F_QUANTITY * wmsResponse.Data.CN_N_CONUT;
+                            productTime = wmsResponse.Data.CN_T_PRODUCTION_S;
                         }
                     }
 
-                    CMMLog.Info("SendErpTaskInfoTableDG 琛�1");
-                    MongoDBSingleton.Instance.Insert<SendErpTaskInfoTableDG>(new SendErpTaskInfoTableDG
+                    CMMLog.Info("SendErpTaskInfoTableDG琛�1");
+                    if (!string.IsNullOrEmpty(materiCode) && !string.IsNullOrEmpty(lotCode) && totalWeight != 0 && !string.IsNullOrEmpty(productTime))
                     {
-                        Bit = startBit,
-                        materiCode = materiCode,
-                        lotCode = lotCode,
-                        totalWeight = totalWeight,
-                        productTime = Convert.ToDateTime(productTime).AddHours(8),
-                        invalidationTime = Convert.ToDateTime(productTime).AddHours(8).AddDays(365),
-                        dateTime = DateTime.Now.AddHours(8),
-                        //鍙樻洿娉ㄩ噴
-                        mesSucess = "0"
-                    }, "SendErpTaskInfoTable");
+                        MongoDBSingleton.Instance.Insert<SendErpTaskInfoTableDG>(new SendErpTaskInfoTableDG
+                        {
+                            Bit = startBit,
+                            materiCode = materiCode,
+                            lotCode = lotCode,
+                            totalWeight = totalWeight,
+                            productTime = Convert.ToDateTime(productTime).AddHours(8),
+                            invalidationTime = Convert.ToDateTime(productTime).AddHours(8).AddDays(365),
+                            dateTime = DateTime.Now.AddHours(8),
+                            //鍙樻洿娉ㄩ噴
+                            mesSucess = "0"
+                        }, "SendErpTaskInfoTableDG");
+                    }
+                    else
+                    {
+                        CMMLog.Info($"SendErpTaskInfoTableDG:鑾峰彇鏁版嵁閿欒锛宮ateriCode锛歿materiCode},lotCode:{lotCode},totalWeight:{totalWeight},productTime:{productTime}");
+                    }
+                    
                 }
 
-                CMMLog.Info("鎻掑叆SendErpTaskInfoTable 琛�缁撴潫");
+                CMMLog.Info("鎻掑叆SendErpTaskInfoTableDG琛�缁撴潫");
             }
             catch (Exception ex)
             {
 
-                CMMLog.Info("鎻掑叆SendErpTaskInfoTable 琛�err:" + ex.Message);
+                CMMLog.Info("鎻掑叆SendErpTaskInfoTableDG琛�err:" + ex.Message);
             }
         }
 

--
Gitblit v1.9.1