From 1bbd45a2bf28afc9da6abe335f8072cf29d78456 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 29 十一月 2022 08:58:14 +0800
Subject: [PATCH] 修改了安瑞所需模块解析条码方法
---
WebAPI/Controllers/PublicPageMethodController.cs | 102 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 85 insertions(+), 17 deletions(-)
diff --git a/WebAPI/Controllers/PublicPageMethodController.cs b/WebAPI/Controllers/PublicPageMethodController.cs
index a47f0ea..80c23d0 100644
--- a/WebAPI/Controllers/PublicPageMethodController.cs
+++ b/WebAPI/Controllers/PublicPageMethodController.cs
@@ -34,7 +34,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -108,7 +108,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -140,7 +140,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -214,7 +214,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -245,7 +245,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -319,7 +319,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -350,7 +350,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -424,7 +424,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -455,7 +455,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -529,7 +529,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1481,6 +1481,47 @@
}
#endregion
+
+
+ #region 鍑哄簱鐢宠鍗曟煡璇㈠垪琛�
+ [Route("OtherOutRequestBillList/CX")]
+ [HttpGet]
+ public object CX(string sWhere)
+ {
+ try
+ {
+
+ string sql1 = "Select * from Kf_StockOutRequestBillMain where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "Kf_StockOutRequestBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ 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 = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 鏍规嵁鏍戝瀷id鏌ユ壘璁惧鍒楄〃
[Route("Gy_MaintenanceMode/EqpCX")]
[HttpGet]
@@ -1919,6 +1960,33 @@
}
#endregion
+ #region 鑾峰彇鍏ㄩ儴鐗╂枡淇℃伅
+ [Route("PublicPageMethod/MaterialList")]
+ [HttpGet]
+ public object MaterialList(string sWhere)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_KF_ICInventoryList_IF" + sWhere , "h_v_KF_ICInventoryList_IF");
+
+ 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 = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 鏍规嵁鏍戝瀷id鏌ユ壘鐗╂枡鍒楄〃
[Route("Gy_MaintenanceMode/PartCX")]
[HttpGet]
@@ -2228,7 +2296,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2302,7 +2370,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2333,7 +2401,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2438,7 +2506,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -3587,13 +3655,13 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName from Gy_ClassTimePrj where HStopflag=0 Order by HItemID ", "Gy_ClassTimePrj");
+ ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName from Gy_ClassTimePrjGroup where HStopflag=0 Order by HItemID ", "Gy_ClassTimePrjGroup");
}
else
{
- string sql1 = "Select HItemID,HNumber ,HName from Gy_ClassTimePrj where HStopflag=0 ";
+ string sql1 = "Select HItemID,HNumber ,HName from Gy_ClassTimePrjGroup where HStopflag=0 ";
string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrj");
+ ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
}
//ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
--
Gitblit v1.9.1