From 518f0889cc2be49de201aacc19e72ac874351ffb Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期日, 28 四月 2024 17:32:34 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs | 98 +++++++++++++++++++++++++++++--------------------
1 files changed, 58 insertions(+), 40 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs b/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs
index 03f0323..128b977 100644
--- a/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs
@@ -38,14 +38,14 @@
{
List<object> columnNameList = new List<object>();
//鏌ョ湅鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Xs_ReceivableBill_Query", 1, false, user))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Xs_ReceivableBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
if (sWhere == null || sWhere.Equals(""))
{
@@ -105,14 +105,14 @@
try
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second("Xs_ReceivableBill_Edit", 1, false, msg4))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log_second("Xs_ReceivableBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
DAL.ClsXs_ReceivableBill oBill = new DAL.ClsXs_ReceivableBill();
List<Model.ClsXs_ReceivableBillMain> lsmain = new List<Model.ClsXs_ReceivableBillMain>();
@@ -301,14 +301,14 @@
string s = "";
//鏌ョ湅鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Xs_ReceivableBill_Drop", 1, false, user))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Xs_ReceivableBill_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
if (HInterID == null || HInterID.Equals(""))
{
@@ -363,6 +363,24 @@
oCN.BeginTran();
+ //ds = oCN.RunProcReturn("select * from h_v_Xs_ReceivableBillList_Query where hmainid=" + HInterID, "h_v_Xs_ReceivableBillList_Query");
+ //foreach (DataRow row in ds.Tables[0].Rows)
+ //{
+ // // 鑾峰彇褰撳墠琛岀殑 HSourceBillType 鍊�
+ // string hSourceBillType = row["HSourceBillType"].ToString();
+
+ // if (hSourceBillType == "1401")
+ // {
+ // //搴旀敹鍗� 鍒犻櫎鍥炲～ 閿�鍞鍗� 鍏宠仈鏁伴噺
+ // oCN.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToPOStockIn_Del " + HInterID);
+ // }
+ // else if (hSourceBillType == "1205")
+ // {
+ // //搴旀敹鍗� 鍒犻櫎鍥炲～ 閿�鍞嚭搴撳崟 鍏宠仈鏁伴噺
+ // oCN.RunProc("exec h_p_Xs_UpDateRelation_ICStockoPOStockIn_Del " + HInterID);
+ // }
+ //}
+
oCN.RunProc("delete from Xs_ReceivableBillMain where HInterID = " + HInterID);
oCN.RunProc("delete from Xs_ReceivableBillSub where HInterID= " + HInterID);
@@ -427,14 +445,14 @@
try
{
//瀹℃牳鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//HInterID鏁版嵁鍒ゆ柇
if (HInterID <= 0)
{
@@ -631,14 +649,14 @@
try
{
//妫�鏌ユ潈闄�
- //if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍏抽棴澶辫触锛佹棤鏉冮檺锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//HInterID鏁版嵁鍒ゆ柇
if (HInterID <= 0)
{
--
Gitblit v1.9.1