From 096f0a528fc003ad60d50155af11a40d14b9f0d9 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 12 十二月 2023 13:34:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/人事管理/异常反馈单/OA_ErrMsgBackBillController.cs | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git "a/WebAPI/Controllers/\344\272\272\344\272\213\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackBillController.cs" "b/WebAPI/Controllers/\344\272\272\344\272\213\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackBillController.cs"
index 97aef31..51eca57 100644
--- "a/WebAPI/Controllers/\344\272\272\344\272\213\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackBillController.cs"
+++ "b/WebAPI/Controllers/\344\272\272\344\272\213\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackBillController.cs"
@@ -105,7 +105,8 @@
BillOld.omodel.HYear = int.Parse(BillOld.omodel.HDate.ToString("yyyy-MM-dd").Split('-')[0]);
BillOld.omodel.HPeriod = int.Parse(BillOld.omodel.HDate.ToString("yyyy-MM-dd").Split('-')[1]);
//鍗曟嵁瀛愯〃2鏁版嵁璧嬪��
- string[] HCopyManList = mainList[0].HCopyMan.ToString().Split(new string[] { "銆�" }, StringSplitOptions.RemoveEmptyEntries);
+ string HSub2List = mainList[0].HCopyMan.ToString() + "銆�" + mainList[0].HSendMan.ToString() + "銆�" + mainList[0].HReceiveMan;
+ string[] HCopyManList = HSub2List.Split(new string[] { "銆�" }, StringSplitOptions.RemoveEmptyEntries);
for(int i = 0; i < HCopyManList.Length; i++)
{
Model.ClsOA_ErrMsgBackBillSub2 oSub = new Model.ClsOA_ErrMsgBackBillSub2();
@@ -113,14 +114,12 @@
oSub.HEntryID = i+1;
oSub.HReceiveMan = HCopyManList[i];
oSub.HReadFlag = false;
+ if(oSub.HReceiveMan == mainList[0].HSendMan)
+ {
+ oSub.HReadFlag = true;
+ }
subList2.Add(oSub);
}
- Model.ClsOA_ErrMsgBackBillSub2 oSub1 = new Model.ClsOA_ErrMsgBackBillSub2();
- oSub1.HInterID = mainList[0].HInterID;
- oSub1.HEntryID = subList2.Count + 1;
- oSub1.HReceiveMan = mainList[0].HReceiveMan;
- oSub1.HReadFlag = false;
- subList2.Add(oSub1);
BillOld.DetailColl2 = subList2;
if (!BillOld.AddBill(ref DBUtility.ClsPub.sExeReturnInfo))
--
Gitblit v1.9.1