From b51ed3cea777b1809afe07db7314b0e0a8c0e9b8 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 22 二月 2023 11:15:25 +0800
Subject: [PATCH] 工序出站-保存屏蔽包装标识，员工同步更改
---
WebAPI/Controllers/PublicPageMethodController.cs | 127 +++++++++++++++++++++++++++++++-----------
1 files changed, 93 insertions(+), 34 deletions(-)
diff --git a/WebAPI/Controllers/PublicPageMethodController.cs b/WebAPI/Controllers/PublicPageMethodController.cs
index a47f0ea..b6f02c4 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,48 @@
}
#endregion
+
+
+ #region 鍑哄簱鐢宠鍗曟煡璇㈠垪琛�
+ [Route("OtherOutRequestBillList/CX")]
+ [HttpGet]
+ public object CX(string sWhere)
+ {
+ try
+ {
+
+ string sql1 = "Select * from AIS20220914133941..T_STK_OUTSTOCKAPPLY where fdocumentstatus = 'C' and FCloseStatus = 'A'";
+ string sql2 = "order by Fdate asc";
+ string sql = sql1 + sWhere + sql2;
+ ds = oCN.RunProcReturn(sql, "T_STK_OUTSTOCKAPPLY");
+ 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 +1961,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]
@@ -2001,7 +2070,7 @@
}
else
{
- string sql1 = "Select HItemID,HParentID,HNumber,HName from h_v_IF_Unit ";
+ string sql1 = "Select HItemID,HParentID,HNumber,HName from h_v_IF_Unit ";
string sql = sql1 + sWhere;
ds = oCN.RunProcReturn(sql, "h_v_IF_Unit");
}
@@ -2119,22 +2188,12 @@
string sql = sql1 + sWhere;
ds = oCN.RunProcReturn(sql, "Gy_Property");
}
- 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;
- }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
}
catch (Exception e)
{
@@ -2228,7 +2287,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2302,7 +2361,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2333,7 +2392,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2438,7 +2497,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -3587,13 +3646,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