From 0484048734d67b9bde2cf69d47b4e169449382dc Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 22 五月 2024 17:32:23 +0800
Subject: [PATCH] 器具档案 增加 子表 和网格； Gy_MouldFileSub_SubMater 用来显示 这个 器具的 的 子配件（或子器具）； （子表 非必录，允许为空）
---
WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
index ff159be..70a60b5 100644
--- a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
+++ b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
@@ -327,6 +327,17 @@
oBill.DetailColl.Add(oItemSub);
}
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ 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;
+ }
+
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
@@ -339,7 +350,6 @@
}
else //缂栬緫淇濆瓨
{
- string s = "";
if (BillOld.ShowBill(lsmain[0].HInterID, ref s) == false)
{
objJsonResult.code = "0";
@@ -531,7 +541,16 @@
objJsonResult.data = null;
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 (IsAudit == 0) //瀹℃牳鎻愪氦
@@ -567,7 +586,6 @@
return objJsonResult;
}
//==================================================================================
-
//瀹℃牳鎻愪氦
oCN.BeginTran();
--
Gitblit v1.9.1