From df80023baf4e5eba2de7dcbe9dd1bdd3aeaa607e Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 14 一月 2025 12:58:50 +0800
Subject: [PATCH] 设备档案 增加 字段； IP地址，MAC地址，联网方式，采集类型，采集方式 HMacAddress varchar(50) //数采MAC地址 HIPAddress varchar(50) //数采IP地址 HLinkNETMode varchar(50) //联网方式 HCollectMode varchar(50) //采集方式 HCollectClass varchar(50) //采集类型
---
WebAPI/Controllers/LMESController.cs | 143 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 125 insertions(+), 18 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index b4d6eb6..e6e1b31 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -1210,7 +1210,7 @@
#region 宸ヨ壓璺嚎鍒嗛〉鍒楄〃
[Route("Gy_RoutingBill/page")]
[HttpGet]
- public json Gy_RoutingBillPage(string sWhere, string user, int page, int size)
+ public object Gy_RoutingBillPage(string sWhere, string user, int page, int size)
{
DataSet ds;
json res = new json();
@@ -1218,14 +1218,14 @@
{
List<object> columnNameList = new List<object>();
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Gy_RoutingBill_Query", 1, false, user))
- {
- res.code = "0";
- res.count = 0;
- res.Message = "鏃犳煡鐪嬫潈闄愶紒";
- res.data = null;
- return res;
- }
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_RoutingBill_Query", 1, false, user))
+ //{
+ // res.code = "0";
+ // res.count = 0;
+ // res.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ // res.data = null;
+ // return res;
+ //}
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("exec h_p_Gy_RoutingBillList " + page + "," + size + ",''", "h_p_Gy_RoutingBillList");
@@ -1256,7 +1256,7 @@
res.count = CountConstant.FAIL;
res.Message = "Exception锛�" + e.ToString();
res.data = null;
- return objJsonResult;
+ return res;
}
}
#endregion
@@ -1326,7 +1326,7 @@
{
string sql1 = "select * from h_v_Gy_RoutingBillList where 1 = 1 ";
//瀹㈡埛鑷畾涔�
- if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�" || oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒" || oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧")
+ if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�" || oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒" )
{
sql1 = "select top 1000 * from h_v_Gy_RoutingBillList where 1 = 1 ";
}
@@ -1456,7 +1456,7 @@
if (oSystemParameter.ShowBill(ref Ret))
{
//鍒ゆ柇瀹㈡埛涓洪緳灞辨苯閰�
- if (oSystemParameter.omodel.WMS_CampanyName == "榫欏北姹介厤")
+ if (oSystemParameter.omodel.WMS_CampanyName == "榫欏北姹介厤" || oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧")
{
//鍒ゆ柇鏄惁鏈夋煡璇㈠伐浠锋潈闄�
if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_CheckProcPrice", 1, false, UserName))
@@ -1599,6 +1599,28 @@
objJsonResult.count = 0;
objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string HBillStatus = Convert.ToString(ds.Tables[0].Rows[0]["HBillStatus"]);
+ //string hdeleteman = Convert.ToString(ds.Tables[0].Rows[0]["hdeleteman"]);
+ if (HBillStatus == "6")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍦ㄥ鏍镐腑,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ DataSet dss;
+ //鍒ゆ柇宸ヨ壓璺嚎鏄惁琚紩鐢�
+ dss = oCN.RunProcReturn("select COUNT(*) as number from Sc_ProcessExchangeBillMain where HRoutingBillID = " + lngBillKey, "Gy_RoutingBillMain");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["number"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚寮曠敤锛屼笉鍏佽鍒犻櫎锛�";
+ objJsonResult.data = 1;
return objJsonResult;
}
//if (hdeleteman != "")
@@ -3547,7 +3569,23 @@
return objJsonResult;
}
}
-
+
+ //鑾峰彇绯荤粺鍙傛暟鍒ゆ柇宸ヨ壓璺嚎鏄惁鍚敤澶氱骇瀹℃壒绂佺敤鏅�氬鎵�
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.Gy_RoutingBill_EnableMultiLevel.ToUpper() == "Y") //绯荤粺鍙傛暟 鍚敤鑷姩瀹℃牳
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "宸ヨ壓璺嚎宸插惎鐢ㄥ绾у鎵规櫘閫氬鏍哥鐢�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
if (string.IsNullOrWhiteSpace(HInterID))
{
@@ -3583,9 +3621,18 @@
//瀹℃牳宸ヨ壓璺嚎
oCN.RunProc(" Update Gy_RoutingBillMain set HChecker='" + user + "',HCheckDate=getdate(),HBillStatus=2 Where HInterID=" + HInterID.ToString());
-
- ////鍒锋柊榛樿宸ヨ壓璺嚎
- //oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID);
+
+ //鑾峰彇绯荤粺鍙傛暟
+ string Ret = "";
+ if (oSystemParameter.ShowBill(ref Ret))
+ {
+ //鍒ゆ柇瀹㈡埛
+ if (oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧") //绯荤粺鍙傛暟
+ {
+ //鍒锋柊榛樿宸ヨ壓璺嚎
+ oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID + ",'" + user + "'");
+ }
+ }
////瀹℃牳鍗曟嵁
//if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
@@ -3599,8 +3646,26 @@
}
else
{
+ //鍙嶅鏍稿墠鎺у埗=========================================
+ DataSet ds = oCN.RunProcReturn("Exec h_p_Gy_Routing_BeforeUnCheckCtrl " + HInterID + ",'" + 0 + "','" + user + "'", "h_p_Gy_Routing_BeforeUnCheckCtrl");
+ if (ds == null)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + "鍙嶅鏍稿墠鍒ゆ柇澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
//鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅鏍�
- DataSet ds;
string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
@@ -3724,6 +3789,16 @@
return objJsonResult;
}
}
+ string HBillStatus = Convert.ToString(ds.Tables[0].Rows[0]["HBillStatus"]);
+ //string hdeleteman = Convert.ToString(ds.Tables[0].Rows[0]["hdeleteman"]);
+ if (HBillStatus == "6")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍦ㄥ鏍镐腑,涓嶈兘鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//鍏抽棴鍗曟嵁
if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
{
@@ -3732,6 +3807,17 @@
objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
+ }
+ //鑾峰彇绯荤粺鍙傛暟璁剧疆澶辨晥鏃堕棿
+ string Ret = "";
+ if (oSystemParameter.ShowBill(ref Ret))
+ {
+ //鍒ゆ柇瀹㈡埛
+ if (oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧") //绯荤粺鍙傛暟
+ {
+ //鍒锋柊澶辨晥鏃堕棿
+ oCN.RunProc("update Gy_RoutingBillMain set HEndDate = CONVERT(date, DATEADD(day, -1, GETDATE())) where HInterID = " + HInterID);
+ }
}
}
else
@@ -3746,10 +3832,20 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁宸插弽鍏抽棴!涓嶉渶瑕佸啀鍙嶅叧闂�!";
+ objJsonResult.Message = "鍗曟嵁鏈墜鍔ㄥ叧闂�!闇�瑕佸厛鍏抽棴";
objJsonResult.data = null;
return objJsonResult;
}
+ }
+ string HBillStatus = Convert.ToString(ds.Tables[0].Rows[0]["HBillStatus"]);
+ //string hdeleteman = Convert.ToString(ds.Tables[0].Rows[0]["hdeleteman"]);
+ if (HBillStatus == "6")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍦ㄥ鏍镐腑,涓嶈兘鍙嶅叧闂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
}
//鍙嶅叧闂崟鎹�
if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
@@ -3760,6 +3856,17 @@
objJsonResult.data = null;
return objJsonResult;
}
+ //鑾峰彇绯荤粺鍙傛暟璁剧疆澶辨晥鏃堕棿
+ string Ret = "";
+ if (oSystemParameter.ShowBill(ref Ret))
+ {
+ //鍒ゆ柇瀹㈡埛
+ if (oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧") //绯荤粺鍙傛暟
+ {
+ //鍒锋柊澶辨晥鏃堕棿
+ oCN.RunProc("update Gy_RoutingBillMain set HEndDate = '9999-12-31',HBeginDate = CONVERT(date, GETDATE()) where HInterID = " + HInterID);
+ }
+ }
}
oCN.Commit();//鎻愪氦浜嬪姟
--
Gitblit v1.9.1