From 9167264eeb081fdbb94d8a1d2f76f35a6ccdd5fe Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 06 四月 2022 11:02:33 +0800
Subject: [PATCH] nothing
---
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 61 +++++++++++++++++++++---------
1 files changed, 42 insertions(+), 19 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index db285b7..c1ee855 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -45,8 +45,9 @@
string UserName = sArray[1].ToString();
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;
@@ -54,6 +55,7 @@
objJsonResult.data = null;
return objJsonResult;
}
+
//鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
string s = "";
int sYear = 0;
@@ -140,14 +142,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 +243,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;
@@ -361,23 +373,34 @@
{
try
{
- ds = Get_TransFerBillList(sWhere);
- if (ds == null)
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("OA_ErrMsgBackBill_Query", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�";
- objJsonResult.data = ds.Tables[0];
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
return objJsonResult;
}
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+
+ ds = Get_TransFerBillList(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)
{
@@ -400,7 +423,7 @@
A.HSourceInterID,A.HSourceEntryID,A.HSourceBillNo,A.HSourceBillType
from OA_ErrMsgBackBillMain A
inner join OA_ErrMsgBackBillSub2 B on A.HInterID=B.HInterID
- left join Gy_Department D on A.HDeptID=D.HItemID where 1=1 " + sWhere + "");
+ left join Gy_Department D on A.HDeptID=D.HItemID where 1=1 " + sWhere + " order by HItemID desc ");
return new SQLHelper.ClsCN().RunProcReturn(sql, "OA_ErrMsgBackBillMain");
}
@@ -459,7 +482,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