From 3f42797486d817c0ff03cd8bb6729bc80b434941 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 11 六月 2024 08:33:24 +0800
Subject: [PATCH] 注释联系单会计合理判断
---
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 86 ++++++++++++++++++++++++++++++++----------
1 files changed, 65 insertions(+), 21 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index a866a25..bd9af46 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -5523,16 +5523,16 @@
//鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
string s = "";
- int sYear = 0;
- int sPeriod = 0;
- if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Now, ref sYear, ref sPeriod, ref s) == false)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = s;
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //int sYear = 0;
+ //int sPeriod = 0;
+ //if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Now, ref sYear, ref sPeriod, ref s) == false)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = s;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
ListModels oListModels = new ListModels();
try
@@ -6290,7 +6290,7 @@
#region 宸ヤ綔鑱旂郴鍗曞洖澶�
/// <summary>
- /// 寮傚父鍙嶉鍗�
+ /// 宸ヤ綔鑱旂郴鍗�
/// </summary>
/// <param name="msg"></param>
/// <returns></returns>
@@ -6319,16 +6319,16 @@
//鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
string s = "";
- int sYear = 0;
- int sPeriod = 0;
- if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Now, ref sYear, ref sPeriod, ref s) == false)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = s;
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //int sYear = 0;
+ //int sPeriod = 0;
+ //if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Now, ref sYear, ref sPeriod, ref s) == false)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = s;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
ListModels oListModels = new ListModels();
try
@@ -6466,6 +6466,50 @@
}
#endregion
+ #region 宸ヤ綔鑱旂郴鍗曟牴鎹簮鍗旾D鏌ョ湅鏄惁鏈夊搴旇仈绯诲崟
+ [Route("Sc_MESTransFerWorkBill/GetOA_WorkLinkBillListBySourceID")]
+ [HttpGet]
+ public object GetOA_WorkLinkBillListBySourceID(string HRelationInterID, string HRelationEntryID)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sql = string.Format(@"select A.*,D.HName HDeptName,e.HName HEvaluateStatusName
+ from OA_WorkLinkBillMain A
+ left join Gy_Department D on A.HDeptID=D.HItemID
+ left join Gy_EvaluateStatus AS e ON A.HEvaluateStatusID = e.HItemID
+ where A.HRelationInterID='" + HRelationInterID + "' and A.HRelationEntryID= '"+ HRelationEntryID+"'"); ;
+ ds = oCN.RunProcReturn(sql, "OA_WorkLinkBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ #endregion
+
#endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1