From 559fcae9b6cc325fc5fa7f2f01c8296070c9d526 Mon Sep 17 00:00:00 2001
From: black-goat-me <226547893@qq.com>
Date: 星期四, 18 五月 2023 23:10:04 +0800
Subject: [PATCH] 白坯发布汇总报表、白坯发布明细报表：未实现任意字段过滤
---
WebAPI/Controllers/WebAPIController.cs | 1903 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 1,796 insertions(+), 107 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index ab9a83b..028a6d9 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -25,6 +25,7 @@
public DataSet ds = new DataSet();
private json objjson = new json();
private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
//public static string sUrl = "http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx";
// private POInStockBillServices oclscg_poinstockbillmain = new POInStockBillServices();
/// <summary>
@@ -78,6 +79,116 @@
return objjson;
}
}
+
+ [Route("Web/GetMAXNumPDA")]
+ [HttpGet]
+ public object GetMAXNumPDA(string HBillType)
+ {
+ try
+ {
+ string HBillNo = "";
+ string sErrMsg = "";
+ Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
+ HInterID = DBUtility.ClsPub.CreateBillID_Prod(HBillType, ref sErrMsg);
+ HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(HBillType, ref sErrMsg, true);
+
+ DataSet ds;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn("exec h_p_IF_CheckBillIDExists_WMS " + HInterID + ",'" + HBillNo + "'", "h_p_IF_CheckBillIDExists_WMS");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ sErrMsg = "瀛樺湪閲嶅鍗曟嵁鍐呯爜鎴栧崟鎹彿鐨勫崟鎹紝涓嶅厑璁告柊澧烇紝璇烽��鍑哄悗閲嶆柊鐧诲綍锛�";
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = sErrMsg;
+ objjson.data = null;
+ return objjson;
+ }
+ else if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0][0]) == "1")
+ {
+ sErrMsg = "瀛樺湪閲嶅鍗曟嵁鍐呯爜鎴栧崟鎹彿鐨勫崟鎹紝涓嶅厑璁告柊澧烇紝璇烽��鍑哄悗閲嶆柊鐧诲綍锛�";
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = sErrMsg;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ //----------鍒涘缓铏氳〃------------------------
+ DataTable dt_Main = new DataTable("Json");
+ dt_Main.Columns.Add("HBillNo", typeof(string));
+ dt_Main.Columns.Add("HInterID", typeof(int));
+ //---------鍒涘缓鏂拌------------------------
+ DataRow dr_main = dt_Main.NewRow();//鍒涘缓鏂拌
+ dt_Main.Rows.Add(dr_main);//灏嗘柊琛屽姞鍏ュ埌琛ㄤ腑
+ dr_main["HBillNo"] = DBUtility.ClsPub.isStrNull(HBillNo);
+ dr_main["HInterID"] = DBUtility.ClsPub.isLong(HInterID);
+ //杩斿洖鏁版嵁
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛";
+ objjson.data = dt_Main;
+ return objjson;
+ }
+ }
+ catch (Exception e)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + e.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+
+ //[Route("Web/Get_MaxBillNoAndID")]
+ //[HttpGet]
+ //public object Get_MaxBillNoAndID(string HBillType)
+ //{
+ // try
+ // {
+ // string HBillNo = "";
+ // Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
+ // HInterID = DBUtility.ClsPub.CreateBillID(HBillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ // HBillNo = DBUtility.ClsPub.CreateBillCode(HBillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ // //----------鍒涘缓铏氳〃------------------------
+ // DataTable dt_Main = new DataTable("Json");
+ // dt_Main.Columns.Add("HBillNo", typeof(string));
+ // dt_Main.Columns.Add("HInterID", typeof(int));
+ // //---------鍒涘缓鏂拌------------------------
+ // DataRow dr_main = dt_Main.NewRow();//鍒涘缓鏂拌
+ // dt_Main.Rows.Add(dr_main);//灏嗘柊琛屽姞鍏ュ埌琛ㄤ腑
+ // dr_main["HBillNo"] = DBUtility.ClsPub.isStrNull(HBillNo);
+ // dr_main["HInterID"] = DBUtility.ClsPub.isLong(HInterID);
+
+ // if (HBillNo == null || HInterID == 0)
+ // {
+ // objjson.code = "0";
+ // objjson.count = 0;
+ // objjson.Message = "鑾峰彇澶辫触";
+ // objjson.data = null;
+ // return objjson;
+ // }
+ // else
+ // {
+ // objjson.code = "0";
+ // objjson.count = 1;
+ // objjson.Message = "鑾峰彇鎴愬姛";
+ // objjson.data = dt_Main;
+ // return objjson;
+ // }
+ // }
+ // catch (Exception e)
+ // {
+ // objjson.code = "0";
+ // objjson.count = 0;
+ // objjson.Message = "鑾峰彇澶辫触" + e.ToString();
+ // objjson.data = null;
+ // return objjson;
+ // }
+ //}
/// <summary>
/// 鐧诲綍
/// </summary>
@@ -122,12 +233,12 @@
return objjson;
}
- catch (Exception)
+ catch (Exception e)
{
objjson.code = "0";
objjson.count = 0;
- objjson.Message = "鐧诲綍寮傚父锛�";
+ objjson.Message = "鐧诲綍寮傚父锛�" + e.Message;
objjson.data = null;
return objjson; ;
}
@@ -187,6 +298,45 @@
}
+
+ //鎾ら攢缂撳瓨鍒楄〃璁板綍
+ [Route("Web/Rescind_Json")]
+ [HttpGet]
+ public object Rescind_Json(long sHInterID, string sBillNo, string sBillType)
+ {
+ string sErrMsg = string.Empty;
+ try
+ {
+ if (webserver.RescindBillList(sHInterID, sBillNo, sBillType, ref sErrMsg))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+
//鍒犻櫎缂撳瓨鍒楄〃璁板綍
[Route("Web/Delete_Json")]
[HttpGet]
@@ -234,6 +384,16 @@
try
{
ds = webserver.GetKf_PonderationBillMain_TempList(HBillType, sWhere);
+
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
@@ -250,6 +410,7 @@
objJsonResult.count = 1;
objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
return objJsonResult;
}
}
@@ -301,6 +462,159 @@
objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
+ }
+ }
+
+
+
+ //鏍规嵁鎷栨潯鐮佽繑鍥炴潯鐮佹。妗堣〃鍞竴鐮佷俊鎭�
+ [Route("GroupOrder/GetBillEntry_TmpListGroupOrder")]
+ [HttpGet]
+ public object GetBillEntry_TmpListGroupOrder(string HBarCode)
+ {
+ try
+ {
+ ds = webserver.GetBarCode(HBarCode);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+
+ //鏍规嵁缃戞牸閫変腑璁板綍鍘讳慨鏀规潯鐮佹。妗堛�佺粍鎵樺崟瀛愯〃璁板綍骞堕噸鏂扮敓鎴愮粍鎵樺崟sum琛�
+ [Route("GroupOrderBill/Edit")]
+ [HttpGet]
+ public object Edit(string HBarCode1, Int64 HQty)
+ {
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ try
+ {
+ oCN.RunProc("update Gy_BarCodeBill set HQty = " + HQty.ToString() + " where HBarCode = '" + HBarCode1 + "'");
+ oCN.RunProc("update Sc_PackUnionBillSub set HQty = " + HQty.ToString() + " where HBarCode = '" + HBarCode1 + "'");
+ DataSet ds = oCN.RunProcReturn("exec h_p_DisPlayBarCode '" + HBarCode1 + "'", "h_p_DisPlayBarCode");
+
+ long HInterIDTTM = 0;
+ long HInterID = 0;
+ string HBarCode_Pack = "";
+ string HBarCode = "";
+ string HUser = "";
+ HInterIDTTM = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HInterID_TTM"]);
+ HBarCode_Pack = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBarCode_Pack"]);
+ HUser = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HMaker"]);
+ HInterID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HInterID"]);
+ oCN.RunProc("exec h_p_WMS_PackUnionBill_SumSubBill " + HInterIDTTM.ToString() + ",'" + HBarCode_Pack + "','3783','" + HUser + "'," + HInterID.ToString()); //鏍规嵁绠辨潯鐮侊紝鍐欏叆 SUM琛紝SUM鏉＄爜妗ｆ
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇敼鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //DataSet DS1 = webserver.GetBarCode(HBarCode); //HSPID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSPID"]);
+
+ //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+
+
+ //if (DS1 == null || DS1.Tables[0].Rows.Count <= 0)
+ // {
+ // objjson.code = "0";
+ // objjson.count = 0;
+ // objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ // objjson.data = null;
+ // return objjson;
+ // }
+ // else
+ // {
+ // objjson.code = "0";
+ // objjson.count = 1;
+ // objjson.Message = "鑾峰彇鎴愬姛!";
+ // objjson.data = DS1.Tables[0];
+ // return objjson;
+ // }
+ //}
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ //鏍规嵁缃戞牸閫変腑璁板綍鐨勫敮涓�鐮� 鍘诲垹闄ゆ潯鐮佹。妗� 缁勬墭鍗曞瓙琛� 缁勬墭鍗晄um琛ㄧ殑鍞竴鐮佹暟鎹�
+ [Route("GroupOrderBill/Delete")]
+ [HttpGet]
+ public object Delete(string HBarCode1)
+ {
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ try
+ {
+ oCN.RunProc("delete from Gy_BarCodeBill where HBarCode = '" + HBarCode1 + "'");
+ oCN.RunProc("delete from Sc_PackUnionBillSub where HBarCode = '" + HBarCode1 + "'");
+ oCN.RunProc("delete from Sc_PackUnionBillSub_Sum where HBarCode = '" + HBarCode1 + "'"); //HSPID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSPID"]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+
+
+ //if (DS1 == null || DS1.Tables[0].Rows.Count <= 0)
+ // {
+ // objjson.code = "0";
+ // objjson.count = 0;
+ // objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ // objjson.data = null;
+ // return objjson;
+ // }
+ // else
+ // {
+ // objjson.code = "0";
+ // objjson.count = 1;
+ // objjson.Message = "鑾峰彇鎴愬姛!";
+ // objjson.data = DS1.Tables[0];
+ // return objjson;
+ // }
+ //}
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鍒犻櫎澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
}
}
@@ -417,6 +731,53 @@
}
}
+ /// <summary>
+ /// 鑾峰彇浠撳簱鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetWarehouseList_Json_New")]
+ [HttpGet]
+ public object GetWarehouseList_Json_New(string Warehouse, Int64 HOrgID)
+ {
+ sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID =" + HOrgID + "";
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+ if (Warehouse != "")
+ {
+ sWhere = sWhere + " and ( HNumber like '%" + Warehouse + "%' or HName like '%" + Warehouse + "%' or HUSEORGID like '%" + Warehouse + "%' ) ";
+ }
+
+ try
+ {
+ WebS.WebService1 oWeb = new WebS.WebService1();
+ ds = oWeb.GetWarehouseList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
/// <summary>
@@ -454,6 +815,138 @@
try
{
ds = webserver.GetStockPlaceList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+
+ ///// <summary>
+ ///// 鑾峰彇浠撲綅鍒楄〃
+ ///// </summary>
+ ///// <returns></returns>
+ //[Route("Web/GetStockPlaceList_Json_NEW")]
+ //[HttpGet]
+ //public object GetStockPlaceList_Json_NEW(string StockPlace, Int64 HWhID, Int64 HOrgID)
+ //{
+ // WebS.WebService1 oWeb = new WebS.WebService1();
+ // sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + HOrgID + "";
+ // //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+ // if (HWhID == 0)
+ // {
+ // if (StockPlace != "")
+ // {
+ // sWhere = " Where HStopFlag=0 and HUSEORGID = " + HOrgID + " and ( HNumber like '%" + StockPlace + "%' or HName like '%" + StockPlace + "%' ) ";
+ // }
+ // else
+ // {
+ // sWhere = " Where HStopFlag=0 ";
+ // }
+ // }
+ // else
+ // {
+ // if (StockPlace != "")
+ // {
+ // sWhere = " Where HStopFlag=0 and HWHID=" + HWhID.ToString() + " and HWHID=" + HWhID.ToString() + " and ( HNumber like '%" + StockPlace + "%' or HName like '%" + StockPlace + "%' ) ";
+ // }
+ // else
+ // {
+ // sWhere = " Where HStopFlag=0 and HWHID=" + HWhID.ToString();
+ // }
+ // }
+ // try
+ // {
+ // //ds = webserver.GetStockPlaceList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+ // ds = oWeb.GetStockPlaceList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+ // if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ // {
+ // objjson.code = "0";
+ // objjson.count = 0;
+ // objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ // objjson.data = null;
+ // return objjson;
+ // }
+ // else
+ // {
+ // objjson.code = "0";
+ // objjson.count = 1;
+ // objjson.Message = "鑾峰彇鎴愬姛!";
+ // objjson.data = ds.Tables[0];
+ // return objjson;
+ // }
+ // }
+ // catch (Exception ex)
+ // {
+
+ // objjson.code = "0";
+ // objjson.count = 0;
+ // objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ // objjson.data = null;
+ // return objjson;
+ // }
+ //}
+
+
+ /// <summary>
+ /// 鑾峰彇浠撲綅鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetStockPlaceList_Json_NEW")]
+ [HttpGet]
+ public object GetStockPlaceList_Json_NEW(string StockPlace, Int64 HWhID, Int64 HOrgID)
+ {
+ WebS.WebService1 oWeb = new WebS.WebService1();
+ sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + HOrgID + "";
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+ if (HWhID == 0)
+ {
+ if (StockPlace != "")
+ {
+ sWhere = " Where HStopFlag=0 and ( HNumber like '%" + StockPlace + "%' or HName like '%" + StockPlace + "%' ) ";
+ }
+ else
+ {
+ sWhere = " Where HStopFlag=0 ";
+ }
+ }
+ else
+ {
+ if (StockPlace != "")
+ {
+ sWhere = " Where HStopFlag=0 and HWHID=" + HWhID.ToString() + " and HWHID=" + HWhID.ToString() + " and ( HNumber like '%" + StockPlace + "%' or HName like '%" + StockPlace + "%' ) ";
+ }
+ else
+ {
+ sWhere = " Where HStopFlag=0 and HWHID=" + HWhID.ToString();
+ }
+ }
+ try
+ {
+ //ds = webserver.GetStockPlaceList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+ ds = oWeb.GetStockPlaceList(sWhere, ref DBUtility.ClsPub.sErrInfo);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objjson.code = "0";
@@ -526,23 +1019,26 @@
}
}
+
/// <summary>
/// 鑾峰彇渚涘簲鍟嗗垪琛�
/// </summary>
/// <returns></returns>
[Route("Web/GetSupplierList_Json")]
[HttpGet]
- public object GetSupplierList_Json(string Supplier)
+ public object GetSupplierList_Json(string Supplier, Int64 HOrgID)
{
- sWhere = " Where HStopFlag=0 and HEndFlag=1";
+ sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID =" + HOrgID + "";
//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
if (Supplier != "")
{
- sWhere = sWhere + " and ( HNumber like '%" + Supplier + "%' or HName like '%" + Supplier + "%' ) ";
+ sWhere = sWhere + " and ( HNumber like '%" + Supplier + "%' or HName like '%" + Supplier + "%' or HUSEORGID like '%" + HOrgID + "%' ) ";
}
try
{
- ds = webserver.GetSupplierList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+ WebS.WebService1 oWeb = new WebS.WebService1();
+ ds = oWeb.GetSupplierList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+ //ds = webserver.GetSupplierList(sWhere, ref DBUtility.ClsPub.sErrInfo);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objjson.code = "0";
@@ -604,7 +1100,8 @@
}
try
{
- ds = webserver.GetEmployeeList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+ string sql = $"Select * from h_v_IF_Emp {sWhere} Order by HNumber";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_Emp");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objjson.code = "0";
@@ -646,7 +1143,7 @@
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- ds = oCN.RunProcReturn("Select HItemID,HNumber 鐝粍浠ｇ爜,HName 鐝粍 from h_v_IF_Group where HStopflag=0 " + sWhere + " Order by HItemID ", "h_v_IF_Group");
+ ds = oCN.RunProcReturn("Select HItemID,鐝粍浠ｇ爜 鐝粍浠ｇ爜,鐝粍鍚嶇О 鐝粍 from h_v_GroupList where 1=1 " + sWhere + " Order by HItemID ", "h_v_GroupList");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objjson.code = "0";
@@ -692,6 +1189,53 @@
try
{
ds = webserver.GetDepartmentList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇缁勭粐鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetOrganizationList_Json")]
+ [HttpGet]
+ public object GetOrganizationList_Json()
+ {
+ WebS.WebService1 oWebs1 = new WebS.WebService1();
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1";
+ ////sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+ //if (Organization != "")
+ //{
+ // sWhere = sWhere + " and ( HNumber like '%" + Organization + "%' or HName like '%" + Organization + "%' ) ";
+ //}
+ try
+ {
+ ds = oWebs1.get_ORGANIZATIONSList();
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objjson.code = "0";
@@ -819,6 +1363,227 @@
}
/// <summary>
+ /// 鑾峰彇璁￠噺鍗曚綅缁勫垪琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetUnitGroupList_Json")]
+ [HttpGet]
+ public object GetUnitGroupList_Json(string Unit)
+ {
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1";
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+ if (Unit != "" && Unit != null)
+ {
+ sWhere = sWhere + " and ( HNumber like '%" + Unit + "%' or HName like '%" + Unit + "%' ) ";
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("Select HItemID,HNumber 璁￠噺鍗曚綅缁勪唬鐮�,HName 璁￠噺鍗曚綅缁� from Gy_UnitGroup where HStopflag=0 Order by HItemID ", "Gy_UnitGroup");
+ }
+ else
+ {
+ string sql1 = "Select HItemID,HNumber 璁￠噺鍗曚綅缁勪唬鐮�,HName 璁￠噺鍗曚綅缁� from Gy_UnitGroup where HStopflag=0 and HEndFlag=1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "Gy_UnitGroup");
+ }
+
+ //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+
+
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇閿�鍞柟寮忓垪琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetSellStyleList_Json")]
+ [HttpGet]
+ public object GetSellStyleList_Json(string SellStyle)
+ {
+ if (SellStyle != "")
+ {
+ sWhere = sWhere + " and ( HNumber like '%" + SellStyle + "%' or HName like '%" + SellStyle + "%' ) ";
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName from Gy_SellStyle where HStopflag=0 Order by HItemID ", "Gy_SellStyle");
+ }
+ else
+ {
+ string sql1 = "Select HItemID,HNumber ,HName from Gy_SellStyle where HStopflag=0 and HEndFlag=1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "Gy_SellStyle");
+ }
+
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇缁撶畻鏂瑰紡鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetSettleStyleList_Json")]
+ [HttpGet]
+ public object GetSettleStyleList_Json(string SettleStyle)
+ {
+ if (SettleStyle != "")
+ {
+ sWhere = sWhere + " and ( HNumber like '%" + SettleStyle + "%' or HName like '%" + SettleStyle + "%' ) ";
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName from Gy_SettleStyle where HStopflag=0 Order by HItemID ", "Gy_SettleStyle");
+ }
+ else
+ {
+ string sql1 = "Select HItemID,HNumber ,HName from Gy_SettleStyle where HStopflag=0 and HEndFlag=1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "Gy_SettleStyle");
+ }
+
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇閲囪喘鏂瑰紡鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetPoStockStyleList_Json")]
+ [HttpGet]
+ public object GetPoStockStyleList_Json(string PoStockStyle)
+ {
+ if (PoStockStyle != "")
+ {
+ sWhere = sWhere + " and ( HNumber like '%" + PoStockStyle + "%' or HName like '%" + PoStockStyle + "%' ) ";
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName from Gy_PoStockStyle where HStopflag=0 Order by HItemID ", "Gy_PoStockStyle");
+ }
+ else
+ {
+ string sql1 = "Select HItemID,HNumber ,HName from Gy_PoStockStyle where HStopflag=0 and HEndFlag=1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "Gy_PoStockStyle");
+ }
+
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ /// <summary>
/// 鑾峰彇瀹㈡埛鍒楄〃
/// </summary>
/// <returns></returns>
@@ -878,12 +1643,110 @@
//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
if (sWhere != "")
{
- sWhere = sWhere + " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
+ sWhere = " and ( p.HNumber like '%" + sWhere + "%' or p.HName like '%" + sWhere + "%' ) ";
}
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- ds = oCN.RunProcReturn("Select HItemID,HNumber 宸ュ簭浠ｇ爜,HName 宸ュ簭 from Gy_Process where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Process");
+ ds = oCN.RunProcReturn("Select p.HItemID,p.HNumber 宸ュ簭浠ｇ爜,p.HName 宸ュ簭,w.HItemID 宸ヤ綔涓績ID,w.HNumber 宸ヤ綔涓績浠ｇ爜,w.HName 宸ヤ綔涓績,d.HItemID 閮ㄩ棬ID,d.HNumber 閮ㄩ棬浠ｇ爜,d.HName 閮ㄩ棬 from Gy_Process p left join Gy_WorkCenter w on p.HWorkCenterID = w.HItemID left join Gy_Department d on p.HDeptID = d.HItemID where p.HStopflag = 0 " + sWhere + " Order by HItemID ", "Gy_Process");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触";
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + e.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鐗╂枡鍒楄〃
+ /// <summary>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Web/GetMaterList_Json")]
+ [HttpGet]
+ public object GetMaterList_Json(string sWhere)
+ {
+ DataSet ds;
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1";
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+ if (sWhere != "")
+ {
+ sWhere = " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn("Select HItemID,HNumber 鐗╂枡浠ｇ爜,HName 鐗╂枡,HModel 瑙勬牸鍨嬪彿 from Gy_Material where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Material");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触";
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + e.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇妯″叿鍒楄〃
+ /// <summary>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Web/GetRelationList_Json")]
+ [HttpGet]
+ public object GetRelationList_Json(string sWhere)
+ {
+ DataSet ds;
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1";
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+ if (sWhere != "")
+ {
+ sWhere = " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn("Select HItemID,HNumber 妯″叿浠ｇ爜,HName 妯″叿,HModel 瑙勬牸鍨嬪彿 from h_v_Gy_Mould where HStopflag=0 " + sWhere + " Order by HItemID ", "h_v_Gy_Mould");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objjson.code = "0";
@@ -942,6 +1805,61 @@
return objjson; ;
}
}
+
+ #region 浜х嚎涓績鍒楄〃鏌ヨ
+ [Route("Web/Gy_LineCenter_Json")]
+ [HttpGet]
+ public object Gy_LineCenter_Json(string BadReason)
+ {
+ if (BadReason != "")
+ {
+ sWhere = sWhere + " and ( HNumber like '%" + BadReason + "%' or HName like '%" + BadReason + "%' ) ";
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+
+ {
+ ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName from Gy_LineCenter where HStopflag=0 Order by HItemID ", "Gy_LineCenter");
+ }
+ else
+ {
+ string sql1 = "Select HItemID,HNumber ,HName from Gy_LineCenter where HStopflag=0 and HEndFlag=1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "Gy_LineCenter");
+ sWhere = "";
+ }
+
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ #endregion
#region 涓嶈壇鍘熷洜璁剧疆鍒楄〃/淇濆瓨/缂栬緫/鍒犻櫎鏂规硶
/// <summary>
@@ -1016,10 +1934,21 @@
{
DataSet ds;
var _value = msg["msg"].ToString();
- string msg1 = _value.ToString();
- //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- //string msg2 = sArray[0].ToString();
- //string msg3 = sArray[1].ToString();
+ string msg3 = _value.ToString();
+ string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string msg2 = sArray[1].ToString();
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_BadReason_Edit", 1, false, msg2))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
Int64 HItemID = 0;
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
//鑾峰彇鏈�澶D鍊艰祴鍊�
@@ -1215,21 +2144,21 @@
/// <returns></returns>
[Route("DeltetGy_BadReason")]
[HttpGet]
- public object DeltetGy_BadReason(string HItemID)
+ public object DeltetGy_BadReason(string HItemID, string user)
{
DataSet ds;
//string ModRightNameCheck = "Sc_ProcessReport_check";
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Gy_BadReason_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (string.IsNullOrWhiteSpace(HItemID))
@@ -1617,7 +2546,7 @@
}
/// <summary>
- /// 鑾峰彇鏍哥畻鏂瑰紡鍒楄〃
+ /// 鑾峰彇鏍哥畻鏂瑰紡缁勫垪琛�
/// </summary>
/// <returns></returns>
[Route("Web/GetClassTimePrjGroupList_Json")]
@@ -1675,6 +2604,207 @@
}
}
+ [Route("Web/GetClassTimePrjGroupBillList_Json")]
+ [HttpGet]
+ public object GetClassTimePrjGroupBillList_Json(string sWhere, string user)
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql = "Select a.HItemID ,HNumber 鏍哥畻鏂瑰紡缁勪唬鐮�,HName 鏍哥畻鏂瑰紡缁勫悕绉�,HDeptID,b.閮ㄩ棬鍚嶇О 閮ㄩ棬 from Gy_ClassTimePrjGroup a left join h_v_Gy_Department b on a.HDeptID=b.HItemID";
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
+ }
+ else
+ {
+ sql = sql + sWhere;
+ ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
+ }
+
+ //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+
+
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+ /// <summary>
+ /// 鏍哥畻鏂瑰紡缁勭紪杈�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ [Route("Web/GetClassTimePrjGroupBillEdit_Json")]
+ [HttpGet]
+ public object GetClassTimePrjGroupBillEdit_Json(string sWhere)
+ {
+ //if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql = "select a.HNumber,a.HName,a.HDeptID,b.HName as 浠撳簱鍚嶇О from Gy_ClassTimePrjGroup a left join Gy_Department b on a.HDeptID = b.HItemID where a.hitemid = " + sWhere;
+ ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+
+ #region 鍒犻櫎鏍哥畻鏂瑰紡缁�
+ /// <summary>
+ /// 鏍哥畻鏂瑰紡鍒楄〃鍒犻櫎鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Web/DeleteClassTimePrjGroupBillList")]
+ [HttpGet]
+ public object DeleteClassTimePrjGroupBillList(long HItemID, string User)
+ {
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj_Delete", 1, false, User))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.BeginTran();
+ string sql = "delete from Gy_ClassTimePrjGroup where HItemID =" + HItemID;
+ oCN.RunProc(sql);
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ /// <summary>
+ /// 淇濆瓨鑾峰彇鏍哥畻鏂瑰紡缁�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Web/SaveGetClassTimePrjGroupList")]
+ [HttpGet]
+ public object SaveGetClassTimePrjGroupList(string HNumber, string HName, string HDeptID, string refSav, string user, string HItem)
+ {
+
+ try
+ {
+ int HItemID = int.Parse(HItem);
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_ClassTimePrj", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql = "";
+ if (refSav == "Add")
+ {
+ sql = "Insert Into Gy_ClassTimePrjGroup " +
+ "(HNumber,HName,HStopflag,HRemark,HShortNumber,HParentID,HLevel" +
+ ",HEndFlag,HHelpCode,HDeptID,HGroupID,HUseFlag" +
+ ") " +
+ " values('" + HNumber + "','" + HName + "','','',0,0,0,0,''," + HDeptID + ",0,'鏈娇鐢�'" + ") ";
+ }
+ else
+ {
+ sql = "UpDate Gy_ClassTimePrjGroup set HNumber='" + HNumber + "',HName='" + HName + "',HDeptID=" + HDeptID + " where HItemID=" + HItemID;
+ }
+ oCN.RunProc(sql);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
/// <summary>
/// 鑾峰彇宀椾綅鍒楄〃
/// </summary>
@@ -1701,6 +2831,124 @@
string sql1 = "Select HItemID,HNumber ,HName from Gy_Post where HStopflag=0 ";
string sql = sql1 + sWhere;
ds = oCN.RunProcReturn(sql, "Gy_Post");
+ }
+
+ //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+
+
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇璁惧涓绘。鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetGy_EquipFileBillMainList_Json")]
+ [HttpGet]
+ public object GetGy_EquipFileBillMainList_Json(string EquipFileBill)
+ {
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1";
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+ if (EquipFileBill != "")
+ {
+ sWhere = sWhere + " and ( HEquipFileNumber like '%" + EquipFileBill + "%' or HName like '%" + EquipFileBill + "%' ) ";
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("Select HInterID,HEquipFileNumber,HName from Gy_EquipFileBillMain where 0=0 Order by HInterID ", "Gy_EquipFileBillMain");
+ }
+ else
+ {
+ string sql1 = "Select HInterID,HEquipFileNumber,HName from Gy_EquipFileBillMain where 0=0 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "Gy_EquipFileBillMain");
+ }
+
+ //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+
+
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍣ㄥ叿鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetGy_MouldFileMainList_Json")]
+ [HttpGet]
+ public object GetGy_MouldFileMainList_Json(string MouldFileMain)
+ {
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1";
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+ if (MouldFileMain != "")
+ {
+ sWhere = sWhere + " and ( HNumber like '%" + MouldFileMain + "%' or HName like '%" + MouldFileMain + "%' ) ";
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("Select HInterID,HNumber,HName from Gy_MouldFileMain where 0=0 Order by HInterID ", "Gy_MouldFileMain");
+ }
+ else
+ {
+ string sql1 = "Select HInterID,HNumber,HName from Gy_MouldFileMain where 0=0 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "Gy_MouldFileMain");
}
//ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
@@ -1844,50 +3092,99 @@
/// <returns></returns>
[Route("Web/GetSc_ICMOBillListView2")]
[HttpGet]
- public object GetSc_ICMOBillListView2(string ICMOBill, int OrganizationID)
+ public object GetSc_ICMOBillListView2(int page, int limit, string ICMOBill, int OrganizationID)
{
- if (ICMOBill != "")
- {
- sWhere = " where 1=1 and 鍗曟嵁鍙� like '%" + ICMOBill + "%' ";
- }
try
{
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (sWhere == null || sWhere.Equals(""))
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ int count = 0;
+ int pageNum = page;
+ int pageSize = limit;
+ string sWhere = "";
+ if (ICMOBill == null || ICMOBill.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillList where 1=1 and isnull(瀹℃牳浜�,'')<>'' order by 鍗曟嵁鍙� desc,hsubid ", "h_v_Sc_ICMOBillList");
+ sWhere = " where 1=1";
}
else
{
- string sql = "select * from h_v_Sc_ICMOBillList " + sWhere + " and isnull(瀹℃牳浜�,'')<>'' order by 鍗曟嵁鍙� desc,hsubid ";
- ds = oCN.RunProcReturn(sql, "h_v_Sc_ICMOBillList");
+ sWhere = " where 1=1 and 鍗曟嵁鍙� like '%" + ICMOBill + "%'";
}
- if (ds == null || ds.Tables[0].Rows.Count <= 0)
+
+ DataSet ds0 = oCn.RunProcReturn("select count(*) CountNum from h_v_Sc_ICMOBillList " + sWhere + "", "h_v_Sc_ICMOBillList");
+ count = int.Parse(ds0.Tables[0].Rows[0]["CountNum"].ToString());
+ //string sql = string.Format(@"select top " + pageSize + " hmainid,鏃ユ湡,鍗曟嵁鍙�,绠卞彿鏉″舰鐮�,鍑�閲�,姣涢噸,鐨噸,鐢熶骇缁勭粐,閮ㄩ棬,鎿嶄綔鍛�,瀹㈡埛鏍囩鍙�,鐗╂枡浠ｇ爜,鐗╂枡鍚嶇О,璁￠噺鍗曚綅浠ｇ爜,璁￠噺鍗曚綅鍚嶇О,鏁伴噺,鍒跺崟浜�,鍒跺崟鏃ユ湡 from(select row_number() over (order by hmainid desc) as RowNumber,hmainid,鏃ユ湡,鍗曟嵁鍙�,绠卞彿鏉″舰鐮�,鍑�閲�,姣涢噸,鐨噸,鐢熶骇缁勭粐,閮ㄩ棬,鎿嶄綔鍛�,瀹㈡埛鏍囩鍙�,鐗╂枡浠ｇ爜,鐗╂枡鍚嶇О,璁￠噺鍗曚綅浠ｇ爜,璁￠噺鍗曚綅鍚嶇О,鏁伴噺,鍒跺崟浜�,鍒跺崟鏃ユ湡 from h_v_PackUnionBillList " + sWhere + ") as A where RowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ string sql = string.Format(@"select * from h_v_Sc_ICMOBillList " + sWhere + " and isnull(瀹℃牳浜�,'')<>'' order by hmainid offset ((" + pageNum + "-1)*" + pageSize + ") rows fetch next " + pageSize + " rows only");
+ ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_ICMOBillList");
+ string aa = ds.Tables[0].Columns[0].ToString();
+
+ if (ds.Tables[0].Rows.Count > 0)
{
- objjson.code = "0";
- objjson.count = 0;
- objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
- objjson.data = null;
- return objjson;
+ objJsonResult.code = "1";
+ objJsonResult.count = count;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
+ return objJsonResult;
}
else
{
- objjson.code = "0";
- objjson.count = 1;
- objjson.Message = "鑾峰彇鎴愬姛!";
- objjson.data = ds.Tables[0];
- return objjson;
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏆傛棤璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
}
}
catch (Exception ex)
{
-
- objjson.code = "0";
- objjson.count = 0;
- objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
- objjson.data = null;
- return objjson;
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
}
+
+ //if (ICMOBill != "")
+ //{
+ // sWhere = " where 1=1 and 鍗曟嵁鍙� like '%" + ICMOBill + "%' ";
+ //}
+ //try
+ //{
+ // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ // if (sWhere == null || sWhere.Equals(""))
+ // {
+ // ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillList where 1=1 and isnull(瀹℃牳浜�,'')<>'' order by 鍗曟嵁鍙� desc,hsubid ", "h_v_Sc_ICMOBillList");
+ // }
+ // else
+ // {
+ // string sql = "select * from h_v_Sc_ICMOBillList " + sWhere + " and isnull(瀹℃牳浜�,'')<>'' order by 鍗曟嵁鍙� desc,hsubid ";
+ // ds = oCN.RunProcReturn(sql, "h_v_Sc_ICMOBillList");
+ // }
+ // if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ // {
+ // objjson.code = "0";
+ // objjson.count = 0;
+ // objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ // objjson.data = null;
+ // return objjson;
+ // }
+ // else
+ // {
+ // objjson.code = "0";
+ // objjson.count = 1;
+ // objjson.Message = "鑾峰彇鎴愬姛!";
+ // objjson.data = ds.Tables[0];
+ // return objjson;
+ // }
+ //}
+ //catch (Exception ex)
+ //{
+
+ // objjson.code = "0";
+ // objjson.count = 0;
+ // objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ // objjson.data = null;
+ // return objjson;
+ //}
}
/// <summary>
@@ -2093,7 +3390,7 @@
[HttpGet]
public object GetMaintainItemtemByMouldProjectID(int MouldProjectID)
{
-
+
if (MouldProjectID <= 0)
{
objjson.code = "0";
@@ -2108,7 +3405,7 @@
List<object> list = new List<object>();
DataSet ds2;
DataSet ds1;
- string sql1 = string.Format(@"select t.HMaintainItemID ,m.HNumber HMaintainItemNumber,t.HMaintainItem,t.HMaintainPart,t.HClaim,t.HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
+ string sql1 = string.Format(@"select a.HInterID,a.HBillNo,t.HMaintainItemID ,m.HNumber HMaintainItemNumber,t.HMaintainItem,t.HMaintainPart,t.HClaim,t.HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
from Sc_MouldMaintainRuleBillMain a left join Sc_MouldMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
left join Gy_Employee e on e.HItemID=t.HManagerID
@@ -2119,6 +3416,59 @@
left join h_v_IF_Material m on b.HMaterID=m.HItemID
left join h_v_IF_Unit u on b.HUnitID=u.HItemID
where a.HInterID=(select HMouldMaintainRuleInterID from Gy_MouldFileMain where HInterID=" + MouldProjectID + ") ");
+ ds1 = oCN.RunProcReturn(sql1, "Sc_MouldMaintainRuleBillMain");//淇濆吇
+ ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//閰嶄欢
+ list.Add(ds1.Tables[0]);
+ list.Add(ds2.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+ /// <summary>
+ /// 鏍规嵁鍣ㄥ叿涓诲唴鐮佽幏鍙栧櫒鍏蜂繚鍏绘楠岄」鐩�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetMouldMaintainItemtemByMaintainRuleID")]
+ [HttpGet]
+ public object GetMouldMaintainItemtemByMaintainRuleID(int MouldMaintainRuleID)
+ {
+
+ if (MouldMaintainRuleID <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鍣ㄥ叿淇濆吇瑙勭▼鏈�夋嫨";
+ objjson.data = null;
+ return objjson;
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ List<object> list = new List<object>();
+ DataSet ds2;
+ DataSet ds1;
+ string sql1 = string.Format(@"select t.HMaintainItemID ,m.HNumber HMaintainItemNumber,t.HMaintainItem,t.HMaintainPart,t.HClaim,t.HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
+ from Sc_MouldMaintainRuleBillMain a left join Sc_MouldMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
+ left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
+ left join Gy_Employee e on e.HItemID=t.HManagerID
+ where a.HInterID=" + MouldMaintainRuleID);
+
+ string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName, m.HModel HMaterSpec,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HQtyMust,b.HRemark from Sc_MouldMaintainRuleBillMain a
+ left join Sc_MouldMaintainRuleBillSub b on a.HInterID=b.HInterID
+ left join h_v_IF_Material m on b.HMaterID=m.HItemID
+ left join h_v_IF_Unit u on b.HUnitID=u.HItemID
+ where a.HInterID=" + MouldMaintainRuleID);
ds1 = oCN.RunProcReturn(sql1, "Sc_MouldMaintainRuleBillMain");//淇濆吇
ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//閰嶄欢
list.Add(ds1.Tables[0]);
@@ -2152,59 +3502,7 @@
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
string sql = string.Format(@"select * from h_v_Sc_MouldDotCheckRuleBillList ");
- ds = oCN.RunProcReturn(sql+sWhere, "h_v_Sc_MouldDotCheckRuleBillList");
- if (ds == null || ds.Tables[0].Rows.Count <= 0)
- {
- objjson.code = "0";
- objjson.count = 0;
- objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
- objjson.data = null;
- return objjson;
- }
- else
- {
- objjson.code = "1";
- objjson.count = 1;
- objjson.Message = "鑾峰彇鎴愬姛!";
- objjson.data = ds.Tables[0];
- return objjson;
- }
- }
- catch (Exception ex)
- {
- objjson.code = "0";
- objjson.count = 0;
- objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
- objjson.data = null;
- return objjson;
- }
- }
-
- /// <summary>
- /// 鏍规嵁璁惧鏄剧ず璁惧淇濆吇瑙勭▼椤圭洰
- /// </summary>
- /// <returns></returns>
- [Route("Web/GetMaintainItemtemByEquipProjectID")]
- [HttpGet]
- public object GetMaintainItemtemByEquipProjectID(int EquipProjectID)
- {
- if (EquipProjectID <= 0)
- {
- objjson.code = "0";
- objjson.count = 0;
- objjson.Message = "浜у搧鍣ㄥ叿鏈�夋嫨";
- objjson.data = null;
- return objjson;
- }
- try
- {
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- string sql = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
- from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
- left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
- left join Gy_Employee e on e.HItemID=t.HManagerID
- where a.HInterID=(select HEquipMaintainRuleInterID from Gy_EquipFileBillMain where HInterID=" + EquipProjectID + ") ");
- ds = oCN.RunProcReturn(sql, "Sb_EquipMaintainRuleBillMain");
+ ds = oCN.RunProcReturn(sql + sWhere, "h_v_Sc_MouldDotCheckRuleBillList");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objjson.code = "0";
@@ -2233,6 +3531,112 @@
}
/// <summary>
+ /// 鏍规嵁璁惧鏄剧ず璁惧淇濆吇瑙勭▼椤圭洰
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetMaintainItemtemByEquipProjectID")]
+ [HttpGet]
+ public object GetMaintainItemtemByEquipProjectID(string EquipProjectID)
+ {
+ if (EquipProjectID == null)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "浜у搧鍣ㄥ叿鏈�夋嫨";
+ objjson.data = null;
+ return objjson;
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ List<object> list = new List<object>();
+ DataSet ds2;
+ DataSet ds1;
+ string sql1 = string.Format(@"select a.HInterID,a.HBillNo,t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
+ from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
+ left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
+ left join Gy_Employee e on e.HItemID=t.HManagerID
+ where a.HInterID=(select HEquipMaintainRuleInterID from Gy_EquipFileBillMain where HInterID=" + EquipProjectID + ") ");
+ string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a
+ left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID
+ left join h_v_IF_Material m on b.HMaterID=m.HItemID
+ left join h_v_IF_Unit u on b.HUnitID=u.HItemID
+ where a.HInterID=(select HEquipMaintainRuleInterID from Gy_EquipFileBillMain where HInterID=" + EquipProjectID + ") ");
+
+ ds1 = oCN.RunProcReturn(sql1, "Sb_EquipMaintainRuleBillMain");//淇濆吇
+ ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//閰嶄欢
+ list.Add(ds1.Tables[0]);
+ list.Add(ds2.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+ /// <summary>
+ /// 鏍规嵁璁惧淇濆吇瑙勭▼鏄剧ず璁惧淇濆吇瑙勭▼椤圭洰
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetMaintainItemtemByMaintainRuleID")]
+ [HttpGet]
+ public object GetMaintainItemtemByMaintainRuleID(int EquipProjectID)
+ {
+ if (EquipProjectID <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "璁惧淇濆吇瑙勭▼鏈�夋嫨";
+ objjson.data = null;
+ return objjson;
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ List<object> list = new List<object>();
+ DataSet ds2;
+ DataSet ds1;
+ string sql1 = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
+ from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
+ left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
+ left join Gy_Employee e on e.HItemID=t.HManagerID
+ where a.HInterID=" + EquipProjectID);
+ string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a
+ left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID
+ left join h_v_IF_Material m on b.HMaterID=m.HItemID
+ left join h_v_IF_Unit u on b.HUnitID=u.HItemID
+ where a.HInterID=" + EquipProjectID);
+
+ ds1 = oCN.RunProcReturn(sql1, "Sb_EquipMaintainRuleBillMain");//淇濆吇
+ ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//閰嶄欢
+ list.Add(ds1.Tables[0]);
+ list.Add(ds2.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+
+ /// <summary>
/// 鏍规嵁璁惧鏄剧ず璁惧鐐规绋嬮」鐩�
/// </summary>
/// <returns></returns>
@@ -2252,7 +3656,7 @@
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
string sql = string.Format(@"select b.HDotCheckItemID HDotCheckItemID,c.HNumber HDotCheckCode,b.HDotCheckItem,b.HDotCheckPart,b.HClaim,
- b.HManagerID,e.HNumber HManagerCode,e.HName HManagerName,b.HRemark from Sb_EquipDotCheckRuleBillMain a
+ b.HManagerID,e.HNumber HManagerCode,e.HName HManagerName,b.HRemark,a.HInterID,a.HBillNo from Sb_EquipDotCheckRuleBillMain a
left join Sb_EquipDotCheckRuleBillSub b on a.HInterID=b.HInterID
left join Gy_QCCheckItem c on c.HItemID=b.HDotCheckItemID
left join Gy_Employee e on e.HItemID=b.HManagerID
@@ -2284,6 +3688,59 @@
return objjson;
}
}
+ /// <summary>
+ /// 鏍规嵁璁惧鐐规瑙勭▼鏄剧ず璁惧鐐规绋嬮」鐩�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetDotCheckRuleItemByDotCheckRuleID")]
+ [HttpGet]
+ public object GetDotCheckRuleItemByDotCheckRuleID(int HDotCheckRuleInterID)
+ {
+ if (HDotCheckRuleInterID <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "璁惧鐐规瑙勭▼鏈�夋嫨";
+ objjson.data = null;
+ return objjson;
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql = string.Format(@"select b.HDotCheckItemID HDotCheckItemID,c.HNumber HDotCheckCode,b.HDotCheckItem,b.HDotCheckPart,b.HClaim,
+ b.HManagerID,e.HNumber HManagerCode,e.HName HManagerName,b.HRemark from Sb_EquipDotCheckRuleBillMain a
+ left join Sb_EquipDotCheckRuleBillSub b on a.HInterID=b.HInterID
+ left join Gy_QCCheckItem c on c.HItemID=b.HDotCheckItemID
+ left join Gy_Employee e on e.HItemID=b.HManagerID
+ where a.HInterID=" + HDotCheckRuleInterID);
+ ds = oCN.RunProcReturn(sql, "Sb_EquipDotCheckRuleBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
/// <summary>
/// 鑾峰彇缁翠慨椤圭洰鍒楄〃
@@ -2457,6 +3914,238 @@
}
#endregion
+
+ ///// <summary>
+ ///// 浜у搧鍏ュ簱缂撳瓨鍒楄〃鍒锋柊淇℃伅
+ ///// </summary>
+ ///// <returns></returns>
+ //[Route("Web/chanpinruk")]
+ //[HttpGet]
+ //public object chanpinruk(string HBillType, string sHMaker, Int64 HOrgID)
+ //{
+ // try
+ // {
+ // ds = webserver.GetKf_PonderationBillMain_TempList_New(HBillType, sHMaker, HOrgID);
+ // if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ // }
+ // else
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ // objJsonResult.data = ds.Tables[0];
+ // return objJsonResult;
+ // }
+ // }
+ // catch (Exception e)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ //}
+
+
+ /// <summary>
+ /// 浜у搧鍏ュ簱缂撳瓨鍒楄〃鍒锋柊淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/chanpinruk")]
+ [HttpGet]
+ public object chanpinruk(string HBillType, string sHMaker, Int64 HOrgID)
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ try
+ {
+ ds = oWebs.GetKf_PonderationBillMain_TempList_New(HBillType, sHMaker, HOrgID);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 浜у搧鍏ュ簱缂撳瓨鍒楄〃鍒锋柊淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/chanpinruk1")]
+ [HttpGet]
+ public object chanpinruk1(string HBillType, string sHMaker, Int64 HOrgID)
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ try
+ {
+ ds = oWebs.GetKf_PonderationBillMain_TempList_New(HBillType, sHMaker, HOrgID);
+
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ #region PDA鍏朵粬鍏ュ簱鍒楄〃妯″潡
+ /// <summary>
+ /// 鍏朵粬鍏ュ簱缂撳瓨鍒楄〃鍒锋柊淇℃伅
+ /// </summary>
+ /// <param name="HBillType"></param>
+ /// <param name="sHMaker"></param>
+ /// <param name="HOrgID"></param>
+ /// <returns></returns>
+ [Route("Web/GetOtherInBillMain_TempList_New")]
+ [HttpGet]
+ public object GetOtherInBillMain_TempList_New (string HBillType, string sHMaker, Int64 HOrgID)
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ DataSet ds = oCN.RunProcReturn("exec h_p_KF_GetPonderationBillMain_TempList_New1 '" + HBillType + "','" + sHMaker + "'," + HOrgID.ToString(), "h_p_KF_GetPonderationBillMain_TempList_New1");
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = 0;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ /// <summary>
+ /// 鑾峰彇娴佹按鍙峰垪琛�
+ /// </summary>
+ /// <param name="HInterID"></param>
+ /// <returns></returns>
+ [Route("Web/GetProcNoList")]
+ [HttpGet]
+ public object GetProcNoList(int HInterID,string sWhere,string UserID)
+ {
+ List<object> columnNameList = new List<object>();
+ try
+ {
+ ds = oCN.RunProcReturn("exec h_p_Sc_ProcNoList '" + HInterID + "','" + sWhere + "','" + UserID + "'" , "h_p_Sc_ProcNoList");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ }
+ return objJsonResult;
+ }
+
}
}
--
Gitblit v1.9.1