From 4c7cb8434be52f1de8557c069ebf82dfbfd8d6ee Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 05 十一月 2025 15:29:46 +0800
Subject: [PATCH] 增加凯贝装箱单
---
WebAPI/Controllers/XSGL/YS_ReceiveOtherBillController.cs | 56 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 14 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/YS_ReceiveOtherBillController.cs b/WebAPI/Controllers/XSGL/YS_ReceiveOtherBillController.cs
index 8aa0c73..c7e73f0 100644
--- a/WebAPI/Controllers/XSGL/YS_ReceiveOtherBillController.cs
+++ b/WebAPI/Controllers/XSGL/YS_ReceiveOtherBillController.cs
@@ -23,18 +23,7 @@
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- DataSet ds;
-
- public class ClsYS_ReceiveOtherBillSubs
- {
-
- public Int64 HProjectMoneyIDSub;// int //璐圭敤椤圭洰
- public string HTypeSub;// varchar(20) --鍙戠エ绫诲瀷
- public double HMoneySub;// dec(18,8) //鍗曟嵁閲戦
- public double HTaxRateSub;// dec(18,8) //绋庣巼
- public double HSumMoneySub;// dec(18,8) //鎬婚噾棰�
- }
-
+ DataSet ds;
#region 鍏朵粬搴旀敹鍗曞垪琛� 鏌ヨ
/// <summary>
@@ -220,6 +209,16 @@
}
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ 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;
+ }
+
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
@@ -356,7 +355,15 @@
//鍒ゆ柇鏄惁鏄垱寤虹姸鎬佽繘琛屽垹闄�
if (int.Parse(BillOld.omodel.HBillStatus.ToString()) <= 1)
{
-
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ 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;
+ }
//鍒犻櫎鍓嶆帶鍒�=========================================
string sql1 = "exec h_p_YS_ReceiveOtherBill_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
@@ -535,6 +542,17 @@
//杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣�
if (IsAudit == 0) //瀹℃牳鎻愪氦
{
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ 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();
//璁板綍杩斿洖淇℃伅
@@ -599,7 +617,17 @@
}
if (IsAudit == 1) //鍙嶅鏍告彁浜�
{
-
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ 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;
+ }
+
//鍙嶅鏍稿墠鎺у埗=========================================
string sql1 = "exec h_p_YS_ReceiveOtherBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
ds = oCN.RunProcReturn(sql1, "h_p_YS_ReceiveOtherBill_BeforeUnCheckCtrl");
--
Gitblit v1.9.1