From 2de60516a01f97a8d9047e30e029f5e724f94bbb Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 18 五月 2023 14:58:01 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 2 +-
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 2 +-
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 2 +-
WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index f7d177d..83b1ba4 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -982,7 +982,7 @@
{
if (oSystemParameter.omodel.MES_StationInBill_DeleteCtl == "Y")
{
- if (oBill.omodel.HMaker != HDeleteMan)
+ if (oBill.omodel.HMaker != HDeleteMan && (HDeleteMan != "admin" && HDeleteMan != "Admin"))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 0c5a398..0b69b2c 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -1630,7 +1630,7 @@
{
if (oSystemParameter.omodel.MES_StationOutBill_DeleteCtl == "Y")
{
- if (oBill.omodel.HMaker != HDeleteMan)
+ if (oBill.omodel.HMaker != HDeleteMan && (HDeleteMan != "admin" && HDeleteMan != "Admin"))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index ba0ce87..b582041 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -859,7 +859,7 @@
{
if (oSystemParameter.omodel.Sc_ProcessExchangeBill_DeleterAndMakerMustSame == "Y")
{
- if (oBill.omodel.HMaker != user)
+ if (oBill.omodel.HMaker != user && (user != "admin" && user != "Admin"))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
index 1e2bc7b..8fdcc66 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
@@ -854,7 +854,7 @@
{
if (oSystemParameter.omodel.Sc_ICMOBill_DeleterAndMakerMustSame == "Y")
{
- if (ds.Tables[0].Rows[0]["HMaker"].ToString() != user)
+ if (ds.Tables[0].Rows[0]["HMaker"].ToString() != user && (user != "admin" && user != "Admin"))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
--
Gitblit v1.9.1