From 4ab7a22f8049a160e6fe847f0c12af8d2290dfef Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 06 五月 2024 13:34:44 +0800
Subject: [PATCH] 销售订单：查询时、获取编辑数据时，根据子表id升序排列
---
WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs | 231 ++++++---------------------------------------------------
1 files changed, 25 insertions(+), 206 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs b/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs
index 77dd97b..475be3f 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs
@@ -34,7 +34,7 @@
{
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -42,23 +42,24 @@
objJsonResult.data = null;
return objJsonResult;
}
- ds = oCN.RunProcReturn("select HItemID,HParentID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_MouldType where 1=1 " + sWhere, "Gy_MouldType");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳ā娌诲叿鍒嗙被鏁版嵁锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鏌ユ壘鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+ ds = oCN.RunProcReturn("select HItemID,HParentID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_MouldType where 1=1 " + sWhere+ " order by HNumber", "Gy_MouldType");
+
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
}
catch (Exception e)
{
@@ -128,7 +129,7 @@
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -231,11 +232,11 @@
bool HEndFlag = list[0].HEndFlag;
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg4, 1, true, msg3))
+ if (!DBUtility.ClsPub.Security_Log(msg4, 1, false, msg3))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ objJsonResult.Message = "娌℃湁淇濆瓨鏉冮檺锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -316,11 +317,11 @@
string HUseFlag = list[0].HUseFlag;
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log(msg5, 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ objJsonResult.Message = "娌℃湁淇濆瓨鏉冮檺";
objJsonResult.data = null;
return objJsonResult;
}
@@ -439,188 +440,6 @@
}
#endregion
- //#region [妯″叿鍒嗙被瀹℃牳銆佸弽瀹℃牳]
- //[Route("Gy_ModelType/ModelTypeCheck")]
- //[HttpGet]
- //public object ModelTypeCheck(int HInterID, int IsAudit, string CurUserName)
- //{
- // string ModRightNameCheck = "Gy_MouldType_Check";
- // DBUtility.ClsPub.CurUserName = CurUserName;
- // try
- // {
- // //瀹℃牳鏉冮檺
- // if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (HInterID <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "HInterID灏忎簬0锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // Int64 lngBillKey = 0;
- // lngBillKey = DBUtility.ClsPub.isLong(HInterID);
- // ds = oCN.RunProcReturn("Select * from Gy_MouldType Where HItemID=" + lngBillKey.ToString(), "Gy_MouldType");
- // if (ds.Tables[0].Rows.Count != 0)
- // {
- // string HCloseMan = ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
- // string HDeleteMan = ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
- // string HChecker = ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
- // if (HCloseMan.Trim() != "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (HDeleteMan.Trim() != "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (IsAudit == 0) //瀹℃牳鍒ゆ柇
- // {
- // if (HChecker.Trim() != "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
- // {
- // if (HChecker.Trim() == "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
-
- // if (IsAudit == 0) //瀹℃牳鎻愪氦
- // {
- // //瀹℃牳鎻愪氦
- // if (CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "瀹℃牳鎴愬姛";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // if (IsAudit == 1) //鍙嶅鏍告彁浜�
- // {
- // //鍙嶅鏍告彁浜bandonCheck
- // if (AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鍙嶅鏍告垚鍔�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // return objJsonResult;
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- ////瀹℃牳
- //public bool CheckBill(Int64 lngBillKey, ref string sReturn)
- //{
- // //妯″叿妗ｆ鏈夋渚�
- // try
- // {
- // string HChecker = DBUtility.ClsPub.CurUserName;
- // string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
- // oCN.BeginTran();
- // oCN.RunProc(" Update " + MvarItemKey + " set HBillStatus='2',HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
- // oCN.Commit();
- // //鐢熸垚璋冩嫧鍗�
- // //寰楀埌璋冩嫧鍗� mainid 鍗曟嵁鍙�
- // //long NewInterID = DBUtility.ClsPub.CreateBillID("1207", ref DBUtility.ClsPub.sExeReturnInfo);
- // //string NewBillNo = DBUtility.ClsPub.CreateBillCode("1207", ref DBUtility.ClsPub.sExeReturnInfo, true);//寰楀埌鏂板崟鍙�
- // //oCn.RunProc("exec h_p_Kf_MoveStockBill_Add " + lngBillKey.ToString() + "," + NewInterID.ToString() + ",'" + NewBillNo + "','" + HChecker + "'");
- // //
- // sReturn = "瀹℃牳鍗曟嵁鎴愬姛锛�";
- // return true;
- // }
- // catch (Exception e)
- // {
- // sReturn = e.Message;
- // throw (e);
- // }
- //}
-
- ////鍙嶅鏍�
- //public bool AbandonCheck(Int64 lngBillKey, ref string sReturn)
- //{
-
- // try
- // {
- // string HChecker = DBUtility.ClsPub.CurUserName;
- // string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
- // oCN.BeginTran();
- // //杩樺師鍗曟嵁鐘舵�佷负鏈鏍哥姸鎬�
- // oCN.RunProc(" Update " + MvarItemKey + " set HBillStatus='1',HChecker='',HCheckDate='' Where HInterID=" + lngBillKey.ToString());
- // sReturn = "鍙嶅鏍稿崟鎹垚鍔燂紒";
- // oCN.Commit();
- // return true;
- // }
- // catch (Exception e)
- // {
- // sReturn = e.Message;
- // throw (e);
- // }
- //}
- //#endregion
+
}
}
--
Gitblit v1.9.1