From 76ffaf6c0b670ca779523ff22fbfb536bb45bf71 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期三, 19 一月 2022 08:49:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 0c3a0cc..6ecfc85 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -283,7 +283,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;
@@ -353,7 +353,7 @@
{
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -517,7 +517,7 @@
string msg4 = sArray[2].ToString();//褰撳墠浜�
oCN.BeginTran();
- if (!DBUtility.ClsPub.Security_Log(msg3, 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log(msg3, 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -594,6 +594,8 @@
int HCaveQty = mainList[0].HCaveQty;
int HMouldDotCheckRuleInterID= mainList[0].HMouldDotCheckRuleInterID;
int HMouldMaintainRuleInterID= mainList[0].HMouldMaintainRuleInterID;
+ int HNowSupID = mainList[0].HNowSupID;
+ int HNowSupTypeID = mainList[0].HNowSupTypeID;
@@ -606,7 +608,7 @@
",HMaterID,HMaterNumber,HMouldType,HUnitID" +
",HOutComDate,HOutComNo,HDeptID,HSupID,HSupNumber" +
",HPrintQty,HMouldStatus,HWhID,HRoutingID,HCaveQty" +
- ",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife" +
+ ",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife,HNowSupID,HNowSupTypeID" +
",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID" +
") " +
" values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
@@ -616,7 +618,7 @@
"," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
"," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID +","+ HCaveQty+
- "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "'" +
+ "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID+"','"+ HNowSupTypeID+"'"+
",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID+"','"+ HMouldMaintainRuleInterID+"'"+
") ");
@@ -673,7 +675,7 @@
string msg4 = sArray[2].ToString();//褰撳墠浜�
try
{
- if (!DBUtility.ClsPub.Security_Log(msg3, 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log(msg3, 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -732,7 +734,8 @@
int HCaveQty = mainList[0].HCaveQty;
int HMouldDotCheckRuleInterID = mainList[0].HMouldDotCheckRuleInterID;
int HMouldMaintainRuleInterID = mainList[0].HMouldMaintainRuleInterID;
-
+ int HNowSupID = mainList[0].HNowSupID;
+ int HNowSupTypeID = mainList[0].HNowSupTypeID;
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
@@ -781,6 +784,8 @@
",HMouldDotCheckRuleInterID="+ HMouldDotCheckRuleInterID.ToString()+
",HMouldMaintainRuleInterID=" + HMouldMaintainRuleInterID.ToString() +
",HMouldOWNER='" + HMouldOWNER + "'" +
+ ",HNowSupID="+HNowSupID.ToString()+
+ ",HNowSupTypeID="+HNowSupTypeID.ToString()+
",HProdWeight=" + HProdWeight.ToString() +
" where HInterID=" + HInterID.ToString());
@@ -850,7 +855,7 @@
DAL.ClsGy_MouldFile oBill = new DAL.ClsGy_MouldFile();
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -967,7 +972,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;
--
Gitblit v1.9.1