From 89759d9f7c3e92876d960ed8e7469e624f0f7f45 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 28 十一月 2025 16:58:50 +0800
Subject: [PATCH] 新增器具入库申请单、器具领用申请单、器具领用出库单模块所需调用方法，器具调拨申请单模块相关调用方法优化
---
WebAPI/Controllers/MJGL/Sc_MouldMoveStockRequestBillController.cs | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockRequestBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockRequestBillController.cs
index cf9543e..257d96e 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockRequestBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockRequestBillController.cs
@@ -34,29 +34,32 @@
#region 鍣ㄥ叿璋冩嫧鐢宠鍗曞垎椤靛垪琛�
[Route("Sc_MouldMoveStockRequestBillController/page")]
[HttpGet]
- public json Sc_MouldMoveStockRequestBillPage(string sWhere, string user, int page, int size)
+ public json Sc_MouldMoveStockRequestBillPage(string sWhere, string user, int page, int size, string Type)
{
try
{
List<object> columnNameList = new List<object>();
- //鍒ゆ柇鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameList, 3, false, user))
+ //鍒楄〃杩涘叆鏃跺垽鏂潈闄愶紝閫夋簮鍗曡繘鍏ヤ笉鍒ゆ柇鏉冮檺
+ if (Type == ModName)
{
- objJsonResult.code = CodeConstant.FAIL;
- objJsonResult.count = CountConstant.FAIL;
- objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
- objJsonResult.data = null;
- return objJsonResult;
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameList, 3, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
sWhere = sWhere.Replace("'", "''");
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCn.RunProcReturn("exec h_p_Sc_MouldMoveStockRequestBillList " + page + "," + size + ",''", "h_p_Sc_MouldMoveStockRequestBillList");
+ ds = oCn.RunProcReturn("exec h_p_Sc_MouldMoveStockRequestBillList " + page + "," + size + ",'','" + Type + "'", "h_p_Sc_MouldMoveStockRequestBillList");
}
else
{
- ds = oCn.RunProcReturn("exec h_p_Sc_MouldMoveStockRequestBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_Sc_MouldMoveStockRequestBillList");
+ ds = oCn.RunProcReturn("exec h_p_Sc_MouldMoveStockRequestBillList " + page + "," + size + ",'" + sWhere + "','" + Type + "'", "h_p_Sc_MouldMoveStockRequestBillList");
}
//娣诲姞鍒楀悕
@@ -716,7 +719,7 @@
string s = "";
int sYear = 0;
int sPeriod = 0;
- if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod_Pay(oItem.HDate, ref sYear, ref sPeriod, ref s) == false)
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(oItem.HDate, ref sYear, ref sPeriod, ref s) == false)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -762,6 +765,7 @@
objJsonResult.count = 1;
objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; //鎴愬姛锛�
objJsonResult.data = null;
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
return objJsonResult;
}
else
--
Gitblit v1.9.1