From 69d1e112acf87dc96c4beb55c9a8abd1286fa287 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 06 五月 2024 17:15:24 +0800
Subject: [PATCH] 1. 必录项 标识加上 2.工作任务 增加 任务类别 的 字段 以及 选择基础资料功能； 3.工程项目中 项目列表 选择现在会 报错；完善；
---
WebAPI/Controllers/XSGL/YS_ReceiveOtherBillController.cs | 32 +++++++++-----------------------
1 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/YS_ReceiveOtherBillController.cs b/WebAPI/Controllers/XSGL/YS_ReceiveOtherBillController.cs
index 358d185..8aa0c73 100644
--- a/WebAPI/Controllers/XSGL/YS_ReceiveOtherBillController.cs
+++ b/WebAPI/Controllers/XSGL/YS_ReceiveOtherBillController.cs
@@ -354,7 +354,7 @@
return objJsonResult;
}
//鍒ゆ柇鏄惁鏄垱寤虹姸鎬佽繘琛屽垹闄�
- if (BillOld.omodel.HBillStatus.ToString() == "1")
+ if (int.Parse(BillOld.omodel.HBillStatus.ToString()) <= 1)
{
@@ -540,29 +540,15 @@
//璁板綍杩斿洖淇℃伅
string msg = "";
- if(oBill.omodel.HMainSourceInterID != 0)
+ string sql = "exec h_p_YS_ReceiveOtherBill_CheckCrediControl " + oBill.omodel.HInterID;
+ ds = oCN.RunProcReturn(sql, "h_p_YS_ReceiveOtherBill_CheckCrediControl");
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() == "1")
{
- //妫�楠屾簮鍗曟槸鍚﹀瓨鍦ㄥ強鍗曟嵁鐘舵��
- string sql = "select * from YS_ReceiveOtherBillMain where HInterID = " + oBill.omodel.HMainSourceInterID;
- ds = oCN.RunProcReturn(sql, "YS_ReceiveOtherBillMain");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:婧愬崟-鐗规壒鐢宠鍗曚笉瀛樺湪!";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else if (ds.Tables[0].Rows[0]["HBillStatus"].ToString() != "2")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:婧愬崟-鐗规壒鐢宠鍗曟湭澶勪簬宸插鏍哥姸鎬�!";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
-
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
}
//瀹℃牳鍓嶆帶鍒�=========================================
--
Gitblit v1.9.1