From de398f47dd12b3890c9ee545422da78e82b60fa9 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 08 十二月 2025 09:22:06 +0800
Subject: [PATCH] 修改PDA出入库中出现undefined问题,修改job中因为上游调用频率过快导致job死掉,修改前端报警信息使用不同颜色

---
 新建文件夹/WIDESEA_WMSServer/ClassLibrary2/MaterielInfoService.cs |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/MaterielInfoService.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/MaterielInfoService.cs"
index c59e778..a459b95 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/MaterielInfoService.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/MaterielInfoService.cs"
@@ -27,7 +27,7 @@
         public IRepository<Dt_MaterielInfo> Repository => BaseDal;
 
 
-        static string SearchDate = "2025-11-01 00:00:00";
+        static string SearchDate = "2016-11-01 00:00:00";
 
         /// <summary>
         /// 鑾峰彇鑽搧鍩虹淇℃伅鍚屾鎺ュ彛
@@ -39,7 +39,7 @@
             try
             {
 
-                var url = "http://121.37.118.63:80/GYZ2/95fck/goodsInfo";
+                var url = "http://192.168.1.100:80/GYZ2/95fck/goodsInfo";
                 if (string.IsNullOrEmpty(SearchDate))
                 {
                     // 榛樿鏌ヨ杩囧幓24灏忔椂鐨勬暟鎹�
@@ -57,8 +57,7 @@
 
                 // 鍙嶅簭鍒楀寲
                 var response = JsonConvert.DeserializeObject<UpstreamResponse<MedicationsInfo>>(result);
-
-                if (response == null || response.resultCode != "0")
+                if (response == null || response.resultCode != "0"||response.data==null)
                 {
                     // 璋冪敤寮傚父鎺ュ彛
                     //SendErrorToUpstream(5, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
@@ -82,7 +81,7 @@
                     MaterielErpType = Medicat.goods_type,
                     item = Medicat.goods_tym, //閫氱敤鍚�
                     MaterielName = Medicat.goods_spm,//鐗╂枡鍚嶇О
-                    Dosage_form = GetDosageForm(Medicat.dosage_form),//鑽墏
+                    Dosage_form = Medicat.dosage_form,//鑽墏
                     Barcode = Medicat.barcode,//鏉″舰鍚�
                     MaterielSpec = Medicat.model,
                     Factory = Medicat.factory,

--
Gitblit v1.9.3