From 76dfcdf6ced44433f4e70f9cc3edc8bb46635fa3 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期六, 21 一月 2023 12:12:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DAL/工资管理/ClsPay_PayMentBill.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git "a/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_PayMentBill.cs" "b/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_PayMentBill.cs"
index 0ee3c94..5f81953 100644
--- "a/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_PayMentBill.cs"
+++ "b/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_PayMentBill.cs"
@@ -247,17 +247,17 @@
oSub.HPayRemark = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPayRemark"]);
oSub.HUnPayRemark = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HUnPayRemark"]);
//====鑷畾涔夊垪 鏄剧ず 骞�
- oSub.oSelfValue.Clear();
- foreach (Model.ClsGy_SelfEntry oEntry in omodel.oSelf)
- {
- Model.ClsGy_SelfEntryValue oSubValue = new Model.ClsGy_SelfEntryValue();
- oSubValue.HInterID = oSub.HInterID;
- oSubValue.HEntryID = oSub.HEntryID;
- oSubValue.HSQLColumnName = oEntry.HSQLColumnName;
- oSubValue.HCaption = oEntry.HCaption;
- oSubValue.HValue = DsSub.Tables[0].Rows[i][oEntry.HSQLColumnName];
- oSub.oSelfValue.Add(oSubValue);
- }
+ //oSub.oSelfValue.Clear();
+ //foreach (Model.ClsGy_SelfEntry oEntry in omodel.oSelf)
+ //{
+ // Model.ClsGy_SelfEntryValue oSubValue = new Model.ClsGy_SelfEntryValue();
+ // oSubValue.HInterID = oSub.HInterID;
+ // oSubValue.HEntryID = oSub.HEntryID;
+ // oSubValue.HSQLColumnName = oEntry.HSQLColumnName;
+ // oSubValue.HCaption = oEntry.HCaption;
+ // oSubValue.HValue = DsSub.Tables[0].Rows[i][oEntry.HSQLColumnName];
+ // oSub.oSelfValue.Add(oSubValue);
+ //}
//==============
DetailColl.Add(oSub);
}
--
Gitblit v1.9.1