From 306bde7e1ebdde6403f89a0d13feccf9b1e79d2f Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 20 九月 2024 13:59:31 +0800
Subject: [PATCH] PDA领料出库上传方法修改
---
DAL/销售管理/ClsKf_ICStockBackBill.cs | 145 +++++++++++++++++++++++++++++++++---------------
1 files changed, 99 insertions(+), 46 deletions(-)
diff --git "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsKf_ICStockBackBill.cs" "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsKf_ICStockBackBill.cs"
index bb0b182..71cdbf7 100644
--- "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsKf_ICStockBackBill.cs"
+++ "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsKf_ICStockBackBill.cs"
@@ -36,58 +36,41 @@
public override void DeleteRelation(ref string sReturn, Int64 lngBillKey)
{
//鏀舵枡閫氱煡鍗� 閫�鏂欓�氱煡鍗� 鍏宠仈鏁伴噺
- //try
- //{
- // if (omodel.HMainSourceBillType == "鍙戣揣閫氱煡鍗�")
- // {
- // oCn.RunProc("exec h_p_Xs_UpDateSeOutStockRelation_Del " + lngBillKey.ToString());
- // }
- // else if (omodel.HMainSourceBillType == "閫�璐ч�氱煡鍗�")
- // {
- // oCn.RunProc("exec h_p_Xs_UpDateSeOutStockRelation_Back_Del " + lngBillKey.ToString());
- // }
- // else if (DetailColl[0].HSourceBillType == "1401") //閿�鍞鍗�
- // {
- // oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellOut_Delete " + lngBillKey.ToString());
- // }
- // else
- // {
+ try
+ {
+ if (DetailColl[0].HSourceBillType == "1401") //閿�鍞鍗�
+ {
+ oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellBack_Delete " + lngBillKey.ToString());
+ }
+ else
+ {
- // }
- //}
- //catch (Exception e)
- //{
- // throw (e);
- //}
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
}
//鏂板鍏宠仈
public override void AddNewRelation(ref string sReturn, Int64 lngBillKey)
{
- //鏀舵枡閫氱煡鍗� 閫�鏂欓�氱煡鍗� 鍏宠仈鏁伴噺
- //try
- //{
- // if (omodel.HMainSourceBillType == "鍙戣揣閫氱煡鍗�")
- // {
- // oCn.RunProc("exec h_p_Xs_UpDateSeOutStockRelation_Add " + lngBillKey.ToString());
- // }
- // else if (omodel.HMainSourceBillType == "閫�璐ч�氱煡鍗�")
- // {
- // oCn.RunProc("exec h_p_Xs_UpDateSeOutStockRelation_Back_Add " + lngBillKey.ToString());
- // }
- // else if(DetailColl[0].HSourceBillType == "1401") //閿�鍞鍗�
- // {
- // oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellOut_Add " + lngBillKey.ToString());
- // }
- // else
- // {
+ try
+ {
+ if (DetailColl[0].HSourceBillType == "1401") //閿�鍞鍗�
+ {
+ oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellBack_Add " + lngBillKey.ToString());
+ }
+ else
+ {
- // }
- //}
- //catch (Exception e)
- //{
- // throw (e);
- //}
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
}
//淇敼鍗曟嵁
@@ -95,6 +78,21 @@
{
try
{
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Kf_SellOutBackBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Kf_SellOutBackBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
//
oCn.BeginTran();
string mainSql = "update Kf_ICStockBillMain set " +
@@ -135,6 +133,8 @@
" where HInterID = " + lngBillKey;
//鏇存柊涓昏〃
oCn.RunProc(mainSql);
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
//鍒犻櫎瀛愯〃
DeleteBillSub(lngBillKey);
//鎻掑叆瀛愯〃
@@ -209,6 +209,24 @@
oCn.RunProc(subSql);
}
+ //鏇存柊璁㈠崟鍏宠仈鏁伴噺
+ AddNewRelation(ref sReturn, omodel.HInterID);
+ //鎺у埗鍏宠仈鏁伴噺
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("exec h_p_Kf_SellOutBackBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Kf_SellOutBackBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
oCn.Commit();
@@ -235,6 +253,22 @@
{
omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
}
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Kf_SellOutBackBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Kf_SellOutBackBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
//
oCn.BeginTran();
//涓昏〃
@@ -371,7 +405,26 @@
}
-
+ //鏇存柊璁㈠崟鍏宠仈鏁伴噺
+ AddNewRelation(ref sReturn, omodel.HInterID);
+ //鎺у埗鍏宠仈鏁伴噺
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("exec h_p_Kf_SellOutBackBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Kf_SellOutBackBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
oCn.Commit();
return true;
--
Gitblit v1.9.1