From 3b91a02964f52ee4bbaf55c4e8963466345d1bad Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 21 六月 2024 16:09:30 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs | 233 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 214 insertions(+), 19 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
index cfffd2c..6f70605 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -87,12 +87,12 @@
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList order by hmainid desc", "h_v_IF_SeOrderBillList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList order by hmainid desc,hsubid asc", "h_v_IF_SeOrderBillList");
}
else
{
string sql1 = "select * from h_v_IF_SeOrderBillList where 1 = 1 ";
- string sql = sql1 + sWhere+ " order by hmainid desc";
+ string sql = sql1 + sWhere+ " order by hmainid desc,hsubid asc";
ds = oCN.RunProcReturn(sql, "h_v_IF_SeOrderBillList");
}
@@ -1209,9 +1209,23 @@
//oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
//oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
//oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- oBill.DetailColl.Add(oItemSub);
+ if (oItemSub.HMaterID != 0)
+ {
+ oBill.DetailColl.Add(oItemSub);
+ }
}
+
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
+
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
@@ -1265,7 +1279,7 @@
try
{
- ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList where hmainid =" + HInterID, "h_v_IF_SeOrderBillList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList where hmainid =" + HInterID + " order by hsubid asc", "h_v_IF_SeOrderBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -1362,10 +1376,36 @@
}
//==================================================================================
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
+
oCN.BeginTran();
oCN.RunProc("delete from Xs_SeOrderBillMain where HInterID = " + HInterID);
oCN.RunProc("delete from Xs_SeOrderBillSub where HInterID='" + HInterID + "'");
+
+
+ //鍐欏叆鏃ュ織
+ string Operation = "鍒犻櫎";
+ string ComputerName = System.Net.Dns.GetHostName(); //璁惧鍚嶇О
+ string WorkList = Operation + "鍗曟嵁锛屽崟鎹彿锛�" + BillOld.omodel.HBillNo;
+ string MvarReportTitle = BillOld.MvarReportTitle; //妯″潡
+ string SystemName = "LMES-" + MvarReportTitle + "妯″潡";
+ string IPAddress = "";
+ //string IPAddress = Dns.GetHostEntry(Dns.GetHostName()).AddressList[0].ToString(); //IP鍦板潃
+ //string IPAddress = System.Web.HttpContext.Current.Request.UserHostAddress;
+
+ oCN.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
+ "(getdate(),'" + user + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','" + IPAddress + "','" + Operation + "')"
+ );
+
//鍒犻櫎鍚庢帶鍒�==================================================================================
string sql2 = "exec h_p_Xs_SeOrderBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
@@ -1492,6 +1532,18 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+ foreach(Model.ClsXs_SeOrderBillSub oSub in oBill.DetailColl)
+ {
+ if (oSub.HCloseMan != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓瓨鍦ㄨ鍏抽棴鐨勮褰�!鍙嶅鏍稿け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
}
}
else
@@ -1539,6 +1591,17 @@
}
//==================================================================================
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
+
//瀹℃牳鎻愪氦
if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Xs_SeOrderBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
@@ -1578,6 +1641,17 @@
return objJsonResult;
}
//=========================================================
+
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
//鍙嶅鏍告彁浜bandonCheck
if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Xs_SeOrderBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
@@ -1717,9 +1791,40 @@
//杩涜闇�瑕佽繘琛岀殑鍏抽棴/鍙嶅叧闂搷浣�
if (IsAudit == 0) //鍏抽棴鎻愪氦
{
+ oBill.oCn.BeginTran();
//鍏抽棴鎻愪氦
if (oBill.CloseBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
+ //鍏抽棴鍚庢帶鍒�=========================================
+ string sql_afterClose = "exec h_p_Xs_SeOrderBill_AfterCloseCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
+ DataSet ds_afterClose = oBill.oCn.RunProcReturn(sql_afterClose, "h_p_Xs_SeOrderBill_AfterCloseCtrl");
+ if (ds_afterClose == null || ds_afterClose.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触锛屽師鍥狅細鍏抽棴鍚庢帶鍒堕敊璇紝璇疯仈绯荤綉缁滅鐞嗕汉鍛橈紒";
+ objJsonResult.data = null;
+ oBill.oCn.RollBack();
+
+ return objJsonResult;
+ }
+ else
+ {
+ if (ds_afterClose.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触锛屽師鍥狅細" + ds_afterClose.Tables[0].Rows[0]["HRemark"].ToString();
+ objJsonResult.data = null;
+ oBill.oCn.RollBack();
+
+ return objJsonResult;
+ }
+ }
+ //=========================================
+
+ oBill.oCn.Commit();
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鍏抽棴鎴愬姛";
@@ -1728,6 +1833,8 @@
}
else
{
+ oBill.oCn.RollBack();
+
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
@@ -1903,7 +2010,7 @@
if (IsAudit == 0) //琛屽叧闂彁浜�
{
//琛屽叧闂彁浜�
- if (oBill.CloseRow(lngBillKey,HEntryID,oBill.omodel.HBillNo,CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ if (oBill.CloseRow(lngBillKey,HEntryID,oBill.omodel.HBillNo,CurUserName, "h_p_Xs_SeOrderBill_AfterEntryCloseCtrl", ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -1922,25 +2029,25 @@
}
if (IsAudit == 1) //琛屽弽鍏抽棴鎻愪氦
{
- //oBill.oCn.BeginTran();
+ oBill.oCn.BeginTran();
//琛屽弽鍏抽棴鎻愪氦
if (oBill.CancelRow(lngBillKey, HEntryID, oBill.omodel.HBillNo, CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
- //ds = oCN.RunProcReturn("exec h_p_Kf_CheckSeOrderBill_CrediControl " + oBill.omodel.HInterID, "h_p_Kf_CheckSeOrderBill_CrediControl");
- //if (ds.Tables[0].Rows[0]["HBack"].ToString() == "1")
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString();
- // objJsonResult.data = null;
- // oBill.oCn.RollBack();
- // return objJsonResult;
- //}
+ ds = oCN.RunProcReturn("exec h_p_Kf_CheckSeOrderBill_CrediControl " + oBill.omodel.HInterID, "h_p_Kf_CheckSeOrderBill_CrediControl");
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() == "1")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString();
+ objJsonResult.data = null;
+ oBill.oCn.RollBack();
+ return objJsonResult;
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鍙嶅叧闂垚鍔�";
objJsonResult.data = null;
- //oBill.oCn.Commit();
+ oBill.oCn.Commit();
return objJsonResult;
}
else
@@ -1949,7 +2056,7 @@
objJsonResult.count = 0;
objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
- //oBill.oCn.RollBack();
+ oBill.oCn.RollBack();
return objJsonResult;
}
}
@@ -2226,7 +2333,7 @@
}
else
{
- sWhere = " and HCusID in (select hcusid from Gy_UserCustomerRelation Where HUserID = '" + CurUserID + "') ";
+ sWhere = " and HCusID in (select hcusid from Gy_UserCustomerRelation Where HUserID = '" + CurUserID + "' union all select 166351 hcusid)";
}
objJsonResult.code = "1";
@@ -2460,5 +2567,93 @@
}
}
#endregion
+
+ #region 閿�鍞鍗� 鏍规嵁鑱屽憳鑾峰彇閮ㄩ棬銆佷富绠�
+ [Route("Xs_SeOrderBill/getEmpInfoByHEmpID")]
+ [HttpGet]
+ public object getEmpInfoByHEmpID(long HEmpID)
+ {
+ try
+ {
+ string sql = "select a.HItemID HEmpID,a.HName HEmpName,ISNULL(a.HDeptID,0) HDeptID,b.HName HDeptName,ISNULL(b.HEmpID,0) HManagerID,c.HName HManagerName " +
+ " from Gy_Employee as a " +
+ " left join Gy_Department as b on a.HDeptID = b.HItemID " +
+ " left join Gy_Employee as c on b.HEmpID = c.HItemID " +
+ " where a.HItemID = " + HEmpID;
+ ds = oCN.RunProcReturn(sql, "Gy_Employee");
+
+
+ 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 = "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 閿�鍞鍗� 鑾峰彇鎺掑簭鍚庣殑鏁版嵁
+ [Route("Xs_SeOrderBill/sortList")]
+ [HttpGet]
+ public object sortList(string sWhere, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏌ヨ鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList order by hmainid desc", "h_v_IF_SeOrderBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_IF_SeOrderBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_IF_SeOrderBillList");
+ }
+
+ 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
}
}
\ No newline at end of file
--
Gitblit v1.9.1