From 9cd0addce97d49b2738a3bc2db7e770bef898947 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 13 十一月 2023 14:22:54 +0800
Subject: [PATCH] 销售出库单提交只生成WMS单据调用方法,审核时增加信用控制判断

---
 CLOUDWEB/WebService1.asmx.cs |   48 +++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 7e9027f..55e1b66 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -17805,16 +17805,7 @@
                     oCn.RollBack();
                     return false;
                 }
-
-                if (oSystemParameterMain.Kf_SellOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟  鑷姩瀹℃牳 
-                {
-                    //瀹℃牳WMS鍗曟嵁
-                    oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=convert(varchar(10),getdate(),120),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
-                }
-
-                sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
                 oCn.Commit();
-                return true;
             }
             catch (Exception e)
             {
@@ -17822,6 +17813,45 @@
                 oCn.RollBack();
                 return false;
             }
+
+            if (oSystemParameterMain.Kf_SellOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟  鑷姩瀹℃牳 
+            {
+                DataSet ds2 = oCn.RunProcReturn("exec h_p_Kf_CheckSellOutBill_CrediControl " + oMain.HInterID.ToString(), "h_p_Kf_CheckSellOutBill_CrediControl");
+                if (ds2 == null || ds2.Tables[0].Rows.Count == 0)
+                {
+                    sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒鍗曟嵁鍙凤細" + oMain.HBillNo + "锛屽崟鎹甀D锛�" + oMain.HInterID + "锛涘鏍搁攢鍞嚭搴撳崟锛屼俊鐢ㄦ帶鍒跺垽鏂敊璇紒";
+                    return true;
+                }
+                else if (DBUtility.ClsPub.isLong(ds2.Tables[0].Rows[0][0]) == 1)
+                {
+                    sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒鍗曟嵁鍙凤細" + oMain.HBillNo + "锛屽崟鎹甀D锛�" + oMain.HInterID + "锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HRemark"]);
+                    return true;
+                }
+                else
+                {
+                    DataSet ds = oCn.RunProcReturn("exec h_p_Kf_SellOutBill_Check " + oMain.HInterID.ToString() + ",'1205','" + oMain.HMaker + "'", "h_p_Kf_SellOutBill_Check");
+                    if (ds == null || ds.Tables[0].Rows.Count == 0)
+                    {
+                        sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒鍗曟嵁鍙凤細" + oMain.HBillNo + "锛屽崟鎹甀D锛�" + oMain.HInterID + "锛涘鏍搁攢鍞嚭搴撳崟鍒ゆ柇閿欒锛�";
+                        return true;
+                    }
+                    else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 1)
+                    {
+                        sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒鍗曟嵁鍙凤細" + oMain.HBillNo + "锛屽崟鎹甀D锛�" + oMain.HInterID + "锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+                        return true;
+                    }
+                    else
+                    {
+                        sErrMsg = "鐢熸垚骞跺鏍搁攢鍞嚭搴撳崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+                        return true;
+                    }
+                }
+            }
+            else
+            {
+                sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+                return true;
+            }
         }
 
         #endregion

--
Gitblit v1.9.1