From 686133fb6f4929b9806a1548c6625d706fd1e335 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 06 五月 2024 08:56:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DAL/销售管理/ClsXs_ReceivableBill.cs | 98 ++++++++++++++++++++++++------------------------
1 files changed, 49 insertions(+), 49 deletions(-)
diff --git "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ReceivableBill.cs" "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ReceivableBill.cs"
index 3691193..d087237 100644
--- "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ReceivableBill.cs"
+++ "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ReceivableBill.cs"
@@ -36,52 +36,52 @@
#region 鍏宠仈鏁伴噺
//鍒犻櫎鍏宠仈
- //public override void DeleteRelation(ref string sReturn, Int64 lngBillKey)
- //{
- // //閿�鍞鍗� 閿�鍞嚭搴撳崟 鍏宠仈鏁伴噺
- // try
- // {
- // if (DetailColl[0].HSourceBillType == "1401") //閿�鍞鍗�
- // {
- // oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToPOStockIn_Del " + lngBillKey.ToString());
- // }
- // else if (DetailColl[0].HSourceBillType == "1205") //閿�鍞嚭搴撳崟
- // {
- // oCn.RunProc("exec h_p_Xs_UpDateRelation_ICStockoPOStockIn_Del " + lngBillKey.ToString());
- // }
- // else
- // {
- // }
- // }
- // catch (Exception e)
- // {
- // throw (e);
- // }
- //}
- ////鏂板鍏宠仈
- //public override void AddNewRelation(ref string sReturn, Int64 lngBillKey)
- //{
- // //閿�鍞鍗� 閿�鍞嚭搴撳崟 鍏宠仈鏁伴噺
- // try
- // {
- // if (DetailColl[0].HSourceBillType == "1401") //閿�鍞鍗�
- // {
- // oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToPOStockIn_Add " + lngBillKey.ToString());
- // }
- // else if (DetailColl[0].HSourceBillType == "1205") //閿�鍞嚭搴撳崟
- // {
- // oCn.RunProc("exec h_p_Xs_UpDateRelation_ICStockToPOStockIn_Add " + lngBillKey.ToString());
- // }
- // else
- // {
+ public override void DeleteRelation(ref string sReturn, Int64 lngBillKey)
+ {
+ //閿�鍞鍗� 閿�鍞嚭搴撳崟 鍏宠仈鏁伴噺
+ try
+ {
+ if (DetailColl[0].HSourceBillType == "1401") //閿�鍞鍗�
+ {
+ oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToPOStockIn_Del " + lngBillKey.ToString());
+ }
+ else if (DetailColl[0].HSourceBillType == "1205") //閿�鍞嚭搴撳崟
+ {
+ oCn.RunProc("exec h_p_Xs_UpDateRelation_ICStockoPOStockIn_Del " + lngBillKey.ToString());
+ }
+ else
+ {
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+ //鏂板鍏宠仈
+ public override void AddNewRelation(ref string sReturn, Int64 lngBillKey)
+ {
+ //閿�鍞鍗� 閿�鍞嚭搴撳崟 鍏宠仈鏁伴噺
+ try
+ {
+ if (DetailColl[0].HSourceBillType == "1401") //閿�鍞鍗�
+ {
+ oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToPOStockIn_Add " + lngBillKey.ToString());
+ }
+ else if (DetailColl[0].HSourceBillType == "1205") //閿�鍞嚭搴撳崟
+ {
+ oCn.RunProc("exec h_p_Xs_UpDateRelation_ICStockToPOStockIn_Add " + lngBillKey.ToString());
+ }
+ else
+ {
- // }
- // }
- // catch (Exception e)
- // {
- // throw (e);
- // }
- //}
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
#endregion
@@ -169,8 +169,8 @@
oCn.RunProc(subSql);
}
- ////鏇存柊璁㈠崟鍏宠仈鏁伴噺
- //AddNewRelation(ref sReturn, omodel.HInterID);
+ //鏇存柊璁㈠崟鍏宠仈鏁伴噺
+ AddNewRelation(ref sReturn, omodel.HInterID);
sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
oCn.Commit();
@@ -288,8 +288,8 @@
oCn.RunProc(subSql);
}
- ////鏇存柊璁㈠崟鍏宠仈鏁伴噺
- //AddNewRelation(ref sReturn, omodel.HInterID);
+ //鏇存柊璁㈠崟鍏宠仈鏁伴噺
+ AddNewRelation(ref sReturn, omodel.HInterID);
sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
oCn.Commit();
--
Gitblit v1.9.1