From 89873b7d156f21e7aa71b3f004a11ced2e7a7d4e Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 29 十一月 2024 09:28:55 +0800
Subject: [PATCH] 日计划导入限制
---
WebAPI/Controllers/CGGL/Cg_PORequestBillController.cs | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/CGGL/Cg_PORequestBillController.cs b/WebAPI/Controllers/CGGL/Cg_PORequestBillController.cs
index c9909e6..08033d0 100644
--- a/WebAPI/Controllers/CGGL/Cg_PORequestBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_PORequestBillController.cs
@@ -63,7 +63,7 @@
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
- objJsonResult.list = columnNameList;
+ objJsonResult.list = columnNameList;//灏哻olumnNameList璧嬪�肩粰objJsonResult鐨刲ist灞炴��
return objJsonResult;
}
catch (Exception e)
@@ -167,7 +167,15 @@
string HCloseMan = mainList2[0].HCloseMan == null ? "''" : mainList2[0].HCloseMan;
string HCloseDate = mainList2[0].HCloseDate == null ? "''" : mainList2[0].HCloseDate;
-
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
ds = oCN.RunProcReturn("select * from h_v_Cg_PORequestBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_Cg_PORequestBillList");
@@ -426,6 +434,17 @@
{
try
{
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
+
oCN.BeginTran();
oCN.RunProc("Delete From Cg_PORequestBillMain where HInterID = " + HInterID);
oCN.RunProc("Delete From Cg_PORequestBillSub where HInterID = " + HInterID);
@@ -559,6 +578,18 @@
HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
}
BillOld.MvarItemKey = "Cg_PORequestBillMain";
+
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
+
oCN.BeginTran();//寮�濮嬩簨鍔�
//Type 1 瀹℃牳 2 鍙嶅鏍�
@@ -584,7 +615,7 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+
if (!BillOld.CheckBill(int.Parse(HInterID), HBillNo, "h_p_Cg_PORequestBill_AfterCheckCtrl", user, ref ClsPub.sExeReturnInfo))
{
objJsonResult.code = "0";
@@ -617,6 +648,7 @@
return objJsonResult;
}
+
if (BillOld.AbandonCheck(int.Parse(HInterID), HBillNo, "h_p_Cg_PORequestBill_AfterUnCheckCtrl", user, ref ClsPub.sExeReturnInfo))
{
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
--
Gitblit v1.9.1