From c0e0cc4fa24c38785054ec759f0fee75a3bae5f7 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 21 十月 2021 19:16:14 +0800
Subject: [PATCH] 测试器具加设备
---
WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs
index a993580..a885694 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs
@@ -88,7 +88,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldMoveStockStepInBillList", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBillList", 1, true, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -116,7 +116,7 @@
public static DataSet Sc_MouldMoveStockStepInBill(string sWhere,string Organization)
{
- string sql1 = string.Format(@"select * from h_v_Sc_MouldMoveStockStepInBillListDetail where 璋冨嚭缁勭粐='" + Organization + "'");
+ string sql1 = string.Format(@"select * from h_v_Sc_MouldMoveStockStepInBillListDetail where (璋冨叆缁勭粐='" + Organization + "' or 璋冨嚭缁勭粐='" + Organization + "' )");
if (sWhere == null || sWhere.Equals(""))
{
return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 鏃ユ湡 desc", "h_v_Sc_MouldMoveStockStepInBillListDetail");
@@ -161,8 +161,9 @@
{
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 FROM h_v_Sc_MouldMoveStockStepInBillListDetail"), "h_v_Sc_MouldMoveStockStepInBillListDetail");
+ 鍗曚环 HPrice, 閲戦 HMoney,HStockOrgID, HOtherOrgID,璋冨嚭缁勭粐浠ｇ爜 HOtherOrgCode,璋冨嚭缁勭粐 HOtherOrgName, HWHID, 璋冨叆浠撳簱浠ｇ爜 HWHCode, 璋冨叆浠撳簱 HWHName,HSPID,
+ 璋冨叆浠撲綅浠ｇ爜 HSPCode, 璋冨叆浠撲綅 HSPName,HSCWHID, 璋冨嚭浠撳簱浠ｇ爜 HSCWHCode, 璋冨嚭浠撳簱 HSCWHName,HSCSPID,
+ 璋冨嚭浠撲綅浠ｇ爜 HSCSPCode, 璋冨嚭浠撲綅 HSCSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID FROM h_v_Sc_MouldMoveStockStepInBillListDetail"), "h_v_Sc_MouldMoveStockStepInBillListDetail");
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -171,12 +172,12 @@
}
else
{
-
//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,HWHSonID HWHID, 鍙戞枡浠撳簱浠ｇ爜 HWHCode, 鍙戞枡浠撳簱 HWHName,HSPID,
- 浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark FROM h_v_Sc_MouldMoveStockStepInBillListDetail where 1 = 1 ");
+ 鍗曚环 HPrice, 閲戦 HMoney,HStockOrgID, HOtherOrgID,璋冨嚭缁勭粐浠ｇ爜 HOtherOrgCode,璋冨嚭缁勭粐 HOtherOrgName, HWHID, 璋冨叆浠撳簱浠ｇ爜 HWHCode, 璋冨叆浠撳簱 HWHName,HSPID,
+ 璋冨叆浠撲綅浠ｇ爜 HSPCode, 璋冨叆浠撲綅 HSPName,HSCWHID, 璋冨嚭浠撳簱浠ｇ爜 HSCWHCode, 璋冨嚭浠撳簱 HSCWHName,HSCSPID,
+ 璋冨嚭浠撲綅浠ｇ爜 HSCSPCode, 璋冨嚭浠撲綅 HSCSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID FROM h_v_Sc_MouldMoveStockStepInBillListDetail where 1 = 1 ");
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMoveStockStepInBillListDetail");
@@ -218,7 +219,7 @@
ListModels oListModels = new ListModels();
try
{
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldMoveStockStepInBill_Edit", 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBill_Edit", 1, true, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -351,7 +352,7 @@
public object DeltetMouldMoveStockStepInBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldMoveStockStepInBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBill_Delete", 1, true, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
--
Gitblit v1.9.1