From 517b819913e5146cc47b80877dd557326c76246a Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期四, 23 十二月 2021 15:39:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/WebAPIController.cs | 76 +++++++++++++++++++++++++++++---------
1 files changed, 58 insertions(+), 18 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index ab9a83b..c4dec73 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -187,6 +187,45 @@
}
+
+ //鎾ら攢缂撳瓨鍒楄〃璁板綍
+ [Route("Web/Rescind_Json")]
+ [HttpGet]
+ public object Rescind_Json(long sHInterID, string sBillNo, string sBillType)
+ {
+ string sErrMsg = string.Empty;
+ try
+ {
+ if (webserver.RescindBillList(sHInterID, sBillNo, sBillType, ref sErrMsg))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+
//鍒犻櫎缂撳瓨鍒楄〃璁板綍
[Route("Web/Delete_Json")]
[HttpGet]
@@ -2199,28 +2238,29 @@
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- string sql = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
+ List<object> list = new List<object>();
+ DataSet ds2;
+ DataSet ds1;
+ string sql1 = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
left join Gy_Employee e on e.HItemID=t.HManagerID
where a.HInterID=(select HEquipMaintainRuleInterID from Gy_EquipFileBillMain where HInterID=" + EquipProjectID + ") ");
- ds = oCN.RunProcReturn(sql, "Sb_EquipMaintainRuleBillMain");
- if (ds == null || ds.Tables[0].Rows.Count <= 0)
- {
- objjson.code = "0";
- objjson.count = 0;
- objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
- objjson.data = null;
- return objjson;
- }
- else
- {
- objjson.code = "1";
- objjson.count = 1;
- objjson.Message = "鑾峰彇鎴愬姛!";
- objjson.data = ds.Tables[0];
- return objjson;
- }
+ string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a
+ left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID
+ left join h_v_IF_Material m on b.HMaterID=m.HItemID
+ left join h_v_IF_Unit u on b.HUnitID=u.HItemID
+ where a.HInterID=(select HEquipMaintainRuleInterID from Gy_EquipFileBillMain where HInterID=" + EquipProjectID + ") ");
+
+ ds1 = oCN.RunProcReturn(sql1, "Sb_EquipMaintainRuleBillMain");//淇濆吇
+ ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//閰嶄欢
+ list.Add(ds1.Tables[0]);
+ list.Add(ds2.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+ return objJsonResult;
}
catch (Exception ex)
{
--
Gitblit v1.9.1