From 00e25e4a9c9bd2fc91558c3c1a68f47db6d08b1d Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 08 七月 2024 18:57:35 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs | 656 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 621 insertions(+), 35 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
index 27036ac..dbb259b 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
@@ -1,4 +1,5 @@
锘縰sing DBUtility;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -48,22 +49,12 @@
ds = oCN.RunProcReturn(sql, "h_v_Gy_EquipFileMainList");
}
- //if (ds.Tables[0].Rows.Count != 0 || ds != null)
- //{
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
- //}
- //else
- //{
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "鏃犳暟鎹�";
- //objJsonResult.data = null;
- //return objJsonResult;
- //}
}
catch (Exception e)
{
@@ -91,7 +82,7 @@
return objJsonResult;
}
- string s = "";
+ //string s = "";
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HItemID);
if (lngBillKey == 0)
@@ -103,9 +94,23 @@
return objJsonResult;
}
DLL.ClsGy_EquipFileMain oBill = new DLL.ClsGy_EquipFileMain();
- if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ oCN.BeginTran();
+ ds = oCN.RunProcReturn("select * from Gy_EquipFileBillMain where HInterID=" + HItemID, "Gy_EquipFileBillMain");
+ if (ds.Tables[0].Rows.Count > 0)
{
+ if (int.Parse(ds.Tables[0].Rows[0]["HBillStatus"].ToString()) > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵�侊紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
oCN.RunProc("Delete From Gy_EquipFileBillMain where HInterID=" + lngBillKey);
+ oCN.RunProc("Delete From Gy_EquipFileBillSub_MaintainRule where HInterID=" + lngBillKey);
+ oCN.RunProc("Delete From Gy_EquipFileBillSub_DotCheckRule where HInterID=" + lngBillKey);
+ oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鍒犻櫎鎴愬姛";
@@ -120,6 +125,7 @@
objJsonResult.data = null;
return objJsonResult;
}
+
}
#endregion
@@ -150,6 +156,80 @@
}
#endregion
+ # region 璁惧淇濆吇瑙勭▼缂栬緫鏃惰幏鍙栬〃浣撴暟鎹柊(淇濆吇瑙勭▼鍒楄〃銆佺偣妫�瑙勭▼鍒楄〃)
+ [Route("Gy_EquipFileMain/Gy_EquipFileMainSubAndSubItem")]
+ [HttpGet]
+ public object Gy_EquipFileMainSubAndSubItem(string HInterID)
+ {
+
+ DataSet ds, ds1;
+ List<object> list = new List<object>();
+ string Swhere = "";
+ try
+ {
+ if (HInterID != "" || HInterID != null)
+ {
+ Swhere = " and hmainid='" + HInterID + "'";
+ }
+ else
+ {
+ Swhere = HInterID;
+ }
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鑾峰彇淇濆吇椤圭洰缂栬緫鏁版嵁
+ string sql = "select 淇濆吇椤圭洰ID HMaintainItemID,淇濆吇椤圭洰浠ｇ爜 HMaintainItemNumber,淇濆吇椤圭洰 HMaintainItem,淇濆吇閮ㄤ綅 HMaintainPart,鍏蜂綋瑕佹眰 HClaim,璐熻矗浜篒D HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜哄悕绉� HManagerName,瀛愬娉�2 HRemark from h_v_Sb_EquipMaintainRuleSub_Item where 1 = 1 " + Swhere + "";
+ ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMaintainRuleSub_Item");
+ //鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
+ string sql1 = "select 閰嶄欢ID HMaterID,閰嶄欢浠ｇ爜 HMaterNumber,閰嶄欢鍚嶇О HMaterName,鍗曚綅ID HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitNumber,璁￠噺鍗曚綅鍚嶇О HUnitName,鐢ㄩ噺 HQty,瀛愬娉�1 HRemark from h_v_Sb_EquipMaintainRuleSub where 1 = 1 " + Swhere + "";
+ ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipMaintainRuleSub");
+
+ list.Add(ds.Tables[0]);
+ list.Add(ds1.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ #region[璁惧妗ｆ缂栬緫鏃惰幏鍙栧瓙琛ㄦ暟鎹甝
+ [Route("Gy_EquipFileMain/Gy_EquipFileSubDetai")]
+ [HttpGet]
+ public object Gy_EquipFileSubDetai(long HInterID)
+ {
+ try
+ {
+ List<DataTable> tableList = new List<DataTable>();
+ ds = oCN.RunProcReturn("select a.*,b.HBillNo from Gy_EquipFileBillSub_MaintainRule AS a left join Sb_EquipMaintainRuleBillMain as b on b.HInterID = a.HMaintainRuleID where a.HInterID = " + HInterID, "Gy_EquipFileBillSub_MaintainRule");
+ tableList.Add(ds.Tables[0]);
+ ds = oCN.RunProcReturn("select a.*,b.HBillNo from Gy_EquipFileBillSub_DotCheckRule AS a left join Sb_EquipDotCheckRuleBillMain as b on b.HInterID = a.HDotCheckRuleID where a.HInterID = " + HInterID, "Gy_EquipFileBillSub_DotCheckRule");
+ tableList.Add(ds.Tables[0]);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = tableList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 璁惧妗ｆ鏂板淇濆瓨
/// <summary>
/// 妯℃不鍏峰垎绫�-淇濆瓨鎸夐挳
@@ -165,11 +245,12 @@
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
- string msg3 = sArray[1].ToString();
- string msg4 = sArray[2].ToString();
+ string msg2 = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃1
+ string msg4 = sArray[2].ToString(); //瀛愯〃2
+ string msg5 = sArray[3].ToString(); //鐢ㄦ埛
- if (!DBUtility.ClsPub.Security_Log("Gy_EquipFile_Edit", 1, false, msg4))
+ if (!DBUtility.ClsPub.Security_Log("Gy_EquipFile_Edit", 1, false, msg5))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -210,7 +291,10 @@
string HLogo = list[0].HLogo; //鈭� varchar(50) //鍝佺墝
int HSellSupID = list[0].HSellSupID; // 鈭� int //渚涘簲鍟�(Gy_Supplier)
int HMakeSupID = list[0].HMakeSupID; // int //鍒堕�犲晢 (Gy_Supplier)
- string HMaker = msg4;
+ string HMainSourceFlag = list[0].HMainSourceFlag; //varchar(10) //鏄惁涓荤敓浜ц澶�(鍚︼紝鏄�)
+ string HMacAddress = list[0].HMacAddress; // varchar(50) //鏁伴噰鐗╃悊鍦板潃
+ int HMainSourceID = list[0].HMainSourceID; //int //鎵�灞炰富鐢熶骇璁惧锛圙y_EquipFileBillMain锛�
+ string HMaker = msg5;
string HMakeDate = DateTime.Now.Date.ToString();
int HEquipDotCheckRuleInterID = list[0].HEquipDotCheckRuleInterID;
int HEquipMaintainRuleInterID = list[0].HEquipMaintainRuleInterID;
@@ -224,22 +308,30 @@
objJsonResult.data = null;
return objJsonResult;
}
+ DataSet DS = oCN.RunProcReturn("Select * from Gy_EquipFileBillMain Where HEquipFileNumber='" + HEquipFileNumber + "' and HInterID<>" + HInterID, "Gy_EquipFileBillMain", ref Pub_Class.ClsPub.sExeReturnInfo);
+
+ if (DS.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜閲嶅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
//涓昏〃
oCN.RunProc("Insert into Gy_EquipFileBillMain " +
- " (hbillno,HEquipFileNumber,HEquipFileNo,HName,HModel,HModel2,HMaterID,HUnitID,HOutComDate" +
+ " (HInterID,hbillno,HEquipFileNumber,HEquipFileNo,HName,HModel,HModel2,HMaterID,HUnitID,HOutComDate" +
",HOutComNo,HDeptID,HUseEmpID,HRepairEmpID,HAddress,HSetupDate,HStartupDate,HStatus," +
-"HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate,HYear,HMaker,HMakeDate,HEquipMaintainRuleInterID,HEquipDotCheckRuleInterID,HSourceID) " +
- " Values('" + hbillno + "','" + HEquipFileNumber + "','" + HEquipFileNo + "','" + HName + "','" + HModel + "','" + HModel2 + "'," + HMaterID + "," + HUnitID +
+"HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate,HYear,HMaker,HMakeDate,HEquipMaintainRuleInterID,HEquipDotCheckRuleInterID,HSourceID,HMainSourceFlag,HMacAddress,HMainSourceID) " +
+ " Values("+ HInterID+",'" + hbillno + "','" + HEquipFileNumber + "','" + HEquipFileNo + "','" + HName + "','" + HModel + "','" + HModel2 + "'," + HMaterID + "," + HUnitID +
",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HUseEmpID + "," + HRepairEmpID + ",'" + HAddress +
"','" + HSetupDate + "','" + HStartupDate + "','" + HStatus + "'," + HEquipFileTypeID + ",'" + HProNum +
- "','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID + ",'3308','" + HDate + "','" + HYear + "','" + HMaker + "','" + HMakeDate + "','" + HEquipMaintainRuleInterID + "','" + HEquipDotCheckRuleInterID +"'," + HSourceID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ "','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID + ",'3308','" + HDate + "','" + HYear + "','" + HMaker + "','" + HMakeDate + "','" + HEquipMaintainRuleInterID + "','" + HEquipDotCheckRuleInterID +"'," + HSourceID + ",'" + HMainSourceFlag + "','" + HMacAddress + "','" + HMainSourceID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ objJsonResult = AddBillSub(msg3, msg4, HInterID, hbillno, 1);
oCN.Commit();
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鏂板鎴愬姛锛�";
//objJsonResult.data = null;
return objJsonResult;
}
@@ -267,11 +359,12 @@
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
- string msg3 = sArray[1].ToString();
- string msg4 = sArray[2].ToString();
+ string msg2 = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃1
+ string msg4 = sArray[2].ToString(); //瀛愯〃2
+ string msg5 = sArray[3].ToString(); //鐢ㄦ埛
- if (!DBUtility.ClsPub.Security_Log("Gy_EquipFile_Edit", 1, false, msg4))
+ if (!DBUtility.ClsPub.Security_Log("Gy_EquipFile_Edit", 1, false, msg5))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -308,7 +401,10 @@
string HLogo = list[0].HLogo; //鈭� varchar(50) //鍝佺墝
int HSellSupID = list[0].HSellSupID; // 鈭� int //渚涘簲鍟�(Gy_Supplier)
int HMakeSupID = list[0].HMakeSupID; // int //鍒堕�犲晢 (Gy_Supplier)
- string HUpDater = msg4;
+ string HMainSourceFlag = list[0].HMainSourceFlag; //varchar(10) //鏄惁涓荤敓浜ц澶�(鍚︼紝鏄�)
+ string HMacAddress = list[0].HMacAddress; // varchar(50) //鏁伴噰鐗╃悊鍦板潃
+ int HMainSourceID = list[0].HMainSourceID; //int //鎵�灞炰富鐢熶骇璁惧锛圙y_EquipFileBillMain锛�
+ string HUpDater = msg5;
string HUpDateDate = DateTime.Now.Date.ToString();
int HEquipDotCheckRuleInterID = list[0].HEquipDotCheckRuleInterID;
int HEquipMaintainRuleInterID = list[0].HEquipMaintainRuleInterID;
@@ -363,19 +459,20 @@
",HLogo='" + HLogo + "'" +
",HSellSupID=" + HSellSupID +
",HMakeSupID= " + HMakeSupID +
- ",HUpDater= '" + HUpDater + "'" +
+ ",HUpDater= '" + HUpDater + "'" +
",HUpDateDate= '" + HUpDateDate + "'" +
",HEquipDotCheckRuleInterID='" + HEquipDotCheckRuleInterID + "'" +
",HEquipMaintainRuleInterID='" + HEquipMaintainRuleInterID + "'" +
",HSourceID='" + HSourceID + "'" +
+ ",HMainSourceFlag= '" + HMainSourceFlag + "'" +
+ ",HMacAddress= '" + HMacAddress + "'" +
+ ",HMainSourceID = '" + HMainSourceID + "'" +
" Where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
//
+ objJsonResult = AddBillSub(msg3, msg4, HInterID, list[0].HBillNo, 2);
oCN.Commit();
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "淇敼鎴愬姛锛�";
//objJsonResult.data = null;
return objJsonResult;
}
@@ -391,13 +488,117 @@
}
#endregion
+ #region 璁惧妗ｆ淇濆瓨瀛愯〃鏁版嵁
+ /// <summary>
+ /// 瀛愯〃鏁版嵁鏂板鎴栬�呯紪杈�
+ /// </summary>
+ /// <param name="msg3"></param>
+ /// <param name="msg4"></param>
+ /// <param name="HInterID"></param>
+ /// <param name="HBillNo"></param>
+ /// <param name="OperationType">1涓烘坊鍔�2涓虹紪杈�</param>
+ /// <returns></returns>
+ public json AddBillSub(string msg3, string msg4, long HInterID, string HBillNo, int OperationType)
+ {
+ List<ClsGy_EquipFileBillSub_MaintainRule> MaintainRuleColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_EquipFileBillSub_MaintainRule>>(msg3);
+
+ List<ClsGy_EquipFileBillSub_DotCheckRule> DotCheckRuleColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_EquipFileBillSub_DotCheckRule>>(msg4);
+ if (OperationType == 2)
+ {
+ //鍒犻櫎瀛愯〃
+ oCN.RunProc("delete from Gy_EquipFileBillSub_MaintainRule where HInterID = " + HInterID );
+ oCN.RunProc("delete from Gy_EquipFileBillSub_DotCheckRule where HInterID = " + HInterID );
+ }
+ int i = 0;
+ //淇濆瓨淇濆吇瑙勬牸
+ foreach (ClsGy_EquipFileBillSub_MaintainRule oSub in MaintainRuleColl)
+ {
+ i++;
+ if (oSub.HMaintainRuleID <= 0 || oSub.HMaintainRuleID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + i + "琛�,淇濆吇瑙勬牸涓嶈兘涓虹┖";
+ objJsonResult.data = null;
+ throw new Exception("淇濆吇瑙勬牸涓嶈兘涓虹┖");
+ }
+ DataSet Cs;
+ Int64 NewHEntryID = 1;
+ Int64 newHFlag = 1;
+ Cs = oCN.RunProcReturn("select MAX(HEntryID)HEntryID from Gy_EquipFileBillSub_MaintainRule", "Gy_EquipFileBillSub_MaintainRule");
+ if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString()) != 0)
+ {
+ NewHEntryID = ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString());
+ NewHEntryID += 1;
+ }
+ if(oSub.HStdFlag == true)
+ {
+ newHFlag = 1;
+ }
+ else
+ {
+ newHFlag = 0;
+ }
+ oCN.RunProc($@"Insert into Gy_EquipFileBillSub_MaintainRule
+ (HInterID,HBillNo_bak,HEntryID,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,
+ HMaintainRuleID,HStdFlag
+ )
+ values({HInterID},'{HBillNo}',{NewHEntryID},'{oSub.HRemark}',{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HRelationQty},{oSub.HRelationMoney}
+ ,{oSub.HMaintainRuleID},{newHFlag})");
+ }
+ i = 0;
+ //淇濆瓨鐐规瑙勭▼
+ foreach (ClsGy_EquipFileBillSub_DotCheckRule oSub in DotCheckRuleColl)
+ {
+ i++;
+ if (oSub.HDotCheckRuleID <= 0 || oSub.HDotCheckRuleID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + i + "琛�,鐐规瑙勭▼涓嶈兘涓虹┖";
+ objJsonResult.data = null;
+ throw new Exception("鐐规瑙勭▼涓嶈兘涓虹┖");
+ }
+ DataSet Cs;
+ Int64 NewHEntryID = 1;
+ Int64 newHFlag = 1;
+ Cs = oCN.RunProcReturn("select MAX(HEntryID)HEntryID from Gy_EquipFileBillSub_DotCheckRule", "Gy_EquipFileBillSub_DotCheckRule");
+ if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString()) != 0)
+ {
+ NewHEntryID = ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString());
+ NewHEntryID += 1;
+ }
+ if (oSub.HStdFlag == true)
+ {
+ newHFlag = 1;
+ }
+ else
+ {
+ newHFlag = 0;
+ }
+ oCN.RunProc($@"Insert into Gy_EquipFileBillSub_DotCheckRule
+ (HInterID,HBillNo_bak,HEntryID,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,
+ HDotCheckRuleID,HStdFlag
+ )
+ values({HInterID},'{HBillNo}',{NewHEntryID},'{oSub.HRemark}',{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HRelationQty},{oSub.HRelationMoney}
+ ,{oSub.HDotCheckRuleID},{newHFlag})");
+ }
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨瀛愯〃鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ #endregion
+
#region[璁惧灞ュ巻(鐐瑰嚮涓昏〃甯﹀嚭浠庤〃)]
[Route("Gy_EquipFileMain/Sb_EquipFileBillResumeDate")]
[HttpGet]
public object Sb_EquipFileBillResumeDate(string HInterID)
{
- DataTable ds, ds1;
+ DataTable ds, ds1,ds2;
long HInterID1 = long.Parse(HInterID);
List<object> list = new List<object>();
try
@@ -407,9 +608,11 @@
string sql1 = string.Format($"exec h_p_Gy_EquipRecord {HInterID1}");
ds = oCN.RunProcReturn(sql1, "h_p_Gy_EquipRecord").Tables[0];
ds1 = oCN.RunProcReturn(sql1, "h_p_Gy_EquipRecord").Tables[1];
+ ds2 = oCN.RunProcReturn(sql1, "h_p_Gy_EquipRecord").Tables[2];
list.Add(ds);//鏃ュ父璁板綍
list.Add(ds1);//缁翠慨璁板綍
+ list.Add(ds2);//閰嶄欢鏇存崲娓呭崟
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
@@ -729,5 +932,388 @@
}
#endregion
+
+ #region 璁惧杩愯鐘舵�佹姤琛�
+
+ [Route("SB_EquipRunningStatus/Report")]
+ [HttpGet]
+ public object Report(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //if (!DBUtility.ClsPub.Security_Log("Gy_EquipFileList", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Sb_EquipRunningStatusReport " + sWhere + " order by 鎵�灞炴棩鏈� desc", "h_v_Sb_EquipRunningStatusReport");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sb_EquipRunningStatusReport where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鎵�灞炴棩鏈� desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipRunningStatusReport");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+
+ //if (ds.Tables[0].Rows.Count != 0 && ds != null)
+ //{
+
+ //}
+ //else
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳暟鎹�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧杩愯鐘舵�佹姤琛� 鏍戠姸鍥� 閮ㄩ棬鍒嗙被鏌ヨ
+ public class TreeModel_Report
+ {
+ public string id { get; set; }
+ public string title { get; set; }
+ public string type { get; set; }
+ public List<TreeModel_Report> children = new List<TreeModel_Report>();
+ }
+ [Route("SB_EquipRunningStatus/ReportTreeGetList")]
+ [HttpGet]
+ public object ReportTreeGetList(string sWhere, string user)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select HItemID,HNumber,HName from Gy_Department", "Gy_Department");
+
+ List<TreeModel_Report> treeModels = new List<TreeModel_Report>();
+ TreeModel_Report first = new TreeModel_Report();
+
+ DataSet Ds;
+ string HCampanyName = "";
+ Ds = oCN.RunProcReturn("select HValue from Xt_SystemParameter where HCaption = '瀹㈡埛鍚嶇О'", "Xt_SystemParameter");
+ if (Ds.Tables[0].Rows.Count != 0 && Ds != null)
+ {
+ HCampanyName = Ds.Tables[0].Rows[0]["HValue"].ToString();
+ }
+
+ first.id = "0";
+ first.title = HCampanyName;
+ treeModels.Add(first);
+
+ foreach (DataRow row in ds.Tables[0].Rows)
+ {
+ var strLen = row["hitemid"].ToString().Split('.');
+ if (strLen.Length == 1)
+ {
+ TreeModel_Report tree = new TreeModel_Report();
+ tree.id = row["HItemID"].ToString();
+ tree.title = row["HName"].ToString();
+ tree.type = "Department";
+ treeModels[0].children.Add(tree);
+ }
+ }
+ getWorkCenter_Level2(ds.Tables[0], treeModels[0].children);
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = Newtonsoft.Json.JsonConvert.SerializeObject(treeModels);
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ /// <summary>
+ /// 绗簩绾у伐浣滀腑蹇�
+ /// </summary>
+ public void getWorkCenter_Level2(DataTable dt, List<TreeModel_Report> tree)
+ {
+ for (int i = 0;i < dt.Rows.Count;i++)
+ {
+ var HDeptID = dt.Rows[i]["HItemID"].ToString();
+ ds = oCN.RunProcReturn("select distinct HItemID,HNumber,HName from Gy_WorkCenter where HDeptID = " + HDeptID, "Gy_WorkCenter");
+ if (ds.Tables[0].Rows.Count != 0 && ds != null)
+ {
+ for (int j = 0; j < ds.Tables[0].Rows.Count; j++)
+ {
+ TreeModel_Report tbjson = new TreeModel_Report();
+ tbjson.id = ds.Tables[0].Rows[j]["HItemID"].ToString();
+ tbjson.title = ds.Tables[0].Rows[j]["HName"].ToString();
+ tbjson.type = "WorkCenter";
+ tree[i].children.Add(tbjson);
+ }
+ }
+ //digui_Report(ds.Tables[0], tree[i].children, 2);
+ }
+
+ }
+
+ /// <summary>
+ /// 閫掑綊鍑芥暟
+ /// </summary>
+ public void digui_Report(DataTable dt, List<TreeModel_Report> tree, int num)
+ {
+ for (int m = 0; m < tree.Count; m++)
+ {
+ tree[m].children = new List<TreeModel_Report>();
+ for (int i = 0; i < dt.Rows.Count; i++)//绗竴娆″惊鐜紝寰楀埌鎵�鏈夋牴鑺傜偣鐨勫瓙闆�
+ {
+ var HWorkCenterNumber = dt.Rows[i]["HNumber"].ToString();
+ DataSet Ds;
+ Ds = oCN.RunProcReturn("select distinct HItemID,HNumber,HName from Gy_WorkCenter where HNumber like '" + HWorkCenterNumber + "%'", "Gy_WorkCenter");
+
+ if (Ds.Tables[0].Rows.Count != 0 && Ds != null)
+ {
+ for (int j = 0;j < Ds.Tables[0].Rows.Count;j++)
+ {
+ var strLen = Ds.Tables[0].Rows[j]["HNumber"].ToString().Split('.');
+ if (strLen.Length == num && Ds.Tables[0].Rows[j]["HNumber"].ToString().Contains(tree[m].id + "."))
+ {
+ TreeModel_Report tbjson = new TreeModel_Report();
+ tbjson.id = Ds.Tables[0].Rows[j]["HItemID"].ToString();
+ tbjson.title = Ds.Tables[0].Rows[j]["HName"].ToString();
+ tbjson.type = "WorkCenter";
+ tree[m].children.Add(tbjson);
+ }
+ }
+ }
+ }
+ var strLens = tree[m].id.Split('.');
+ for (int i = 0; i < tree[m].children.Count; i++)
+ {
+ digui_Report(dt, tree[m].children, strLens.Length + 2);//鍐嶆鐢ㄥ瓙闆嗗幓寰幆锛屾嬁鍑哄瓙闆嗙殑瀛愰泦
+ }
+ }
+
+ }
+ #endregion
+
+ #region 璁惧PDA妯″潡 鎵爜
+ [Route("Gy_EquipFileBill/txtHBarCode_KeyDown")]
+ [HttpGet]
+ public object txtHBarCode_KeyDown(string HBarCode, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ if (HBarCode == null || HBarCode.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜淇℃伅涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ string sql = "select * from h_v_Gy_EquipFileBill_KeyDown_PDA where 鏉″舰鐮� = '" + HBarCode + "'";
+ ds = oCN.RunProcReturn(sql, "锘縣_v_Gy_EquipFileBill_KeyDown_PDA");
+ }
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璁惧鏉＄爜锛�" + HBarCode + " ,娌℃湁鍒涘缓姝よ澶囨。妗�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧灞ュ巻鍒楄〃
+
+ [Route("Gy_EquipFileMain/GetResumeList")]
+ [HttpGet]
+ public object GetResumeList(string HInterID, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ if (!DBUtility.ClsPub.Security_Log("Gy_EquipFileList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn($@"select a.HInterID,a.HDate '鏃ユ湡',a.HBillType,x.HName 鍗曟嵁绫诲瀷,a.HBillNo as '鍗曟嵁鍙�',
+ CASE WHEN a.HBillStatus <= 1 THEN '鍒涘缓' WHEN a.HBillStatus = 2 THEN '宸插鏍�' WHEN a.HBillStatus = 3 AND
+ a.HCloseType = 0 THEN '鑷姩鍏抽棴' WHEN a.HBillStatus = 3 AND
+ a.HCloseType = 1 THEN '鎵嬪姩鍏抽棴' WHEN a.HBillStatus = 4 THEN '宸蹭綔搴�' ELSE '鍏跺畠鐘舵��' END AS 鍗曟嵁鐘舵��,
+ a.HMaker AS 鍒跺崟浜�, a.HMakeDate AS 鍒跺崟鏃ユ湡,a.HChecker AS 瀹℃牳浜�, a.HCheckDate AS 瀹℃牳鏃ユ湡, a.HUpDater AS 淇敼浜�, a.HUpDateDate AS 淇敼鏃ユ湡,
+ a.HCloseMan AS 鍏抽棴浜�, a.HCloseDate AS 鍏抽棴鏃ユ湡, a.HDeleteMan AS 浣滃簾浜�, a.HDeleteDate AS 浣滃簾鏃ユ湡
+ from (
+ select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Gy_EquipFileBillMain where HInterID = {HInterID} UNION ALL
+ select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipStockInCheckBillMain where HEquipID = {HInterID} UNION ALL
+ select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipDotCheckBillMain where HEquipID = {HInterID} UNION ALL
+ select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipMaintainBillMain where HEquipID = {HInterID} UNION ALL
+ select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipRepairWorkBillMain where HEquipID = {HInterID} UNION ALL
+ select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipConkBookBillMain where HEquipID = {HInterID}
+ )as a,Xt_BillType as x
+ where a.HBillType = x.HNumber
+ ORDER BY '鏃ユ湡' ASC;", "h_v_Gy_EquipFileMainList");
+
+ //娣诲姞鍔ㄦ�佸垪淇℃伅
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鍣ㄥ叿灞ュ巻鍒楄〃
+
+ [Route("Gy_MouldFileMain/GetMouldResumeList")]
+ [HttpGet]
+ public object GetMouldResumeList(string HInterID, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ if (!DBUtility.ClsPub.Security_Log("Gy_MouldFileList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn($@"select a.HInterID,a.HDate '鏃ユ湡',a.HBillType,x.HName 鍗曟嵁绫诲瀷,a.HBillNo as '鍗曟嵁鍙�',
+ CASE WHEN a.HBillStatus <= 1 THEN '鍒涘缓' WHEN a.HBillStatus = 2 THEN '宸插鏍�' WHEN a.HBillStatus = 3 AND
+ a.HCloseType = 0 THEN '鑷姩鍏抽棴' WHEN a.HBillStatus = 3 AND
+ a.HCloseType = 1 THEN '鎵嬪姩鍏抽棴' WHEN a.HBillStatus = 4 THEN '宸蹭綔搴�' ELSE '鍏跺畠鐘舵��' END AS 鍗曟嵁鐘舵��,
+ a.HMaker AS 鍒跺崟浜�, a.HMakeDate AS 鍒跺崟鏃ユ湡,a.HChecker AS 瀹℃牳浜�, a.HCheckDate AS 瀹℃牳鏃ユ湡, a.HUpDater AS 淇敼浜�, a.HUpDateDate AS 淇敼鏃ユ湡,
+ a.HCloseMan AS 鍏抽棴浜�, a.HCloseDate AS 鍏抽棴鏃ユ湡, a.HDeleteMan AS 浣滃簾浜�, a.HDeleteDate AS 浣滃簾鏃ユ湡
+ from (
+ select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Gy_MouldFileMain where HInterID = {HInterID} UNION ALL
+ select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sc_MouldDotCheckBillMain where HMouldID = {HInterID} UNION ALL
+ select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sc_MouldMaintainBillMain where HMouldID = {HInterID} UNION ALL
+ select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sc_MouldRepairWorkBillMain where HMouldID = {HInterID} UNION ALL
+ select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sc_MouldConkBookBillMain where HMouldID = {HInterID} UNION ALL
+ select a.HInterID,a.HDate,a.HBillType,a.HBillNo,a.HBillStatus,a.HMaker,a.HMakeDate,a.HChecker,a.HCheckDate,a.HUpDater,a.HUpDateDate,a.HCloseMan,a.HCloseDate,a.HDeleteMan,a.HDeleteDate,a.HCloseType
+ from Sc_MouldStockBillMain as a,Sc_MouldStockBillSub as b
+ where a.HInterID = b.HInterID and b.HMaterID = {HInterID} and HBillType in ('3801','3829','3826','3831','3827')
+ )as a,Xt_BillType as x
+ where a.HBillType = x.HNumber
+ ORDER BY '鏃ユ湡' ASC;", "Gy_MouldFileResume");
+
+ //娣诲姞鍔ㄦ�佸垪淇℃伅
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
}
}
--
Gitblit v1.9.1