From c2a9a460e38c7c196fe98a94e29e6330eac3626f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 03 三月 2023 14:30:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/WebAPIController.cs | 244 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 241 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 6aa23c6..4d401c8 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -833,6 +833,72 @@
}
+ ///// <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>
@@ -955,7 +1021,7 @@
//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 + "%' or HUSEORGID like '%" + Supplier + "%' ) ";
+ sWhere = sWhere + " and ( HNumber like '%" + Supplier + "%' or HName like '%" + Supplier + "%' or HUSEORGID like '%" + HOrgID + "%' ) ";
}
try
{
@@ -1422,6 +1488,60 @@
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)
@@ -2734,6 +2854,124 @@
}
/// <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);
+
+
+ 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>
@@ -3287,9 +3525,9 @@
/// <returns></returns>
[Route("Web/GetMaintainItemtemByEquipProjectID")]
[HttpGet]
- public object GetMaintainItemtemByEquipProjectID(int EquipProjectID)
+ public object GetMaintainItemtemByEquipProjectID(string EquipProjectID)
{
- if (EquipProjectID <= 0)
+ if (EquipProjectID == null)
{
objjson.code = "0";
objjson.count = 0;
--
Gitblit v1.9.1