From eefd7d9b5a0913827f836b2988988d7c886b6d06 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 27 二月 2024 10:46:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs | 232 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 210 insertions(+), 22 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
index 88da647..7882ae9 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,14 +17,15 @@
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,string user)
+ public object GetList(string sWhere, string user)
{
try
{
@@ -78,7 +80,7 @@
#region [璁惧妗ｆ鍒犻櫎鍔熻兘]
[Route("Gy_EquipFileMain/Delete_EquipFile")]
[HttpGet]
- public object Delete_EquipFile(string HItemID,string user)
+ public object Delete_EquipFile(string HItemID, string user)
{
if (!DBUtility.ClsPub.Security_Log("Gy_EquipFile_Delete", 1, false, user))
{
@@ -181,11 +183,11 @@
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) //璁惧瑙勬牸
@@ -212,6 +214,7 @@
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))
{
@@ -227,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,HYear,HMaker,HMakeDate,HEquipMaintainRuleInterID,HEquipDotCheckRuleInterID) " +
+"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 +"','"+ HYear+ "','" + HMaker + "','" + HMakeDate +"','"+ HEquipMaintainRuleInterID+"','"+ HEquipDotCheckRuleInterID+
- "')", 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";
@@ -254,7 +256,7 @@
#endregion
#region 璁惧妗ｆ淇敼淇濆瓨
-
+
[Route("Gy_EquipFileMain/EditBill")]
[HttpPost]
public object EditBill([FromBody] JObject oMain)
@@ -310,6 +312,8 @@
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))
{
@@ -341,28 +345,29 @@
",HName='" + HName + "'" +
",HModel='" + HModel + "'" +
",HModel2='" + HModel2 + "'" +
- ",HMaterID=" + HMaterID +
- ",HUnitID=" + HUnitID +
+ ",HMaterID=" + HMaterID +
+ ",HUnitID=" + HUnitID +
",HOutComDate='" + HOutComDate + "'" +
",HOutComNo='" + HOutComNo + "'" +
- ",HDeptID=" + HDeptID +
+ ",HDeptID=" + HDeptID +
",HUseEmpID=" + HUseEmpID +
",HRepairEmpID=" + HRepairEmpID +
",HAddress='" + HAddress + "'" +
",HSetupDate='" + HSetupDate + "'" +
",HStartupDate='" + HStartupDate + "'" +
",HStatus='" + HStatus + "'" +
- ",HEquipFileTypeID=" + HEquipFileTypeID +
+ ",HEquipFileTypeID=" + HEquipFileTypeID +
",HProNum='" + HProNum + "'" +
",HBarCode='" + HBarCode + "'" +
",HWorkArea='" + HWorkArea + "'" +
",HLogo='" + HLogo + "'" +
- ",HSellSupID=" + HSellSupID +
+ ",HSellSupID=" + HSellSupID +
",HMakeSupID= " + HMakeSupID +
",HUpDater= '" + HUpDater + "'" +
",HUpDateDate= '" + HUpDateDate + "'" +
- ",HEquipDotCheckRuleInterID='"+ HEquipDotCheckRuleInterID+"'"+
- ",HEquipMaintainRuleInterID='"+ HEquipMaintainRuleInterID+"'"+
+ ",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);
@@ -392,13 +397,13 @@
public object Sb_EquipFileBillResumeDate(string HInterID)
{
- DataTable ds,ds1;
+ DataTable ds, ds1;
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];
@@ -427,8 +432,8 @@
public object Gy_MouldFileBillResumeDate(string HInterID)
{
- DataTable ds,ds1,ds2,ds3;
-
+ DataTable ds, ds1, ds2, ds3;
+
long HInterID1 = long.Parse(HInterID);
List<object> list = new List<object>();
try
@@ -461,5 +466,188 @@
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
}
}
--
Gitblit v1.9.1