From ebe0e19399a5126c03c90be819ad1a9168e1992b Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 01 十一月 2021 13:25:54 +0800
Subject: [PATCH] nothing
---
WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs | 74 ++++++++++++++++++++++++++-----------
1 files changed, 52 insertions(+), 22 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
index 226c981..6dd7a94 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
@@ -23,11 +23,21 @@
[Route("Sc_MouldProdInBill/Get_MouldProdInBillList")]
[HttpGet]
- public object Get_MouldProdInBillList(string sWhere)
+ public object Get_MouldProdInBillList(string sWhere,string user, string Organization)
{
try
{
- ds = Sc_GetMouldProdInHouseBill(sWhere);
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBillList", 1, true, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = Sc_GetMouldProdInHouseBill(sWhere,Organization);
if (ds == null)
{
objJsonResult.code = "0";
@@ -55,16 +65,16 @@
}
}
- public static DataSet Sc_GetMouldProdInHouseBill(string sWhere)
+ public static DataSet Sc_GetMouldProdInHouseBill(string sWhere, string Organization)
{
+ string sql1 = string.Format(@"select * from h_v_Sc_MouldProdInHouseBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldProdInHouseBillList " + sWhere, "h_v_Sc_MouldProdInHouseBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1+ sWhere + "order by 鏃ユ湡 desc", "h_v_Sc_MouldProdInHouseBillList");
}
else
{
- string sql1 = "select * from h_v_Sc_MouldProdInHouseBillList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdInHouseBillList");
}
@@ -79,17 +89,17 @@
/// <returns></returns>
[Route("Sc_MouldProdInBill/set_DeleteBill")]
[HttpGet]
- public object set_DeleteBill(string HInterID)
+ public object set_DeleteBill(string HInterID,string user)
{
- ////缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdInBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Delete", 1, true, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
string s = "";
Int64 lngBillKey = 0;
@@ -113,7 +123,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (oBill.omodel.HChecker != "")
+ if (oBill.omodel.HChecker != ""&& oBill.omodel.HChecker !=null)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -129,7 +139,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
if (IsDete)
{
objJsonResult.code = "1";
@@ -176,7 +186,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -283,7 +293,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -399,6 +409,7 @@
public object Sc_MouldScrapInProdBillListProjectDetai(string sqlWhere)
{
DataSet ds;
+ DataSet ds1;
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
@@ -406,8 +417,14 @@
{
ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,
鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife,搴旀敹鏁伴噺 HQtyMust,
- 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney, HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode,鏀舵枡浠撳簱 HWHName,琛ㄤ綋澶囨敞 HRemark
+ 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney,hwhid1 HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode,鏀舵枡浠撳簱 HWHName,
+ HSPID, 鏀舵枡浠撲綅浠ｇ爜 HSPCode,鏀舵枡浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID
FROM h_v_Sc_MouldProdInHouseBillList"), "h_v_Sc_MouldProdInHouseBillList");
+ //鏌ユ眹鎬�
+ ds1 = oCN.RunProcReturn(string.Format(@"select 妯″叿浠ｇ爜,妯″叿鍚嶇О,鍗曟嵁鍙�,瑙勬牸鍨嬪彿,鎵规,瀹炴敹鏁伴噺,hwhid1,鏀舵枡浠撳簱浠ｇ爜,
+ 鏀舵枡浠撳簱,琛ㄤ綋澶囨敞,sum(HMaterID) from h_v_Sc_MouldProdInHouseBillList group by 妯″叿浠ｇ爜,
+ 妯″叿鍚嶇О,鍗曟嵁鍙�,瑙勬牸鍨嬪彿,鎵规,瀹炴敹鏁伴噺,hwhid1,鏀舵枡浠撳簱浠ｇ爜,鏀舵枡浠撳簱,琛ㄤ綋澶囨敞"),
+ "h_v_Sc_MouldProdInHouseBillList");
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -420,7 +437,8 @@
//string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,
鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife,搴旀敹鏁伴噺 HQtyMust,
- 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney, HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode,鏀舵枡浠撳簱 HWHName,琛ㄤ綋澶囨敞 HRemark
+ 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney,hwhid1 HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode,鏀舵枡浠撳簱 HWHName,
+ HSPID, 鏀舵枡浠撲綅浠ｇ爜 HSPCode,鏀舵枡浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID
FROM h_v_Sc_MouldProdInHouseBillList where 1=1");
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldProdInHouseBillList");
@@ -458,12 +476,23 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
string refSav = sArray[2].ToString();
+ string msg4 = sArray[3].ToString();
string UserName = "";
string s = "";
ListModels oListModels = new ListModels();
try
{
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Edit", 1, true, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
DLL.ClsSc_MouldProdInBill oBill = new DLL.ClsSc_MouldProdInBill();
List<Models.ClsSc_MouldProdBillMain> lsmain = new List<Models.ClsSc_MouldProdBillMain>();
msg2 = msg2.Replace("\\", "");
@@ -527,6 +556,7 @@
//oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
//oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
//oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
//oItem.HPeriod = 0;
--
Gitblit v1.9.1