From a91d445374856ef13b7dc3cb62e7cdcf17834c94 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期一, 28 六月 2021 11:22:25 +0800
Subject: [PATCH] 工序流转卡模块
---
WebAPI/Controllers/WebAPIController.cs | 136 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 125 insertions(+), 11 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 6998c6c..42aee5b 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -23,7 +23,7 @@
public DataSet ds = new DataSet();
private json objjson = new json();
private json objJsonResult = new json();
- // private POInStockBillServices oclscg_poinstockbillmain = new POInStockBillServices();
+ // private POInStockBillServices oclscg_poinstockbillmain = new POInStockBillServices();
/// <summary>
/// 閫佽揣鍗曡〃澶翠俊鎭�
/// </summary>
@@ -1016,10 +1016,10 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
//鑾峰彇鏈�澶D鍊艰祴鍊�
DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_BadReason ", "Gy_BadReason");
- if (Maxds!=null||Maxds.Tables[0].Rows.Count > 0)
+ if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
{
//HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
- var maxid=Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
+ var maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
maxid += 1;
HItemID = maxid;
}
@@ -1049,7 +1049,7 @@
objJsonResult.data = 1;
return objJsonResult;
}
- if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim()) )
+ if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim()))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1058,9 +1058,9 @@
return objJsonResult;
}
//鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
-
- ds = oCN.RunProcReturn("select * from Gy_BadReason where HStopflag=0 and HNumber='" + oItem.HNumber.Trim()+"'", "Gy_BadReason");
- if ( oItem.HNumber.Trim()=="" )
+
+ ds = oCN.RunProcReturn("select * from Gy_BadReason where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_BadReason");
+ if (oItem.HNumber.Trim() == "")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1069,7 +1069,7 @@
return objJsonResult;
}
//鏂板鏃跺垽鏂�
- if (oItem.HItemID==0)
+ if (oItem.HItemID == 0)
{
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
@@ -1144,11 +1144,11 @@
}
oItem.HShortNumber = sShortNumber;//鐭唬鐮�
oItem.HEndFlag = true;//鏈骇鏍囧織
- oItem.HLevel= DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇
+ oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇
oBill.oModel = oItem;
}
-
+
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
@@ -1234,7 +1234,7 @@
}
oCN.BeginTran();//寮�濮嬩簨鍔�
ds = oCN.RunProcReturn("select * from Gy_BadReason where HItemID=" + HItemID, "Gy_BadReason");
- if (ds == null || ds.Tables[0].Rows.Count == 0 )
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1273,6 +1273,67 @@
}
#endregion
+
+ /// <summary>
+ /// 鎶ュ簾鍘熷洜
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetScrapReasonList_Json")]
+ [HttpGet]
+ public object GetScrapReasonList_Json(string BadReason)
+ {
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1";
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+ if (BadReason != ""&& BadReason != null)
+ {
+ 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_ScrapReason where HStopflag=0 Order by HItemID ", "Gy_ScrapReason");
+ }
+ else
+ {
+ string sql1 = "Select HItemID,HNumber ,HName from Gy_ScrapReason where HStopflag=0 and HEndFlag=1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "Gy_ScrapReason");
+ }
+
+ //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>
@@ -1666,6 +1727,59 @@
}
/// <summary>
+ /// 鑾峰彇鐐规椤圭洰鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetCheckItemList_Json")]
+ [HttpGet]
+ public object GetCheckItemList_Json(string CheckItem)
+ {
+ DataSet ds;
+ try
+ {
+ sWhere = " Where HStopFlag=0 and HEndFlag=1";
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+ if (CheckItem != ""&& CheckItem!=null)
+ {
+ sWhere = sWhere + " and ( HNumber like '%" + CheckItem + "%' or HName like '%" + CheckItem + "%' ) ";
+ ds = oCN.RunProcReturn("Select HItemID,HNumber,HName from Gy_DotCheck " + sWhere + " Order by HItemID ", "Gy_DotCheck");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("Select HItemID,HNumber,HName from Gy_DotCheck " + sWhere + " Order by HItemID ", "Gy_DotCheck");
+ }
+ 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>
--
Gitblit v1.9.1