From 94acd320ea22ea212290e493fb6211deda1b7eef Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 20 九月 2022 01:07:22 +0800
Subject: [PATCH] 增加 工艺参数基础资料， 控制器、类文件（工艺参数，工艺参数单位，工艺参数对应表）
---
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 932 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 642 insertions(+), 290 deletions(-)
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index 87f6567..8b371b4 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -4,6 +4,7 @@
using System.Collections.Generic;
using System.Data;
using System.Web.Http;
+using ViewAPI;
using WebAPI.Models;
namespace WebAPI.Controllers
{
@@ -183,28 +184,37 @@
/// <returns></returns>
[Route("Sc_MouldMaintainBill/GetMouldMaintainBillList")]
[HttpGet]
- public object GetMouldMaintainBillList(string sWhere)
+ public object GetMouldMaintainBillList(string sWhere,string user)
{
try
{
-
- ds = Sc_MouldMaintainBillList_s(sWhere);
- if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+
+ ds = Sc_MouldMaintainBillList_s(sWhere);
+
+ //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 ex)
{
@@ -223,12 +233,12 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintain order by 鏃ユ湡 desc", "h_v_Sc_MouldMaintain");
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintain order by hmainid desc", "h_v_Sc_MouldMaintain");
}
else
{
string sql1 = "select * from h_v_Sc_MouldMaintain where 1 = 1 ";
- string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere + "order by hmainid desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldMaintain");
}
@@ -244,28 +254,37 @@
/// <returns></returns>
[Route("Sc_MouldDotCheckPlanBill/GetMouldDotCheckPlanBillList")]
[HttpGet]
- public object GetMouldDotCheckPlanBillList(string sWhere)
+ public object GetMouldDotCheckPlanBillList(string sWhere,string user)
{
try
{
-
- ds = Sc_MouldDotCheckPlanBillList_s(sWhere);
- if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldDotCheckPlanBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+
+ ds = Sc_MouldDotCheckPlanBillList_s(sWhere);
+
+ //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 ex)
{
@@ -282,7 +301,7 @@
public static DataSet Sc_MouldDotCheckPlanBillList_s(string sWhere)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckPlanBillList order by 鏃ユ湡 desc", "h_v_Sc_MouldDotCheckPlanBillList");
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckPlanBillList where 1=1 "+sWhere+ " order by hmainid desc", "h_v_Sc_MouldDotCheckPlanBillList");
}
#endregion
@@ -292,28 +311,36 @@
/// <returns></returns>
[Route("Sc_MouldDotCheckBill/GetMouldDotCheckBillList")]
[HttpGet]
- public object GetMouldDotCheckBillList(string sWhere)
+ public object GetMouldDotCheckBillList(string sWhere,string user)
{
try
{
-
- ds = Sc_MouldDotCheckBillList_s(sWhere);
- if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldDotCheckBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+ ds = Sc_MouldDotCheckBillList_s(sWhere);
+
+ //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 ex)
{
@@ -330,7 +357,7 @@
public static DataSet Sc_MouldDotCheckBillList_s(string sWhere)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckBillList where 1=1 " + sWhere + "order by 鏃ユ湡 desc", "h_v_Sc_MouldDotCheckBillList");
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckBillList where 1=1 " + sWhere + "order by hmainid desc", "h_v_Sc_MouldDotCheckBillList");
}
#endregion
@@ -390,28 +417,37 @@
/// <returns></returns>
[Route("Sc_MouldMaintainPlanBill/GetMouldMaintainPlanBillList")]
[HttpGet]
- public object GetMouldMaintainPlanBillList(string sWhere)
+ public object GetMouldMaintainPlanBillList(string sWhere,string user)
{
try
{
-
- ds = Sc_MouldMaintainPlanBillList_s(sWhere);
- if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainPlanBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+
+ ds = Sc_MouldMaintainPlanBillList_s(sWhere);
+
+ //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 ex)
{
@@ -428,7 +464,7 @@
public static DataSet Sc_MouldMaintainPlanBillList_s(string sWhere)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintainPlanBillList where 1=1 "+sWhere+" order by 鏃ユ湡 desc", "h_v_Sc_MouldMaintainPlanBillList");
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintainPlanBillList where 1=1 "+sWhere+ " order by hmainid desc", "h_v_Sc_MouldMaintainPlanBillList");
}
#endregion
@@ -439,12 +475,21 @@
/// <returns></returns>
[Route("Sc_MouldConkBookBill/GetMouldConkBookBillList")]
[HttpGet]
- public object GetMouldConkBookBillList(string sWhere)
+ public object GetMouldConkBookBillList(string sWhere,string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldConkBookBillList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
ds = Sc_MouldConkBookBillList_s(sWhere);
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
@@ -469,7 +514,7 @@
DataSet ds;
if (sWhere == null || sWhere.Equals(""))
{
- ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldConkBookBillList order by 鏃ユ湡 desc" + sWhere, "h_v_Sc_MouldConkBookBillList");
+ ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldConkBookBillList where 1=1 " + sWhere+ " order by hmainid desc", "h_v_Sc_MouldConkBookBillList");
}
else
{
@@ -489,11 +534,21 @@
/// <returns></returns>
[Route("Sc_MouldRepairCheckBill/GetMouldRepairCheckBillList")]
[HttpGet]
- public object GetMouldRepairCheckBillList(string sWhere)
+ public object GetMouldRepairCheckBillList(string sWhere,string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipRepairCheckBillList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
ds = Sc_MouldRepairCheckBillList_s(sWhere);
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -519,12 +574,12 @@
DataSet ds;
if (sWhere == null || sWhere.Equals(""))
{
- ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairCheckBillList_Edit order by 鏃ユ湡 desc" + sWhere, "h_v_Sc_MouldRepairCheckBillList_Edit");
+ ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairCheckBillList_Edit where 1=1" + sWhere+ " order by hmainid desc", "h_v_Sc_MouldRepairCheckBillList_Edit");
}
else
{
string sql1 = "select * from h_v_Sc_MouldRepairCheckBillList_Edit where 1 = 1 ";
- string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere + "order by hmainid desc";
ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairCheckBillList_Edit");
}
return ds;
@@ -595,28 +650,37 @@
/// <returns></returns>
[Route("Sb_MouldRepairWorkBill/GetMouldRepairWorkBillList")]
[HttpGet]
- public object GetMouldRepairWorkBillList(string sWhere)
+ public object GetMouldRepairWorkBillList(string sWhere,string user)
{
try
{
-
- ds = Sc_MouldRepairWorkBillList_s(sWhere);
- if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+
+ ds = Sc_MouldRepairWorkBillList_s(sWhere);
+
+ //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 ex)
{
@@ -635,12 +699,12 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairWorkBillList order by 鏃ユ湡 desc" + sWhere, "h_v_Sc_MouldRepairWorkBillList");
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairWorkBillList where 1=1 " + sWhere+ " order by hmainid desc", "h_v_Sc_MouldRepairWorkBillList");
}
else
{
string sql1 = "select * from h_v_Sc_MouldRepairWorkBillList where 1 = 1 ";
- string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere + "order by hmainid desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairWorkBillList");
}
}
@@ -751,35 +815,46 @@
/// <returns></returns>
[Route("Kf_MoveStockBill/GetMoveStockBillList")]
[HttpGet]
- public object GetMoveStockBillList(string sWhere)
+ public object GetMoveStockBillList(string sWhere,string user)
{
try
{
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_IF_MoveStockBillList order by 鏃ユ湡 desc", "h_v_IF_MoveStockBillList");
- }
- else
- {
- string sql = "select * from h_v_IF_MoveStockBillList where 1=1 " + sWhere+ "order by 鏃ユ湡 desc";
- ds = oCN.RunProcReturn(sql, "h_v_IF_MoveStockBillList");
- }
- if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Kf_MoveStockBillQuery", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
objJsonResult.data = null;
return objJsonResult;
}
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_MoveStockBillList order by hmainid desc", "h_v_IF_MoveStockBillList");
+ }
else
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+ string sql = "select * from h_v_IF_MoveStockBillList where 1=1 " + sWhere+ "order by hmainid desc";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_MoveStockBillList");
}
+
+ //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 ex)
{
@@ -797,28 +872,38 @@
/// <returns></returns>
[Route("Kf_SellOutBill/GetSellOutBillList")]
[HttpGet]
- public object GetSellOutBillList(string sWhere)
+ public object GetSellOutBillList(string sWhere,string user)
{
try
{
-
- ds = Sc_GetSellOutBillList(sWhere);
- if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Kf_SellOutBillQuery", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.Message = "娌℃湁鏌ヨ鏉冮檺!";
objJsonResult.data = null;
return objJsonResult;
}
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+
+ ds = Sc_GetSellOutBillList(sWhere);
+
+ //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 ex)
{
@@ -835,10 +920,20 @@
/// <returns></returns>
[Route("Kf_SellOutBill/DeltetSellOutBill")]
[HttpGet]
- public object DeltetSeOutStockBackBill(string HInterID)
+ public object DeltetSeOutStockBackBill(string HInterID,string user)
{
try
{
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Kf_SellOutBill_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬垹闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
oCN.BeginTran();
oCN.RunProc("Delete From Kf_ICStockBillMain where HInterID = " + HInterID);
oCN.RunProc("Delete From Kf_ICStockBillSub where HInterID = " + HInterID);
@@ -864,7 +959,14 @@
public static DataSet Sc_GetSellOutBillList(string sWhere)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList order by 鏃ユ湡 desc", "h_v_IF_SellOutBillList");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList order by hmainid desc", "h_v_IF_SellOutBillList");
+ }
+ else
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList where 1=1 " + sWhere + " order by hmainid desc", "h_v_IF_SellOutBillList");
+ }
}
#endregion
@@ -875,36 +977,46 @@
/// <returns></returns>
[Route("Kf_OtherOutBill/GetOtherOutBillList")]
[HttpGet]
- public object GetOtherOutBillList(string sWhere)
+ public object GetOtherOutBillList(string sWhere,string user)
{
try
{
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_Kf_OtherOutBillList where 1=1 order by 鏃ユ湡 desc", "h_v_Kf_OtherOutBillList");
- }
- else
- {
- string sql = "select * from h_v_Kf_OtherOutBillList where 1 = 1 " + sWhere+ " order by 鏃ユ湡 desc";
- ds = oCN.RunProcReturn(sql, "h_v_Kf_OtherOutBillList");
- }
-
- if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Kf_OtherOutBillQuery", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
objJsonResult.data = null;
return objJsonResult;
}
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Kf_OtherOutBillList where 1=1 order by hmainid desc", "h_v_Kf_OtherOutBillList");
+ }
else
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+ string sql = "select * from h_v_Kf_OtherOutBillList where 1 = 1 " + sWhere+ " order by hmainid desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Kf_OtherOutBillList");
}
+
+ //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 ex)
{
@@ -1022,36 +1134,47 @@
/// <returns></returns>
[Route("Kf_ProductInBill/GetProductInBill")]
[HttpGet]
- public object GetProductInBill(string sWhere)
+ public object GetProductInBill(string sWhere,string user)
{
try
{
-
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_IF_ProductInBillList where 1=1 order by 鏃ユ湡 desc", "h_v_IF_ProductInBillList");
- }
- else
- {
- string sql = "select * from h_v_IF_ProductInBillList where 1 = 1 " + sWhere + " order by 鏃ユ湡 desc";
- ds = oCN.RunProcReturn(sql, "h_v_IF_ProductInBillList");
- }
- if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Kf_ProductInBill_Query", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
objJsonResult.data = null;
return objJsonResult;
}
+
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_ProductInBillList where 1=1 order by hmainid desc", "h_v_IF_ProductInBillList");
+ }
else
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+ string sql = "select * from h_v_IF_ProductInBillList where 1 = 1 " + sWhere + " order by hmainid desc";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_ProductInBillList");
}
+
+ //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 ex)
{
@@ -1102,36 +1225,46 @@
/// <returns></returns>
[Route("Kf_OtherInBill/GetOtherInBill")]
[HttpGet]
- public object GetOtherInBill(string sWhere)
+ public object GetOtherInBill(string sWhere,string user)
{
try
{
-
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_Kf_OtherInBillList where 1=1 order by 鏃ユ湡 desc", "h_v_Kf_OtherInBillList");
- }
- else
- {
- string sql = "select * from h_v_Kf_OtherInBillList where 1 = 1 " + sWhere+ " order by 鏃ユ湡 desc";
- ds = oCN.RunProcReturn(sql, "h_v_Kf_OtherInBillList");
- }
- if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Kf_OtherInBillQuery", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
objJsonResult.data = null;
return objJsonResult;
}
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Kf_OtherInBillList where 1=1 order by hmainid desc", "h_v_Kf_OtherInBillList");
+ }
else
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+ string sql = "select * from h_v_Kf_OtherInBillList where 1 = 1 " + sWhere+ " order by hmainid desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Kf_OtherInBillList");
}
+
+ //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 ex)
{
@@ -1149,35 +1282,45 @@
/// <returns></returns>
[Route("Kf_EntrustInBill/GetEntrustInBill")]
[HttpGet]
- public object GetEntrustInBill(string sWhere)
+ public object GetEntrustInBill(string sWhere,string user)
{
try
{
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_Kf_EntrustInBillList where 1=1", "h_v_Kf_EntrustInBillList");
- }
- else
- {
- string sql = "select * from h_v_Kf_EntrustInBillList where 1 = 1 " + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_Kf_EntrustInBillList");
- }
- if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Kf_EntrustInBillQuery", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
objJsonResult.data = null;
return objJsonResult;
}
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Kf_EntrustInBillList where 1=1 order by hmainid desc", "h_v_Kf_EntrustInBillList");
+ }
else
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+ string sql = "select * from h_v_Kf_EntrustInBillList where 1 = 1 " + sWhere+ " order by hmainid desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Kf_EntrustInBillList");
}
+
+ //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 ex)
{
@@ -1235,12 +1378,22 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
string UserName = "";
ListModels oListModels = new ListModels();
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
DAL.ClsSb_MouldRepairWorkBill oBill = new DAL.ClsSb_MouldRepairWorkBill();
List<Model.ClsSb_MouldRepairWorkBillMain> lsmain = new List<Model.ClsSb_MouldRepairWorkBillMain>();
msg2 = msg2.Replace("\\", "");
@@ -1420,17 +1573,17 @@
/// <returns></returns>
[Route("Sb_MouldRepairWorkBill/DeltetMouldRepairWorkBill")]
[HttpGet]
- public object DeltetMouldRepairWorkBill(string HInterID)
+ public object DeltetMouldRepairWorkBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
Int64 lngBillKey = 0;
@@ -1510,7 +1663,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1656,6 +1809,15 @@
ListModels oListModels = new ListModels();
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipRepairCheckBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
DLL.ClsSc_MouldRepairCheckBill oBill = new DLL.ClsSc_MouldRepairCheckBill();
List<Model.ClsSc_MouldRepairCheckBillMain> lsmain = new List<Model.ClsSc_MouldRepairCheckBillMain>();
msg2 = msg2.Replace("\\", "");
@@ -1839,17 +2001,17 @@
/// <returns></returns>
[Route("Sc_MouldRepairCheckBill/DeltetMouldRepairCheckBill")]
[HttpGet]
- public object DeltetMouldRepairCheckBill(string HInterID)
+ public object DeltetMouldRepairCheckBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairCheckBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipRepairCheckBill_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
Int64 lngBillKey = 0;
@@ -1917,7 +2079,7 @@
#region 妯″叿鏁呴殰鐧昏琛ㄤ繚瀛�/缂栬緫
/// <summary>
- /// 淇濆瓨妯″叿缁翠慨鍗�
+ /// 淇濆瓨鏁呴殰鐧昏琛�
/// </summary>
/// <param name="msg"></param>
/// <returns></returns>
@@ -1930,12 +2092,20 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
-
+ string msg4 = sArray[2].ToString();
string UserName = "";
ListModels oListModels = new ListModels();
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldConkBookBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
DAL.ClsSc_MouldConkBookBill oBill = new DAL.ClsSc_MouldConkBookBill();
List<Model.ClsSc_MouldConkBookBillMain> lsmain = new List<Model.ClsSc_MouldConkBookBillMain>();
msg2 = msg2.Replace("\\", "");
@@ -2115,22 +2285,22 @@
#region [妯″叿鏁呴殰鐧昏琛ㄥ垹闄ゅ姛鑳絔
/// <summary>
- /// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
+ /// 妯″叿鏁呴殰鐧昏琛ㄥ垹闄ゅ姛鑳�
/// </summary>
/// <returns></returns>
[Route("Sc_MouldConkBookBill/DeltetMouldConkBookBill")]
[HttpGet]
- public object DeltetMouldConkBookBill(string HInterID)
+ public object DeltetMouldConkBookBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sc_MouldConkBookBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldConkBookBill_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
Int64 lngBillKey = 0;
@@ -2212,12 +2382,22 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
string UserName = "";
ListModels oListModels = new ListModels();
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainPlanBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
DAL.ClsSc_MouldMaintainPlanBill oBill = new DAL.ClsSc_MouldMaintainPlanBill();
List<Model.ClsSc_MouldMaintainPlanBillMain> lsmain = new List<Model.ClsSc_MouldMaintainPlanBillMain>();
msg2 = msg2.Replace("\\", "");
@@ -2391,17 +2571,17 @@
/// <returns></returns>
[Route("Sc_MouldMaintainPlanBill/DeltetMouldMaintainPlanBill")]
[HttpGet]
- public object DeltetMouldMaintainPlanBill(string HInterID)
+ public object DeltetMouldMaintainPlanBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainPlanBill_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
Int64 lngBillKey = 0;
@@ -2484,11 +2664,21 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
string msg4 = sArray[2].ToString();
+ string msg5 = sArray[3].ToString();
string UserName = "";
ListModels oListModels = new ListModels();
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainBill_Edit", 1, false, msg5))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
DAL.ClsSc_MouldMaintainBill oBill = new DAL.ClsSc_MouldMaintainBill();
List<Model.ClsSc_MouldMaintainBillMain> lsmain = new List<Model.ClsSc_MouldMaintainBillMain>();
msg2 = msg2.Replace("\\", "");
@@ -2732,8 +2922,17 @@
/// <returns></returns>
[Route("Sc_MouldMaintainBill/DeltetSc_MouldMaintainBill")]
[HttpGet]
- public object DeltetSc_MouldMaintainBill(string HInterID)
+ public object DeltetSc_MouldMaintainBill(string HInterID,string user)
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainBill_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HInterID);
if (lngBillKey == 0)
@@ -2813,12 +3012,21 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
-
+ string msg4 = sArray[2].ToString();
string UserName = "";
ListModels oListModels = new ListModels();
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldDotCheckBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
DAL.ClsSc_MouldDotCheckBill oBill = new DAL.ClsSc_MouldDotCheckBill();
List<Model.ClsSc_MouldDotCheckBillMain> lsmain = new List<Model.ClsSc_MouldDotCheckBillMain>();
msg2 = msg2.Replace("\\", "");
@@ -2984,25 +3192,50 @@
return objJsonResult;
}
#endregion
-
+ #region[妯″叿鐐规璁板綍琛ㄩ�夋嫨鐐规璁″垝甯﹀嚭琛ㄦ牸鏁版嵁]
+ [Route("Sc_MouldDotCheckBill/Sc_MouldDotCheckSubBillListByPlan")]
+ [HttpGet]
+ public object Sc_MouldDotCheckSubBillListByPlan(string HPlanInterID)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql1 = "select hsubid HDotCheckItemID,鐐规椤圭洰 HDotCheckItem,鐐规閮ㄤ綅 HDotCheckPart,鍏蜂綋瑕佹眰 HClaim,琛ㄤ綋澶囨敞 HRemark,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName from h_v_Sc_MouldDotCheckPlanBillList where hmainid =" + HPlanInterID;
+ ds = oCN.RunProcReturn(sql1, "h_v_Sc_MouldDotCheckPlanBillList");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
#region [妯″叿鐐规璁板綍琛ㄥ垹闄ゅ姛鑳絔
/// <summary>
- /// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
+ /// 妯″叿鐐规璁板綍鍒犻櫎鍔熻兘
/// </summary>
/// <returns></returns>
[Route("Sc_MouldDotCheckBill/DeltetSc_MouldDotCheckBill")]
[HttpGet]
- public object DeltetSc_MouldDotCheckBill(string HInterID)
+ public object DeltetSc_MouldDotCheckBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldDotCheckBill_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
Int64 lngBillKey = 0;
@@ -3085,12 +3318,22 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
string UserName = "";
ListModels oListModels = new ListModels();
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldDotCheckPlanBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
DAL.ClsSc_MouldDotCheckPlanBill oBill = new DAL.ClsSc_MouldDotCheckPlanBill();
List<Model.ClsSc_MouldDotCheckPlanBillMain> lsmain = new List<Model.ClsSc_MouldDotCheckPlanBillMain>();
msg2 = msg2.Replace("\\", "");
@@ -3265,17 +3508,17 @@
/// <returns></returns>
[Route("Sc_MouldDotCheckPlanBill/DeltetSc_MouldDotCheckPlanBillBill")]
[HttpGet]
- public object DeltetSc_MouldDotCheckPlanBillBill(string HInterID)
+ public object DeltetSc_MouldDotCheckPlanBillBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldDotCheckPlanBill_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
Int64 lngBillKey = 0;
@@ -3426,7 +3669,7 @@
/// <returns></returns>
[Route("Sc_MouldScrapInHouseBill/SaveGetMouldScrapInHouseBillList")]
[HttpPost]
- public object fSaveGetMouldScrapInHouseBillList([FromBody] JObject msg)
+ public object SaveGetMouldScrapInHouseBillList([FromBody] JObject msg)
{
var _value = msg["msg"].ToString();
string msg1 = _value.ToString();
@@ -3442,7 +3685,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapRequestBill_Edit", 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapRequestBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -3579,15 +3822,19 @@
{
// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ string sql = string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ");
+ oCn.RunProc(sql);
}
else
{
bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼鎴愬姛
+ //string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID 1,{oBill.omodel.HInterID.ToString()},' ' ");
+ string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID ");
+ oCn.RunProc(sql);
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ";
- oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
@@ -3764,7 +4011,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBillList", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -3774,6 +4021,7 @@
}
ds = Sc_GetMouldScrapOutHouseBill(sWhere, Organization);
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -3795,11 +4043,11 @@
string sql1 = string.Format(@"select * from h_v_Sc_MouldScrapOutHouseBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 鍒跺崟鏃ユ湡 desc", "h_v_Sc_MouldScrapOutHouseBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + " order by 鍒跺崟鏃ユ湡 desc", "h_v_Sc_MouldScrapOutHouseBillList");
}
else
{
- string sql = sql1 + sWhere + "order by 鍒跺崟鏃ユ湡 desc";
+ string sql = sql1 + sWhere + " order by 鍒跺崟鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldScrapOutHouseBillList");
}
}
@@ -3899,7 +4147,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBill_Edit", 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -3988,15 +4236,19 @@
{
// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ string sql = string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' ");
+ oCn.RunProc(sql);
}
else
{
bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼鎴愬姛
+ //string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID 1,{oBill.omodel.HInterID.ToString()},' ' ");
+ string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID ");
+ oCn.RunProc(sql);
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' ";
- oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
@@ -4034,7 +4286,7 @@
public object DeltetMouldScrapOutHouseBill(string HInterID, string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBill_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4073,10 +4325,21 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+ //鍒犻櫎鍓嶆煡鎵惧綋鍓嶅崟鎹殑鎵�鏈夊櫒鍏稩D
+ //string swhere = "";
+ //DataSet ds = oCn.RunProcReturn("select HMaterID from Sc_MouldStockBillSub where HinterID=" + HInterID, "Sc_MouldStockBillSub");
+ //for (var i = 0; i < ds.Tables[0].Rows.Count; i++)
+ //{
+ // swhere = swhere + ds.Tables[0].Rows[i]["HMaterID"].ToString()+",";
+ //}
+ //swhere = swhere.Substring(0, swhere.Length - 1);
bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
if (IsDete)
{
+ //鍒犻櫎鎴愬姛淇敼鍣ㄥ叿妗ｆ浣嶇疆
+ //string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID 0,0,'{swhere}' ");
+ string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID ");
+ oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
@@ -4121,7 +4384,7 @@
// try
// {
// //瀹℃牳鏉冮檺
- // if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ // if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
// {
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -4250,7 +4513,7 @@
{
//flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapOutBill_Check", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapOutBill_Check", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4339,7 +4602,7 @@
{
try
{
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBillList", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4349,6 +4612,7 @@
}
ds = Sc_GetMouldProdBackBill(sWhere, Organization);
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -4415,7 +4679,7 @@
ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,鎵规 HBatchNo,
璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 绱Н浣跨敤瀵垮懡 HUseLife, 搴斿彂鏁伴噺 HQtyMust, 瀹炲彂鏁伴噺 HQty,
鍗曚环 HPrice, 閲戦 HMoney,鏀舵枡浠撳簱ID HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode, 鏀舵枡浠撳簱 HWHName,HSPID,
- 浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID,HUnitID,璁￠噺鍗曚綅浠ｇ爜,璁￠噺鍗曚綅 FROM h_v_Sc_MouldProdBackBillList"), "h_v_Sc_MouldProdBackBillList");
+ 浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID,HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitCode,璁￠噺鍗曚綅 HUnitName FROM h_v_Sc_MouldProdBackBillList"), "h_v_Sc_MouldProdBackBillList");
}
else
@@ -4425,7 +4689,7 @@
string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,鎵规 HBatchNo,
璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 绱Н浣跨敤瀵垮懡 HUseLife, 搴斿彂鏁伴噺 HQtyMust, 瀹炲彂鏁伴噺 HQty,
鍗曚环 HPrice, 閲戦 HMoney,鏀舵枡浠撳簱ID HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode, 鏀舵枡浠撳簱 HWHName,HSPID,
- 浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID,HUnitID,璁￠噺鍗曚綅浠ｇ爜,璁￠噺鍗曚綅 FROM h_v_Sc_MouldProdBackBillList where 1 = 1 ");
+ 浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID,HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitCode,璁￠噺鍗曚綅 HUnitName FROM h_v_Sc_MouldProdBackBillList where 1 = 1 ");
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldProdBackBillList");
@@ -4474,7 +4738,7 @@
ListModels oListModels = new ListModels();
try
{
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Edit", 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4563,18 +4827,21 @@
{
// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
-
+ string sql1 = string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ");
+ oCn.RunProc(sql1);
}
else
{
bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼鎴愬姛
+ //string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID 1,{oBill.omodel.HInterID.ToString()},' ' ");
+ string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID ");
+ oCn.RunProc(sql);
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldProdBackBillList '{oBill.omodel.HBillNo}' ";
+ string sql =string.Format($"exec h_p_Sc_MouldProdBackBillList '{oBill.omodel.HBillNo}' ") ;
oCn.RunProc(sql);
- string sql1 = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ";
- oCn.RunProc(sql1);
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
@@ -4612,7 +4879,7 @@
public object DeltetMouldProdBackBill(string HInterID, string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4651,10 +4918,21 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+ //鍒犻櫎鍓嶆煡鎵惧綋鍓嶅崟鎹殑鎵�鏈夊櫒鍏稩D
+ //string swhere = "";
+ //DataSet ds = oCn.RunProcReturn("select HMaterID from Sc_MouldStockBillSub where HinterID=" + HInterID, "Sc_MouldStockBillSub");
+ //for (var i = 0; i < ds.Tables[0].Rows.Count; i++)
+ //{
+ // swhere = swhere + ds.Tables[0].Rows[i]["HMaterID"].ToString()+",";
+ //}
+ //swhere = swhere.Substring(0, swhere.Length - 1);
bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
if (IsDete)
{
+ //鍒犻櫎鎴愬姛淇敼鍣ㄥ叿妗ｆ浣嶇疆
+ //string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID 0,0,'{swhere}' ");
+ string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID ");
+ oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
@@ -4689,7 +4967,7 @@
{
//flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdBackBill_Check", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdBackBill_Check", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4777,7 +5055,7 @@
{
try
{
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdOutBillList", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdOutBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4787,6 +5065,7 @@
}
ds = Sc_GetMouldProdOutBill(sWhere, Organization);
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -4808,6 +5087,7 @@
string sql1 = string.Format(@"select * from h_v_Sc_MouldProdOutHouseBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
+ Log.LogInfo(sql1);
return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 鍒跺崟鏃ユ湡 desc", "h_v_Sc_MouldProdOutHouseBillList");
}
else
@@ -4853,7 +5133,7 @@
ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,鎵规 HBatchNo,
璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 绱Н浣跨敤瀵垮懡 HUseLife, 搴斿彂鏁伴噺 HQtyMust, 瀹炲彂鏁伴噺 HQty,
鍗曚环 HPrice, 閲戦 HMoney,HWHSonID HWHID, 鍙戞枡浠撳簱浠ｇ爜 HWHCode, 鍙戞枡浠撳簱 HWHName,HSPID,
- 浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID,HUnitID,璁￠噺鍗曚綅浠ｇ爜,璁￠噺鍗曚綅 FROM h_v_Sc_MouldProdOutHouseBillList"), "h_v_Sc_MouldProdOutHouseBillList");
+ 浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID,HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitCode,璁￠噺鍗曚綅 HUnitName FROM h_v_Sc_MouldProdOutHouseBillList"), "h_v_Sc_MouldProdOutHouseBillList");
}
else
@@ -4863,7 +5143,7 @@
string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,鎵规 HBatchNo,
璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 绱Н浣跨敤瀵垮懡 HUseLife, 搴斿彂鏁伴噺 HQtyMust, 瀹炲彂鏁伴噺 HQty,
鍗曚环 HPrice, 閲戦 HMoney,HWHSonID HWHID, 鍙戞枡浠撳簱浠ｇ爜 HWHCode, 鍙戞枡浠撳簱 HWHName,HSPID,
- 浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID,HUnitID,璁￠噺鍗曚綅浠ｇ爜,璁￠噺鍗曚綅 FROM h_v_Sc_MouldProdOutHouseBillList where 1 = 1 ");
+ 浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID,HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitCode,璁￠噺鍗曚綅 HUnitName FROM h_v_Sc_MouldProdOutHouseBillList where 1 = 1 ");
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldProdOutHouseBillList");
}
@@ -4912,7 +5192,8 @@
ListModels oListModels = new ListModels();
try
{
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdOutBill_Edit", 1, true, msg4))
+ //妯″潡鍚嶏紝鍐欏叆鏃ュ織锛屾姤閿欐锛岀敤鎴峰悕
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdOutBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -5000,15 +5281,19 @@
{
// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ string sql = string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' ");
+ oCn.RunProc(sql);
}
else
{
bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼鎴愬姛
+ //string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID 1,{oBill.omodel.HInterID.ToString()},' ' ");
+ string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID ");
+ oCn.RunProc(sql);
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' ";
- oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
@@ -5036,6 +5321,44 @@
}
#endregion
+ //鍒ゆ柇鐢ㄦ埛鏉冮檺
+ #region
+ [Route("Sc_MouldProdOutBill/QueryUserRight")]
+ [HttpPost]
+ public object QueryUserRight(string UserName)
+ {
+ try
+ {
+ //妯″潡鍚嶏紝鍐欏叆鏃ュ織锛屾姤閿欐锛岀敤鎴峰悕
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdOutBill_Edit", 1, false, UserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ヨ鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏈夋潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch(Exception e1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ヨ鏉冮檺锛�" + e1.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
#region [妯″叿澶勭悊棰嗙敤鍗曞垹闄ゅ姛鑳絔
/// <summary>
/// 妯″叿澶勭悊棰嗙敤鍗曞垹闄ゅ姛鑳�
@@ -5046,7 +5369,7 @@
public object DeltetMouldProdOutBill(string HInterID, string user)
{
//鍒犻櫎鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdOutBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdOutBill_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -5085,10 +5408,21 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+ //鍒犻櫎鍓嶆煡鎵惧綋鍓嶅崟鎹殑鎵�鏈夊櫒鍏稩D
+ //string swhere = "";
+ //DataSet ds = oCn.RunProcReturn("select HMaterID from Sc_MouldStockBillSub where HinterID=" + HInterID, "Sc_MouldStockBillSub");
+ //for (var i = 0; i < ds.Tables[0].Rows.Count; i++)
+ //{
+ // swhere = swhere + ds.Tables[0].Rows[i]["HMaterID"].ToString() + ",";
+ //}
+ //swhere = swhere.Substring(0, swhere.Length - 1);
bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
if (IsDete)
{
+ //鍒犻櫎鎴愬姛淇敼鍣ㄥ叿妗ｆ浣嶇疆
+ // string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID 0,0,'{swhere}' ");
+ string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID ");
+ oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
@@ -5120,10 +5454,9 @@
[Route("Sc_MouldProdOutBill/AuditMouldProdOutBill")]
[HttpGet]
public object AuditMouldProdOutBill(string HInterID, string user, int flag)
- {
- //flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
+ {
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdOutBill_Check", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdOutBill_Check", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -5207,12 +5540,21 @@
[Route("Sc_MouldLifeChangeBill/GetMouldLifeChangeBill")]
[HttpGet]
- public object GetMouldLifeChangeBill(string sWhere)
+ public object GetMouldLifeChangeBill(string sWhere,string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeChangeBillList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
ds = Sc_GetMouldLifeChangeBill(sWhere);
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -5233,12 +5575,12 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldLifeChangeBillList order by 鏃ユ湡 desc", "h_v_Sc_MouldLifeChangeBillList");
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldLifeChangeBillList order by hmainid desc", "h_v_Sc_MouldLifeChangeBillList");
}
else
{
string sql1 = "select * from h_v_Sc_MouldLifeChangeBillList where 1 = 1 ";
- string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere + "order by hmainid desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldLifeChangeBillList");
}
@@ -5329,12 +5671,22 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
string UserName = "";
ListModels oListModels = new ListModels();
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeChangeBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
DLL.ClsSc_MouldLifeChangeBill oBill = new DLL.ClsSc_MouldLifeChangeBill();
List<Model.ClsSc_MouldLifeChangeBillMain> lsmain = new List<Model.ClsSc_MouldLifeChangeBillMain>();
msg2 = msg2.Replace("\\", "");
@@ -5456,17 +5808,17 @@
/// <returns></returns>
[Route("Sc_MouldLifeChangeBill/DeltetMouldLifeChangeBill")]
[HttpGet]
- public object DeltetMouldLifeChangeBill(string HInterID)
+ public object DeltetMouldLifeChangeBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeChangeBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeChangeBill_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
Int64 lngBillKey = 0;
--
Gitblit v1.9.1