From 355dec078e44db52fc6c6371debbe44898e6f1f1 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 07 三月 2024 11:22:42 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs | 537 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 458 insertions(+), 79 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
index 30db31b..e765a51 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing DBUtility;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
@@ -16,51 +17,53 @@
private json objJsonResult = new json();
public DataSet ds = new DataSet();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- public DLL.ClsGy_EquipFileMain BillNew0 = new DLL.ClsGy_EquipFileMain();
- public DLL.ClsGy_EquipFileMain BillOld0 = new DLL.ClsGy_EquipFileMain();
+ public DLL.ClsGy_EquipFileMain BillNew0 = new DLL.ClsGy_EquipFileMain();
+ public DLL.ClsGy_EquipFileMain BillOld0 = new DLL.ClsGy_EquipFileMain();
+ public DAL.ClsGy_EquipFileMain BillOld = new DAL.ClsGy_EquipFileMain();
#region 璁惧妗ｆ鍒楄〃
[Route("Gy_EquipFileMain/GetList")]
[HttpGet]
- public object GetList(string sWhere)
+ public object GetList(string sWhere, string user)
{
try
{
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, true, user))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ 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_Gy_EquipFileMainList " + sWhere + "order by 鏃ユ湡 desc", "h_v_Gy_EquipFileMainList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_EquipFileMainList " + sWhere + " order by hmainid desc", "h_v_Gy_EquipFileMainList");
}
else
{
string sql1 = "select * from h_v_Gy_EquipFileMainList where 1 = 1 ";
- string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere + " order by hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_Gy_EquipFileMainList");
}
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏆傛棤鏁版嵁锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+
+ //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)
{
@@ -77,8 +80,17 @@
#region [璁惧妗ｆ鍒犻櫎鍔熻兘]
[Route("Gy_EquipFileMain/Delete_EquipFile")]
[HttpGet]
- public object Delete_EquipFile(string HItemID)
+ public object Delete_EquipFile(string HItemID, string user)
{
+ if (!DBUtility.ClsPub.Security_Log("Gy_EquipFile_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
string s = "";
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HItemID);
@@ -93,23 +105,12 @@
DLL.ClsGy_EquipFileMain oBill = new DLL.ClsGy_EquipFileMain();
if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
{
- bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
- if (IsDete)
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- objJsonResult.data = null;
- return objJsonResult;
- }
+ oCN.RunProc("Delete From Gy_EquipFileBillMain where HInterID=" + lngBillKey);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
}
else
{
@@ -165,30 +166,42 @@
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();
+
+ if (!DBUtility.ClsPub.Security_Log("Gy_EquipFile_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
List<Models.ClsGy_EquipFileMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_EquipFileMain>>(msg2);
- string hbillno= list[0].HBillNo;
+ string hbillno = list[0].HBillNo;
+ string HYear = DateTime.Now.Year.ToString();
DateTime HDate = list[0].HDate;
long HInterID = list[0].HInterID;
- string HEquipFileNumber = list[0].HEquipFileNumber;
+ string HEquipFileNumber = list[0].HEquipFileNumber;
string HEquipFileNo = list[0].HEquipFileNo; // varchar(50) //璁惧缂栫爜(鍞竴)
string HName = list[0].HName; // 鈭� varchar(100) //璁惧鍚嶇О
string HModel = list[0].HModel; // 鈭� varchar(100) //璁惧瑙勬牸
string HModel2 = list[0].HModel2; // 鈭� varchar(100) //璁惧鍨嬪彿
int HMaterID = list[0].HMaterID; // 鈭� int //瀵瑰簲鐗╂枡
int HUnitID = list[0].HUnitID; // 鈭� int //鍗曚綅
- DateTime HOutComDate = list[0].HOutComDate; // 鈭� datetime //璁惧鍑哄巶鏃ユ湡
+ string HOutComDate = list[0].HOutComDate; // 鈭� datetime //璁惧鍑哄巶鏃ユ湡
string HOutComNo = list[0].HOutComNo; // 鈭� varchar(100) //璁惧鍑哄巶缂栧彿
int HDeptID = list[0].HDeptID; // 鈭� int //浣跨敤閮ㄩ棬锛坓y_Department锛�
int HUseEmpID = list[0].HUseEmpID; //鈭� int //浣跨敤璐熻矗浜猴紙gy_Employee锛�
int HRepairEmpID = list[0].HRepairEmpID; //鈭� int //缁存姢璐熻矗浜猴紙gy_Employee锛�
string HAddress = list[0].HAddress; // 鈭� varchar(500) //瀹夎鍦扮偣
- DateTime HSetupDate = list[0].HSetupDate; //鈭� datetime //瀹夎鏃ユ湡
- DateTime HStartupDate = list[0].HStartupDate; //鈭� datetime //杩愯寮�濮嬫棩鏈�
+ string HSetupDate = list[0].HSetupDate; //鈭� datetime //瀹夎鏃ユ湡
+ string HStartupDate = list[0].HStartupDate; //鈭� datetime //杩愯寮�濮嬫棩鏈�
string HStatus = list[0].HStatus; // 鈭� varchar(20) //褰撳墠鐘舵�侊紙绌洪棽銆佸崰鐢ㄣ�佸姞宸ャ�佸叧鏈恒�佸紓甯稿仠鏈猴級
int HEquipFileTypeID = list[0].HEquipFileTypeID; //鈭� int //璁惧绫诲埆锛圙y_EquipFileType)
string HProNum = list[0].HProNum; // 鈭� varchar(100) //宸ョ▼缂栫爜
@@ -197,6 +210,11 @@
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 HMakeDate = DateTime.Now.Date.ToString();
+ int HEquipDotCheckRuleInterID = list[0].HEquipDotCheckRuleInterID;
+ int HEquipMaintainRuleInterID = list[0].HEquipMaintainRuleInterID;
+ int HSourceID = list[0].HSourceID;
if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber))
{
@@ -212,12 +230,11 @@
oCN.RunProc("Insert into Gy_EquipFileBillMain " +
" (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) " +
+"HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate,HYear,HMaker,HMakeDate,HEquipMaintainRuleInterID,HEquipDotCheckRuleInterID,HSourceID) " +
" Values('" + 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 +
- "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ "','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID + ",'3308','" + HDate + "','" + HYear + "','" + HMaker + "','" + HMakeDate + "','" + HEquipMaintainRuleInterID + "','" + HEquipDotCheckRuleInterID +"'," + HSourceID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.Commit();
objJsonResult.code = "1";
@@ -239,7 +256,7 @@
#endregion
#region 璁惧妗ｆ淇敼淇濆瓨
-
+
[Route("Gy_EquipFileMain/EditBill")]
[HttpPost]
public object EditBill([FromBody] JObject oMain)
@@ -252,6 +269,16 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
+
+ if (!DBUtility.ClsPub.Security_Log("Gy_EquipFile_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
@@ -265,14 +292,14 @@
string HModel2 = list[0].HModel2; // 鈭� varchar(100) //璁惧鍨嬪彿
int HMaterID = list[0].HMaterID; // 鈭� int //瀵瑰簲鐗╂枡
int HUnitID = list[0].HUnitID; // 鈭� int //鍗曚綅
- DateTime HOutComDate = list[0].HOutComDate; // 鈭� datetime //璁惧鍑哄巶鏃ユ湡
+ string HOutComDate = list[0].HOutComDate; // 鈭� datetime //璁惧鍑哄巶鏃ユ湡
string HOutComNo = list[0].HOutComNo; // 鈭� varchar(100) //璁惧鍑哄巶缂栧彿
int HDeptID = list[0].HDeptID; // 鈭� int //浣跨敤閮ㄩ棬锛坓y_Department锛�
int HUseEmpID = list[0].HUseEmpID; //鈭� int //浣跨敤璐熻矗浜猴紙gy_Employee锛�
int HRepairEmpID = list[0].HRepairEmpID; //鈭� int //缁存姢璐熻矗浜猴紙gy_Employee锛�
string HAddress = list[0].HAddress; // 鈭� varchar(500) //瀹夎鍦扮偣
- DateTime HSetupDate = list[0].HSetupDate; //鈭� datetime //瀹夎鏃ユ湡
- DateTime HStartupDate = list[0].HStartupDate; //鈭� datetime //杩愯寮�濮嬫棩鏈�
+ string HSetupDate = list[0].HSetupDate; //鈭� datetime //瀹夎鏃ユ湡
+ string HStartupDate = list[0].HStartupDate; //鈭� datetime //杩愯寮�濮嬫棩鏈�
string HStatus = list[0].HStatus; // 鈭� varchar(20) //褰撳墠鐘舵�侊紙绌洪棽銆佸崰鐢ㄣ�佸姞宸ャ�佸叧鏈恒�佸紓甯稿仠鏈猴級
int HEquipFileTypeID = list[0].HEquipFileTypeID; //鈭� int //璁惧绫诲埆锛圙y_EquipFileType)
string HProNum = list[0].HProNum; // 鈭� varchar(100) //宸ョ▼缂栫爜
@@ -280,7 +307,13 @@
string HWorkArea = list[0].HWorkArea; //鈭� varchar(50) //浜у湴
string HLogo = list[0].HLogo; //鈭� varchar(50) //鍝佺墝
int HSellSupID = list[0].HSellSupID; // 鈭� int //渚涘簲鍟�(Gy_Supplier)
- int HMakeSupID = list[0].HMakeSupID; // int //鍒堕�犲晢 (Gy_Supplier)
+ int HMakeSupID = list[0].HMakeSupID; // int //鍒堕�犲晢 (Gy_Supplier)
+ string HUpDater = msg4;
+ string HUpDateDate = DateTime.Now.Date.ToString();
+ int HEquipDotCheckRuleInterID = list[0].HEquipDotCheckRuleInterID;
+ int HEquipMaintainRuleInterID = list[0].HEquipMaintainRuleInterID;
+ int HSourceID = list[0].HSourceID;
+
if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber))
{
@@ -308,28 +341,33 @@
//涓昏〃
oCN.RunProc("Update Gy_EquipFileBillMain set " +
" HEquipFileNumber='" + HEquipFileNumber + "'" +
- " HEquipFileNo='" + HEquipFileNo + "'" +
- " HName='" + HName + "'" +
- " HModel='" + HModel + "'" +
- " HModel2='" + HModel2 + "'" +
- " HMaterID=" + HMaterID +
- " HUnitID=" + HUnitID +
- " HOutComDate='" + HOutComDate + "'" +
- " HOutComNo='" + HOutComNo + "'" +
- " HDeptID=" + HDeptID +
- " HUseEmpID=" + HUseEmpID +
- " HRepairEmpID=" + HRepairEmpID +
- " HAddress='" + HAddress + "'" +
- " HSetupDate='" + HSetupDate + "'" +
- " HStartupDate='" + HStartupDate + "'" +
- " HStatus='" + HStatus + "'" +
- " HEquipFileTypeID=" + HEquipFileTypeID +
+ ",HEquipFileNo='" + HEquipFileNo + "'" +
+ ",HName='" + HName + "'" +
+ ",HModel='" + HModel + "'" +
+ ",HModel2='" + HModel2 + "'" +
+ ",HMaterID=" + HMaterID +
+ ",HUnitID=" + HUnitID +
+ ",HOutComDate='" + HOutComDate + "'" +
+ ",HOutComNo='" + HOutComNo + "'" +
+ ",HDeptID=" + HDeptID +
+ ",HUseEmpID=" + HUseEmpID +
+ ",HRepairEmpID=" + HRepairEmpID +
+ ",HAddress='" + HAddress + "'" +
+ ",HSetupDate='" + HSetupDate + "'" +
+ ",HStartupDate='" + HStartupDate + "'" +
+ ",HStatus='" + HStatus + "'" +
+ ",HEquipFileTypeID=" + HEquipFileTypeID +
",HProNum='" + HProNum + "'" +
",HBarCode='" + HBarCode + "'" +
",HWorkArea='" + HWorkArea + "'" +
- ",HLogo=" + HLogo +
- ",HSellSupID=" + HSellSupID +
+ ",HLogo='" + HLogo + "'" +
+ ",HSellSupID=" + HSellSupID +
",HMakeSupID= " + HMakeSupID +
+ ",HUpDater= '" + HUpDater + "'" +
+ ",HUpDateDate= '" + HUpDateDate + "'" +
+ ",HEquipDotCheckRuleInterID='" + HEquipDotCheckRuleInterID + "'" +
+ ",HEquipMaintainRuleInterID='" + HEquipMaintainRuleInterID + "'" +
+ ",HSourceID='" + HSourceID + "'" +
" Where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -352,5 +390,346 @@
}
}
#endregion
+
+ #region[璁惧灞ュ巻(鐐瑰嚮涓昏〃甯﹀嚭浠庤〃)]
+ [Route("Gy_EquipFileMain/Sb_EquipFileBillResumeDate")]
+ [HttpGet]
+ public object Sb_EquipFileBillResumeDate(string HInterID)
+ {
+
+ DataTable ds, ds1,ds2;
+ long HInterID1 = long.Parse(HInterID);
+ List<object> list = new List<object>();
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
+ 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 = "鑾峰彇淇℃伅鎴愬姛锛�";
+ 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_MouldFileBillResumeDate")]
+ [HttpGet]
+ public object Gy_MouldFileBillResumeDate(string HInterID)
+ {
+
+ DataTable ds, ds1, ds2, ds3;
+
+ long HInterID1 = long.Parse(HInterID);
+ List<object> list = new List<object>();
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
+ string sql1 = string.Format($"exec h_p_Gy_MouldRecord {HInterID1}");
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_MouldRecord").Tables[0];
+ ds1 = oCN.RunProcReturn(sql1, "h_p_Gy_MouldRecord").Tables[1];
+ ds2 = oCN.RunProcReturn(sql1, "h_p_Gy_MouldRecord").Tables[2];
+ ds3 = oCN.RunProcReturn(sql1, "h_p_Gy_MouldRecord").Tables[3];
+
+ list.Add(ds);//鍑哄叆搴撹褰�
+ list.Add(ds1);//鍣ㄥ叿鑰楃敤璁板綍
+ list.Add(ds2);//鏃ュ父璁板綍
+ list.Add(ds3);//缁翠慨璁板綍
+
+ 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_MouldFileBillBarCodeInfo")]
+ [HttpGet]
+ public object Gy_MouldFileBillBarCodeInfo(string HBarCode)
+ {
+ DataTable ds;
+ List<object> list = new List<object>();
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
+ string sql1 = string.Format($"exec h_p_Gy_EquipFileGetInfoByBarCode {HBarCode}");
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_EquipFileGetInfoByBarCode").Tables[0];
+
+ list.Add(ds);//璁惧妗ｆ
+
+ 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_EquipFileBill/CheckGy_EquipFileBill")]
+ [HttpGet]
+ public object CheckGy_EquipFileBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_EquipFileBill_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ if (!BillOld.CheckBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (BillOld.AbandonCheck(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧妗ｆ鍏抽棴/鍙嶅叧闂姛鑳�
+ [Route("Gy_EquipFileBill/CloseGy_EquipFileBill")]
+ [HttpGet]
+ public object CloseGy_EquipFileBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_EquipFileBill_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ if (!BillOld.CloseBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (!BillOld.CancelClose(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧妗ｆ鍒楄〃 鏍戠姸鍥� 璁惧鍒嗙被鏌ヨ
+ public class TreeModel
+ {
+ public string id { get; set; }
+ public string title { get; set; }
+ public List<TreeModel> children = new List<TreeModel>();
+ }
+ [Route("Gy_EquipFileMain/TreeGetList")]
+ [HttpGet]
+ public object TreeGetList(string sWhere, string user)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select HItemID,HNumber,HName from Gy_EquipFileType", "Gy_EquipFileType");
+
+ List<TreeModel> treeModels = new List<TreeModel>();
+ TreeModel first = new TreeModel();
+ first.id = "0";
+ first.title = "璁惧鍒嗙被璁剧疆";
+ treeModels.Add(first);
+
+ foreach (DataRow row in ds.Tables[0].Rows)
+ {
+ var strLen = row["hitemid"].ToString().Split('.');
+ if (strLen.Length == 1)
+ {
+ TreeModel tree = new TreeModel();
+ tree.id = row["HItemID"].ToString();
+ tree.title = row["HName"].ToString();
+ treeModels[0].children.Add(tree);
+ }
+ }
+ digui(ds.Tables[0], treeModels[0].children, 2);
+
+
+ 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 digui(DataTable dt, List<TreeModel> tree, int num)
+ {
+ for (int m = 0; m < tree.Count; m++)
+ {
+ tree[m].children = new List<TreeModel>();
+ for (int i = 0; i < dt.Rows.Count; i++)//绗竴娆″惊鐜紝寰楀埌鎵�鏈夋牴鑺傜偣鐨勫瓙闆�
+ {
+ var strLen = dt.Rows[i]["HNumber"].ToString().Split('.');
+ if (strLen.Length == num && dt.Rows[i]["HNumber"].ToString().Contains(tree[m].id + "."))
+ {
+ TreeModel tbjson = new TreeModel();
+ tbjson.id = dt.Rows[i]["HItemID"].ToString();
+ tbjson.title = dt.Rows[i]["HName"].ToString();
+ tree[m].children.Add(tbjson);
+ }
+ }
+ var strLens = tree[m].id.Split('.');
+ for (int i = 0; i < tree[m].children.Count; i++)
+ {
+ digui(dt, tree[m].children, strLens.Length + 2);//鍐嶆鐢ㄥ瓙闆嗗幓寰幆锛屾嬁鍑哄瓙闆嗙殑瀛愰泦
+ }
+ }
+
+ }
+ #endregion
}
}
--
Gitblit v1.9.1