From d9b200d424889c069953ec084ef9d4dd6c4ff66b Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 20 九月 2024 16:42:50 +0800
Subject: [PATCH] 销售管理字段迁移，采购管理字段迁徙
---
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 40 ++++++++++++++++++++--------------------
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 9 +++++----
Model/采购管理/ClsCg_POOrderBillMain.cs | 2 ++
DAL/采购管理/ClsCg_PayableBill.cs | 6 +++++-
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
Model/采购管理/ClsCg_PayableBillMain.cs | 2 ++
9 files changed, 34 insertions(+), 25 deletions(-)
diff --git "a/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_PayableBill.cs" "b/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_PayableBill.cs"
index ab9fbb6..edf0c25 100644
--- "a/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_PayableBill.cs"
+++ "b/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_PayableBill.cs"
@@ -124,6 +124,8 @@
",HExplanation = '" + omodel.HExplanation + "'" +
",HInnerBillNo = '" + omodel.HInnerBillNo + "'" +
",HRemark = '" + omodel.HRemark + "'" +
+ ",HProjectID = " + omodel.HProjectID +
+ ",HInvoiceBillNo = '" + omodel.HInvoiceBillNo + "'" +
" where HInterID = " + omodel.HInterID;
oCn.RunProc(mainSql);
@@ -294,7 +296,7 @@
string mainSql = "insert into Cg_PayableBillMain" +
"(HInterID,HBillNo,HDate,HYear,HPeriod,HBillType,HBillSubType" +
",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
- ",HMaker,HMakeDate,HSSID,HPSStyleID,HReceiveDate,HSupID,HCurID,HExRate,HEmpID,HMangerID,HDeptID,HExplanation,HInnerBillNo,HRemark) " +
+ ",HMaker,HMakeDate,HSSID,HPSStyleID,HReceiveDate,HSupID,HCurID,HExRate,HEmpID,HMangerID,HDeptID,HExplanation,HInnerBillNo,HRemark,HProjectID,HInvoiceBillNo) " +
"values(" +
"" + omodel.HInterID + "" +
",'" + omodel.HBillNo + "'" +
@@ -321,6 +323,8 @@
",'" + omodel.HExplanation + "'" +
",'" + omodel.HInnerBillNo + "'" +
",'" + omodel.HRemark + "'" +
+ "," + omodel.HProjectID +
+ ",'" + omodel.HInvoiceBillNo + "'" +
")";
oCn.RunProc(mainSql);
diff --git "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBillMain.cs" "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBillMain.cs"
index 9ecfced..09e653c 100644
--- "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBillMain.cs"
+++ "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBillMain.cs"
@@ -49,6 +49,8 @@
public string HPROVIDERADDRESS; //供货方地址
public Int64 HCORRESPONDORGID; //对应组织
public Int64 HPROVIDERCONTACTID;//供货方联系人
+ public string HLinkMan; //联系人
+ public string HLinkPhone; //联系人电话
}
}
diff --git "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_PayableBillMain.cs" "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_PayableBillMain.cs"
index a8403b1..2058f37 100644
--- "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_PayableBillMain.cs"
+++ "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_PayableBillMain.cs"
@@ -17,6 +17,8 @@
public string HReceiveDate;
public string HExplanation;
public string HInnerBillNo;
+ public Int64 HProjectID; //项目编号
+ public string HInvoiceBillNo;//发票编号
public bool HRedBlueFlag; //bit --红蓝字
public string HHookMan; //varchar --勾稽人
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index bf7c8cd..d04822d 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -746,7 +746,8 @@
string HInnerBillNo = mainList[0].HInnerBillNo;//鍐呴儴鍗曟嵁鍙�
long HWHID = mainList[0].HWHID;//浠撳簱
long HProjectID = mainList[0].HProjectID;//浠撳簱
-
+ string HLinkMan = mainList[0].HLinkMan;//鑱旂郴浜�
+ string HLinkPhone = mainList[0].HLinkPhone;//鑱旂郴浜虹數璇�
List<ClsCg_POOrderBillMain> mainList2 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_POOrderBillMain>>(msg2);
DateTime dt = DateTime.Now;
long HPURCHASEORGID = mainList2[0].HOrgID;
@@ -827,14 +828,14 @@
,HMaker,HMakeDate
,HERPInterID,HERPBillType,HPURCHASEORGID
,HPURCHASERGROUPID,HPROVIDERID,HSETTLEID,HCHARGEID,HBUSINESSTYPE,HPROVIDERADDRESS,HCORRESPONDORGID,HPROVIDERCONTACTID
- ,HWHID,HProjectID)
+ ,HWHID,HProjectID,HLinkMan,HLinkPhone)
values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1102 + "','" +
1102 + "','" + HDate + "','" + HBillNo + "','" + HBillStatus + "','" + HAddress +
"'," + HSSID + ",'" + HSSDate + "'," + HPSStyleID + "," + HSupID + "," + HCurID +
"," + HExRate + "," + HEmpID + "," + HManagerID + "," + HDeptID + ",'" + HExplanation + "','" + HRemark + "','" + HInnerBillNo + "','" + HMaker + "',getdate()" + "," + HERPInterID + ",'" + HERPBillType + "'," + HPURCHASEORGID + "," + HPURCHASERGROUPID + ","
+ HPROVIDERID + "," + HSETTLEID + "," + HCHARGEID + ",'" + HBUSINESSTYPE + "','" + HPROVIDERADDRESS + "',"
+ HCORRESPONDORGID + "," + HPROVIDERCONTACTID + ","
- + HWHID+","+ HProjectID + ")");
+ + HWHID+","+ HProjectID +",'"+HLinkMan+"','"+HLinkPhone+"'"+")");
}
else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
{ //淇敼
@@ -862,7 +863,7 @@
"HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
",HSSID=" + HSSID + ",HPSStyleID=" + HPSStyleID + ",HSupID=" + HSupID + ",HCurID=" + HCurID
+ ",HExRate=" + HExRate + ",HEmpID=" + HEmpID + ",HManagerID=" + HManagerID + ",HDeptID=" + HDeptID
- + ",HAddress='" + HAddress + "',HSSDate='" + HSSDate + "',HWHID="+ HWHID + ",HProjectID="+ HProjectID + " where HInterID=" + HInterID);
+ + ",HAddress='" + HAddress + "',HSSDate='" + HSSDate + "',HWHID="+ HWHID + ",HProjectID="+ HProjectID +",HLinkMan = '"+HLinkMan+"',HLinkPhone = '"+HLinkPhone+ "' where HInterID=" + HInterID);
//鍒犻櫎瀛愯〃
oCN.RunProc("delete from Cg_POOrderBillSub where HInterID='" + HInterID + "'");
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index b71c63b..543fa79 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>09/20/2024 13:07:08</publishTime>
+ <publishTime>09/20/2024 16:18:49</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>09/20/2024 13:07:08</publishTime>
+ <publishTime>09/20/2024 16:18:49</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>09/20/2024 13:07:02</publishTime>
+ <publishTime>09/20/2024 16:18:47</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>09/20/2024 13:07:02</publishTime>
+ <publishTime>09/20/2024 16:18:47</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>09/20/2024 13:06:55</publishTime>
+ <publishTime>09/20/2024 16:18:41</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>09/20/2024 13:06:55</publishTime>
+ <publishTime>09/20/2024 16:18:41</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>09/20/2024 13:06:57</publishTime>
+ <publishTime>09/20/2024 16:18:42</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>09/20/2024 13:06:57</publishTime>
+ <publishTime>09/20/2024 16:18:42</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>09/20/2024 13:06:51</publishTime>
+ <publishTime>09/20/2024 16:18:39</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>09/20/2024 13:06:51</publishTime>
+ <publishTime>09/20/2024 16:18:39</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>09/20/2024 13:06:53</publishTime>
+ <publishTime>09/20/2024 16:18:40</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>09/20/2024 13:06:53</publishTime>
+ <publishTime>09/20/2024 16:18:40</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>09/20/2024 13:06:54</publishTime>
+ <publishTime>09/20/2024 16:18:40</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>09/20/2024 13:06:54</publishTime>
+ <publishTime>09/20/2024 16:18:40</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>09/20/2024 13:04:41</publishTime>
+ <publishTime>09/20/2024 16:14:46</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>09/20/2024 13:04:41</publishTime>
+ <publishTime>09/20/2024 16:14:46</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>09/20/2024 13:04:48</publishTime>
+ <publishTime>09/20/2024 16:14:52</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>09/20/2024 13:04:48</publishTime>
+ <publishTime>09/20/2024 16:14:52</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>09/20/2024 13:07:46</publishTime>
+ <publishTime>09/20/2024 16:19:21</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>09/20/2024 13:07:46</publishTime>
+ <publishTime>09/20/2024 16:19:21</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>08/16/2024 16:55:28</publishTime>
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index c6022af..ddb9de8 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
index cf19e3f..7e29fa1 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index c6022af..ddb9de8 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
index cf19e3f..7e29fa1 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1