From be84cd7103a846ad4b7b1601cb5ec9f1447e482d Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 11 一月 2024 09:52:25 +0800
Subject: [PATCH] 工序流转卡派工单保存方法，增加 调用 保存前控制 h_p_Sc_ProcExchSendWorkBill_BeforeSaveCtrl 和保存后控制 h_p_Sc_ProcExchSendWorkBill_AfterSaveCtrl的 存储过程。 工序委外派工单保存方法，增加 调用 保存前控制 h_p_WW_EntrustWorkOrderBill_BeforeSaveCtrl 和保存后控制 h_p_WW_EntrustWorkOrderBill_AfterSaveCtrl的 存储过程。 工序进站接收单保存方法，增加 调用 保存前控制 h_p_Sc_StationInBill_BeforeSaveCtrl 和保存后控制 h_p_Sc_StationInBill_AfterSaveCtrl的 存储过程。 工序出站汇报单保存方法，增加 调用 保存前控制 h_p_Sc_StationOutBill_BeforeSaveCtrl 和保存后控制 h_p_Sc_StationOutBill_AfterSaveCtrl的 存储过程。
---
WebAPI/Controllers/XSGL/YS_ReceiveBackBillController.cs | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/YS_ReceiveBackBillController.cs b/WebAPI/Controllers/XSGL/YS_ReceiveBackBillController.cs
index 1776b68..cb373b9 100644
--- a/WebAPI/Controllers/XSGL/YS_ReceiveBackBillController.cs
+++ b/WebAPI/Controllers/XSGL/YS_ReceiveBackBillController.cs
@@ -38,23 +38,23 @@
{
List<object> columnNameList = new List<object>();
//鏌ョ湅鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Gy_ProjectStage_Query", 1, false, user))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("YS_ReceiveBackBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_YS_ReceiveBackBillList_Query order by 鍗曟嵁鍙� ", "h_v_YS_ReceiveBackBillList_Query");
+ ds = oCN.RunProcReturn("select * from h_v_YS_ReceiveBackBillList_Query order by 鍗曟嵁鍙� desc", "h_v_YS_ReceiveBackBillList_Query");
}
else
{
string sql1 = "select * from h_v_YS_ReceiveBackBillList_Query where 1 = 1 ";
- string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
ds = oCN.RunProcReturn(sql, "h_v_YS_ReceiveBackBillList_Query");
}
@@ -469,6 +469,17 @@
//杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣�
if (IsAudit == 0) //瀹℃牳鎻愪氦
{
+ string sql = "exec h_p_YS_ReceiveBackBill_CheckCrediControl " + oBill.omodel.HInterID;
+ ds = oCN.RunProcReturn(sql, "h_p_YS_ReceiveBackBill_CheckCrediControl");
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() == "1")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//瀹℃牳鎻愪氦
if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
--
Gitblit v1.9.1