From 5ef4a489b3739a670796810dd484376dcc7534c6 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 10 五月 2023 13:36:13 +0800
Subject: [PATCH] 乔一 添加字段白坯发布

---
 WebAPI/Controllers/BaseSet/Gy_CustomerController.cs |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
index 90fb06d..f362ec6 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
@@ -42,7 +42,22 @@
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
-                string sql1 = string.Format(@"select * from h_v_Gy_CustomerList where 缁勭粐鍚嶇О='" + Organization + "'");
+                string sql1 = "";
+                //瀹㈡埛鍒跺畾
+                string sErr = "";
+                if (oSystemParameter.ShowBill(ref sErr))
+                {
+                    if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴")
+                    {
+                         sql1 = string.Format(@"select * from h_v_Gy_CustomerList where 1=1");
+                    }
+                    else
+                    {
+                         sql1 = string.Format(@"select * from h_v_Gy_CustomerList where 缁勭粐鍚嶇О='" + Organization + "'");
+                    }
+                }
+
+             
                 if (sWhere == null || sWhere.Equals(""))
                 {
                     ds = oCN.RunProcReturn(sql1 + sWhere + " order by 瀹㈡埛浠g爜 ", "h_v_Gy_CustomerList");
@@ -285,7 +300,7 @@
                     ",HEmpID,HCreditDate,HCreditRatingDate,HMaxCreditRatingDate" +
                     ",HMonthUseQty,HForecastCreditRating,HCreditLevelID,HCountAccrualRating" +
                     ",HSubsidyAccrualRating,HCreditRating,HMaxCreditRating" +
-                    ",HCusTypeID) " +
+                    ",HCusTypeID,HCREATEORGID,HUSEORGID) " +
                     " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID +
                     ", " + HLevel + ",0,'" + HStopflag + "','" + HRemark + "'" +
                     ",'" + HShortName + "','" + HAddress + "','" + HLinkMan + "','" + HLinkPhone + "','" + HMobilePhone + "'" +
@@ -295,7 +310,7 @@
                     "," + HEmpID + "," + HCreditDate + "," + HCreditRatingDate + "," + HMaxCredRatingDate +
                     "," + HMonthUseQty + "," + HForecastCreditRating + "," + HCreditLevelID + "," + HCountAccrualRating +
                     "," + HSubsidyAccrualRating + "," + HCreditRating + "," + HMaxCreditRating +
-                    ", " + HCusTypeID + ")");
+                    ", " + HCusTypeID + ","+ HCreateOrgID + ","+ HUseOrgID + ")");
                 //淇敼涓婄骇涓洪潪鏈骇浠g爜
                 oCN.RunProc("Update Gy_Customer set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                 oCN.Commit();

--
Gitblit v1.9.1