From 9167264eeb081fdbb94d8a1d2f76f35a6ccdd5fe Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 06 四月 2022 11:02:33 +0800
Subject: [PATCH] nothing
---
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs | 167 +++++++++++++++++++++++++++++++------------------------
1 files changed, 95 insertions(+), 72 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
index aa4976d..ef10199 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
@@ -23,44 +23,45 @@
[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 +78,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 +103,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
{
@@ -168,6 +167,15 @@
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() + "]";
@@ -184,14 +192,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) //宸ョ▼缂栫爜
@@ -202,6 +210,8 @@
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;
if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber))
{
@@ -217,11 +227,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,HYear) " +
+ "HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate,HYear,HMaker,HMakeDate,HEquipMaintainRuleInterID,HEquipDotCheckRuleInterID) " +
" 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 +"','"+ HYear+
+ "','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID +",'3308','" + HDate +"','"+ HYear+ "','" + HMaker + "','" + HMakeDate +"','"+ HEquipMaintainRuleInterID+"','"+ HEquipDotCheckRuleInterID+
"')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.Commit();
@@ -259,6 +269,15 @@
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);
@@ -271,14 +290,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) //宸ョ▼缂栫爜
@@ -289,6 +308,8 @@
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;
if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber))
{
@@ -316,30 +337,32 @@
//涓昏〃
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 +
+ ",HLogo='" + HLogo + "'" +
",HSellSupID=" + HSellSupID +
",HMakeSupID= " + HMakeSupID +
- ",HUpDater= " + HUpDater +
- ",HUpDateDate= " + HUpDateDate +
+ ",HUpDater= '" + HUpDater + "'" +
+ ",HUpDateDate= '" + HUpDateDate + "'" +
+ ",HEquipDotCheckRuleInterID='"+ HEquipDotCheckRuleInterID+"'"+
+ ",HEquipMaintainRuleInterID='"+ HEquipMaintainRuleInterID+"'"+
" Where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
--
Gitblit v1.9.1