From cb98f3abf09cb75bf1328c42745f3be8cd9d9374 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 17 五月 2024 08:04:43 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/ReportPlatFormController.cs | 114 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 93 insertions(+), 21 deletions(-)
diff --git a/WebAPI/Controllers/ReportPlatFormController.cs b/WebAPI/Controllers/ReportPlatFormController.cs
index bfc89cd..5a410a8 100644
--- a/WebAPI/Controllers/ReportPlatFormController.cs
+++ b/WebAPI/Controllers/ReportPlatFormController.cs
@@ -15,6 +15,7 @@
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
#region 鎶ュ伐骞冲彴鏍规嵁璐ｄ换浜虹瓫閫夊姞杞借祫婧愬垪琛�
@@ -70,28 +71,31 @@
try
{
- //ds = oCN.RunProcReturn("select * from Gy_SourceRelationSet where HSourceID='" + HSourceID + "'", "Gy_SourceRelationSet");
- //if (ds.Tables[0].Rows.Count > 0)
- //{
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鐢熶骇璧勬簮宸插瓨鍦紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
- oCN.BeginTran();
- //鍐欏叆浜х嚎缁戝畾
- string sql = string.Format(@"insert into Gy_SourceRelationSet (HSourceID,HUserName,HGroupID,HManagerID,HRemark,HCreateDate,HCreator,HNowFlag,HCheckManID)
+ ds = oCN.RunProcReturn("select * from Gy_SourceRelationSet where HSourceID='" + HSourceID + "' and HUserName='" + HUserName + "'", "Gy_SourceRelationSet");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠浜哄憳鍒涘缓姝ょ敓浜ц祫婧�,涓嶅厑璁搁噸澶嶅垱寤猴紒";
+ objJsonResult.data = null;
+
+ }
+ else
+ {
+ oCN.BeginTran();
+ //鍐欏叆浜х嚎缁戝畾
+ string sql = string.Format(@"insert into Gy_SourceRelationSet (HSourceID,HUserName,HGroupID,HManagerID,HRemark,HCreateDate,HCreator,HNowFlag,HCheckManID)
values('" + HSourceID + "','" + HUserName + "','" + HGroupID + "','" + HManagerID + "','" + HRemark + "','" + DateTime.Parse(HCreateDate).ToShortDateString() + "','" + HUserName + "','0','')");
- oCN.RunProc(sql);
- oCN.Commit();
+ oCN.RunProc(sql);
+ oCN.Commit();
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- objJsonResult.data = null;
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ }
}
catch (Exception e)
{
@@ -157,13 +161,13 @@
#region 鎶ュ伐骞冲彴鍒犻櫎璧勬簮鍒楄〃
[Route("ReportPlatForm/DeleteGetLineBindBillList")]
[HttpGet]
- public object DeleteGetLineBindBillList(string HSourceID)
+ public object DeleteGetLineBindBillList(string HSourceID,string user)
{
try
{
oCN.BeginTran();
//鏇存柊鍒囨崲鐘舵�佸��
- string sql = string.Format(@"delete Gy_SourceRelationSet where HSourceID='" + HSourceID + "'");
+ string sql = string.Format(@"delete Gy_SourceRelationSet where HSourceID='" + HSourceID + "' and HUserName = '" + user + "'");
oCN.RunProc(sql);
oCN.Commit();
objJsonResult.code = "1";
@@ -185,5 +189,73 @@
}
#endregion
+ #region 閫氳繃绯荤粺鍙傛暟鎺у埗锛屽垽鏂敓浜ц鍗曟槸鍚﹀仛浜嗛浠舵楠屽崟鍜屽伐搴忔楠屽崟
+ [Route("ReportPlatForm/IsCheck")]
+ [HttpGet]
+ public object IsCheck(Int64 HICMOInterID,Int64 HICMOEntryID,string HICMOBillNo)
+ {
+ try
+ {
+ //鑾峰彇绯荤粺鍙傛暟
+ string sErrMsg = "";
+ string HBackRemark = "";
+ if (oSystemParameter.ShowBill(ref sErrMsg) == true)
+ {
+ if (oSystemParameter.omodel.Sc_ICMOReportBill_FirstCheckOut == "Y") //绯荤粺鍙傛暟 鏄惁鍋氫簡棣栦欢妫�楠屽崟 绌虹櫧涓洪�氱敤
+ {
+ ds = oCN.RunProcReturn("exec h_p_JIT_IsFirstCheckOut " + HICMOInterID + "," + HICMOEntryID + ",'" + HICMOBillNo + "'", "h_p_Sc_IsFirstCheckOut");
+
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ HBackRemark += ds.Tables[0].Rows[0]["HBackRemark"] + " ";
+ }
+ }
+ if(oSystemParameter.omodel.Sc_ICMOReportBill_ProcessCheckOut == "Y") //绯荤粺鍙傛暟 鏄惁鍋氫簡杩囩▼妫�楠屽崟 绌虹櫧涓洪�氱敤
+ {
+ ds = oCN.RunProcReturn("exec h_p_JIT_IsProcessCheckOut " + HICMOInterID + "," + HICMOEntryID + ",'" + HICMOBillNo + "'", "h_p_Sc_IsProcessCheckOut");
+
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ HBackRemark += ds.Tables[0].Rows[0]["HBackRemark"];
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (HBackRemark == "")
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "褰撳墠鐢熶骇璁㈠崟宸茬淮鎶ら浠舵楠屽崟鍜岃繃绋嬫楠屽崟";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = HBackRemark;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ex.Message;
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
}
}
--
Gitblit v1.9.1