From 015997e4efd5e5189498c9af00b7805919a676b2 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 15 十一月 2023 19:44:17 +0800
Subject: [PATCH] 特批申请单：审核时判断源单是否处于创建状态，不是则审核失败
---
WebAPI/Controllers/XSGL/YS_ReceiveBackBillController.cs | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/YS_ReceiveBackBillController.cs b/WebAPI/Controllers/XSGL/YS_ReceiveBackBillController.cs
index dcace17..730fb42 100644
--- a/WebAPI/Controllers/XSGL/YS_ReceiveBackBillController.cs
+++ b/WebAPI/Controllers/XSGL/YS_ReceiveBackBillController.cs
@@ -49,12 +49,12 @@
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");
}
@@ -312,6 +312,8 @@
{
try
{
+ string s = "";
+
//鏌ョ湅鏉冮檺
if (!DBUtility.ClsPub.Security_Log("YS_ReceiveBackBill_Drop", 1, false, user))
{
@@ -331,6 +333,24 @@
return objJsonResult;
}
+ if (BillOld.ShowBill(long.Parse(HInterID), ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽鍒犻櫎锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
oCN.BeginTran();
oCN.RunProc("delete from YS_ReceiveBillMain where HInterID = " + HInterID);
--
Gitblit v1.9.1