From 9ce9ea28b20f48914cf7f0c3d0b61a4ba939f96a Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 14 六月 2024 13:07:25 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/XSGL/Xs_OutDoorCheckBillController.cs | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Xs_OutDoorCheckBillController.cs b/WebAPI/Controllers/XSGL/Xs_OutDoorCheckBillController.cs
index 4772373..5290013 100644
--- a/WebAPI/Controllers/XSGL/Xs_OutDoorCheckBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_OutDoorCheckBillController.cs
@@ -126,6 +126,18 @@
return objJsonResult;
}
}
+
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ 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;
+ }
+
//鍒犻櫎鍗曟嵁锛堝寘鍚垹闄ゅ悗鎺у埗銆佸啓鍏ユ棩蹇楋級
if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Xs_OutDoorCheckBill_AfterDelCtrl", HMaker, ref ClsPub.sExeReturnInfo))
{
@@ -239,6 +251,18 @@
return objJsonResult;
}
}
+
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ 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;
+ }
+
//瀹℃牳鍗曟嵁
if (!oBill.CheckBill(HInterID, oBill.omodel.HBillNo, "h_p_Xs_OutDoorCheckBill_AfterCheckCtrl", HMaker, ref ClsPub.sExeReturnInfo))
{
@@ -289,6 +313,17 @@
}
}
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ 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;
+ }
+
//鍙嶅鏍稿崟鎹�
if (!oBill.AbandonCheck(HInterID, oBill.omodel.HBillNo, "h_p_Xs_OutDoorCheckBill_AfterUnCheckCtrl", HMaker, ref ClsPub.sExeReturnInfo))
{
--
Gitblit v1.9.1