MY преди 4 месеца
родител
ревизия
9e68cdf5d1
променени са 3 файла, в които са добавени 16 реда и са изтрити 12 реда
  1. 8 1
      JLHHJSvr/BLL/HelperBase.cs
  2. 1 1
      JLHHJSvr/Helper/ERPHelper.cs
  3. 7 10
      JLHHJSvr/Helper/InterfaceHelper.cs

+ 8 - 1
JLHHJSvr/BLL/HelperBase.cs

@@ -1,4 +1,5 @@
-using JLHHJSvr.LJFramework.Tools;
+using JLHHJSvr.LJException;
+using JLHHJSvr.LJFramework.Tools;
 using LJLib.InstallHelper;
 using Newtonsoft.Json.Linq;
 using System;
@@ -47,6 +48,12 @@ namespace JLHHJSvr.BLL
         {
             var url = "http://127.0.0.1:" + GlobalVar.ERP_HTTPPort + "/api/common/" + apiName;
             var rslt = LJHttpUtil.PostRequest(url, request);
+
+            var errMsg = rslt.GetValue("ErrMsg");
+            if (errMsg != null && !string.IsNullOrEmpty(errMsg.ToString()))
+            {
+                throw new LJCommonException(errMsg.ToString());
+            }
             return rslt;
         }
 

+ 1 - 1
JLHHJSvr/Helper/ERPHelper.cs

@@ -45,7 +45,7 @@ namespace JLHHJSvr.Helper
         }
         public void CheckLogin()
         {
-            if(GlobalVar.ERP_TOKEN == null || string.IsNullOrEmpty(GlobalVar.ERP_TOKEN))
+            if(string.IsNullOrEmpty(GlobalVar.ERP_TOKEN))
             {
                 Login();
             }

+ 7 - 10
JLHHJSvr/Helper/InterfaceHelper.cs

@@ -1335,18 +1335,15 @@ namespace JLHHJSvr.Helper
 
             foreach (var mx in diancengList)
             {
-                if (mx.mtrlid > 0)
+                var key = $"{mx.chastr}-{kindDict[mx.formulakind.Value]}";
+                if (mx.mtrlid > 0 && new int[] { 32, 12, 13, 14, 29 }.Contains(mx.formulakind.Value))
                 {
-                    var key = $"{mx.chastr}-{kindDict[mx.formulakind.Value]}";
+                    this.ProcessWangMianBLPrdPf(mx, qdList, mx.chastr, kindDict[mx.formulakind.Value], ++countDict[key]);
+                }
 
-                    if (mx.formulakind == 999)
-                    {
-                        this.ProcessChuangWangPrdPf(mx, qdList, mx.chastr, ++countDict[key]);
-                    }
-                    else if (new int[] { 32, 12, 13, 14, 29 }.Contains(mx.formulakind.Value))
-                    {
-                        this.ProcessWangMianBLPrdPf(mx, qdList, mx.chastr, kindDict[mx.formulakind.Value], ++countDict[key]);
-                    }
+                if (mx.formulakind == 999)
+                {
+                    this.ProcessChuangWangPrdPf(mx, qdList, mx.chastr, ++countDict[key]);
                 }
             }