From 5f5bbb5e963dae6fe5139b2ec270032571e92814 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期五, 22 十月 2021 19:27:07 +0800
Subject: [PATCH] nothing
---
WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
index df994bc..be3b1c1 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
@@ -23,12 +23,12 @@
[Route("Sc_MouldProdInBill/Get_MouldProdInBillList")]
[HttpGet]
- public object Get_MouldProdInBillList(string sWhere,string user)
+ public object Get_MouldProdInBillList(string sWhere,string user, string Organization)
{
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdInBillList", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBillList", 1, true, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -37,7 +37,7 @@
return objJsonResult;
}
- ds = Sc_GetMouldProdInHouseBill(sWhere);
+ ds = Sc_GetMouldProdInHouseBill(sWhere,Organization);
if (ds == null)
{
objJsonResult.code = "0";
@@ -65,15 +65,15 @@
}
}
- 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 order by 鏃ユ湡 desc " + 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+ "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdInHouseBillList");
}
@@ -92,7 +92,7 @@
public object set_DeleteBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdInBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Delete", 1, true, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -186,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;
@@ -293,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;
@@ -417,7 +417,7 @@
ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,
鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife,搴旀敹鏁伴噺 HQtyMust,
瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney,hwhid1 HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode,鏀舵枡浠撳簱 HWHName,
- HSPID, 鏀舵枡浠撲綅浠ｇ爜 HSPCode,鏀舵枡浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark
+ HSPID, 鏀舵枡浠撲綅浠ｇ爜 HSPCode,鏀舵枡浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID
FROM h_v_Sc_MouldProdInHouseBillList"), "h_v_Sc_MouldProdInHouseBillList");
objJsonResult.code = "0";
@@ -432,7 +432,7 @@
string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,
鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife,搴旀敹鏁伴噺 HQtyMust,
瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney,hwhid1 HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode,鏀舵枡浠撳簱 HWHName,
- HSPID, 鏀舵枡浠撲綅浠ｇ爜 HSPCode,鏀舵枡浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark
+ 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");
@@ -478,7 +478,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdInBill_Edit", 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Edit", 1, true, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -550,6 +550,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