From 3759a25e8608c8dc0ec4308ebef66babc62fce63 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 10 十月 2023 14:12:17 +0800
Subject: [PATCH] 新增领料统计报表调用方法
---
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs | 250 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 192 insertions(+), 58 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
index 6d4099f..188a2a3 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
@@ -16,51 +16,52 @@
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();
#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 +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,16 +167,25 @@
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) //璁惧瑙勬牸
@@ -202,6 +210,9 @@
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))
{
@@ -217,12 +228,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) " +
+"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 +
- "')", 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";
@@ -244,7 +254,7 @@
#endregion
#region 璁惧妗ｆ淇敼淇濆瓨
-
+
[Route("Gy_EquipFileMain/EditBill")]
[HttpPost]
public object EditBill([FromBody] JObject oMain)
@@ -258,6 +268,15 @@
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() + "]";
@@ -289,6 +308,10 @@
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))
{
@@ -320,26 +343,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 + "'" +
+ ",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);
@@ -362,5 +388,113 @@
}
}
#endregion
+
+ #region[璁惧灞ュ巻(鐐瑰嚮涓昏〃甯﹀嚭浠庤〃)]
+ [Route("Gy_EquipFileMain/Sb_EquipFileBillResumeDate")]
+ [HttpGet]
+ public object Sb_EquipFileBillResumeDate(string HInterID)
+ {
+
+ 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];
+
+ list.Add(ds);//鏃ュ父璁板綍
+ list.Add(ds1);//缁翠慨璁板綍
+ 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
}
}
--
Gitblit v1.9.1