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/SCGL/Sc_MESTransFerWorkBillController.cs | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index db285b7..380e2ec 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -46,7 +46,7 @@
string refSav = sArray[2].ToString();
DBUtility.ClsPub.CurUserName = UserName;
//淇濆瓨鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("OA_ErrMsgBackBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second("OA_ErrMsgBackBill_Edit", 1, false, DBUtility.ClsPub.CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -140,14 +140,24 @@
objJsonResult.data = 1;
return objJsonResult;
}
- string[] arrStr = oItem.HCopyMan.Split(',');
-
- //鎺ユ敹浜鸿〃浣撴暟鎹�
+
+ //string[] arrStr = oItem.HSendMan.Split(','); //鍙戦�佷汉
+ //arrStr = oItem.HReceiveMan.Split(','); //鎺ユ敹浜�
+ string[] arrStr = oItem.HCopyMan.Split(','); //鎶勯�佷汉
+ List<string> b = new List<string>(arrStr);
+ b.Add(oItem.HSendMan);
+ b.Add(oItem.HReceiveMan);
+ arrStr = b.ToArray();
+ //鎶勯�佷汉琛ㄤ綋鏁版嵁
for (int i = 1; i <= arrStr.Length; i++)
{
Models.ClsOA_ErrMsgBackBillSub2 sb = new Models.ClsOA_ErrMsgBackBillSub2();
sb.HEntryID = i;
sb.HReceiveMan = arrStr[i - 1];
+ if (arrStr[i-1].ToString() == oItem.HSendMan)
+ {
+ sb.HReadFlag = true;
+ }
oBill.DetailColl2.Add(sb);
}
oBill.omodel = oItem;
@@ -231,7 +241,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -459,7 +469,7 @@
public object Get_DeleteTransFerBill(string HInterID,string HEntryID, string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("OA_ErrMsgBackBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("OA_ErrMsgBackBill_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
--
Gitblit v1.9.1