From dab190364a9c8b341cfa399ddc2e5d6cb76fb394 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 30 十一月 2022 15:32:26 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs | 65 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 19 deletions(-)
diff --git a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
index 20e9a95..cf6838a 100644
--- a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
@@ -237,6 +237,7 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
string msg4 = sArray[2].ToString();
+ string msg5 = sArray[3].ToString();
//string UserName = "";
@@ -330,6 +331,30 @@
oBill.DetailColl.Add(oItemSub);
}
+
+ //閰嶄欢琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ //msg5 = msg5.Substring(1, msg5.Length - 2);
+ msg5 = msg5.Replace("\\", "");
+ msg5 = msg5.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsSb_EquipRepairWorkBillSub_Mater> ls1 = new List<Model.ClsSb_EquipRepairWorkBillSub_Mater>();
+ ls1 = JsonConvert.DeserializeObject<List<Model.ClsSb_EquipRepairWorkBillSub_Mater>>(msg5);
+ int j = 0;
+ foreach (Model.ClsSb_EquipRepairWorkBillSub_Mater oItemSub in ls1)
+ {
+
+ j++;
+ oItemSub.HEntryID = i;
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ oBill.DetailColl_Mater.Add(oItemSub);
+
+ }
+
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
@@ -386,35 +411,37 @@
}
#endregion
- #region[璁惧缁翠慨鍒楄〃缂栬緫鏃惰幏鍙栬〃浣撴暟鎹甝
+ #region[璁惧缁翠慨鍒楄〃缂栬緫鏃惰幏鍙栬〃浣撴暟鎹�(缁翠慨鍒楄〃銆侀厤浠跺垪琛�)]
[Route("Sb_EqpRepairWorkBill/Sb_EqpRepairWorkBillListProjectDetai")]
[HttpGet]
- public object Sb_EqpRepairWorkBillListProjectDetai(string sqlWhere)
+ public object Sb_EqpRepairWorkBillListProjectDetai(string HInterID)
{
- DataSet ds;
+ DataSet ds, ds1;
+ List<object> list = new List<object>();
+ string sqlWhere = "";
try
{
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (sqlWhere == null || sqlWhere.Equals(""))
+ if (HInterID != "" || HInterID != null)
{
- //ds = oCN.RunProcReturn("select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark from Sc_MouldRepairWorkBillSub", "Sc_MouldRepairWorkBillSub");
- ds = oCN.RunProcReturn("select HRepairID,缁翠慨椤圭洰浠ｇ爜 HRepairCode,缁翠慨椤圭洰 HRepairName,HManagerID1 HManagerID,琛ㄤ綋璐熻矗浜轰唬鐮� HManagerCode,琛ㄤ綋璐熻矗浜� HManagerName,HRepairID1 HRepairID, 琛ㄤ綋缁翠慨椤圭洰浠ｇ爜 HRepairCode,琛ㄤ綋缁翠慨椤圭洰 HRepairName,琛ㄤ綋缁翠慨瑕佹眰 HRepairExplanation,琛ㄤ綋澶囨敞 HRemark,婧愬崟涓诲唴鐮� HSourceInterID,婧愬崟瀛愬唴鐮� HSourceEntryID,婧愬崟鍗曞彿 HSourceBillNo,婧愬崟绫诲瀷 HSourceBillType from h_v_Sc_EquipRepairWorkBillList_Edit", "h_v_Sc_EquipRepairWorkBillList_Edit");
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
+ sqlWhere = " and hmainid='" + HInterID + "'";
}
else
{
- //string sql1 = "select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark from Sc_MouldRepairWorkBillSub where 1 = 1 ";
- string sql1 = "select HRepairID,缁翠慨椤圭洰浠ｇ爜 HRepairCode,缁翠慨椤圭洰 HRepairName,HManagerID1 HManagerID,琛ㄤ綋璐熻矗浜轰唬鐮� HManagerCode,琛ㄤ綋璐熻矗浜� HManagerName,HRepairID1 HRepairID, 琛ㄤ綋缁翠慨椤圭洰浠ｇ爜 HRepairCode,琛ㄤ綋缁翠慨椤圭洰 HRepairName,琛ㄤ綋缁翠慨瑕佹眰 HRepairExplanation,琛ㄤ綋澶囨敞 HRemark ,婧愬崟涓诲唴鐮� HSourceInterID,婧愬崟瀛愬唴鐮� HSourceEntryID,婧愬崟鍗曞彿 HSourceBillNo,婧愬崟绫诲瀷 HSourceBillType from h_v_Sc_EquipRepairWorkBillList_Edit where 1 = 1 ";
- string sql = sql1 + sqlWhere;
- ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipRepairWorkBillList_Edit");
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
+ sqlWhere = HInterID;
}
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ ds = oCN.RunProcReturn("select HRepairID,缁翠慨椤圭洰浠ｇ爜 HRepairCode,缁翠慨椤圭洰 HRepairName,HManagerID1 HManagerID,琛ㄤ綋璐熻矗浜轰唬鐮� HManagerCode,琛ㄤ綋璐熻矗浜� HManagerName,HRepairID1 HRepairID, 琛ㄤ綋缁翠慨椤圭洰浠ｇ爜 HRepairCode,琛ㄤ綋缁翠慨椤圭洰 HRepairName,琛ㄤ綋缁翠慨瑕佹眰 HRepairExplanation,琛ㄤ綋澶囨敞 HRemark,婧愬崟涓诲唴鐮� HSourceInterID,婧愬崟瀛愬唴鐮� HSourceEntryID,婧愬崟鍗曞彿 HSourceBillNo,婧愬崟绫诲瀷 HSourceBillType from h_v_Sc_EquipRepairWorkBillList_Edit where 1 = 1 " + sqlWhere , "h_v_Sc_EquipRepairWorkBillList_Edit");
+ string sql1 = "select * from h_v_Sb_EquipRepairWorkBillSub_Mater where 1 = 1 " + sqlWhere;
+ ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipRepairWorkBillSub_Mater");
+ list.Add(ds.Tables[0]);
+ list.Add(ds1.Tables[0]);
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+
}
catch (Exception e)
{
--
Gitblit v1.9.1