From 09cabedaff68030a639a53b99c3869ffbaa195e6 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 23 八月 2024 10:36:22 +0800
Subject: [PATCH] 关联数量相关
---
DAL/bin/Release/DAL.pdb | 0
WebAPI/Controllers/CGGL/YF_PayMentBillController.cs | 8 +++
BLL/bin/Release/DAL.dll | 0
DAL/应收管理/ClsYS_ReceiveBill.cs | 4 +-
BLL/bin/Release/BLL.pdb | 0
BLL/bin/Release/BLL.dll | 0
BLL/bin/Release/DAL.pdb | 0
DAL/应付管理/ClsYF_PayMentBill.cs | 59 ++++++++++++++++++++++++++++-
DAL/bin/Release/DAL.dll | 0
WebAPI/Models/ClsKf_ICStockBillSub.cs | 2
WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml.user | 18 ++++----
11 files changed, 75 insertions(+), 16 deletions(-)
diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
index 7b02f6f..38a1331 100644
--- a/BLL/bin/Release/BLL.dll
+++ b/BLL/bin/Release/BLL.dll
Binary files differ
diff --git a/BLL/bin/Release/BLL.pdb b/BLL/bin/Release/BLL.pdb
index 0b7a3f5..357fb35 100644
--- a/BLL/bin/Release/BLL.pdb
+++ b/BLL/bin/Release/BLL.pdb
Binary files differ
diff --git a/BLL/bin/Release/DAL.dll b/BLL/bin/Release/DAL.dll
index cf0aae9..e4fc266 100644
--- a/BLL/bin/Release/DAL.dll
+++ b/BLL/bin/Release/DAL.dll
Binary files differ
diff --git a/BLL/bin/Release/DAL.pdb b/BLL/bin/Release/DAL.pdb
index cd548a7..de2a22a 100644
--- a/BLL/bin/Release/DAL.pdb
+++ b/BLL/bin/Release/DAL.pdb
Binary files differ
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
index cf0aae9..e4fc266 100644
--- a/DAL/bin/Release/DAL.dll
+++ b/DAL/bin/Release/DAL.dll
Binary files differ
diff --git a/DAL/bin/Release/DAL.pdb b/DAL/bin/Release/DAL.pdb
index cd548a7..de2a22a 100644
--- a/DAL/bin/Release/DAL.pdb
+++ b/DAL/bin/Release/DAL.pdb
Binary files differ
diff --git "a/DAL/\345\272\224\344\273\230\347\256\241\347\220\206/ClsYF_PayMentBill.cs" "b/DAL/\345\272\224\344\273\230\347\256\241\347\220\206/ClsYF_PayMentBill.cs"
index 39ea7a2..c13f622 100644
--- "a/DAL/\345\272\224\344\273\230\347\256\241\347\220\206/ClsYF_PayMentBill.cs"
+++ "b/DAL/\345\272\224\344\273\230\347\256\241\347\220\206/ClsYF_PayMentBill.cs"
@@ -31,8 +31,48 @@
{
DetailColl = null;
}
-
+
#endregion 鑷畾涔夋柟娉�
+
+ //鍒犻櫎鍏宠仈
+ public override void DeleteRelation(ref string sReturn, Int64 lngBillKey)
+ {
+ //搴旀敹鍗� 鍏宠仈鏁伴噺
+ try
+ {
+ if (DetailColl[0].HSourceBillType == "1114") //搴斾粯鍗�
+ {
+ oCn.RunProc("exec h_p_Cg_UpDateRelation_PayableToPayMent_Del " + lngBillKey.ToString());
+ }
+ else
+ {
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+ //鏂板鍏宠仈
+ public override void AddNewRelation(ref string sReturn, Int64 lngBillKey)
+ {
+ //搴旀敹鍗� 鍏宠仈鏁伴噺
+ try
+ {
+ if (DetailColl[0].HSourceBillType == "1114") //搴斾粯鍗�
+ {
+ oCn.RunProc("exec h_p_Cg_UpDateRelation_PayableToPayMent_Add " + lngBillKey.ToString());
+ }
+ else
+ {
+
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
//淇敼鍗曟嵁
public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
{
@@ -82,8 +122,11 @@
",HMainSourceBillNo='" + omodel.HMainSourceBillNo.ToString() +
"',HMainSourceBillType='" + omodel.HMainSourceBillType.ToString() +
"' where HInterID=" + lngBillKey.ToString());
- //鍒犻櫎鍏宠仈
- DeleteRelation(ref sReturn, lngBillKey);
+ if (DetailColl.Count != 0)
+ {
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ }
//鍒犻櫎瀛愯〃
DeleteBillSub(lngBillKey);
//鎻掑叆瀛愯〃
@@ -120,6 +163,11 @@
// return false;
// }
//}
+ if (DetailColl.Count != 0)
+ {
+ //鏇存柊璁㈠崟鍏宠仈鏁伴噺
+ AddNewRelation(ref sReturn, omodel.HInterID);
+ }
sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
oCn.Commit();
return true;
@@ -178,6 +226,11 @@
"," + oSub.HPOContractInterID.ToString() + "," + oSub.HPOContractEntryID.ToString() + ",'" + oSub.HPOContractBillNo + "'," + oSub.HSeContractInterID.ToString() + "," + oSub.HSeContractEntryID.ToString() + ",'" + oSub.HSeContractBillNo + "'" +
") ");
}
+ if (DetailColl.Count != 0)
+ {
+ //鏇存柊璁㈠崟鍏宠仈鏁伴噺
+ AddNewRelation(ref sReturn, omodel.HInterID);
+ }
//
//foreach (Model.ClsYF_PayMentBillSub oSub in DetailColl)
//{
diff --git "a/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBill.cs" "b/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBill.cs"
index 2f34b78..8c0ee97 100644
--- "a/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBill.cs"
+++ "b/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBill.cs"
@@ -41,7 +41,7 @@
//搴旀敹鍗� 鍏宠仈鏁伴噺
try
{
- if (DetailColl[0].HSourceBillType == "1114") //搴旀敹鍗�
+ if (DetailColl[0].HSourceBillType == "1426") //搴旀敹鍗�
{
oCn.RunProc("exec h_p_Xs_UpDateRelation_ReceiveToReceivableIn_Del " + lngBillKey.ToString());
}
@@ -60,7 +60,7 @@
//搴旀敹鍗� 鍏宠仈鏁伴噺
try
{
- if (DetailColl[0].HSourceBillType == "1114") //搴旀敹鍗�
+ if (DetailColl[0].HSourceBillType == "1426") //搴旀敹鍗�
{
oCn.RunProc("exec h_p_Xs_UpDateRelation_ReceiveToReceivableIn_Add " + lngBillKey.ToString());
}
diff --git a/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs b/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
index 03729bf..9267506 100644
--- a/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
+++ b/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
@@ -447,7 +447,13 @@
string sReturn = "";
oCN.BeginTran();
-
+ ds = oCN.RunProcReturn("select * from h_v_YF_PayMentBillList where hmainid=" + HInterID, "h_v_YF_PayMentBillList");
+ string hSourceBillType = ds.Tables[0].Rows[0]["婧愬崟绫诲瀷"].ToString();
+ if (hSourceBillType == "1114")
+ {
+ //鏀舵鍗� 鍒犻櫎鍥炲～ 搴斾粯鍗曞叧鑱旀暟閲�
+ oCN.RunProc("exec h_p_Cg_UpDateRelation_PayableToPayMent_Del " + HInterID);
+ }
oCN.RunProc("delete from YF_PayMentBillMain where HInterID = " + HInterID);
oCN.RunProc("delete from YF_PayMentBillSub where HInterID= " + HInterID);
diff --git a/WebAPI/Models/ClsKf_ICStockBillSub.cs b/WebAPI/Models/ClsKf_ICStockBillSub.cs
index 5f5b621..4ecf12d 100644
--- a/WebAPI/Models/ClsKf_ICStockBillSub.cs
+++ b/WebAPI/Models/ClsKf_ICStockBillSub.cs
@@ -74,7 +74,7 @@
public Int64 HSourceInterID;
public Int64 HSourceEntryID;
public Int64 HAuxPropID;
- public Int64 HlineTotal;
+ public double HlineTotal;
public object HContainerNum { get; internal set; }
public object HPVC { get; internal set; }
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml.user
index b33347b..4a9ba5f 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>G:\issWeb\缃戠珯鍙戝竷\API</_PublishTargetUrl>
- <History>True|2024-08-22T04:38:36.4895558Z;True|2024-08-22T10:56:52.4037571+08:00;True|2024-08-22T10:23:09.0739592+08:00;True|2024-08-22T09:03:26.5727554+08:00;False|2024-08-22T09:02:31.4240959+08:00;True|2024-08-22T08:47:36.3625451+08:00;True|2024-08-21T16:51:37.2382964+08:00;True|2024-08-21T16:25:44.7030554+08:00;True|2024-08-21T16:21:11.7076342+08:00;False|2024-08-21T16:20:13.4190052+08:00;True|2024-08-21T16:00:41.9895716+08:00;True|2024-08-21T14:57:09.3460834+08:00;True|2024-08-21T10:38:36.4128047+08:00;True|2024-08-21T08:14:03.4933362+08:00;</History>
+ <History>True|2024-08-23T00:57:01.4824044Z;True|2024-08-22T16:32:28.5510545+08:00;True|2024-08-22T15:05:33.7972126+08:00;True|2024-08-22T13:12:04.7949636+08:00;True|2024-08-22T12:38:36.4895558+08:00;True|2024-08-22T10:56:52.4037571+08:00;True|2024-08-22T10:23:09.0739592+08:00;True|2024-08-22T09:03:26.5727554+08:00;False|2024-08-22T09:02:31.4240959+08:00;True|2024-08-22T08:47:36.3625451+08:00;True|2024-08-21T16:51:37.2382964+08:00;True|2024-08-21T16:25:44.7030554+08:00;True|2024-08-21T16:21:11.7076342+08:00;False|2024-08-21T16:20:13.4190052+08:00;True|2024-08-21T16:00:41.9895716+08:00;True|2024-08-21T14:57:09.3460834+08:00;True|2024-08-21T10:38:36.4128047+08:00;True|2024-08-21T08:14:03.4933362+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -45,19 +45,19 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>08/22/2024 09:03:10</publishTime>
+ <publishTime>08/23/2024 08:56:36</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>08/22/2024 09:03:10</publishTime>
+ <publishTime>08/23/2024 08:56:36</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>08/22/2024 09:03:08</publishTime>
+ <publishTime>08/23/2024 08:56:33</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>08/22/2024 09:03:08</publishTime>
+ <publishTime>08/23/2024 08:56:33</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
@@ -288,13 +288,13 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>08/22/2024 12:38:24</publishTime>
+ <publishTime>08/23/2024 08:56:45</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>08/22/2024 12:38:24</publishTime>
+ <publishTime>08/23/2024 08:56:45</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>08/22/2024 12:38:33</publishTime>
+ <publishTime>08/23/2024 08:56:56</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -489,7 +489,7 @@
<publishTime>04/29/2024 08:30:03</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/21/2024 08:14:02</publishTime>
+ <publishTime>08/22/2024 15:05:31</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1