From d291af0ea6fbda27a326d19a6a51d99c1cedff59 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 09 八月 2024 15:49:05 +0800
Subject: [PATCH] 直接调拨核对模块，扫源单方法增加私有云模式时通过WEBAPI重新同步单据功能；领料出库核对模块，扫物料条码调用方法修改，增加系统参数判断，安瑞先解析条码；新增设备维修记录报表调用方法
---
WebAPI/Controllers/XSGL/Xs_SellOutChangeBillController.cs | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Xs_SellOutChangeBillController.cs b/WebAPI/Controllers/XSGL/Xs_SellOutChangeBillController.cs
index 26001ac..bca5439 100644
--- a/WebAPI/Controllers/XSGL/Xs_SellOutChangeBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SellOutChangeBillController.cs
@@ -211,7 +211,15 @@
}
-
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ 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;
+ }
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
@@ -366,6 +374,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;
+ }
+
oCN.BeginTran();
oCN.RunProc("delete from Xs_SellOutChangeBillMain where HInterID = " + HInterID);
@@ -509,6 +527,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;
+ }
+
//妫�楠屽瓙琛ㄦ暟鎹�
string errorMessage = "";
foreach (Model.ClsXs_SellOutChangeBillSub oSub in oBill.DetailColl)
@@ -611,6 +640,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_Xs_SellOutChangeBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
ds = oCN.RunProcReturn(sql1, "h_p_Xs_SellOutChangeBill_BeforeUnCheckCtrl");
--
Gitblit v1.9.1