From 099d12cda0ddb09edbdf46f0733fcb33fa353524 Mon Sep 17 00:00:00 2001 From: duhe <226547893@qq.com> Date: 星期一, 23 十二月 2024 14:28:00 +0800 Subject: [PATCH] 条码生成:增加源单 销售出库单 的相关数据获取 --- SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 2 +- APSM/bin/Release/BLL.dll | 0 BLL/bin/Release/DAL.dll | 0 PlanM/bin/Release/PlanM.dll | 0 APSM/bin/Release/BaseSet.dll | 0 BaseSet/bin/Release/BLL.pdb | 0 SyntacticSugar/bin/Debug/SyntacticSugar.pdb | 0 WebAPI/WebAPI.csproj.user | 4 ++-- DAL/bin/Release/Model.dll | 0 APSM/bin/Release/BLL.pdb | 0 WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user | 22 +++++++++++----------- APSM/bin/Release/BaseSet.pdb | 0 APSM/bin/Release/WorkM.dll | 0 SyntacticSugar/obj/Debug/SyntacticSugar.dll | 0 DAL/bin/Release/DAL.pdb | 0 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache | 0 BaseSet/bin/Release/Model.pdb | 0 BLL/bin/Release/Model.dll | 0 BLL/bin/Release/DAL.pdb | 0 BaseSet/bin/Release/BLL.dll | 0 BaseSet/bin/Release/Model.dll | 0 BLL/bin/Release/Model.pdb | 0 DAL/bin/Release/DAL.dll | 0 PlanM/bin/Release/BLL.dll | 0 SyntacticSugar/bin/Debug/SyntacticSugar.dll | 0 BaseSet/bin/Release/BaseSet.dll | 0 DAL/bin/Release/Model.pdb | 0 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0 WarM/bin/Release/BLL.dll | 0 APSM/bin/Release/WarM.pdb | 0 WorkM/bin/Release/WorkM.pdb | 0 WarM/bin/Release/WarM.pdb | 0 WorkM/bin/Release/BLL.dll | 0 BaseSet/bin/Release/BaseSet.pdb | 0 Model/obj/Release/Model.pdb | 0 BLL/bin/Release/BLL.pdb | 0 PlanM/bin/Release/BLL.pdb | 0 APSM/bin/Release/PlanM.dll | 0 APSM/bin/Release/DAL.dll | 0 APSM/bin/Release/WarM.dll | 0 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0 WarM/bin/Release/WarM.dll | 0 APSM/bin/Release/PlanM.pdb | 0 DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0 WorkM/bin/Release/BLL.pdb | 0 WorkM/bin/Release/Model.dll | 0 WorkM/bin/Release/WorkM.dll | 0 PlanM/bin/Release/Model.pdb | 0 SyntacticSugar/obj/Debug/SyntacticSugar.pdb | 0 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0 WarM/bin/Release/Model.pdb | 0 WarM/bin/Release/Model.dll | 0 APSM/bin/Release/DAL.pdb | 0 PlanM/bin/Release/Model.dll | 0 PlanM/bin/Release/DAL.dll | 0 WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 11 +++++++++++ WorkM/bin/Release/Model.pdb | 0 WarM/bin/Release/DAL.dll | 0 SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0 WarM/bin/Release/DAL.pdb | 0 WorkM/bin/Release/WarM.pdb | 0 WarM/bin/Release/BLL.pdb | 0 BLL/bin/Release/BLL.dll | 0 BaseSet/bin/Release/DAL.pdb | 0 PlanM/bin/Release/DAL.pdb | 0 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0 Model/obj/Release/Model.dll | 0 WorkM/bin/Release/WarM.dll | 0 Model/obj/Release/Model.csproj.AssemblyReference.cache | 0 Model/bin/Release/Model.pdb | 0 BaseSet/bin/Release/DAL.dll | 0 APSM/bin/Release/Model.dll | 0 APSM/bin/Release/APSM.pdb | 0 PlanM/bin/Release/PlanM.pdb | 0 Model/bin/Release/Model.dll | 0 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache | 0 APSM/bin/Release/WorkM.pdb | 0 APSM/bin/Release/Model.pdb | 0 WorkM/bin/Release/DAL.pdb | 0 APSM/bin/Release/APSM.dll | 0 WorkM/bin/Release/DAL.dll | 0 81 files changed, 25 insertions(+), 14 deletions(-) diff --git a/APSM/bin/Release/APSM.dll b/APSM/bin/Release/APSM.dll index 1359446..51d01c1 100644 --- a/APSM/bin/Release/APSM.dll +++ b/APSM/bin/Release/APSM.dll Binary files differ diff --git a/APSM/bin/Release/APSM.pdb b/APSM/bin/Release/APSM.pdb index 0c35208..2d5ca2c 100644 --- a/APSM/bin/Release/APSM.pdb +++ b/APSM/bin/Release/APSM.pdb Binary files differ diff --git a/APSM/bin/Release/BLL.dll b/APSM/bin/Release/BLL.dll index b448243..60b274f 100644 --- a/APSM/bin/Release/BLL.dll +++ b/APSM/bin/Release/BLL.dll Binary files differ diff --git a/APSM/bin/Release/BLL.pdb b/APSM/bin/Release/BLL.pdb index 3a47154..46278c7 100644 --- a/APSM/bin/Release/BLL.pdb +++ b/APSM/bin/Release/BLL.pdb Binary files differ diff --git a/APSM/bin/Release/BaseSet.dll b/APSM/bin/Release/BaseSet.dll index db73ebf..7dcec45 100644 --- a/APSM/bin/Release/BaseSet.dll +++ b/APSM/bin/Release/BaseSet.dll Binary files differ diff --git a/APSM/bin/Release/BaseSet.pdb b/APSM/bin/Release/BaseSet.pdb index 7ee4ec9..cf909a3 100644 --- a/APSM/bin/Release/BaseSet.pdb +++ b/APSM/bin/Release/BaseSet.pdb Binary files differ diff --git a/APSM/bin/Release/DAL.dll b/APSM/bin/Release/DAL.dll index 3114d49..5465d24 100644 --- a/APSM/bin/Release/DAL.dll +++ b/APSM/bin/Release/DAL.dll Binary files differ diff --git a/APSM/bin/Release/DAL.pdb b/APSM/bin/Release/DAL.pdb index 82e4dfc..d85dff9 100644 --- a/APSM/bin/Release/DAL.pdb +++ b/APSM/bin/Release/DAL.pdb Binary files differ diff --git a/APSM/bin/Release/Model.dll b/APSM/bin/Release/Model.dll index d1768cf..cef4a0f 100644 --- a/APSM/bin/Release/Model.dll +++ b/APSM/bin/Release/Model.dll Binary files differ diff --git a/APSM/bin/Release/Model.pdb b/APSM/bin/Release/Model.pdb index 415de8d..b8a1619 100644 --- a/APSM/bin/Release/Model.pdb +++ b/APSM/bin/Release/Model.pdb Binary files differ diff --git a/APSM/bin/Release/PlanM.dll b/APSM/bin/Release/PlanM.dll index 7f477f0..a4d7814 100644 --- a/APSM/bin/Release/PlanM.dll +++ b/APSM/bin/Release/PlanM.dll Binary files differ diff --git a/APSM/bin/Release/PlanM.pdb b/APSM/bin/Release/PlanM.pdb index 0ed08cd..4f9dfc0 100644 --- a/APSM/bin/Release/PlanM.pdb +++ b/APSM/bin/Release/PlanM.pdb Binary files differ diff --git a/APSM/bin/Release/WarM.dll b/APSM/bin/Release/WarM.dll index 9d378ec..f528b48 100644 --- a/APSM/bin/Release/WarM.dll +++ b/APSM/bin/Release/WarM.dll Binary files differ diff --git a/APSM/bin/Release/WarM.pdb b/APSM/bin/Release/WarM.pdb index 29141d2..c650d30 100644 --- a/APSM/bin/Release/WarM.pdb +++ b/APSM/bin/Release/WarM.pdb Binary files differ diff --git a/APSM/bin/Release/WorkM.dll b/APSM/bin/Release/WorkM.dll index edb22ab..7d438cc 100644 --- a/APSM/bin/Release/WorkM.dll +++ b/APSM/bin/Release/WorkM.dll Binary files differ diff --git a/APSM/bin/Release/WorkM.pdb b/APSM/bin/Release/WorkM.pdb index bfb4791..15c7fab 100644 --- a/APSM/bin/Release/WorkM.pdb +++ b/APSM/bin/Release/WorkM.pdb Binary files differ diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll index b448243..60b274f 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 3a47154..46278c7 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 3114d49..5465d24 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 82e4dfc..d85dff9 100644 --- a/BLL/bin/Release/DAL.pdb +++ b/BLL/bin/Release/DAL.pdb Binary files differ diff --git a/BLL/bin/Release/Model.dll b/BLL/bin/Release/Model.dll index d1768cf..cef4a0f 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 415de8d..b8a1619 100644 --- a/BLL/bin/Release/Model.pdb +++ b/BLL/bin/Release/Model.pdb Binary files differ diff --git a/BaseSet/bin/Release/BLL.dll b/BaseSet/bin/Release/BLL.dll index b448243..60b274f 100644 --- a/BaseSet/bin/Release/BLL.dll +++ b/BaseSet/bin/Release/BLL.dll Binary files differ diff --git a/BaseSet/bin/Release/BLL.pdb b/BaseSet/bin/Release/BLL.pdb index 3a47154..46278c7 100644 --- a/BaseSet/bin/Release/BLL.pdb +++ b/BaseSet/bin/Release/BLL.pdb Binary files differ diff --git a/BaseSet/bin/Release/BaseSet.dll b/BaseSet/bin/Release/BaseSet.dll index db73ebf..7dcec45 100644 --- a/BaseSet/bin/Release/BaseSet.dll +++ b/BaseSet/bin/Release/BaseSet.dll Binary files differ diff --git a/BaseSet/bin/Release/BaseSet.pdb b/BaseSet/bin/Release/BaseSet.pdb index 7ee4ec9..cf909a3 100644 --- a/BaseSet/bin/Release/BaseSet.pdb +++ b/BaseSet/bin/Release/BaseSet.pdb Binary files differ diff --git a/BaseSet/bin/Release/DAL.dll b/BaseSet/bin/Release/DAL.dll index 3114d49..5465d24 100644 --- a/BaseSet/bin/Release/DAL.dll +++ b/BaseSet/bin/Release/DAL.dll Binary files differ diff --git a/BaseSet/bin/Release/DAL.pdb b/BaseSet/bin/Release/DAL.pdb index 82e4dfc..d85dff9 100644 --- a/BaseSet/bin/Release/DAL.pdb +++ b/BaseSet/bin/Release/DAL.pdb Binary files differ diff --git a/BaseSet/bin/Release/Model.dll b/BaseSet/bin/Release/Model.dll index d1768cf..cef4a0f 100644 --- a/BaseSet/bin/Release/Model.dll +++ b/BaseSet/bin/Release/Model.dll Binary files differ diff --git a/BaseSet/bin/Release/Model.pdb b/BaseSet/bin/Release/Model.pdb index 415de8d..b8a1619 100644 --- a/BaseSet/bin/Release/Model.pdb +++ b/BaseSet/bin/Release/Model.pdb Binary files differ diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll index 3114d49..5465d24 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 82e4dfc..d85dff9 100644 --- a/DAL/bin/Release/DAL.pdb +++ b/DAL/bin/Release/DAL.pdb Binary files differ diff --git a/DAL/bin/Release/Model.dll b/DAL/bin/Release/Model.dll index d1768cf..cef4a0f 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 415de8d..b8a1619 100644 --- a/DAL/bin/Release/Model.pdb +++ b/DAL/bin/Release/Model.pdb Binary files differ diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache index 6e21ee4..c96789a 100644 --- a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache +++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache Binary files differ diff --git a/Model/bin/Release/Model.dll b/Model/bin/Release/Model.dll index d1768cf..cef4a0f 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 415de8d..b8a1619 100644 --- a/Model/bin/Release/Model.pdb +++ b/Model/bin/Release/Model.pdb Binary files differ diff --git a/Model/obj/Release/Model.csproj.AssemblyReference.cache b/Model/obj/Release/Model.csproj.AssemblyReference.cache index 7d164ad..d495885 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 d1768cf..cef4a0f 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 415de8d..b8a1619 100644 --- a/Model/obj/Release/Model.pdb +++ b/Model/obj/Release/Model.pdb Binary files differ diff --git a/PlanM/bin/Release/BLL.dll b/PlanM/bin/Release/BLL.dll index b448243..60b274f 100644 --- a/PlanM/bin/Release/BLL.dll +++ b/PlanM/bin/Release/BLL.dll Binary files differ diff --git a/PlanM/bin/Release/BLL.pdb b/PlanM/bin/Release/BLL.pdb index 3a47154..46278c7 100644 --- a/PlanM/bin/Release/BLL.pdb +++ b/PlanM/bin/Release/BLL.pdb Binary files differ diff --git a/PlanM/bin/Release/DAL.dll b/PlanM/bin/Release/DAL.dll index 3114d49..5465d24 100644 --- a/PlanM/bin/Release/DAL.dll +++ b/PlanM/bin/Release/DAL.dll Binary files differ diff --git a/PlanM/bin/Release/DAL.pdb b/PlanM/bin/Release/DAL.pdb index 82e4dfc..d85dff9 100644 --- a/PlanM/bin/Release/DAL.pdb +++ b/PlanM/bin/Release/DAL.pdb Binary files differ diff --git a/PlanM/bin/Release/Model.dll b/PlanM/bin/Release/Model.dll index d1768cf..cef4a0f 100644 --- a/PlanM/bin/Release/Model.dll +++ b/PlanM/bin/Release/Model.dll Binary files differ diff --git a/PlanM/bin/Release/Model.pdb b/PlanM/bin/Release/Model.pdb index 415de8d..b8a1619 100644 --- a/PlanM/bin/Release/Model.pdb +++ b/PlanM/bin/Release/Model.pdb Binary files differ diff --git a/PlanM/bin/Release/PlanM.dll b/PlanM/bin/Release/PlanM.dll index 7f477f0..a4d7814 100644 --- a/PlanM/bin/Release/PlanM.dll +++ b/PlanM/bin/Release/PlanM.dll Binary files differ diff --git a/PlanM/bin/Release/PlanM.pdb b/PlanM/bin/Release/PlanM.pdb index 0ed08cd..4f9dfc0 100644 --- a/PlanM/bin/Release/PlanM.pdb +++ b/PlanM/bin/Release/PlanM.pdb Binary files differ diff --git a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache index 89d8190..aba9f94 100644 --- a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache +++ b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache Binary files differ diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.dll b/SyntacticSugar/bin/Debug/SyntacticSugar.dll index 95849dc..55b6c53 100644 --- a/SyntacticSugar/bin/Debug/SyntacticSugar.dll +++ b/SyntacticSugar/bin/Debug/SyntacticSugar.dll Binary files differ diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb index be6ecd0..ceb9ba6 100644 --- a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb +++ b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb Binary files differ diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache new file mode 100644 index 0000000..fea44e6 --- /dev/null +++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache Binary files differ diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt index 4108a88..432c230 100644 --- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt +++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt @@ -3,9 +3,9 @@ D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb -D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb +D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.dll b/SyntacticSugar/obj/Debug/SyntacticSugar.dll index 95849dc..55b6c53 100644 --- a/SyntacticSugar/obj/Debug/SyntacticSugar.dll +++ b/SyntacticSugar/obj/Debug/SyntacticSugar.dll Binary files differ diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb index be6ecd0..ceb9ba6 100644 --- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb +++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb Binary files differ diff --git a/WarM/bin/Release/BLL.dll b/WarM/bin/Release/BLL.dll index b448243..60b274f 100644 --- a/WarM/bin/Release/BLL.dll +++ b/WarM/bin/Release/BLL.dll Binary files differ diff --git a/WarM/bin/Release/BLL.pdb b/WarM/bin/Release/BLL.pdb index 3a47154..46278c7 100644 --- a/WarM/bin/Release/BLL.pdb +++ b/WarM/bin/Release/BLL.pdb Binary files differ diff --git a/WarM/bin/Release/DAL.dll b/WarM/bin/Release/DAL.dll index 3114d49..5465d24 100644 --- a/WarM/bin/Release/DAL.dll +++ b/WarM/bin/Release/DAL.dll Binary files differ diff --git a/WarM/bin/Release/DAL.pdb b/WarM/bin/Release/DAL.pdb index 82e4dfc..d85dff9 100644 --- a/WarM/bin/Release/DAL.pdb +++ b/WarM/bin/Release/DAL.pdb Binary files differ diff --git a/WarM/bin/Release/Model.dll b/WarM/bin/Release/Model.dll index d1768cf..cef4a0f 100644 --- a/WarM/bin/Release/Model.dll +++ b/WarM/bin/Release/Model.dll Binary files differ diff --git a/WarM/bin/Release/Model.pdb b/WarM/bin/Release/Model.pdb index 415de8d..b8a1619 100644 --- a/WarM/bin/Release/Model.pdb +++ b/WarM/bin/Release/Model.pdb Binary files differ diff --git a/WarM/bin/Release/WarM.dll b/WarM/bin/Release/WarM.dll index 9d378ec..f528b48 100644 --- a/WarM/bin/Release/WarM.dll +++ b/WarM/bin/Release/WarM.dll Binary files differ diff --git a/WarM/bin/Release/WarM.pdb b/WarM/bin/Release/WarM.pdb index 29141d2..c650d30 100644 --- a/WarM/bin/Release/WarM.pdb +++ b/WarM/bin/Release/WarM.pdb Binary files differ diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" index 7875f1c..62b12a3 100644 --- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" +++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" @@ -237,6 +237,11 @@ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ProcessExchangeBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count; sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_ProcessExchangeBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)"); break; + case "閿�鍞嚭搴撳崟": + tabname = "h_v_IF_SellOutBillList_Source"; + count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count; + sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_SellOutBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)"); + break; default: break; } @@ -353,6 +358,12 @@ //鍐欏叆淇℃伅 ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType)); break; + case "1205": //閿�鍞嚭搴撳崟 + //寰楀埌淇℃伅 + ds = oCN.RunProcReturn("select * from h_v_IF_SellOutBillList_BarCode where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_SellOutBillList_BarCode"); + //鍐欏叆淇℃伅 + ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType)); + break; case "1102": //閲囪喘璁㈠崟 //寰楀埌淇℃伅 ds = oCN.RunProcReturn("select * from h_v_IF_POOrderList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POOrderList"); diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user index 106b2b4..7cf54be 100644 --- a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user @@ -4,7 +4,7 @@ --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <History>True|2024-12-16T02:57:23.0694936Z;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History> + <History>True|2024-12-23T05:40:03.2774116Z;False|2024-12-23T13:39:39.8510770+08:00;True|2024-12-23T13:11:15.3232454+08:00;True|2024-12-23T13:05:43.3057458+08:00;True|2024-12-16T10:57:23.0694936+08:00;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History> <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl> </PropertyGroup> <ItemGroup> @@ -45,19 +45,19 @@ <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> - <publishTime>12/11/2024 22:40:41</publishTime> + <publishTime>12/23/2024 13:05:14</publishTime> </File> <File Include="bin/BLL.pdb"> - <publishTime>12/11/2024 22:40:41</publishTime> + <publishTime>12/23/2024 13:05:14</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> - <publishTime>12/11/2024 22:40:40</publishTime> + <publishTime>12/23/2024 13:05:13</publishTime> </File> <File Include="bin/DAL.pdb"> - <publishTime>12/11/2024 22:40:40</publishTime> + <publishTime>12/23/2024 13:05:13</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> @@ -111,10 +111,10 @@ <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> - <publishTime>12/11/2024 22:40:36</publishTime> + <publishTime>12/23/2024 13:05:10</publishTime> </File> <File Include="bin/Model.pdb"> - <publishTime>12/11/2024 22:40:36</publishTime> + <publishTime>12/23/2024 13:05:10</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>04/06/2023 15:57:02</publishTime> @@ -294,13 +294,13 @@ <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>12/16/2024 10:57:16</publishTime> + <publishTime>12/23/2024 13:39:58</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>12/16/2024 10:57:16</publishTime> + <publishTime>12/23/2024 13:39:58</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> - <publishTime>12/16/2024 10:57:21</publishTime> + <publishTime>12/23/2024 13:40:02</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> @@ -495,7 +495,7 @@ <publishTime>05/06/2024 13:47:57</publishTime> </File> <File Include="Web.config"> - <publishTime>12/11/2024 22:41:12</publishTime> + <publishTime>12/23/2024 13:05:43</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user index 08b2801..b04473a 100644 --- a/WebAPI/WebAPI.csproj.user +++ b/WebAPI/WebAPI.csproj.user @@ -1,8 +1,8 @@ 锘�<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> - <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\JFAPI.pubxml</NameOfLastUsedPublishProfile> + <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> + <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile> <UseIISExpress>true</UseIISExpress> <Use64BitIISExpress /> <IISExpressSSLPort /> diff --git a/WorkM/bin/Release/BLL.dll b/WorkM/bin/Release/BLL.dll index b448243..60b274f 100644 --- a/WorkM/bin/Release/BLL.dll +++ b/WorkM/bin/Release/BLL.dll Binary files differ diff --git a/WorkM/bin/Release/BLL.pdb b/WorkM/bin/Release/BLL.pdb index 3a47154..46278c7 100644 --- a/WorkM/bin/Release/BLL.pdb +++ b/WorkM/bin/Release/BLL.pdb Binary files differ diff --git a/WorkM/bin/Release/DAL.dll b/WorkM/bin/Release/DAL.dll index 3114d49..5465d24 100644 --- a/WorkM/bin/Release/DAL.dll +++ b/WorkM/bin/Release/DAL.dll Binary files differ diff --git a/WorkM/bin/Release/DAL.pdb b/WorkM/bin/Release/DAL.pdb index 82e4dfc..d85dff9 100644 --- a/WorkM/bin/Release/DAL.pdb +++ b/WorkM/bin/Release/DAL.pdb Binary files differ diff --git a/WorkM/bin/Release/Model.dll b/WorkM/bin/Release/Model.dll index d1768cf..cef4a0f 100644 --- a/WorkM/bin/Release/Model.dll +++ b/WorkM/bin/Release/Model.dll Binary files differ diff --git a/WorkM/bin/Release/Model.pdb b/WorkM/bin/Release/Model.pdb index 415de8d..b8a1619 100644 --- a/WorkM/bin/Release/Model.pdb +++ b/WorkM/bin/Release/Model.pdb Binary files differ diff --git a/WorkM/bin/Release/WarM.dll b/WorkM/bin/Release/WarM.dll index 9d378ec..f528b48 100644 --- a/WorkM/bin/Release/WarM.dll +++ b/WorkM/bin/Release/WarM.dll Binary files differ diff --git a/WorkM/bin/Release/WarM.pdb b/WorkM/bin/Release/WarM.pdb index 29141d2..c650d30 100644 --- a/WorkM/bin/Release/WarM.pdb +++ b/WorkM/bin/Release/WarM.pdb Binary files differ diff --git a/WorkM/bin/Release/WorkM.dll b/WorkM/bin/Release/WorkM.dll index edb22ab..7d438cc 100644 --- a/WorkM/bin/Release/WorkM.dll +++ b/WorkM/bin/Release/WorkM.dll Binary files differ diff --git a/WorkM/bin/Release/WorkM.pdb b/WorkM/bin/Release/WorkM.pdb index bfb4791..15c7fab 100644 --- a/WorkM/bin/Release/WorkM.pdb +++ b/WorkM/bin/Release/WorkM.pdb Binary files differ diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll index d92c15a..d2c8f42 100644 --- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll +++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll Binary files differ diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb index a503aed..0556db9 100644 --- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb +++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb Binary files differ diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache new file mode 100644 index 0000000..b3a6f35 --- /dev/null +++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache Binary files differ diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll index d92c15a..d2c8f42 100644 --- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll +++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll Binary files differ diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb index a503aed..0556db9 100644 --- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb +++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb Binary files differ -- Gitblit v1.9.1