From 7bf3d3a373b61def534d6110d393c1b9db3422d6 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 21 五月 2024 16:28:24 +0800
Subject: [PATCH] 销售订单关闭和行关闭 增加 关闭后控制的 存储过程 ：h_p_Xs_SeOrderBill_AfterCloseCtrl 增加 行关闭后控制的 存储过程：h_p_Xs_SeOrderBill_AfterEntryCloseCtrl 参数 @HInterID int, --单据ID @HBillNo varchar(50), --单据号 @HUser varchar(100) --用户 存储过程里 增加 控制， 当 这个销售订单 出库数量为0， 但是 下推的 工序流转卡 已经 染厂（工序可以写死）进站或出站记录后。 进行报错，不允许关闭；（行关闭，只考虑本行； 整单关闭则 需要 全部行都考虑）
---
WebAPI/Controllers/CGGL/Cg_PayableBillController.cs | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs b/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
index 2027a30..f6dc975 100644
--- a/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
@@ -151,6 +151,7 @@
return objJsonResult;
}
}
+
UserName = oItem.HMaker; //鍒跺崟浜�
oItem.HBillType = "1114";
oItem.HBillSubType = "1114";
@@ -173,10 +174,10 @@
msg3 = msg3.Replace("\\", "");
msg3 = msg3.Replace("\n", ""); //\n
//msg2 = msg2.Replace("'", "鈥�");
- List<Model.ClsCg_PayableBillSub> ls = new List<Model.ClsCg_PayableBillSub>();
- ls = oListModels.getObjectByJson_Cg_PayableBillSub(msg3);
+ List<Model.ClsCg_PayableSub> ls = new List<Model.ClsCg_PayableSub>();
+ ls = oListModels.getObjectByJson_Cg_PayableSub(msg3);
int i = 0;
- foreach (Model.ClsCg_PayableBillSub oItemSub in ls)
+ foreach (Model.ClsCg_PayableSub oItemSub in ls)
{
i++;
oItemSub.HEntryID = i;
@@ -194,6 +195,7 @@
bool bResult;
if (refSav == "Add")
{
+
// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
}
@@ -335,8 +337,14 @@
oCN.BeginTran();
+ //搴斾粯鍗� 鍒犻櫎 鎾ら攢 閲囪喘鍏ュ簱鍗� 鍏宠仈鏁伴噺
+ oCN.RunProc("exec h_p_Cg_UpDateRelation_POStockInToPayable_Del " + HInterID);
+
+ //搴斾粯鍗� 鍒犻櫎 鎾ら攢 閲囪喘璁㈠崟 鍏宠仈鏁伴噺
+ oCN.RunProc("exec h_p_Cg_UpDateRelation_POOrderToPayable_Del " + HInterID);
+
oCN.RunProc("delete from Cg_PayableBillMain where HInterID = " + HInterID);
- oCN.RunProc("delete from Cg_PayableBillSub where HInterID= " + HInterID);
+ oCN.RunProc("delete from Cg_PayableSub where HInterID= " + HInterID);
////鍒犻櫎鍚庢帶鍒�==================================================================================
//string sql2 = "exec h_p_Xs_ReceivableBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
@@ -367,7 +375,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鎮ㄥ凡鍒犻櫎鍗曟嵁鍙蜂负" + BillOld.omodel.HBillNo + "鐨勫簲鏀跺崟锛�";
+ objJsonResult.Message = "鎮ㄥ凡鍒犻櫎鍗曟嵁鍙蜂负" + BillOld.omodel.HBillNo + "鐨勫簲浠樺崟锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -382,6 +390,8 @@
}
}
#endregion
+
+
#region 搴斾粯鍗� 瀹℃牳/鍙嶅鏍�
/// <summary>
@@ -576,7 +586,7 @@
}
catch (Exception e)
{
- oCN.RollBack();
+ //oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -587,6 +597,7 @@
}
#endregion
+
#region 搴斾粯鍗� 鍏抽棴/鍙嶅叧闂�
/// <summary>
/// </summary>
--
Gitblit v1.9.1