From fcfa4b110756932fff3a691c3ca41407e05d15de Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 16 八月 2022 22:31:33 +0800
Subject: [PATCH] 修改了工资单列表双击显示单据方法
---
NETERPNoWin/bin/x86/Debug/Kanban.dll | 0
NETERPNoWin/bin/x86/Debug/WorkM.dll | 0
PayM/bin/x86/Debug/DAL.dll | 0
NETERPNoWin/bin/x86/Debug/BaseSet.dll | 0
PayM/bin/x86/Debug/DBUtility.pdb | 0
NETERPNoWin/bin/x86/Debug/OAM.pdb | 0
NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe | 0
NETERPNoWin/bin/x86/Debug/BaseSet.pdb | 0
NETERPNoWin/bin/x86/Debug/DBUtility.dll | 0
NETERPNoWin/bin/x86/Debug/Kanban.pdb | 0
PayM/obj/x86/Debug/PayM.csprojAssemblyReference.cache | 0
NETERPNoWin/bin/x86/Debug/BLL.dll | 0
NETERPNoWin/bin/x86/Debug/DBUtility.pdb | 0
PayM/obj/x86/Debug/PayM.pdb | 0
NETERPNoWin/bin/x86/Debug/BLL.pdb | 0
Kanban/Sc_QLKB.cs | 2
PayM/obj/x86/Debug/PayM.dll | 0
PayM/bin/x86/Debug/Model.dll | 0
NETERPNoWin/bin/x86/Debug/Model.pdb | 0
NETERPNoWin/bin/x86/Debug/DAL.pdb | 0
PayM/bin/x86/Debug/Model.pdb | 0
PayM/bin/x86/Debug/BLL.dll | 0
NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe | 0
DAL/工资管理/ClsPay_PayMentBill.cs | 22 +++++-----
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache | 0
PayM/bin/x86/Debug/BLL.pdb | 0
NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb | 0
NETERPNoWin/bin/x86/Debug/PlanM.dll | 0
PayM/bin/x86/Debug/DAL.pdb | 0
NETERPNoWin/bin/x86/Debug/DAL.dll | 0
NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb | 0
NETERPNoWin/bin/x86/Debug/WarM.pdb | 0
PayM/bin/x86/Debug/PayM.dll | 0
NETERPNoWin/bin/x86/Debug/OAM.dll | 0
NETERPNoWin/bin/x86/Debug/HXERP.ini | 42 ++++++++++++++-------
NETERPNoWin/bin/x86/Debug/WarM.dll | 0
PayM/bin/x86/Debug/PayM.pdb | 0
DBUtility/业务单据/Xt_BaseBillFun.cs | 2
NETERPNoWin/bin/x86/Debug/WorkM.pdb | 0
NETERPNoWin/bin/x86/Debug/Model.dll | 0
NETERPNoWin/bin/x86/Debug/PlanM.pdb | 0
PayM/bin/x86/Debug/DBUtility.dll | 0
42 files changed, 41 insertions(+), 27 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);
}
diff --git "a/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/Xt_BaseBillFun.cs" "b/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/Xt_BaseBillFun.cs"
index 82acb8b..31d3cfe 100644
--- "a/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/Xt_BaseBillFun.cs"
+++ "b/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/Xt_BaseBillFun.cs"
@@ -551,7 +551,7 @@
}
if (b)
{
- grdMain.Rows[i].DefaultCellStyle.BackColor = Color.Black;
+ grdMain.Rows[i].DefaultCellStyle.BackColor = Color.Khaki;
}
else
{
diff --git a/Kanban/Sc_QLKB.cs b/Kanban/Sc_QLKB.cs
index fd70aad..fd3c8ee 100644
--- a/Kanban/Sc_QLKB.cs
+++ b/Kanban/Sc_QLKB.cs
@@ -187,7 +187,7 @@
int SubIDCol = Fun_GetCol("hsubid");
long n = 0;
DBUtility.Xt_BaseBillFun.GraphLine_XB(grdMain, MainIDCol, SubIDCol, s, ref n);
-
+ //Total();
}
catch (Exception e)
{
diff --git a/NETERPNoWin/bin/x86/Debug/BLL.dll b/NETERPNoWin/bin/x86/Debug/BLL.dll
index 1c6d6ad..64a76e8 100644
--- a/NETERPNoWin/bin/x86/Debug/BLL.dll
+++ b/NETERPNoWin/bin/x86/Debug/BLL.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BLL.pdb b/NETERPNoWin/bin/x86/Debug/BLL.pdb
index c661498..922db76 100644
--- a/NETERPNoWin/bin/x86/Debug/BLL.pdb
+++ b/NETERPNoWin/bin/x86/Debug/BLL.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BaseSet.dll b/NETERPNoWin/bin/x86/Debug/BaseSet.dll
index 189fca5..2ecedb7 100644
--- a/NETERPNoWin/bin/x86/Debug/BaseSet.dll
+++ b/NETERPNoWin/bin/x86/Debug/BaseSet.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BaseSet.pdb b/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
index b5c7289..1636204 100644
--- a/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
+++ b/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DAL.dll b/NETERPNoWin/bin/x86/Debug/DAL.dll
index 97ca775..2d17cd9 100644
--- a/NETERPNoWin/bin/x86/Debug/DAL.dll
+++ b/NETERPNoWin/bin/x86/Debug/DAL.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DAL.pdb b/NETERPNoWin/bin/x86/Debug/DAL.pdb
index cb097e2..b5a7cd8 100644
--- a/NETERPNoWin/bin/x86/Debug/DAL.pdb
+++ b/NETERPNoWin/bin/x86/Debug/DAL.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DBUtility.dll b/NETERPNoWin/bin/x86/Debug/DBUtility.dll
index 7a8358a..ff6de1f 100644
--- a/NETERPNoWin/bin/x86/Debug/DBUtility.dll
+++ b/NETERPNoWin/bin/x86/Debug/DBUtility.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DBUtility.pdb b/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
index b932c7a..920bd36 100644
--- a/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
+++ b/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/HXERP.ini b/NETERPNoWin/bin/x86/Debug/HXERP.ini
index ec3c589..97a7676 100644
--- a/NETERPNoWin/bin/x86/Debug/HXERP.ini
+++ b/NETERPNoWin/bin/x86/Debug/HXERP.ini
@@ -1,25 +1,39 @@
+[po]
+Server=47.96.97.237,15127
[Erp]
-Server=192.168.0.88
+Server=47.96.97.237,15127
DataBase=HX_LMESsys
-DataBaseNumber=001-WMS条码系统
+DataBaseNumber=001-智云LMES管理系统
UserName=HX_USER
PassWord=lc@841022
+UserPsd=
+Remember=
+[Srm]
+Server=47.96.97.237,15127
+DataBase=HX_LMESsys
+DataBaseNumber=001-ERP供应商协同平台
+UserName=HX_USER
+PassWord=lc@841022
+UserPsd=
+Remember=
[K3Erp]
-Server=192.168.0.88
+Server=47.96.97.237,15127
+DataBase=
+UserName=HX_USER
+PassWord=lc@841022
+[K32Erp]
+Server=47.96.97.237,15127
DataBase=HX_LMESsys
UserName=HX_USER
PassWord=lc@841022
[UserInfo]
-UserName=admin,王平,测试人员,jhz,001,景焕章,周黄阳,没有找到！
+UserName=admin,33.995,001,宁波海关驻慈溪办事处,景焕章
UserPsd=
Remember=1
-HOrgName=宁波奥邦喷雾器有限公司
-[K32Erp]
-Server=没有找到！
-DataBase=没有找到！
-UserName=没有找到！
-PassWord=没有找到！
-[OPenWin]
-gnbm=Sc9910
-gnsy=Sc_WorkBillPlanSumReportKB
-gnmc=车间看板
\ No newline at end of file
+HOrgName=手机事业部
+[CLOUDINFO]
+
+sCLOUDUrl=http://47.96.97.237/k3cloud/
+sCLOUDAcc=6204a70eba35fc
+sCLOUDUseName=demo
+sCLOUDPsd=888888
diff --git a/NETERPNoWin/bin/x86/Debug/Kanban.dll b/NETERPNoWin/bin/x86/Debug/Kanban.dll
index 6d02981..4d392ea 100644
--- a/NETERPNoWin/bin/x86/Debug/Kanban.dll
+++ b/NETERPNoWin/bin/x86/Debug/Kanban.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Kanban.pdb b/NETERPNoWin/bin/x86/Debug/Kanban.pdb
index 611553f..e0733b7 100644
--- a/NETERPNoWin/bin/x86/Debug/Kanban.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Kanban.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Model.dll b/NETERPNoWin/bin/x86/Debug/Model.dll
index 7faaa0e..c54333a 100644
--- a/NETERPNoWin/bin/x86/Debug/Model.dll
+++ b/NETERPNoWin/bin/x86/Debug/Model.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Model.pdb b/NETERPNoWin/bin/x86/Debug/Model.pdb
index 1b7e6ca..8dd2d26 100644
--- a/NETERPNoWin/bin/x86/Debug/Model.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Model.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
index a0aba5b..0784f1a 100644
--- a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
+++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
index 257118b..9e6d3e4 100644
--- a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
+++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/OAM.dll b/NETERPNoWin/bin/x86/Debug/OAM.dll
index 40f9f07..256667c 100644
--- a/NETERPNoWin/bin/x86/Debug/OAM.dll
+++ b/NETERPNoWin/bin/x86/Debug/OAM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/OAM.pdb b/NETERPNoWin/bin/x86/Debug/OAM.pdb
index cedb5c8..596f14a 100644
--- a/NETERPNoWin/bin/x86/Debug/OAM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/OAM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/PlanM.dll b/NETERPNoWin/bin/x86/Debug/PlanM.dll
index 5e52036..a31cb4b 100644
--- a/NETERPNoWin/bin/x86/Debug/PlanM.dll
+++ b/NETERPNoWin/bin/x86/Debug/PlanM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/PlanM.pdb b/NETERPNoWin/bin/x86/Debug/PlanM.pdb
index 66fc933..44bbd76 100644
--- a/NETERPNoWin/bin/x86/Debug/PlanM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/PlanM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.dll b/NETERPNoWin/bin/x86/Debug/WarM.dll
index 40fa317..e906546 100644
--- a/NETERPNoWin/bin/x86/Debug/WarM.dll
+++ b/NETERPNoWin/bin/x86/Debug/WarM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.pdb b/NETERPNoWin/bin/x86/Debug/WarM.pdb
index d4ea5d8..93f761c 100644
--- a/NETERPNoWin/bin/x86/Debug/WarM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/WarM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WorkM.dll b/NETERPNoWin/bin/x86/Debug/WorkM.dll
index 7ebb88f..640ff99 100644
--- a/NETERPNoWin/bin/x86/Debug/WorkM.dll
+++ b/NETERPNoWin/bin/x86/Debug/WorkM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WorkM.pdb b/NETERPNoWin/bin/x86/Debug/WorkM.pdb
index 05d3368..27f0bc6 100644
--- a/NETERPNoWin/bin/x86/Debug/WorkM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/WorkM.pdb
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache
index d6d060c..8b3ea05 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe
index a0aba5b..0784f1a 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb
index 257118b..9e6d3e4 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/BLL.dll b/PayM/bin/x86/Debug/BLL.dll
index c92debf..64a76e8 100644
--- a/PayM/bin/x86/Debug/BLL.dll
+++ b/PayM/bin/x86/Debug/BLL.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/BLL.pdb b/PayM/bin/x86/Debug/BLL.pdb
index 5b0255e..922db76 100644
--- a/PayM/bin/x86/Debug/BLL.pdb
+++ b/PayM/bin/x86/Debug/BLL.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/DAL.dll b/PayM/bin/x86/Debug/DAL.dll
index 38159f6..2d17cd9 100644
--- a/PayM/bin/x86/Debug/DAL.dll
+++ b/PayM/bin/x86/Debug/DAL.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/DAL.pdb b/PayM/bin/x86/Debug/DAL.pdb
index f1a6c02..b5a7cd8 100644
--- a/PayM/bin/x86/Debug/DAL.pdb
+++ b/PayM/bin/x86/Debug/DAL.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/DBUtility.dll b/PayM/bin/x86/Debug/DBUtility.dll
index 7a8358a..ff6de1f 100644
--- a/PayM/bin/x86/Debug/DBUtility.dll
+++ b/PayM/bin/x86/Debug/DBUtility.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/DBUtility.pdb b/PayM/bin/x86/Debug/DBUtility.pdb
index b932c7a..920bd36 100644
--- a/PayM/bin/x86/Debug/DBUtility.pdb
+++ b/PayM/bin/x86/Debug/DBUtility.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Model.dll b/PayM/bin/x86/Debug/Model.dll
index b0e5a16..c54333a 100644
--- a/PayM/bin/x86/Debug/Model.dll
+++ b/PayM/bin/x86/Debug/Model.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Model.pdb b/PayM/bin/x86/Debug/Model.pdb
index 36bb467..8dd2d26 100644
--- a/PayM/bin/x86/Debug/Model.pdb
+++ b/PayM/bin/x86/Debug/Model.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/PayM.dll b/PayM/bin/x86/Debug/PayM.dll
index 00ef521..7a5fcf7 100644
--- a/PayM/bin/x86/Debug/PayM.dll
+++ b/PayM/bin/x86/Debug/PayM.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/PayM.pdb b/PayM/bin/x86/Debug/PayM.pdb
index 24d929a..2222b51 100644
--- a/PayM/bin/x86/Debug/PayM.pdb
+++ b/PayM/bin/x86/Debug/PayM.pdb
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.csprojAssemblyReference.cache b/PayM/obj/x86/Debug/PayM.csprojAssemblyReference.cache
index 61ffd8f..0bc5bb9 100644
--- a/PayM/obj/x86/Debug/PayM.csprojAssemblyReference.cache
+++ b/PayM/obj/x86/Debug/PayM.csprojAssemblyReference.cache
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.dll b/PayM/obj/x86/Debug/PayM.dll
index 00ef521..7a5fcf7 100644
--- a/PayM/obj/x86/Debug/PayM.dll
+++ b/PayM/obj/x86/Debug/PayM.dll
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.pdb b/PayM/obj/x86/Debug/PayM.pdb
index 24d929a..2222b51 100644
--- a/PayM/obj/x86/Debug/PayM.pdb
+++ b/PayM/obj/x86/Debug/PayM.pdb
Binary files differ
--
Gitblit v1.9.1