From 988180308e0dc5518d8904b34559bf291298cedf Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 17 七月 2024 10:39:57 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/BaseSet/Gy_CustomerController.cs |   42 +++++++++++++++++++++++++++++++++---------
 1 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
index 0d13801..3f4c8fa 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
@@ -148,7 +148,7 @@
             try
             {
                 string sql = string.Format(@"select  c.HItemID,c.HNumber 瀹㈡埛浠g爜,c.HName 瀹㈡埛鍚嶇О,c.HHelpCode  鍔╄鐮�,c.HShortName 绠�绉�,c.HAddress 鍦板潃,c.HLinkMan 鑱旂郴浜�,c.HLinkPhone 鑱旂郴鐢佃瘽
-                                            ,c.HMobilePhone 鎵嬫満,c.HFax 浼犵湡,c.HPostalCode 閭紪,c.HEmail 鐢靛瓙閭欢,c.HCorMan 娉曚汉浠h〃,c.HBank 寮�鎴烽摱琛�,c.HBankAccount 閾惰璐﹀彿,
+                                            ,c.HMobilePhone 鎵嬫満,c.HFax 浼犵湡,c.HPostalCode 閭紪,c.HEmail 鐢靛瓙閭欢,c.HCorMan 娉曚汉浠h〃,c.HBank 寮�鎴烽摱琛�,c.HBankAccount 閾惰璐﹀彿,c.HMateOutEmp 棰嗙敤浜�,
                                             c.HTaxNum 绋庡姟鐧昏鍙�,c.HTaxRate 澧炲�肩◣鐜�,c.HEnglishName 鑻辨枃鍚嶇О,c.HEngLishAddress 鑻辨枃鍦板潃,c.HCountry 鍥藉,c.HCusStatus 瀹㈡埛鐘舵��
                                             ,c.HStopflag 绂佺敤鏍囧織,c.HRemark 澶囨敞,c.HAreaID 鍦板尯ID,a.HName 鍦板尯鍚嶇О,c.HCurID 榛樿璐у竵ID,r.HName 榛樿璐у竵,
                                             c.HSSID 缁撶畻鏂瑰紡ID,s.HName 缁撶畻鏂瑰紡,c.HCusTypeID 瀹㈡埛鍒嗙被ID,t.HName 瀹㈡埛鍒嗙被 from Gy_Customer c
@@ -354,7 +354,7 @@
                 DateTime HMakeTime = list[0].HMakeTime;
                 long HCreateOrgID = list[0].HCREATEORGID;
                 long HUseOrgID = list[0].HUSEORGID;
-
+                string HMateOutEmp = list[0].HMateOutEmp;
                 //DateTime HDeleteDate = list[0].HDeleteDate;
 
 
@@ -382,7 +382,7 @@
                     ",HEmpID,HCreditDate,HCreditRatingDate,HMaxCreditRatingDate" +
                     ",HMonthUseQty,HForecastCreditRating,HCreditLevelID,HCountAccrualRating" +
                     ",HSubsidyAccrualRating,HCreditRating,HMaxCreditRating" +
-                    ",HCusTypeID,HCREATEORGID,HUSEORGID) " +
+                    ",HCusTypeID,HCREATEORGID,HUSEORGID,HMateOutEmp) " +
                     " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID +
                     ", " + HLevel + ",1,'" + HStopflag + "','" + HRemark + "'" +
                     ",'" + HShortName + "','" + HAddress + "','" + HLinkMan + "','" + HLinkPhone + "','" + HMobilePhone + "'" +
@@ -392,7 +392,7 @@
                     "," + HEmpID + "," + HCreditDate + "," + HCreditRatingDate + "," + HMaxCredRatingDate +
                     "," + HMonthUseQty + "," + HForecastCreditRating + "," + HCreditLevelID + "," + HCountAccrualRating +
                     "," + HSubsidyAccrualRating + "," + HCreditRating + "," + HMaxCreditRating +
-                    ", " + HCusTypeID + ","+ HCreateOrgID + ","+ HUseOrgID + ")");
+                    ", " + HCusTypeID + ","+ HCreateOrgID + ","+ HUseOrgID + ",'"+ HMateOutEmp + "')");
                 //淇敼涓婄骇涓洪潪鏈骇浠g爜
                 oCN.RunProc("Update Gy_Customer set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
 
@@ -438,6 +438,7 @@
             try
             {
                 var model = oMain["model"].ToString();
+                LogService.Write("瀹㈡埛:" + model);
                 var custLocationModel = oMain["model"]["HCustLocationEntry"].ToString();
                 var custContactModel = oMain["model"]["HCustContactEntry"].ToString();
                 //鍙嶅簭鍒楀寲
@@ -451,8 +452,8 @@
                 oCN.RunProc(sql);
                 sql = "set identity_insert gy_Customer on";
                 oCN.RunProc(sql);
-                //涓昏〃_瀹㈡埛
-                oCN.RunProc("Insert into Gy_Customer " +
+
+                LogService.Write("瀹㈡埛:" + "Insert into Gy_Customer " +
                     " (HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                     ",HLevel,HEndFlag,HStopflag,HRemark" +
                     ",HShortName,HAddress,HLinkMan,HLinkPhone,HMobilePhone" +
@@ -473,6 +474,28 @@
                     "," + lsmain[0].HMonthUseQty + "," + lsmain[0].HForecastCreditRating + "," + lsmain[0].HCreditLevelID + "," + lsmain[0].HCountAccrualRating +
                     "," + lsmain[0].HSubsidyAccrualRating + "," + lsmain[0].HCreditRating + "," + lsmain[0].HMaxCreditRating +
                     ", " + lsmain[0].HCusTypeID + ")");
+                //涓昏〃_瀹㈡埛
+                oCN.RunProc("Insert into Gy_Customer " +
+                    " (HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+                    ",HLevel,HEndFlag,HStopflag,HRemark" +
+                    ",HShortName,HAddress,HLinkMan,HLinkPhone,HMobilePhone" +
+                    ",HFax,HPostalCode,HEmail,HBank,HBankAccount" +
+                    ",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
+                    ",HEnglishAddress,HCurID,HSSID,HAreaID,HCusStatus" +
+                    ",HEmpID,HCreditDate,HCreditRatingDate,HMaxCreditRatingDate" +
+                    ",HMonthUseQty,HForecastCreditRating,HCreditLevelID,HCountAccrualRating" +
+                    ",HSubsidyAccrualRating,HCreditRating,HMaxCreditRating" +
+                    ",HCusTypeID,HERPItemID) " +
+                    " Values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HName + "','" + lsmain[0].HHelpCode + "','" + lsmain[0].HShortNumber + "'," + lsmain[0].HParentID +
+                    ", " + lsmain[0].HLevel + ",0,'" + lsmain[0].HStopFlag + "','" + lsmain[0].HRemark + "'" +
+                    ",'" + lsmain[0].HShortName + "','" + lsmain[0].HAddress + "','" + lsmain[0].HLinkMan + "','" + lsmain[0].HLinkPhone + "','" + lsmain[0].HMobilePhone + "'" +
+                    ",'" + lsmain[0].HFax + "','" + lsmain[0].HPostalCode + "','" + lsmain[0].HEmail + "','" + lsmain[0].HBank + "','" + lsmain[0].HBankAccount + "'" +
+                    ",'" + lsmain[0].HTaxNum + "'," + lsmain[0].HTaxRate + ",'" + lsmain[0].HCountry + "','" + lsmain[0].HCorMan + "','" + lsmain[0].HEnglishName + "'" +
+                    ",'" + lsmain[0].HEnglishAddress + "'," + lsmain[0].HCurID + "," + lsmain[0].HSSID + "," + lsmain[0].HAreaID + ",'" + lsmain[0].HCusStatus + "'" +
+                    "," + lsmain[0].HEmpID + "," + lsmain[0].HCreditDate + "," + lsmain[0].HCreditRatingDate + "," + lsmain[0].HMaxCreditRatingDate +
+                    "," + lsmain[0].HMonthUseQty + "," + lsmain[0].HForecastCreditRating + "," + lsmain[0].HCreditLevelID + "," + lsmain[0].HCountAccrualRating +
+                    "," + lsmain[0].HSubsidyAccrualRating + "," + lsmain[0].HCreditRating + "," + lsmain[0].HMaxCreditRating +
+                    ", " + lsmain[0].HCusTypeID + "," + lsmain[0].HItemID + ")");
                 sql = "set identity_insert gy_Customer off";
                 oCN.RunProc(sql);
                 //瀹㈡埛_浜よ揣鍦扮偣
@@ -608,7 +631,7 @@
                 DateTime HMakeTime = list[0].HMakeTime;
                 long HCreateOrgID = list[0].HCREATEORGID;
                 long HUseOrgID = list[0].HUSEORGID;
-
+                string HMateOutEmp = list[0].HMateOutEmp;
 
                 //鍒ゆ柇鏉冮檺
                 if (!ClsPub.Security_Log(msg5, 1, false, msg4))
@@ -665,7 +688,8 @@
                     ",HAreaID  ='" + HAreaID + "'" +
                     ",HCusStatus  ='" + HCusStatus + "'" +
                     ",HCusTypeID  ='" + HCusTypeID + "'" +
-                    ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+                    ",HMateOutEmp='"+ HMateOutEmp+
+                    "',HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                 //淇敼瀛愰」鐩唬鐮�
                 //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                 //灏嗕笂绾� 涓洪潪鏈骇
@@ -1123,7 +1147,7 @@
 	            ,HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HMakeTime,HCREATEORGID,HUSEORGID
                  )
                 values
-                ({jsonData.HItemID},{jsonData.HERPItemID},'{jsonData.HNumber}','{jsonData.HName}',
+                ({jsonData.HItemID},{jsonData.HItemID},'{jsonData.HNumber}','{jsonData.HName}',
                 '{jsonData.HShortNumber}',{jsonData.HParentID},{jsonData.HLevel},{jsonData.HEndFlag},{jsonData.HStopflag},'{jsonData.HRemark}','{jsonData.HUseFlag}','{jsonData.HMakeTime}',{jsonData.HCREATEORGID},{jsonData.HUSEORGID})";
 
                     oCN.RunProc(sql);

--
Gitblit v1.9.1