From a2e882d3b9ad2a4ed118447c8b56216aaf95a5f7 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 23 六月 2025 10:27:59 +0800
Subject: [PATCH] 合并分支
---
DAL/bin/x86/Release/DAL.dll | 0
SQLHelper/obj/x86/Release/SQLHelper.dll | 0
WarM/条码打印/Gy_CusBarCodeBill_KaiBei.designer.cs | 25 -----
Model/obj/x86/Release/Model.csproj.AssemblyReference.cache | 0
BLL/bin/x86/Release/SQLHelper.pdb | 0
DBUtility/bin/x86/Release/DBUtility.pdb | 0
DBUtility/bin/Release/Pub_Class.dll | 0
SQLHelper/obj/x86/Release/SQLHelper.pdb | 0
Model/bin/Release/Pub_Control.pdb | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.pdb | 0
Model/bin/Release/Pub_Class.pdb | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.dll | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.dll | 0
Model/bin/x86/Release/Pub_Control.dll | 0
Model/obj/Release/Model.pdb | 0
BLL/bin/Release/BLL.pdb | 0
SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache | 0
Model/bin/Release/Pub_Control.dll | 0
Model/bin/x86/Release/Pub_Control.pdb | 0
Pub_Control/bin/Release/Pub_Class.pdb | 0
BLL/bin/x86/Release/Pub_Control.pdb | 0
BLL/bin/x86/Release/SQLHelper.dll | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb | 0
Model/bin/x86/Release/SQLHelper.pdb | 0
Pub_Control/bin/Release/Pub_Class.dll | 0
Model/bin/x86/Release/SQLHelper.dll | 0
DAL/源单/InterFace源单/Cls_S_IF_ICMOBillList_CusBarCodeBill_KaiBei.cs | 23 ++++
BLL/bin/Release/Pub_Control.pdb | 0
BLL/bin/x86/Release/Model.dll | 0
Pub_Control/bin/Release/Pub_Control.dll | 0
BLL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/SQLHelper.dll | 0
Model/bin/x86/Release/Model.dll | 0
Model/bin/Release/DBUtility.pdb | 0
SQLHelper/bin/Release/SQLHelper.dll | 0
Pub_Class/bin/x86/Release/Pub_Class.pdb | 0
Model/bin/x86/Release/Model.pdb | 0
BLL/bin/Release/Pub_Control.dll | 0
DAL/bin/Release/SQLHelper.pdb | 0
SQLHelper/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.pdb | 0
Model/bin/Release/DBUtility.dll | 0
WebAPI/Controllers/华远datamapping/HY_DataMappingController.cs | 10 +
BLL/bin/Release/DBUtility.dll | 0
DAL/bin/x86/Release/Pub_Class.pdb | 0
BLL/bin/Release/BLL.dll | 0
Pub_Class/bin/x86/Release/Pub_Class.dll | 0
Pub_Control/bin/Release/Pub_Control.pdb | 0
DAL/bin/x86/Release/Pub_Class.dll | 0
BLL/bin/x86/Release/Model.pdb | 0
BLL/bin/x86/Release/Pub_Control.dll | 0
DBUtility/obj/Release/DBUtility.dll | 0
Model/obj/Release/Model.dll | 0
BLL/bin/x86/Release/DAL.dll | 0
BLL/bin/Release/Pub_Class.dll | 0
SQLHelper/bin/x86/Release/Pub_Class.pdb | 0
DBUtility/bin/Release/SQLHelper.dll | 0
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
DBUtility/bin/Release/SQLHelper.pdb | 0
SQLHelper/bin/x86/Release/Pub_Class.dll | 0
Model/bin/Release/Pub_Class.dll | 0
BLL/bin/x86/Release/TopSdk.dll | 0
BLL/bin/Release/Pub_Class.pdb | 0
DBUtility/bin/x86/Release/DBUtility.dll | 0
BLL/bin/x86/Release/DAL.pdb | 0
BLL/bin/x86/Release/TopSdk.pdb | 0
BLL/bin/Release/DAL.dll | 0
BLL/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/DBUtility.dll | 0
BLL/bin/x86/Release/BLL.pdb | 0
Pub_Control/bin/x86/Release/Pub_Control.dll | 0
DAL/bin/Release/Pub_Control.dll | 0
DAL/bin/x86/Release/DBUtility.dll | 0
DBUtility/bin/Release/Pub_Control.pdb | 0
BLL/bin/Release/SQLHelper.dll | 0
DAL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/Model.dll | 0
BLL/bin/x86/Release/BLL.dll | 0
Model/bin/x86/Release/Pub_Class.pdb | 0
DBUtility/bin/Release/Pub_Control.dll | 0
Model/bin/Release/SQLHelper.pdb | 0
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user | 44 ++++----
DAL/bin/Release/Pub_Control.pdb | 0
Pub_Control/bin/x86/Release/Pub_Control.pdb | 0
DAL/bin/Release/DAL.pdb | 0
SQLHelper/obj/Release/SQLHelper.dll | 0
BLL/bin/Release/Model.dll | 0
BLL/bin/Release/DAL.pdb | 0
DAL/bin/x86/Release/Model.dll | 0
BLL/bin/Release/Model.pdb | 0
DAL/bin/Release/DAL.dll | 0
BLL/bin/x86/Release/Pub_Class.pdb | 0
DAL/bin/Release/Model.pdb | 0
SQLHelper/obj/Release/SQLHelper.pdb | 0
DBUtility/bin/Release/DBUtility.pdb | 0
DBUtility/bin/x86/Release/Pub_Class.pdb | 0
DBUtility/bin/Release/DBUtility.dll | 0
DBUtility/bin/x86/Release/Pub_Class.dll | 0
BLL/bin/x86/Release/Pub_Class.dll | 0
BLL/bin/x86/Release/DBUtility.dll | 0
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
DAL/bin/x86/Release/Model.pdb | 0
Model/obj/x86/Release/Model.dll | 0
Model/bin/x86/Release/Pub_Class.dll | 0
DAL/DAL.csproj | 1
BLL/bin/x86/Release/DBUtility.pdb | 0
DAL/bin/x86/Release/DBUtility.pdb | 0
Model/obj/x86/Release/Model.pdb | 0
DAL/bin/x86/Release/SQLHelper.dll | 0
WarM/条码打印/Gy_CusBarCodeBill_KaiBei.cs | 197 +++++++++++++++------------------------
Pub_Class/bin/Release/Pub_Class.pdb | 0
Model/bin/x86/Release/DBUtility.dll | 0
DBUtility/bin/x86/Release/Pub_Control.pdb | 0
DBUtility/bin/x86/Release/SQLHelper.pdb | 0
SQLHelper/bin/Release/Pub_Class.pdb | 0
Pub_Class/bin/Release/Pub_Class.dll | 0
SQLHelper/bin/x86/Release/SQLHelper.pdb | 0
DAL/bin/x86/Release/Pub_Control.pdb | 0
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0
Model/bin/x86/Release/DBUtility.pdb | 0
DBUtility/bin/x86/Release/Pub_Control.dll | 0
DBUtility/bin/x86/Release/SQLHelper.dll | 0
SQLHelper/bin/Release/Pub_Class.dll | 0
DAL/bin/x86/Release/Pub_Control.dll | 0
DAL/bin/Release/Pub_Class.pdb | 0
DAL/bin/x86/Release/SQLHelper.pdb | 0
Model/bin/Release/Model.pdb | 0
Pub_Control/bin/x86/Release/Pub_Class.dll | 0
DAL/bin/Release/Pub_Class.dll | 0
Model/bin/Release/Model.dll | 0
DBUtility/bin/Release/Pub_Class.pdb | 0
Model/bin/Release/SQLHelper.dll | 0
Pub_Control/bin/x86/Release/Pub_Class.pdb | 0
SQLHelper/bin/x86/Release/SQLHelper.dll | 0
DAL/bin/x86/Release/DAL.pdb | 0
135 files changed, 131 insertions(+), 169 deletions(-)
diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
index b852391..ed08f99 100644
--- a/BLL/bin/Release/BLL.dll
+++ b/BLL/bin/Release/BLL.dll
Binary files differ
diff --git a/BLL/bin/Release/BLL.pdb b/BLL/bin/Release/BLL.pdb
index d0eb1f5..c9d4bf0 100644
--- a/BLL/bin/Release/BLL.pdb
+++ b/BLL/bin/Release/BLL.pdb
Binary files differ
diff --git a/BLL/bin/Release/DAL.dll b/BLL/bin/Release/DAL.dll
index 940e368..3e72523 100644
--- a/BLL/bin/Release/DAL.dll
+++ b/BLL/bin/Release/DAL.dll
Binary files differ
diff --git a/BLL/bin/Release/DAL.pdb b/BLL/bin/Release/DAL.pdb
index 72b820d..014ab10 100644
--- a/BLL/bin/Release/DAL.pdb
+++ b/BLL/bin/Release/DAL.pdb
Binary files differ
diff --git a/BLL/bin/Release/DBUtility.dll b/BLL/bin/Release/DBUtility.dll
index 99636f6..df63b21 100644
--- a/BLL/bin/Release/DBUtility.dll
+++ b/BLL/bin/Release/DBUtility.dll
Binary files differ
diff --git a/BLL/bin/Release/DBUtility.pdb b/BLL/bin/Release/DBUtility.pdb
index 3c8324a..4c45af9 100644
--- a/BLL/bin/Release/DBUtility.pdb
+++ b/BLL/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/BLL/bin/Release/Model.dll b/BLL/bin/Release/Model.dll
index 442b94d..dbc88ad 100644
--- a/BLL/bin/Release/Model.dll
+++ b/BLL/bin/Release/Model.dll
Binary files differ
diff --git a/BLL/bin/Release/Model.pdb b/BLL/bin/Release/Model.pdb
index dfab316..220629a 100644
--- a/BLL/bin/Release/Model.pdb
+++ b/BLL/bin/Release/Model.pdb
Binary files differ
diff --git a/BLL/bin/Release/Pub_Class.dll b/BLL/bin/Release/Pub_Class.dll
index 0f79865..8d89437 100644
--- a/BLL/bin/Release/Pub_Class.dll
+++ b/BLL/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/BLL/bin/Release/Pub_Class.pdb b/BLL/bin/Release/Pub_Class.pdb
index 40f21e8..c226961 100644
--- a/BLL/bin/Release/Pub_Class.pdb
+++ b/BLL/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/BLL/bin/Release/Pub_Control.dll b/BLL/bin/Release/Pub_Control.dll
index 9f1e05a..bd1f501 100644
--- a/BLL/bin/Release/Pub_Control.dll
+++ b/BLL/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/BLL/bin/Release/Pub_Control.pdb b/BLL/bin/Release/Pub_Control.pdb
index 7341b1f..ba6b3df 100644
--- a/BLL/bin/Release/Pub_Control.pdb
+++ b/BLL/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/BLL/bin/Release/SQLHelper.dll b/BLL/bin/Release/SQLHelper.dll
index 82dfc9e..64df8fe 100644
--- a/BLL/bin/Release/SQLHelper.dll
+++ b/BLL/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/BLL/bin/Release/SQLHelper.pdb b/BLL/bin/Release/SQLHelper.pdb
index 012b268..c37b762 100644
--- a/BLL/bin/Release/SQLHelper.pdb
+++ b/BLL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/BLL.dll b/BLL/bin/x86/Release/BLL.dll
index e603f89..8e3c5cf 100644
--- a/BLL/bin/x86/Release/BLL.dll
+++ b/BLL/bin/x86/Release/BLL.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/BLL.pdb b/BLL/bin/x86/Release/BLL.pdb
index 843c776..4732e6d 100644
--- a/BLL/bin/x86/Release/BLL.pdb
+++ b/BLL/bin/x86/Release/BLL.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/DAL.dll b/BLL/bin/x86/Release/DAL.dll
index 2bc8535..a599251 100644
--- a/BLL/bin/x86/Release/DAL.dll
+++ b/BLL/bin/x86/Release/DAL.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/DAL.pdb b/BLL/bin/x86/Release/DAL.pdb
index 468ade3..95f0c46 100644
--- a/BLL/bin/x86/Release/DAL.pdb
+++ b/BLL/bin/x86/Release/DAL.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/DBUtility.dll b/BLL/bin/x86/Release/DBUtility.dll
index 98c0624..d94e799 100644
--- a/BLL/bin/x86/Release/DBUtility.dll
+++ b/BLL/bin/x86/Release/DBUtility.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/DBUtility.pdb b/BLL/bin/x86/Release/DBUtility.pdb
index 8213422..ba6682a 100644
--- a/BLL/bin/x86/Release/DBUtility.pdb
+++ b/BLL/bin/x86/Release/DBUtility.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/Model.dll b/BLL/bin/x86/Release/Model.dll
index b162406..8c5208d 100644
--- a/BLL/bin/x86/Release/Model.dll
+++ b/BLL/bin/x86/Release/Model.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/Model.pdb b/BLL/bin/x86/Release/Model.pdb
index de73ad5..25bdcaa 100644
--- a/BLL/bin/x86/Release/Model.pdb
+++ b/BLL/bin/x86/Release/Model.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/Pub_Class.dll b/BLL/bin/x86/Release/Pub_Class.dll
index 9eba4f9..6036d99 100644
--- a/BLL/bin/x86/Release/Pub_Class.dll
+++ b/BLL/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/Pub_Class.pdb b/BLL/bin/x86/Release/Pub_Class.pdb
index cdfdde1..2bcd6a9 100644
--- a/BLL/bin/x86/Release/Pub_Class.pdb
+++ b/BLL/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/Pub_Control.dll b/BLL/bin/x86/Release/Pub_Control.dll
index d4846c0..0c5597d 100644
--- a/BLL/bin/x86/Release/Pub_Control.dll
+++ b/BLL/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/Pub_Control.pdb b/BLL/bin/x86/Release/Pub_Control.pdb
index d4bf3f3..d6c83df 100644
--- a/BLL/bin/x86/Release/Pub_Control.pdb
+++ b/BLL/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/SQLHelper.dll b/BLL/bin/x86/Release/SQLHelper.dll
index a4e27e7..9fe77ad 100644
--- a/BLL/bin/x86/Release/SQLHelper.dll
+++ b/BLL/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/SQLHelper.pdb b/BLL/bin/x86/Release/SQLHelper.pdb
index c77b28f..3f30dea 100644
--- a/BLL/bin/x86/Release/SQLHelper.pdb
+++ b/BLL/bin/x86/Release/SQLHelper.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/TopSdk.dll b/BLL/bin/x86/Release/TopSdk.dll
index cd56b74..dedb1bd 100644
--- a/BLL/bin/x86/Release/TopSdk.dll
+++ b/BLL/bin/x86/Release/TopSdk.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/TopSdk.pdb b/BLL/bin/x86/Release/TopSdk.pdb
index 3580352..08c2113 100644
--- a/BLL/bin/x86/Release/TopSdk.pdb
+++ b/BLL/bin/x86/Release/TopSdk.pdb
Binary files differ
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 51bbccf..f9a4ab9 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -86,6 +86,7 @@
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_RepairClass_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_RepairCheckClass_Ctl.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_ProductReceiveMaterialBill.cs" />
+ <Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_ICMOBillList_CusBarCodeBill_KaiBei.cs" />
<Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_MoveStockRequestBillList.cs" />
<Compile Include="鐢熶骇绠＄悊\ClsSc_ShiftsBeginInfoBill.cs" />
<Compile Include="ClsPay_AbsentBill.cs" />
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
index 940e368..3e72523 100644
--- a/DAL/bin/Release/DAL.dll
+++ b/DAL/bin/Release/DAL.dll
Binary files differ
diff --git a/DAL/bin/Release/DAL.pdb b/DAL/bin/Release/DAL.pdb
index 72b820d..014ab10 100644
--- a/DAL/bin/Release/DAL.pdb
+++ b/DAL/bin/Release/DAL.pdb
Binary files differ
diff --git a/DAL/bin/Release/DBUtility.dll b/DAL/bin/Release/DBUtility.dll
index 99636f6..df63b21 100644
--- a/DAL/bin/Release/DBUtility.dll
+++ b/DAL/bin/Release/DBUtility.dll
Binary files differ
diff --git a/DAL/bin/Release/DBUtility.pdb b/DAL/bin/Release/DBUtility.pdb
index 3c8324a..4c45af9 100644
--- a/DAL/bin/Release/DBUtility.pdb
+++ b/DAL/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/DAL/bin/Release/Model.dll b/DAL/bin/Release/Model.dll
index 442b94d..dbc88ad 100644
--- a/DAL/bin/Release/Model.dll
+++ b/DAL/bin/Release/Model.dll
Binary files differ
diff --git a/DAL/bin/Release/Model.pdb b/DAL/bin/Release/Model.pdb
index dfab316..220629a 100644
--- a/DAL/bin/Release/Model.pdb
+++ b/DAL/bin/Release/Model.pdb
Binary files differ
diff --git a/DAL/bin/Release/Pub_Class.dll b/DAL/bin/Release/Pub_Class.dll
index 0f79865..8d89437 100644
--- a/DAL/bin/Release/Pub_Class.dll
+++ b/DAL/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/DAL/bin/Release/Pub_Class.pdb b/DAL/bin/Release/Pub_Class.pdb
index 40f21e8..c226961 100644
--- a/DAL/bin/Release/Pub_Class.pdb
+++ b/DAL/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/DAL/bin/Release/Pub_Control.dll b/DAL/bin/Release/Pub_Control.dll
index 9f1e05a..bd1f501 100644
--- a/DAL/bin/Release/Pub_Control.dll
+++ b/DAL/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/DAL/bin/Release/Pub_Control.pdb b/DAL/bin/Release/Pub_Control.pdb
index 7341b1f..ba6b3df 100644
--- a/DAL/bin/Release/Pub_Control.pdb
+++ b/DAL/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/DAL/bin/Release/SQLHelper.dll b/DAL/bin/Release/SQLHelper.dll
index 82dfc9e..64df8fe 100644
--- a/DAL/bin/Release/SQLHelper.dll
+++ b/DAL/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/DAL/bin/Release/SQLHelper.pdb b/DAL/bin/Release/SQLHelper.pdb
index 012b268..c37b762 100644
--- a/DAL/bin/Release/SQLHelper.pdb
+++ b/DAL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/DAL.dll b/DAL/bin/x86/Release/DAL.dll
index 2bc8535..a599251 100644
--- a/DAL/bin/x86/Release/DAL.dll
+++ b/DAL/bin/x86/Release/DAL.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/DAL.pdb b/DAL/bin/x86/Release/DAL.pdb
index 468ade3..95f0c46 100644
--- a/DAL/bin/x86/Release/DAL.pdb
+++ b/DAL/bin/x86/Release/DAL.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/DBUtility.dll b/DAL/bin/x86/Release/DBUtility.dll
index 98c0624..d94e799 100644
--- a/DAL/bin/x86/Release/DBUtility.dll
+++ b/DAL/bin/x86/Release/DBUtility.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/DBUtility.pdb b/DAL/bin/x86/Release/DBUtility.pdb
index 8213422..ba6682a 100644
--- a/DAL/bin/x86/Release/DBUtility.pdb
+++ b/DAL/bin/x86/Release/DBUtility.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/Model.dll b/DAL/bin/x86/Release/Model.dll
index b162406..8c5208d 100644
--- a/DAL/bin/x86/Release/Model.dll
+++ b/DAL/bin/x86/Release/Model.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/Model.pdb b/DAL/bin/x86/Release/Model.pdb
index de73ad5..25bdcaa 100644
--- a/DAL/bin/x86/Release/Model.pdb
+++ b/DAL/bin/x86/Release/Model.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/Pub_Class.dll b/DAL/bin/x86/Release/Pub_Class.dll
index 9eba4f9..6036d99 100644
--- a/DAL/bin/x86/Release/Pub_Class.dll
+++ b/DAL/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/Pub_Class.pdb b/DAL/bin/x86/Release/Pub_Class.pdb
index cdfdde1..2bcd6a9 100644
--- a/DAL/bin/x86/Release/Pub_Class.pdb
+++ b/DAL/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/Pub_Control.dll b/DAL/bin/x86/Release/Pub_Control.dll
index d4846c0..0c5597d 100644
--- a/DAL/bin/x86/Release/Pub_Control.dll
+++ b/DAL/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/Pub_Control.pdb b/DAL/bin/x86/Release/Pub_Control.pdb
index d4bf3f3..d6c83df 100644
--- a/DAL/bin/x86/Release/Pub_Control.pdb
+++ b/DAL/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/SQLHelper.dll b/DAL/bin/x86/Release/SQLHelper.dll
index a4e27e7..9fe77ad 100644
--- a/DAL/bin/x86/Release/SQLHelper.dll
+++ b/DAL/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/SQLHelper.pdb b/DAL/bin/x86/Release/SQLHelper.pdb
index c77b28f..3f30dea 100644
--- a/DAL/bin/x86/Release/SQLHelper.pdb
+++ b/DAL/bin/x86/Release/SQLHelper.pdb
Binary files differ
diff --git "a/DAL/\346\272\220\345\215\225/InterFace\346\272\220\345\215\225/Cls_S_IF_ICMOBillList_CusBarCodeBill_KaiBei.cs" "b/DAL/\346\272\220\345\215\225/InterFace\346\272\220\345\215\225/Cls_S_IF_ICMOBillList_CusBarCodeBill_KaiBei.cs"
new file mode 100644
index 0000000..8f88b7c
--- /dev/null
+++ "b/DAL/\346\272\220\345\215\225/InterFace\346\272\220\345\215\225/Cls_S_IF_ICMOBillList_CusBarCodeBill_KaiBei.cs"
@@ -0,0 +1,23 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using SQLHelper;
+using DBUtility;
+
+namespace DAL
+{
+ public class Cls_S_IF_ICMOBillList_CusBarCodeBill_KaiBei : Cls_S_Xt_BaseBill
+ {
+
+ public Cls_S_IF_ICMOBillList_CusBarCodeBill_KaiBei()
+ {
+ base.ViewName = "h_v_Sc_ICMOBillList_Source_CusBarCodeBill_KaiBei";
+ base.mvarReportTitle = "鐢熶骇璁㈠崟";
+ base.mvarItemKey = "3710";
+ base.sCondtion = " ";
+ base.sOrderSql = " order by 鍗曟嵁鍙� desc,hsubid ";
+ base.sKeyCol = "閮ㄩ棬";
+ }
+
+ }
+}
diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
index 99636f6..df63b21 100644
--- a/DBUtility/bin/Release/DBUtility.dll
+++ b/DBUtility/bin/Release/DBUtility.dll
Binary files differ
diff --git a/DBUtility/bin/Release/DBUtility.pdb b/DBUtility/bin/Release/DBUtility.pdb
index 3c8324a..4c45af9 100644
--- a/DBUtility/bin/Release/DBUtility.pdb
+++ b/DBUtility/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Class.dll b/DBUtility/bin/Release/Pub_Class.dll
index 0f79865..8d89437 100644
--- a/DBUtility/bin/Release/Pub_Class.dll
+++ b/DBUtility/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Class.pdb b/DBUtility/bin/Release/Pub_Class.pdb
index 40f21e8..c226961 100644
--- a/DBUtility/bin/Release/Pub_Class.pdb
+++ b/DBUtility/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Control.dll b/DBUtility/bin/Release/Pub_Control.dll
index 9f1e05a..bd1f501 100644
--- a/DBUtility/bin/Release/Pub_Control.dll
+++ b/DBUtility/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Control.pdb b/DBUtility/bin/Release/Pub_Control.pdb
index 7341b1f..ba6b3df 100644
--- a/DBUtility/bin/Release/Pub_Control.pdb
+++ b/DBUtility/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/SQLHelper.dll b/DBUtility/bin/Release/SQLHelper.dll
index 82dfc9e..64df8fe 100644
--- a/DBUtility/bin/Release/SQLHelper.dll
+++ b/DBUtility/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/DBUtility/bin/Release/SQLHelper.pdb b/DBUtility/bin/Release/SQLHelper.pdb
index 012b268..c37b762 100644
--- a/DBUtility/bin/Release/SQLHelper.pdb
+++ b/DBUtility/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/bin/x86/Release/DBUtility.dll b/DBUtility/bin/x86/Release/DBUtility.dll
index 98c0624..d94e799 100644
--- a/DBUtility/bin/x86/Release/DBUtility.dll
+++ b/DBUtility/bin/x86/Release/DBUtility.dll
Binary files differ
diff --git a/DBUtility/bin/x86/Release/DBUtility.pdb b/DBUtility/bin/x86/Release/DBUtility.pdb
index 8213422..ba6682a 100644
--- a/DBUtility/bin/x86/Release/DBUtility.pdb
+++ b/DBUtility/bin/x86/Release/DBUtility.pdb
Binary files differ
diff --git a/DBUtility/bin/x86/Release/Pub_Class.dll b/DBUtility/bin/x86/Release/Pub_Class.dll
index 9eba4f9..6036d99 100644
--- a/DBUtility/bin/x86/Release/Pub_Class.dll
+++ b/DBUtility/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/DBUtility/bin/x86/Release/Pub_Class.pdb b/DBUtility/bin/x86/Release/Pub_Class.pdb
index cdfdde1..2bcd6a9 100644
--- a/DBUtility/bin/x86/Release/Pub_Class.pdb
+++ b/DBUtility/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/DBUtility/bin/x86/Release/Pub_Control.dll b/DBUtility/bin/x86/Release/Pub_Control.dll
index d4846c0..0c5597d 100644
--- a/DBUtility/bin/x86/Release/Pub_Control.dll
+++ b/DBUtility/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/DBUtility/bin/x86/Release/Pub_Control.pdb b/DBUtility/bin/x86/Release/Pub_Control.pdb
index d4bf3f3..d6c83df 100644
--- a/DBUtility/bin/x86/Release/Pub_Control.pdb
+++ b/DBUtility/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/DBUtility/bin/x86/Release/SQLHelper.dll b/DBUtility/bin/x86/Release/SQLHelper.dll
index a4e27e7..9fe77ad 100644
--- a/DBUtility/bin/x86/Release/SQLHelper.dll
+++ b/DBUtility/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/DBUtility/bin/x86/Release/SQLHelper.pdb b/DBUtility/bin/x86/Release/SQLHelper.pdb
index c77b28f..3f30dea 100644
--- a/DBUtility/bin/x86/Release/SQLHelper.pdb
+++ b/DBUtility/bin/x86/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index 3f14118..a887919 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.dll b/DBUtility/obj/Release/DBUtility.dll
index 99636f6..df63b21 100644
--- a/DBUtility/obj/Release/DBUtility.dll
+++ b/DBUtility/obj/Release/DBUtility.dll
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.pdb b/DBUtility/obj/Release/DBUtility.pdb
index 3c8324a..4c45af9 100644
--- a/DBUtility/obj/Release/DBUtility.pdb
+++ b/DBUtility/obj/Release/DBUtility.pdb
Binary files differ
diff --git a/Model/bin/Release/DBUtility.dll b/Model/bin/Release/DBUtility.dll
index 99636f6..df63b21 100644
--- a/Model/bin/Release/DBUtility.dll
+++ b/Model/bin/Release/DBUtility.dll
Binary files differ
diff --git a/Model/bin/Release/DBUtility.pdb b/Model/bin/Release/DBUtility.pdb
index 3c8324a..4c45af9 100644
--- a/Model/bin/Release/DBUtility.pdb
+++ b/Model/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/Model/bin/Release/Model.dll b/Model/bin/Release/Model.dll
index 442b94d..dbc88ad 100644
--- a/Model/bin/Release/Model.dll
+++ b/Model/bin/Release/Model.dll
Binary files differ
diff --git a/Model/bin/Release/Model.pdb b/Model/bin/Release/Model.pdb
index dfab316..220629a 100644
--- a/Model/bin/Release/Model.pdb
+++ b/Model/bin/Release/Model.pdb
Binary files differ
diff --git a/Model/bin/Release/Pub_Class.dll b/Model/bin/Release/Pub_Class.dll
index 0f79865..8d89437 100644
--- a/Model/bin/Release/Pub_Class.dll
+++ b/Model/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Model/bin/Release/Pub_Class.pdb b/Model/bin/Release/Pub_Class.pdb
index 40f21e8..c226961 100644
--- a/Model/bin/Release/Pub_Class.pdb
+++ b/Model/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Model/bin/Release/Pub_Control.dll b/Model/bin/Release/Pub_Control.dll
index 9f1e05a..bd1f501 100644
--- a/Model/bin/Release/Pub_Control.dll
+++ b/Model/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/Model/bin/Release/Pub_Control.pdb b/Model/bin/Release/Pub_Control.pdb
index 7341b1f..ba6b3df 100644
--- a/Model/bin/Release/Pub_Control.pdb
+++ b/Model/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/Model/bin/Release/SQLHelper.dll b/Model/bin/Release/SQLHelper.dll
index 82dfc9e..64df8fe 100644
--- a/Model/bin/Release/SQLHelper.dll
+++ b/Model/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/Model/bin/Release/SQLHelper.pdb b/Model/bin/Release/SQLHelper.pdb
index 012b268..c37b762 100644
--- a/Model/bin/Release/SQLHelper.pdb
+++ b/Model/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/Model/bin/x86/Release/DBUtility.dll b/Model/bin/x86/Release/DBUtility.dll
index 98c0624..d94e799 100644
--- a/Model/bin/x86/Release/DBUtility.dll
+++ b/Model/bin/x86/Release/DBUtility.dll
Binary files differ
diff --git a/Model/bin/x86/Release/DBUtility.pdb b/Model/bin/x86/Release/DBUtility.pdb
index 8213422..ba6682a 100644
--- a/Model/bin/x86/Release/DBUtility.pdb
+++ b/Model/bin/x86/Release/DBUtility.pdb
Binary files differ
diff --git a/Model/bin/x86/Release/Model.dll b/Model/bin/x86/Release/Model.dll
index b162406..8c5208d 100644
--- a/Model/bin/x86/Release/Model.dll
+++ b/Model/bin/x86/Release/Model.dll
Binary files differ
diff --git a/Model/bin/x86/Release/Model.pdb b/Model/bin/x86/Release/Model.pdb
index de73ad5..25bdcaa 100644
--- a/Model/bin/x86/Release/Model.pdb
+++ b/Model/bin/x86/Release/Model.pdb
Binary files differ
diff --git a/Model/bin/x86/Release/Pub_Class.dll b/Model/bin/x86/Release/Pub_Class.dll
index 9eba4f9..6036d99 100644
--- a/Model/bin/x86/Release/Pub_Class.dll
+++ b/Model/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/Model/bin/x86/Release/Pub_Class.pdb b/Model/bin/x86/Release/Pub_Class.pdb
index cdfdde1..2bcd6a9 100644
--- a/Model/bin/x86/Release/Pub_Class.pdb
+++ b/Model/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/Model/bin/x86/Release/Pub_Control.dll b/Model/bin/x86/Release/Pub_Control.dll
index d4846c0..0c5597d 100644
--- a/Model/bin/x86/Release/Pub_Control.dll
+++ b/Model/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/Model/bin/x86/Release/Pub_Control.pdb b/Model/bin/x86/Release/Pub_Control.pdb
index d4bf3f3..d6c83df 100644
--- a/Model/bin/x86/Release/Pub_Control.pdb
+++ b/Model/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/Model/bin/x86/Release/SQLHelper.dll b/Model/bin/x86/Release/SQLHelper.dll
index a4e27e7..9fe77ad 100644
--- a/Model/bin/x86/Release/SQLHelper.dll
+++ b/Model/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/Model/bin/x86/Release/SQLHelper.pdb b/Model/bin/x86/Release/SQLHelper.pdb
index c77b28f..3f30dea 100644
--- a/Model/bin/x86/Release/SQLHelper.pdb
+++ b/Model/bin/x86/Release/SQLHelper.pdb
Binary files differ
diff --git a/Model/obj/Release/Model.csproj.AssemblyReference.cache b/Model/obj/Release/Model.csproj.AssemblyReference.cache
index 83a6483..651f2ad 100644
--- a/Model/obj/Release/Model.csproj.AssemblyReference.cache
+++ b/Model/obj/Release/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/obj/Release/Model.dll b/Model/obj/Release/Model.dll
index 442b94d..dbc88ad 100644
--- a/Model/obj/Release/Model.dll
+++ b/Model/obj/Release/Model.dll
Binary files differ
diff --git a/Model/obj/Release/Model.pdb b/Model/obj/Release/Model.pdb
index dfab316..220629a 100644
--- a/Model/obj/Release/Model.pdb
+++ b/Model/obj/Release/Model.pdb
Binary files differ
diff --git a/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache b/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
index 51ee23d..1601344 100644
--- a/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
+++ b/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/obj/x86/Release/Model.dll b/Model/obj/x86/Release/Model.dll
index b162406..8c5208d 100644
--- a/Model/obj/x86/Release/Model.dll
+++ b/Model/obj/x86/Release/Model.dll
Binary files differ
diff --git a/Model/obj/x86/Release/Model.pdb b/Model/obj/x86/Release/Model.pdb
index de73ad5..25bdcaa 100644
--- a/Model/obj/x86/Release/Model.pdb
+++ b/Model/obj/x86/Release/Model.pdb
Binary files differ
diff --git a/Pub_Class/bin/Release/Pub_Class.dll b/Pub_Class/bin/Release/Pub_Class.dll
index 0f79865..8d89437 100644
--- a/Pub_Class/bin/Release/Pub_Class.dll
+++ b/Pub_Class/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Class/bin/Release/Pub_Class.pdb b/Pub_Class/bin/Release/Pub_Class.pdb
index 40f21e8..c226961 100644
--- a/Pub_Class/bin/Release/Pub_Class.pdb
+++ b/Pub_Class/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Class/bin/x86/Release/Pub_Class.dll b/Pub_Class/bin/x86/Release/Pub_Class.dll
index 9eba4f9..6036d99 100644
--- a/Pub_Class/bin/x86/Release/Pub_Class.dll
+++ b/Pub_Class/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Class/bin/x86/Release/Pub_Class.pdb b/Pub_Class/bin/x86/Release/Pub_Class.pdb
index cdfdde1..2bcd6a9 100644
--- a/Pub_Class/bin/x86/Release/Pub_Class.pdb
+++ b/Pub_Class/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Class.dll b/Pub_Control/bin/Release/Pub_Class.dll
index 0f79865..8d89437 100644
--- a/Pub_Control/bin/Release/Pub_Class.dll
+++ b/Pub_Control/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Class.pdb b/Pub_Control/bin/Release/Pub_Class.pdb
index 40f21e8..c226961 100644
--- a/Pub_Control/bin/Release/Pub_Class.pdb
+++ b/Pub_Control/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Control.dll b/Pub_Control/bin/Release/Pub_Control.dll
index 9f1e05a..bd1f501 100644
--- a/Pub_Control/bin/Release/Pub_Control.dll
+++ b/Pub_Control/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Control.pdb b/Pub_Control/bin/Release/Pub_Control.pdb
index 7341b1f..ba6b3df 100644
--- a/Pub_Control/bin/Release/Pub_Control.pdb
+++ b/Pub_Control/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/Pub_Control/bin/x86/Release/Pub_Class.dll b/Pub_Control/bin/x86/Release/Pub_Class.dll
index 9eba4f9..6036d99 100644
--- a/Pub_Control/bin/x86/Release/Pub_Class.dll
+++ b/Pub_Control/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Control/bin/x86/Release/Pub_Class.pdb b/Pub_Control/bin/x86/Release/Pub_Class.pdb
index cdfdde1..2bcd6a9 100644
--- a/Pub_Control/bin/x86/Release/Pub_Class.pdb
+++ b/Pub_Control/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Control/bin/x86/Release/Pub_Control.dll b/Pub_Control/bin/x86/Release/Pub_Control.dll
index d4846c0..0c5597d 100644
--- a/Pub_Control/bin/x86/Release/Pub_Control.dll
+++ b/Pub_Control/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/Pub_Control/bin/x86/Release/Pub_Control.pdb b/Pub_Control/bin/x86/Release/Pub_Control.pdb
index d4bf3f3..d6c83df 100644
--- a/Pub_Control/bin/x86/Release/Pub_Control.pdb
+++ b/Pub_Control/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/SQLHelper/bin/Release/Pub_Class.dll b/SQLHelper/bin/Release/Pub_Class.dll
index 0f79865..8d89437 100644
--- a/SQLHelper/bin/Release/Pub_Class.dll
+++ b/SQLHelper/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/SQLHelper/bin/Release/Pub_Class.pdb b/SQLHelper/bin/Release/Pub_Class.pdb
index 40f21e8..c226961 100644
--- a/SQLHelper/bin/Release/Pub_Class.pdb
+++ b/SQLHelper/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/SQLHelper/bin/Release/SQLHelper.dll b/SQLHelper/bin/Release/SQLHelper.dll
index 82dfc9e..64df8fe 100644
--- a/SQLHelper/bin/Release/SQLHelper.dll
+++ b/SQLHelper/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/bin/Release/SQLHelper.pdb b/SQLHelper/bin/Release/SQLHelper.pdb
index 012b268..c37b762 100644
--- a/SQLHelper/bin/Release/SQLHelper.pdb
+++ b/SQLHelper/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/SQLHelper/bin/x86/Release/Pub_Class.dll b/SQLHelper/bin/x86/Release/Pub_Class.dll
index 9eba4f9..6036d99 100644
--- a/SQLHelper/bin/x86/Release/Pub_Class.dll
+++ b/SQLHelper/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/SQLHelper/bin/x86/Release/Pub_Class.pdb b/SQLHelper/bin/x86/Release/Pub_Class.pdb
index cdfdde1..2bcd6a9 100644
--- a/SQLHelper/bin/x86/Release/Pub_Class.pdb
+++ b/SQLHelper/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/SQLHelper/bin/x86/Release/SQLHelper.dll b/SQLHelper/bin/x86/Release/SQLHelper.dll
index a4e27e7..9fe77ad 100644
--- a/SQLHelper/bin/x86/Release/SQLHelper.dll
+++ b/SQLHelper/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/bin/x86/Release/SQLHelper.pdb b/SQLHelper/bin/x86/Release/SQLHelper.pdb
index c77b28f..3f30dea 100644
--- a/SQLHelper/bin/x86/Release/SQLHelper.pdb
+++ b/SQLHelper/bin/x86/Release/SQLHelper.pdb
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
index 46d44a3..1f578f2 100644
--- a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
+++ b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.dll b/SQLHelper/obj/Release/SQLHelper.dll
index 82dfc9e..64df8fe 100644
--- a/SQLHelper/obj/Release/SQLHelper.dll
+++ b/SQLHelper/obj/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.pdb b/SQLHelper/obj/Release/SQLHelper.pdb
index 012b268..c37b762 100644
--- a/SQLHelper/obj/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/Release/SQLHelper.pdb
Binary files differ
diff --git a/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache
index 5d5b72f..970b389 100644
--- a/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache
+++ b/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SQLHelper/obj/x86/Release/SQLHelper.dll b/SQLHelper/obj/x86/Release/SQLHelper.dll
index a4e27e7..9fe77ad 100644
--- a/SQLHelper/obj/x86/Release/SQLHelper.dll
+++ b/SQLHelper/obj/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/obj/x86/Release/SQLHelper.pdb b/SQLHelper/obj/x86/Release/SQLHelper.pdb
index c77b28f..3f30dea 100644
--- a/SQLHelper/obj/x86/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/x86/Release/SQLHelper.pdb
Binary files differ
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs"
index c2dce87..f429a08 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs"
@@ -76,7 +76,6 @@
public int selectRow = 0;
public Int64 HInterID = 0; //鍐呯爜
public Int64 HOrgID = ClsPub.HOrgID;
- public string HCusModel = "Z"; //鍘傚晢浠ｇ爜
public string sDate = ""; //鏃ユ湡
public string sYear = ""; //骞达紙2浣嶏級
public string sYear4 = ""; //骞达紙4浣嶏級
@@ -89,13 +88,9 @@
//娓呯┖鐣岄潰
public void Sub_ClearBill()
{
- cmbHBarCodeType.Items.Clear();
cmbSourceBillType.Items.Clear();
- //鏉＄爜绫诲瀷
- cmbHBarCodeType.Items.Add("鍐呯鐮�");
- cmbHBarCodeType.Items.Add("澶栫鐮�");
//婧愬崟绫诲瀷
- cmbSourceBillType.Items.Add("鐢熶骇姹囨姤鍗�");
+ cmbSourceBillType.Items.Add("鐢熶骇璁㈠崟");
DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
//鑾峰彇褰撳墠缁勭粐
@@ -266,7 +261,7 @@
//鍔犺浇瀹㈡埛淇℃伅
private void Sub_AddHCusNameList()
{
- DataSet ds = oCn.RunProcReturn("exec h_p_Gy_CusBarCodeBill_Cus " + HOrgID.ToString(), "h_p_Gy_CusBarCodeBill_Cus");
+ DataSet ds = oCn.RunProcReturn("exec h_p_Gy_CusBarCodeBill_Cus_KaiBei " + HOrgID.ToString(), "h_p_Gy_CusBarCodeBill_Cus_KaiBei");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
cmbHCusName.DataSource = null;
@@ -457,54 +452,6 @@
sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
sDay = sDay.Substring(sDay.Length - 2, 2);
//==================================
- switch (sYear)
- {
- case "22":
- sYear = "N";
- break;
- case "23":
- sYear = "P";
- break;
- case "24":
- sYear = "Q";
- break;
- case "25":
- sYear = "R";
- break;
- case "26":
- sYear = "S";
- break;
- case "27":
- sYear = "T";
- break;
- case "28":
- sYear = "U";
- break;
- case "29":
- sYear = "V";
- break;
- case "30":
- sYear = "W";
- break;
- case "31":
- sYear = "X";
- break;
- case "32":
- sYear = "Y";
- break;
- case "33":
- sYear = "Z";
- break;
- default:
- sYear = "";
- break;
- }
- if (sYear == "")
- {
- MessageBox.Show("閿欒鐨勫勾浠斤紒");
- return false;
- }
-
switch (sPeriod)
{
case "01":
@@ -561,14 +508,13 @@
double HSourceQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HInitQtyCol].Value); // 婧愬崟鏁伴噺
double HQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HQtyCol].Value); // 鏁伴噺
double HMinQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value); // 鏈�灏忓寘瑁呮暟
- string HCusModelName = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelNameCol].Value); // 瀹㈡埛鏂欏彿
+ string HCusModelName = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelNameCol].Value); // 瀹㈡埛鐗╂枡缂栫爜
string HCode1 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode1Col].Value); // 鐗╂枡绫诲埆
string HCode2 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode2Col].Value); // 鎵规浣�
HCode2 = HCode2.ToUpper();
string HCode3 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value); // 鐗堟湰鍙�
- string HBatchNoNumber = HCode1 + sYear + sPeriod + sDay + HCusModel; // 鎵规鐢熸垚鍓嶇紑
- HBatchNoNumber = HBatchNoNumber.ToUpper();
- string HBarCodeType = DBUtility.ClsPub.isStrNull(cmbHBarCodeType.Text); // 鏉＄爜绫诲瀷
+ string HBatchNoNumber = ""; // 鎵规鐢熸垚鍓嶇紑
+ string HBarCodeType = "瓒呰仛鍙樺唴鏍囩"; // 鏉＄爜绫诲瀷
string HInnerBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HInnerBillNoCol].Value); // 瀹㈡埛璁㈠崟鍙�
if (HMaterID != 0)
@@ -586,10 +532,6 @@
}
else
{
- grdMain.Rows[j].Cells[HBaNoCol].Value = HCode2;
- grdMain.Rows[j].Cells[HBatchNoCol].Value = DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HBatchNo"]);
- grdMain.Rows[j].Cells[HCode2Col].Value = DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HCode2"]);
-
if (DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HExpiryDateCol].Value) == "")
{
if (DBUtility.ClsPub.isBool(oDsCheck.Tables[0].Rows[0]["HISKFPERIOD"]))
@@ -648,17 +590,16 @@
try
{
string TM = ""; //鏉＄爜
- int LSHlen = 4; //娴佹按鍙烽暱搴�
+ int LSHlen = 7; //娴佹按鍙烽暱搴�
double HSumQty = 0; //浜у搧鏁伴噺
double HMinQty = 0; //鏈�灏忓寘瑁呮暟
int HBQty = 0; //绠辨暟
- int LSH = 0; //鍐呯娴佹按鍙�
- int LWSH = 0; //澶栫娴佹按鍙�
+ int LSH = 0; //娴佹按鍙�
string LSH2 = ""; //娴佹按鍙疯浆鎹㈡垚瀛楃
string HCode1 = ""; //鐗╂枡绫诲埆
string HCode2 = ""; //鎵规浣�
string HCode3 = ""; //鐗堟湰鍙�
- string sTMNumber = ""; //澶栫鏉＄爜鍓嶇紑
+ string sTMNumber = ""; //鏉＄爜鍓嶇紑
DataSet Ds;
Int64 HEntryID = 0;
@@ -670,7 +611,7 @@
string HBatchNo = ""; //鎵规
double HQty = 0; //鏁伴噺
Int64 HCusID = 0; //瀹㈡埛ID
- string HCusModelName = ""; //瀹㈡埛鏂欏彿
+ string HCusModelName = ""; //瀹㈡埛鐗╂枡缂栫爜
bool HGiveAwayFlag = false; //璧犲搧鏍囪
string HProduceDate; //鐢熶骇鏃ユ湡锛堜繚璐ㄦ湡鐢級
string HExpiryDate; //淇濊川鏈熻嚦锛堜繚璐ㄦ湡鐢級
@@ -684,7 +625,7 @@
string HMTONo = ""; //MTO鍙�
string HRemark = ""; //澶囨敞
string HInnerBillNo = ""; //瀹㈡埛璁㈠崟鍙�
- string HSno = ""; //鎵规搴忓垪鍙�
+ string HSno = ""; //娴佹按鍙�
string HBoxNo = ""; //鎵规鐢熸垚鍓嶇紑
string sHBaNo = ""; //鐣岄潰涓婅緭鍏ョ殑鎵规浣�
int HSumBQty = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佹�荤鏁�
@@ -697,27 +638,14 @@
Application.DoEvents();
if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
{
- HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value);
- HCode3 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value);
+ string HMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNumberCol].Value);
+ HMaterNumber = HMaterNumber.Substring(HMaterNumber.Length - 3, 3); //鍙栫墿鏂欎唬鐮佸悗涓変綅
+ string sHCusModelName = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelNameCol].Value); //瀹㈡埛浠ｇ爜锛堝彇閲戣澏瀹㈡埛鐗╂枡瀵瑰簲琛ㄥ鎴风墿鏂欑紪鐮侊級
- if (cmbHBarCodeType.Text == "鍐呯鐮�")
- {
- //鑾峰彇鏈�澶ф祦姘村彿
- LSH = 0;
- Ds = oCn.RunProcReturn("select top 1 HSno from Gy_BarCodeBill_Cus where HBatchNo='" + HBatchNo + "' order by HSno desc", "Gy_BarCodeBill_Cus");
- if (Ds != null && Ds.Tables[0].Rows.Count != 0)
- {
- LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
- }
- }
- //澶栫鐮� 渚涘簲鍟嗕唬鐮侊紙娴疆瀹氫箟鐨勪緵搴斿晢浠ｇ爜锛�+8浣嶆棩鏈燂紙渚嬪20230905锛�+5浣嶆祦姘寸爜锛堢函鏁板瓧锛�
- else
- {
- //鏉＄爜鍓嶇紑 = 渚涘簲鍟嗕唬鐮� + 骞� + 鏈� + 鏃�
- sTMNumber = HCusModel + sYear + sPeriod + sDay;
- Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
- LWSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
- }
+ //鏉＄爜鍓嶇紑 = 骞� + 鏈�
+ sTMNumber = sYear + sPeriod;
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
HBQty = ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value);
HMinQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value);
@@ -725,6 +653,7 @@
HSumBQty = HSumBQty + ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value);
pb1.Maximum = HSumBQty;
+ int nn = 0; //鏈娴佹按鍙风疮璁′娇鐢ㄤ釜鏁�
for (int i = 0; i < HBQty; i++)
{
pb1.Value = n+1;
@@ -737,32 +666,23 @@
HMinQty = HSumQty;
}
//
- if (cmbHBarCodeType.Text == "鍐呯鐮�")
+ LSH = LSH + 1;
+ LSH2 = LSH.ToString();
+ while (LSH2.Length < LSHlen) //濡傛灉娴佹按鍙蜂綅鏁板皬浜� 娴佹按鍙烽暱搴� 鍓嶉潰琛�0
{
- LSH = LSH + 1;
- LSH2 = ConvertToBase(LSH, 36);
- while (LSH2.Length < LSHlen) //濡傛灉娴佹按鍙蜂綅鏁板皬浜� LSHlen 鍓嶉潰琛�0
- {
- LSH2 = "0" + LSH2;
- }
- //鏉＄爜缂栧彿 = 鎵规 + 娴佹按鍙� + 鐗堟湰鍙�
- TM = HBatchNo + LSH2 + HCode3;
+ LSH2 = "0" + LSH2;
}
- //澶栫鐮�
- else
+ if (LSH2.Length != 7)
{
- LWSH = LWSH + 1;
- LSH2 = LWSH.ToString();
- while (LSH2.Length < 5) //濡傛灉娴佹按鍙蜂綅鏁板皬浜� 5 鍓嶉潰琛�0
- {
- LSH2 = "0" + LSH2;
- }
- TM = sTMNumber + LSH2;
+ MessageBox.Show("鏉＄爜娴佹按鍙蜂负[" + LSH2 + "]锛岄暱搴︿笉鍏佽瓒呰繃7浣嶏紒");
+ return;
}
+ //瓒呰仛鍙樻暟瀛楁妧鏈湁闄愬叕鍙� 鏉＄爜缂栧彿锛堝叡26浣嶏級 = 浠ｇ爜锛�1浣嶅浐瀹氣�楽鈥欙級 + 鍘傚晢浠ｇ爜锛�2浣嶅浐瀹氣�榊3鈥欙級 + 骞达紙2浣嶅勾鍚庝袱浣嶏級 + 鏈堬紙1浣�10=A,11=B,12=C锛� + 娴佹按鍙凤紙7浣嶏級 + 浠ｅ彿锛�2浣嶅浐瀹氣��1P鈥欙級 + 瀹㈡埛浠ｇ爜锛�8浣嶅彇閲戣澏瀹㈡埛鐗╂枡瀵瑰簲琛ㄥ鎴风墿鏂欑紪鐮侊級 + 鐗╂枡鐗堟湰锛�3浣嶅彇鐗╂枡缂栫爜鍚庝笁浣嶏級
+ TM = "SY3" + sYear + sPeriod + LSH2 + "1P" + sHCusModelName + HMaterNumber;
HEntryID = j + 1;
HBarCode = TM.ToUpper();
- HBarCodeType = ClsPub.isStrNull(cmbHBarCodeType.Text);
+ HBarCodeType = "瓒呰仛鍙樺唴鏍囩";
HMaterID = ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value);
HUnitID = ClsPub.isLong(grdMain.Rows[j].Cells[HUnitIDCol].Value);
HAuxPropID = ClsPub.isLong(grdMain.Rows[j].Cells[HAuxPropIDCol].Value);
@@ -782,16 +702,11 @@
HRemark = ClsPub.isStrNull(grdMain.Rows[j].Cells[HRemarkCol].Value);
HMTONo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HMTONoCol].Value);
HInnerBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HInnerBillNoCol].Value);
- HCode1 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode1Col].Value).ToUpper();
- HCode2 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode2Col].Value).ToUpper();
- HCode3 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value).ToUpper();
HSno = ClsPub.isStrNull(LSH);
- HBoxNo = HCode1 + sYear + sPeriod + sDay + HCusModel;
- HBoxNo = HBoxNo.ToUpper();
+ HBoxNo = sTMNumber;
sHBaNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBaNoCol].Value); // 鐣岄潰涓婅緭鍏ョ殑鎵规浣�
- //瀹㈡埛鏂欏彿HCusModelName銆佺墿鏂欑被鍒獺Code1銆佹壒娆′綅HCode2銆佺増鏈彿HCode3銆佹壒娆″簭鍒楀彿HSno銆佹壒娆＄敓鎴愬墠缂�HBoxNo銆佸巶鍟嗕唬鐮丠CusModel
- //鐣岄潰涓婅緭鍏ョ殑鎵规浣岺SupName銆�36杩涘埗鎵规搴忓垪鍙稨SupNumber銆佸鎴疯鍗曞彿HInnerBillNo
+ //瓒呰仛鍙樻暟瀛楁妧鏈湁闄愬叕鍙� 瀹㈡埛鐗╂枡缂栫爜HCusModelName銆佹祦姘村彿HSno銆佹祦姘村彿HSupNumber銆佹祦姘村彿鐢熸垚鍓嶇紑HBoxNo
oCn.RunProc("insert into Gy_BarCodeBill_Cus" +
"(HInterID,HEntryID,HBillType,HBarCode,HBarCodeType" +
",HMaterID,HUnitID,HAuxPropID,HBatchNo,HQty" +
@@ -807,7 +722,7 @@
",HCode2,HCode3,HBackDataFlag,HSno,HBoxNo" +
") values (" + HInterID + "," + HEntryID + ",'','" + HBarCode + "','" + HBarCodeType + "'"
+ "," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HAuxPropID.ToString() + ",'" + HBatchNo + "'," + HQty.ToString()
- + "," + HCusID.ToString() + ",'" + HCusModel + "','" + HCusModelName + "','" + sDate + "',''"
+ + "," + HCusID.ToString() + ",'','" + HCusModelName + "','" + sDate + "',''"
+ "," + DBUtility.ClsPub.BoolToString(HGiveAwayFlag) + "," + DBUtility.ClsPub.BoolToString(HISKFPERIOD) + ",''"
+ "," + (HProduceDate == "" ? "NULL" : "'" + HProduceDate + "'") + "," + (HExpiryDate == "" ? "NULL" : "'" + HExpiryDate + "'")
+ "," + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + ",1,0"
@@ -818,8 +733,11 @@
+ ",'','','" + LSH2 + "','" + sHBaNo + "','" + HCode1 + "'"
+ ",'" + HCode2 + "','" + HCode3 + "','','" + HSno + "','" + HBoxNo + "')");
n = n + 1;
+ nn = nn + 1;
Application.DoEvents();
}
+ //鍥炲～娴佹按鍙蜂俊鎭�
+ oCn.RunProc("exec h_p_WMS_SetMaxNo_QTY '" + sTMNumber + "'," + nn.ToString() + " ");
}
}
oCn.Commit();
@@ -904,7 +822,7 @@
grdMain.Columns[HMaterNumberCol].HeaderText = "鐗╂枡浠ｇ爜";
grdMain.Columns[HMaterNameCol].HeaderText = "鐗╂枡鍚嶇О";
grdMain.Columns[HMaterModelCol].HeaderText = "瑙勬牸鍨嬪彿";
- grdMain.Columns[HCusModelNameCol].HeaderText = "瀹㈡埛鏂欏彿";
+ grdMain.Columns[HCusModelNameCol].HeaderText = "瀹㈡埛鐗╂枡缂栫爜";
grdMain.Columns[HUnitIDCol].HeaderText = "璁￠噺鍗曚綅ID";
grdMain.Columns[HUnitNumberCol].HeaderText = "璁￠噺鍗曚綅浠ｇ爜";
grdMain.Columns[HUnitNameCol].HeaderText = "璁￠噺鍗曚綅鍚嶇О";
@@ -945,6 +863,7 @@
grdMain.Columns[HAuxPropNumberCol].Visible = false;
grdMain.Columns[HAuxPropNameCol].Visible = false;
grdMain.Columns[HBatchManagerCol].Visible = false;
+ grdMain.Columns[HBatchNoCol].Visible = false;
grdMain.Columns[HGiveAwayFlagCol].Visible = false;
grdMain.Columns[HProduceDateCol].Visible = false;
grdMain.Columns[HExpiryDateCol].Visible = false;
@@ -962,6 +881,10 @@
grdMain.Columns[HEXPPERIODCol].Visible = false;
grdMain.Columns[HLSHCol].Visible = false;
grdMain.Columns[HBaNoCol].Visible = false;
+ grdMain.Columns[HCode1Col].Visible = false;
+ grdMain.Columns[HCode2Col].Visible = false;
+ grdMain.Columns[HCode3Col].Visible = false;
+ grdMain.Columns[HInnerBillNoCol].Visible = false;
//璁剧疆鍙紪杈戝垪
string sAllowCol = HQtyCol.ToString()+
@@ -1278,7 +1201,16 @@
private void cmdSourceBillNo_Click(object sender, EventArgs e)
{
- if (cmbSourceBillType.Text.Trim() == "鐢熶骇姹囨姤鍗�")
+ if (cmbSourceBillType.Text.Trim() == "鐢熶骇璁㈠崟")
+ {
+ string sWhere = " and HOrgID =" + HOrgID.ToString();
+ DAL.Cls_S_IF_ICMOBillList_CusBarCodeBill_KaiBei oIF_ICMOBillList = new DAL.Cls_S_IF_ICMOBillList_CusBarCodeBill_KaiBei();
+ if (oIF_ICMOBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIF_ICMOBillList.oBillSelectColl);
+ }
+ }
+ else if (cmbSourceBillType.Text.Trim() == "鐢熶骇姹囨姤鍗�")
{
string sWhere = " and HOrgID =" + HOrgID.ToString();
DAL.Cls_S_IF_ICMOReportBillList_CusBarCodeBill oIF_ICMOReportBillList = new DAL.Cls_S_IF_ICMOReportBillList_CusBarCodeBill();
@@ -1298,8 +1230,19 @@
foreach (DBUtility.BillSelect oSelectRow in oList)
{
i = i + 1;
+ //鐢熶骇璁㈠崟
+ if (oSelectRow.BillType == "3710")
+ {
+ grdMain.Rows.Add();
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("exec h_p_Gy_CusBarCodeBill_ICMOBillList " + oSelectRow.BillMainID.ToString() + "," + oSelectRow.BillSubID.ToString() + ",'1'", "h_p_Gy_CusBarCodeBill_ICMOBillList");
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm1(Ds.Tables[0], i);
+ GetCusMatNo(1);
+ }
//鐢熶骇姹囨姤鍗�
- if (oSelectRow.BillType == "3711")
+ else if (oSelectRow.BillType == "3711")
{
grdMain.Rows.Add();
grdMain.Rows[i].Cells[HTagCol].Value = "*";
@@ -1388,7 +1331,21 @@
return;
}
//鏍规嵁婧愬崟绫诲瀷 鍜屾簮鍗曞彿 鑾峰彇淇℃伅
- if (cmbSourceBillType.Text.Trim() == "鐢熶骇姹囨姤鍗�")
+ if (cmbSourceBillType.Text.Trim() == "鐢熶骇璁㈠崟")
+ {
+ DAL.Cls_S_IF_ICMOBillList_CusBarCodeBill oIF_ICMOBillList = new DAL.Cls_S_IF_ICMOBillList_CusBarCodeBill();
+ if (oIF_ICMOBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString())) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIF_ICMOBillList.oBillSelectColl);
+ txtHSourceBillNo.Text = "";
+ }
+ else
+ {
+ MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
+ return;
+ }
+ }
+ else if (cmbSourceBillType.Text.Trim() == "鐢熶骇姹囨姤鍗�")
{
DAL.Cls_S_IF_ICMOReportBillList_CusBarCodeBill oIF_ICMOReportBillList = new DAL.Cls_S_IF_ICMOReportBillList_CusBarCodeBill();
if (oIF_ICMOReportBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString())) //閫夋嫨鍘熷崟
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.designer.cs"
index 404980e..61c7306 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.designer.cs"
@@ -55,8 +55,6 @@
this.label2 = new System.Windows.Forms.Label();
this.cmbHOrgID = new System.Windows.Forms.ComboBox();
this.label3 = new System.Windows.Forms.Label();
- this.cmbHBarCodeType = new System.Windows.Forms.ComboBox();
- this.label1 = new System.Windows.Forms.Label();
this.cmdHEmpID = new System.Windows.Forms.Button();
this.cmdSourceBillNo = new System.Windows.Forms.Button();
this.txtHSourceBillNo = new System.Windows.Forms.TextBox();
@@ -325,8 +323,6 @@
this.gbUp.Controls.Add(this.label2);
this.gbUp.Controls.Add(this.cmbHOrgID);
this.gbUp.Controls.Add(this.label3);
- this.gbUp.Controls.Add(this.cmbHBarCodeType);
- this.gbUp.Controls.Add(this.label1);
this.gbUp.Controls.Add(this.cmdHEmpID);
this.gbUp.Controls.Add(this.cmdSourceBillNo);
this.gbUp.Controls.Add(this.txtHSourceBillNo);
@@ -397,25 +393,6 @@
this.label3.Size = new System.Drawing.Size(53, 12);
this.label3.TabIndex = 84;
this.label3.Text = "缁� 缁�";
- //
- // cmbHBarCodeType
- //
- this.cmbHBarCodeType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cmbHBarCodeType.FormattingEnabled = true;
- this.cmbHBarCodeType.Location = new System.Drawing.Point(676, 46);
- this.cmbHBarCodeType.Name = "cmbHBarCodeType";
- this.cmbHBarCodeType.Size = new System.Drawing.Size(188, 20);
- this.cmbHBarCodeType.TabIndex = 81;
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.ForeColor = System.Drawing.Color.Black;
- this.label1.Location = new System.Drawing.Point(609, 50);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(53, 12);
- this.label1.TabIndex = 80;
- this.label1.Text = "鏉＄爜绫诲瀷";
//
// cmdHEmpID
//
@@ -923,8 +900,6 @@
private System.Windows.Forms.Panel panel3;
private System.Windows.Forms.DataGridView grdSum;
private System.Windows.Forms.DataGridView grdPrint;
- private System.Windows.Forms.ComboBox cmbHBarCodeType;
- private System.Windows.Forms.Label label1;
private System.Windows.Forms.ToolStripButton dy;
private System.Windows.Forms.ComboBox cmbHOrgID;
private System.Windows.Forms.Label label3;
diff --git "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs" "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs"
index 1fa2450..2b3bf08 100644
--- "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs"
+++ "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs"
@@ -601,7 +601,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1; //鎴愬姛锛�
objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
- objJsonResult.data = ds.Tables[0];
+ objJsonResult.data = ds.Tables[0].Rows[0]["HBarCode"].ToString();
return objJsonResult;
}
}
@@ -772,10 +772,16 @@
}
else
{
+ List<string> HBarCodeList = new List<string>();
+ for(int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ HBarCodeList.Add(ds.Tables[0].Rows[i]["HBarCode"].ToString());
+ }
+
objJsonResult.code = "1";
objJsonResult.count = 1; //鎴愬姛锛�
objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
- objJsonResult.data = ds.Tables[0];
+ objJsonResult.data = HBarCodeList;
return objJsonResult;
}
}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
index c771af8..2103adf 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2025-06-20T05:22:54.5321865Z;False|2025-06-20T13:21:30.8643897+08:00;True|2025-06-20T08:36:32.6695266+08:00;False|2025-06-20T08:35:57.8274069+08:00;True|2025-06-19T08:14:35.0623669+08:00;False|2025-06-19T08:12:57.2451557+08:00;True|2025-06-18T16:56:03.4555368+08:00;True|2025-06-18T16:42:43.2441845+08:00;False|2025-06-18T16:42:02.6907205+08:00;True|2025-06-16T16:13:03.2956026+08:00;False|2025-06-16T16:12:23.8438917+08:00;True|2025-06-16T15:21:32.7370852+08:00;True|2025-06-16T15:08:57.7166003+08:00;True|2025-06-16T14:02:18.4224630+08:00;True|2025-06-16T11:00:03.6375429+08:00;False|2025-06-16T10:59:26.0956296+08:00;True|2025-06-09T16:45:52.0865612+08:00;True|2025-06-09T16:38:47.2182194+08:00;True|2025-06-09T16:17:50.9170601+08:00;False|2025-06-09T16:17:43.0333396+08:00;True|2025-06-09T15:25:17.0429161+08:00;True|2025-06-09T15:00:15.0058791+08:00;True|2025-06-09T14:50:02.1370115+08:00;True|2025-06-09T14:38:10.9037045+08:00;True|2025-06-09T14:34:53.2826267+08:00;True|2025-06-09T14:07:24.5341951+08:00;True|2025-06-09T13:39:17.5042542+08:00;True|2025-06-09T09:30:31.8197114+08:00;True|2025-01-10T13:10:47.2046185+08:00;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History>
+ <History>True|2025-06-20T06:33:10.9210583Z;True|2025-06-20T13:22:54.5321865+08:00;False|2025-06-20T13:21:30.8643897+08:00;True|2025-06-20T08:36:32.6695266+08:00;False|2025-06-20T08:35:57.8274069+08:00;True|2025-06-19T08:14:35.0623669+08:00;False|2025-06-19T08:12:57.2451557+08:00;True|2025-06-18T16:56:03.4555368+08:00;True|2025-06-18T16:42:43.2441845+08:00;False|2025-06-18T16:42:02.6907205+08:00;True|2025-06-16T16:13:03.2956026+08:00;False|2025-06-16T16:12:23.8438917+08:00;True|2025-06-16T15:21:32.7370852+08:00;True|2025-06-16T15:08:57.7166003+08:00;True|2025-06-16T14:02:18.4224630+08:00;True|2025-06-16T11:00:03.6375429+08:00;False|2025-06-16T10:59:26.0956296+08:00;True|2025-06-09T16:45:52.0865612+08:00;True|2025-06-09T16:38:47.2182194+08:00;True|2025-06-09T16:17:50.9170601+08:00;False|2025-06-09T16:17:43.0333396+08:00;True|2025-06-09T15:25:17.0429161+08:00;True|2025-06-09T15:00:15.0058791+08:00;True|2025-06-09T14:50:02.1370115+08:00;True|2025-06-09T14:38:10.9037045+08:00;True|2025-06-09T14:34:53.2826267+08:00;True|2025-06-09T14:07:24.5341951+08:00;True|2025-06-09T13:39:17.5042542+08:00;True|2025-06-09T09:30:31.8197114+08:00;True|2025-01-10T13:10:47.2046185+08:00;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>06/20/2025 13:22:41</publishTime>
+ <publishTime>06/20/2025 14:32:56</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>06/20/2025 13:22:41</publishTime>
+ <publishTime>06/20/2025 14:32:56</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>06/20/2025 13:22:39</publishTime>
+ <publishTime>06/20/2025 14:32:54</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>06/20/2025 13:22:39</publishTime>
+ <publishTime>06/20/2025 14:32:54</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>06/20/2025 13:22:35</publishTime>
+ <publishTime>06/20/2025 14:32:48</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>06/20/2025 13:22:35</publishTime>
+ <publishTime>06/20/2025 14:32:48</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>06/20/2025 13:22:36</publishTime>
+ <publishTime>06/20/2025 14:32:49</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>06/20/2025 13:22:36</publishTime>
+ <publishTime>06/20/2025 14:32:49</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/06/2023 15:57:02</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>06/20/2025 13:22:33</publishTime>
+ <publishTime>06/20/2025 14:32:45</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>06/20/2025 13:22:33</publishTime>
+ <publishTime>06/20/2025 14:32:45</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>06/20/2025 13:22:34</publishTime>
+ <publishTime>06/20/2025 14:32:46</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>06/20/2025 13:22:34</publishTime>
+ <publishTime>06/20/2025 14:32:46</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>06/20/2025 13:22:34</publishTime>
+ <publishTime>06/20/2025 14:32:46</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>06/20/2025 13:22:34</publishTime>
+ <publishTime>06/20/2025 14:32:46</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>06/20/2025 13:20:54</publishTime>
+ <publishTime>06/20/2025 14:32:02</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>06/20/2025 13:20:54</publishTime>
+ <publishTime>06/20/2025 14:32:02</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,22 +285,22 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>06/20/2025 13:20:58</publishTime>
+ <publishTime>06/20/2025 14:32:08</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>06/20/2025 13:20:58</publishTime>
+ <publishTime>06/20/2025 14:32:08</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>06/20/2025 13:22:49</publishTime>
+ <publishTime>06/20/2025 14:33:05</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>06/20/2025 13:22:49</publishTime>
+ <publishTime>06/20/2025 14:33:05</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>06/20/2025 13:22:53</publishTime>
+ <publishTime>06/20/2025 14:33:09</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
index cd56b74..dedb1bd 100644
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
index 3580352..08c2113 100644
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
index cd56b74..dedb1bd 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
index 3580352..08c2113 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1