From 208d7616c641e7e4439611883e7aa0719cae6bd2 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 16 六月 2025 10:02:59 +0800
Subject: [PATCH] 分支合并
---
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 9
BLL/bin/Release/DAL.dll | 0
BLL/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/DBUtility.dll | 0
DAL/bin/Release/Pub_Control.dll | 0
DBUtility/bin/Release/Pub_Control.pdb | 0
SyntacticSugar/bin/Debug/SyntacticSugar.pdb | 0
WebAPI/WebAPI.csproj.user | 2
BLL/bin/Release/SQLHelper.dll | 0
DAL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/Model.dll | 0
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormImportController.cs | 2
DBUtility/bin/Release/Pub_Class.dll | 0
SyntacticSugar/obj/Debug/SyntacticSugar.dll | 0
DBUtility/bin/Release/Pub_Control.dll | 0
Model/bin/Release/SQLHelper.pdb | 0
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user | 46 +-
DAL/bin/Release/Pub_Control.pdb | 0
DAL/bin/Release/DAL.pdb | 0
SQLHelper/obj/Release/SQLHelper.dll | 0
Model/bin/Release/Pub_Control.pdb | 0
BLL/bin/Release/Model.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.pdb | 0
BLL/bin/Release/DAL.pdb | 0
Model/bin/Release/Pub_Class.pdb | 0
BLL/bin/Release/Model.pdb | 0
DAL/bin/Release/DAL.dll | 0
SyntacticSugar/bin/Debug/SyntacticSugar.dll | 0
DAL/bin/Release/Model.pdb | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.dll | 0
SQLHelper/obj/Release/SQLHelper.pdb | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.dll | 0
Model/obj/Release/Model.pdb | 0
BLL/bin/Release/BLL.pdb | 0
DBUtility/bin/Release/DBUtility.pdb | 0
DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources | 0
DBUtility/bin/Release/DBUtility.dll | 0
SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt | 8
Model/bin/Release/Pub_Control.dll | 0
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
Pub_Control/bin/Release/Pub_Class.pdb | 0
WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user | 166 ++++----
WebAPI/Controllers/BaseSet/Gy_ProcessController.cs | 9
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 9
Pub_Control/bin/Release/Pub_Class.dll | 0
SyntacticSugar/obj/Debug/SyntacticSugar.pdb | 0
WebAPI/WebAPI.csproj | 1
BLL/bin/Release/Pub_Control.pdb | 0
DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources | 0
Pub_Class/bin/Release/Pub_Class.pdb | 0
Pub_Control/bin/Release/Pub_Control.dll | 0
BLL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/SQLHelper.dll | 0
Model/bin/Release/DBUtility.pdb | 0
SQLHelper/bin/Release/SQLHelper.dll | 0
SQLHelper/bin/Release/Pub_Class.pdb | 0
BLL/bin/Release/Pub_Control.dll | 0
Pub_Class/bin/Release/Pub_Class.dll | 0
DAL/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources | 0
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache | 0
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0
DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources | 0
SQLHelper/bin/Release/Pub_Class.dll | 0
SQLHelper/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.pdb | 0
Model/bin/Release/DBUtility.dll | 0
DAL/bin/Release/Pub_Class.pdb | 0
WebAPI/Controllers/华远datamapping/HY_DataMappingController.cs | 725 ++++++++++++++++++++++++++++++++++++++++
BLL/bin/Release/DBUtility.dll | 0
DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache | 0
BLL/bin/Release/BLL.dll | 0
Pub_Control/bin/Release/Pub_Control.pdb | 0
DBUtility/obj/Release/DBUtility.dll | 0
WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New.designer.cs | 1
Model/obj/Release/Model.dll | 0
BLL/bin/Release/Pub_Class.dll | 0
DBUtility/bin/Release/SQLHelper.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt | 5
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
Model/bin/Release/Model.pdb | 0
DBUtility/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.Xt_BillType.resources | 0
DAL/bin/Release/Pub_Class.dll | 0
Model/bin/Release/Pub_Class.dll | 0
DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources | 0
Model/bin/Release/Model.dll | 0
/dev/null | 0
DBUtility/bin/Release/Pub_Class.pdb | 0
BLL/bin/Release/Pub_Class.pdb | 0
Model/bin/Release/SQLHelper.dll | 0
WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New_Change.designer.cs | 39 +-
93 files changed, 892 insertions(+), 130 deletions(-)
diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
index d432b2c..cf632cc 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 4b1dc5e..be146ed 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 43b7a19..db121bc 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 a81779b..6a3b9e3 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 96cdd4c..a8f08c4 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 6c5aa81..a221bda 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 8a33f26..72c5a35 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 e07f4d1..8a17f71 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 8785bbb..e139bc9 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 c156e6d..ad77590 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 fcdefb3..e0bfa05 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 3bc379a..67aa4b6 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 461b921..db0a8d1 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 6786f27..17bbc05 100644
--- a/BLL/bin/Release/SQLHelper.pdb
+++ b/BLL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
index 43b7a19..db121bc 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 a81779b..6a3b9e3 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 96cdd4c..a8f08c4 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 6c5aa81..a221bda 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 8a33f26..72c5a35 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 e07f4d1..8a17f71 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 8785bbb..e139bc9 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 c156e6d..ad77590 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 fcdefb3..e0bfa05 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 3bc379a..67aa4b6 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 461b921..db0a8d1 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 6786f27..17bbc05 100644
--- a/DAL/bin/Release/SQLHelper.pdb
+++ b/DAL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
index 96cdd4c..a8f08c4 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 6c5aa81..a221bda 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 8785bbb..e139bc9 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 c156e6d..ad77590 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 fcdefb3..e0bfa05 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 3bc379a..67aa4b6 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 461b921..db0a8d1 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 6786f27..17bbc05 100644
--- a/DBUtility/bin/Release/SQLHelper.pdb
+++ b/DBUtility/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources b/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
index 84a963f..552e300 100644
--- a/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
+++ b/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_BillType.resources b/DBUtility/obj/Release/DBUtility.Xt_BillType.resources
index c65df75..561c1c7 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_BillType.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_BillType.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
index 1d9a8a4..9103b7d 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
index fd5a993..fe71e8f 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
index c8139ba..ae4f855 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
index 3bb77bc..89f77dc 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index 9b4fdbb..c3931f4 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.csproj.GenerateResource.Cache b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
index 81885cb..d4f0c96 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
index a1e8bd7..59940f0 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.dll b/DBUtility/obj/Release/DBUtility.dll
index 96cdd4c..a8f08c4 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 6c5aa81..a221bda 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 96cdd4c..a8f08c4 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 6c5aa81..a221bda 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 8a33f26..72c5a35 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 e07f4d1..8a17f71 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 8785bbb..e139bc9 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 c156e6d..ad77590 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 fcdefb3..e0bfa05 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 3bc379a..67aa4b6 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 461b921..db0a8d1 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 6786f27..17bbc05 100644
--- a/Model/bin/Release/SQLHelper.pdb
+++ b/Model/bin/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 45bf500..70ae2bc 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 8a33f26..72c5a35 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 e07f4d1..8a17f71 100644
--- a/Model/obj/Release/Model.pdb
+++ b/Model/obj/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 8785bbb..e139bc9 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 c156e6d..ad77590 100644
--- a/Pub_Class/bin/Release/Pub_Class.pdb
+++ b/Pub_Class/bin/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 8785bbb..e139bc9 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 c156e6d..ad77590 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 fcdefb3..e0bfa05 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 3bc379a..67aa4b6 100644
--- a/Pub_Control/bin/Release/Pub_Control.pdb
+++ b/Pub_Control/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/SQLHelper/bin/Release/Pub_Class.dll b/SQLHelper/bin/Release/Pub_Class.dll
index 8785bbb..e139bc9 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 c156e6d..ad77590 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 461b921..db0a8d1 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 6786f27..17bbc05 100644
--- a/SQLHelper/bin/Release/SQLHelper.pdb
+++ b/SQLHelper/bin/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 42fb0c2..5fe7ae7 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 461b921..db0a8d1 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 6786f27..17bbc05 100644
--- a/SQLHelper/obj/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/Release/SQLHelper.pdb
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.dll b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
index c1cb681..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 d4f984c..ceb9ba6 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index 073b9d4..0000000
--- a/SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ /dev/null
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index c9aa900..2445d0f 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,3 +1,11 @@
+<<<<<<< HEAD
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+=======
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
@@ -16,3 +24,4 @@
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+>>>>>>> 9b54060aab13ef42f1d251dad16bef4d0c9264d9
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.dll b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
index c1cb681..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 d4f984c..ceb9ba6 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
index c511750..421ee13 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,3 +1,10 @@
+<<<<<<< HEAD
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
+=======
D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
@@ -5,3 +12,4 @@
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
+>>>>>>> 9b54060aab13ef42f1d251dad16bef4d0c9264d9
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.designer.cs"
index 572068e..36b690e 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.designer.cs"
@@ -306,6 +306,7 @@
this.bc.Text = "鐢熸垚";
this.bc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.bc.Visible = false;
this.bc.Click += new System.EventHandler(this.bc_Click);
//
// DelRow
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.designer.cs"
index 47e7403..cf91cce 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.designer.cs"
@@ -97,6 +97,8 @@
this.label_HQty = new System.Windows.Forms.Label();
this.tabPage_ParamsInfo = new System.Windows.Forms.TabPage();
this.groupBox_ParamsInfo = new System.Windows.Forms.GroupBox();
+ this.textBox_WorkPositionParams = new System.Windows.Forms.TextBox();
+ this.label_WorkPositionParams = new System.Windows.Forms.Label();
this.textBox_TopicParams = new System.Windows.Forms.TextBox();
this.label_TopicParams = new System.Windows.Forms.Label();
this.textBox_ClientIDParams = new System.Windows.Forms.TextBox();
@@ -159,8 +161,6 @@
this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog();
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.timer3 = new System.Windows.Forms.Timer(this.components);
- this.textBox_WorkPositionParams = new System.Windows.Forms.TextBox();
- this.label_WorkPositionParams = new System.Windows.Forms.Label();
this.Tool.SuspendLayout();
this.P1.SuspendLayout();
this.tabControl_MainInfo.SuspendLayout();
@@ -315,6 +315,7 @@
this.bc.Text = "鐢熸垚";
this.bc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.bc.Visible = false;
this.bc.Click += new System.EventHandler(this.bc_Click);
//
// DelRow
@@ -968,6 +969,23 @@
this.groupBox_ParamsInfo.Size = new System.Drawing.Size(1287, 320);
this.groupBox_ParamsInfo.TabIndex = 0;
this.groupBox_ParamsInfo.TabStop = false;
+ //
+ // textBox_WorkPositionParams
+ //
+ this.textBox_WorkPositionParams.BackColor = System.Drawing.SystemColors.Window;
+ this.textBox_WorkPositionParams.Location = new System.Drawing.Point(973, 164);
+ this.textBox_WorkPositionParams.Name = "textBox_WorkPositionParams";
+ this.textBox_WorkPositionParams.Size = new System.Drawing.Size(280, 28);
+ this.textBox_WorkPositionParams.TabIndex = 115;
+ //
+ // label_WorkPositionParams
+ //
+ this.label_WorkPositionParams.AutoSize = true;
+ this.label_WorkPositionParams.Location = new System.Drawing.Point(871, 167);
+ this.label_WorkPositionParams.Name = "label_WorkPositionParams";
+ this.label_WorkPositionParams.Size = new System.Drawing.Size(80, 18);
+ this.label_WorkPositionParams.TabIndex = 114;
+ this.label_WorkPositionParams.Text = "MQTT宸ヤ綅";
//
// textBox_TopicParams
//
@@ -1627,23 +1645,6 @@
//
this.timer3.Interval = 5000;
this.timer3.Tick += new System.EventHandler(this.timer3_Tick);
- //
- // textBox_WorkPositionParams
- //
- this.textBox_WorkPositionParams.BackColor = System.Drawing.SystemColors.Window;
- this.textBox_WorkPositionParams.Location = new System.Drawing.Point(973, 164);
- this.textBox_WorkPositionParams.Name = "textBox_WorkPositionParams";
- this.textBox_WorkPositionParams.Size = new System.Drawing.Size(280, 28);
- this.textBox_WorkPositionParams.TabIndex = 115;
- //
- // label_WorkPositionParams
- //
- this.label_WorkPositionParams.AutoSize = true;
- this.label_WorkPositionParams.Location = new System.Drawing.Point(871, 167);
- this.label_WorkPositionParams.Name = "label_WorkPositionParams";
- this.label_WorkPositionParams.Size = new System.Drawing.Size(80, 18);
- this.label_WorkPositionParams.TabIndex = 114;
- this.label_WorkPositionParams.Text = "MQTT宸ヤ綅";
//
// Gy_BarCodeBill_automaticallyByPLC_New_Change
//
diff --git a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
index 125c904..baf872b 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
@@ -482,7 +482,14 @@
}
else
{
- oCN.RunProc(" update Gy_Process set HWorkCenterID=" + HWorkCenterID + ",HDeptID=" + HDeptID + ",HQCSchemeID_Fst=" + HQCSchemeID_Fst + ",HQCSchemeID_Proc=" + HQCSchemeID_Proc + ",HQCSchemeID_Patrol=" + HQCSchemeID_Patrol + ",HProcType = '" + HProcType + "' where HNumber='" + HProcessNum + "'");
+ if (oSystemParameter.omodel.WMS_CampanyName == "瀹濆伐")
+ {
+ oCN.RunProc(" update Gy_Process set HWorkCenterID=" + HWorkCenterID + ",HDeptID=" + HDeptID + ",HQCSchemeID_Fst=" + HQCSchemeID_Fst + ",HQCSchemeID_Proc=" + HQCSchemeID_Proc + ",HQCSchemeID_Patrol=" + HQCSchemeID_Patrol + ",HProcType = '" + HProcType + "' where HNumber='" + HProcessName + "'");
+ }
+ else
+ {
+ oCN.RunProc(" update Gy_Process set HWorkCenterID=" + HWorkCenterID + ",HDeptID=" + HDeptID + ",HQCSchemeID_Fst=" + HQCSchemeID_Fst + ",HQCSchemeID_Proc=" + HQCSchemeID_Proc + ",HQCSchemeID_Patrol=" + HQCSchemeID_Patrol + ",HProcType = '" + HProcType + "' where HNumber='" + HProcessNum + "'");
+ }
}
i++;
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
index cd06e20..34b61fd 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
@@ -111,7 +111,7 @@
//鏌ヨ鐢熶骇璁㈠崟琛ㄥ垽鏂湁娌℃湁鐢熶骇璁㈠崟淇℃伅
for (int i = 0; i < tb2.Rows.Count; i++)
{
- tb2.Rows[i]["HVersion_Import"] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ tb2.Rows[i]["HVersion_Import"] = DateTime.Now.ToString("yyyy-MM-dd HH");
if (tb2.Rows[i]["缁勭粐缂栫爜*"].ToString() == "")
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"
new file mode 100644
index 0000000..6e67119
--- /dev/null
+++ "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs"
@@ -0,0 +1,725 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Net;
+using System.Web.Http;
+using System.Windows.Forms;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ #region 鍗庤繙璇锋眰鍩虹璧勬枡
+ #region 鐐．VRS鍐呭眰妫�楠岀粨鏋滀笂浼犳帴鍙� 鐩稿叧妯″瀷绫�
+ public class VRSInner_saveCheckNote_RequestParams
+ {
+ public string HMaker; //鍒跺崟浜�
+ public List<VRSInner_saveCheckNote_RequestParams_data> param;
+ }
+
+ public class VRSInner_saveCheckNote_RequestParams_data
+ {
+ public string HBarCode; //PNL鏉＄爜缂栧彿
+ public string HPCSNo; //PCS鍙�
+ public int HPosition_x; //PCS鎵�鍦ㄨ鐨勭储寮�
+ public int HPosition_y; //PCS鎵�鍦ㄥ垪鐨勭储寮�
+ public int HPageIndex; //姝ｅ弽闈�(0:姝ｉ潰,1:鍙嶉潰)
+ public string HBadReason; //涓嶈壇鍘熷洜
+ }
+
+ public class VRSInner_saveCheckNote_RequestResult
+ {
+ public string code;
+ public string msg;
+ }
+ #endregion
+
+ #region 鐐．VRS澶栧眰鑾峰彇datamapping鎺ュ彛 鐩稿叧妯″瀷绫�
+ public class VRSOuter_getDataMapping_RequestParams
+ {
+ public string HBarCode; //PNL鏉＄爜缂栧彿
+ }
+
+ public class VRSOuter_getDataMapping_RequestResult
+ {
+ public string code;
+ public string msg;
+ public List<VRSOuter_getDataMapping_RequestResult_data> data;
+ }
+ public class VRSOuter_getDataMapping_RequestResult_data
+ {
+ public string HBarCode; //PNL鏉＄爜鍙�
+ public string HPCSNo; //PCS鍙�
+ public int HPosition_x; //PCS鐨勮绱㈠紩
+ public int HPosition_y; //PCS鐨勫垪绱㈠紩
+ }
+
+ #endregion
+
+ #region 鐐．VRS澶栧眰妫�楠岀粨鏋滀笂浼犳帴鍙� 鐩稿叧妯″瀷绫�
+ public class VRSOuter_saveCheckNote_RequestParams
+ {
+ public string HMaker; //鍒跺崟浜�
+ public List<VRSOuter_saveCheckNote_RequestParams_data> param;
+ }
+
+ public class VRSOuter_saveCheckNote_RequestParams_data
+ {
+ public string HBarCode; //PNL鏉＄爜缂栧彿
+ public string HPCSNo; //PCS鍙�
+ public int HPosition_x; //PCS鎵�鍦ㄨ鐨勭储寮�
+ public int HPosition_y; //PCS鎵�鍦ㄥ垪鐨勭储寮�
+ public int HPageIndex; //姝ｅ弽闈�(0:姝ｉ潰,1:鍙嶉潰)
+ public string HBadReason; //涓嶈壇鍘熷洜
+ }
+
+ public class VRSOuter_saveCheckNote_RequestResult
+ {
+ public string code;
+ public string msg;
+ }
+ #endregion
+
+ #region AVI鑾峰彇datamapping鎺ュ彛 鐩稿叧妯″瀷绫�
+ public class AVI_getDataMapping_RequestParams
+ {
+ public string HBarCode; //PNL鏉＄爜缂栧彿
+ }
+
+ public class AVI_getDataMapping_RequestResult
+ {
+ public string code;
+ public string msg;
+ public List<AVI_getDataMapping_RequestResult_data> data;
+ }
+ public class AVI_getDataMapping_RequestResult_data
+ {
+ public string HBarCode; //PNL鏉＄爜鍙�
+ public string HPCSNo; //PCS鍙�
+ public int HPosition_x; //PCS鐨勮绱㈠紩
+ public int HPosition_y; //PCS鐨勫垪绱㈠紩
+ }
+
+ #endregion
+
+ #region AVI妫�楠岀粨鏋滀笂浼犳帴鍙� 鐩稿叧妯″瀷绫�
+ public class AVI_saveCheckNote_RequestParams
+ {
+ public string HMaker; //鍒跺崟浜�
+ public List<AVI_saveCheckNote_RequestParams_data> param;
+ }
+
+ public class AVI_saveCheckNote_RequestParams_data
+ {
+ public string HBarCode; //PNL鏉＄爜缂栧彿
+ public string HPCSNo; //PCS鍙�
+ public int HPosition_x; //PCS鎵�鍦ㄨ鐨勭储寮�
+ public int HPosition_y; //PCS鎵�鍦ㄥ垪鐨勭储寮�
+ public int HPageIndex; //姝ｅ弽闈�(0:姝ｉ潰,1:鍙嶉潰)
+ public string HBadReason; //涓嶈壇鍘熷洜
+ }
+
+ public class AVI_saveCheckNote_RequestResult
+ {
+ public string code;
+ public string msg;
+ }
+ #endregion
+
+ #region 鐢垫祴鑾峰彇datamapping鎺ュ彛 鐩稿叧妯″瀷绫�
+ public class DC_getDataMapping_RequestParams
+ {
+ public string HBarCode; //set鏉＄爜缂栧彿
+ }
+
+ public class DC_getDataMapping_RequestResult
+ {
+ public string code;
+ public string msg;
+ public List<DC_getDataMapping_RequestResult_data> data;
+ }
+ public class DC_getDataMapping_RequestResult_data
+ {
+ public string HBarCode; //PNL鏉＄爜鍙�
+ public string HPCSNo; //PCS鍙�
+ public int HPosition_x; //PCS鐨勮绱㈠紩
+ public int HPosition_y; //PCS鐨勫垪绱㈠紩
+ }
+
+ #endregion
+
+ #region 鐢垫祴妫�楠岀粨鏋滀笂浼犳帴鍙� 鐩稿叧妯″瀷绫�
+ public class DC_saveCheckNote_RequestParams
+ {
+ public string HMaker; //鍒跺崟浜�
+ public List<DC_saveCheckNote_RequestParams_data> param;
+ }
+
+ public class DC_saveCheckNote_RequestParams_data
+ {
+ public string HBarCode; //set鏉＄爜缂栧彿
+ public string HPCSNo; //PCS鍙�
+ public int HPosition_x; //PCS鎵�鍦ㄨ鐨勭储寮�
+ public int HPosition_y; //PCS鎵�鍦ㄥ垪鐨勭储寮�
+ public int HPageIndex; //姝ｅ弽闈�(0:姝ｉ潰,1:鍙嶉潰)
+ public string HBadReason; //涓嶈壇鍘熷洜
+ }
+
+ public class DC_saveCheckNote_RequestResult
+ {
+ public string code;
+ public string msg;
+ }
+ #endregion
+
+ #region 婵�鍏夊壊鑾峰彇datamapping鎺ュ彛 鐩稿叧妯″瀷绫�
+ public class JGG_getDataMapping_RequestParams
+ {
+ public string HBarCode; //set鏉＄爜缂栧彿
+ }
+
+ public class JGG_getDataMapping_RequestResult
+ {
+ public string code;
+ public string msg;
+ public List<JGG_getDataMapping_RequestResult_data> data;
+ }
+ public class JGG_getDataMapping_RequestResult_data
+ {
+ public string HBarCode; //PNL鏉＄爜鍙�
+ public string HPCSNo; //PCS鍙�
+ public int HPosition_x; //PCS鐨勮绱㈠紩
+ public int HPosition_y; //PCS鐨勫垪绱㈠紩
+ }
+
+ #endregion
+ #endregion
+
+
+ public class HY_DataMappingController : ApiController
+ {
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+
+ #region 鐐．VRS鍐呭眰妫�楠岀粨鏋滀笂浼犳帴鍙�
+ [Route("VRSInner/VRSInner_saveCheckNote")]
+ [HttpPost]
+ public VRSInner_saveCheckNote_RequestResult VRSInner_saveCheckNote([FromBody] JObject sMainSub)
+ {
+ VRSInner_saveCheckNote_RequestResult result = new VRSInner_saveCheckNote_RequestResult();
+ string msg_success = "";
+ try
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string msg2 = "[" + msg1 + "]";
+ List<VRSInner_saveCheckNote_RequestParams> vRSInner_SaveCheckNote_RequestParams = Newtonsoft.Json.JsonConvert.DeserializeObject<List<VRSInner_saveCheckNote_RequestParams>>(msg2);
+
+ oCN.BeginTran();
+
+ for (int i = 0; i < vRSInner_SaveCheckNote_RequestParams.Count; i++)
+ {
+ string HMaker = vRSInner_SaveCheckNote_RequestParams[i].HMaker;
+ for (int j = 0; j < vRSInner_SaveCheckNote_RequestParams[i].param.Count; j++)
+ {
+ string HBarCode = vRSInner_SaveCheckNote_RequestParams[i].param[j].HBarCode;
+ string HSetNo = "";
+ string HPCSNo = vRSInner_SaveCheckNote_RequestParams[i].param[j].HPCSNo;
+ int HPosition_x = vRSInner_SaveCheckNote_RequestParams[i].param[j].HPosition_x;
+ int HPosition_y = vRSInner_SaveCheckNote_RequestParams[i].param[j].HPosition_y;
+ string HCheckProc = "鐐．VRS鍐呭眰";
+ int HPageIndex = vRSInner_SaveCheckNote_RequestParams[i].param[j].HPageIndex;
+ string HBadReason = vRSInner_SaveCheckNote_RequestParams[i].param[j].HBadReason;
+
+ //鏍规嵁PNL鏉＄爜鎵惧埌PNL瀵逛簬鐨凱NL甯冨眬淇℃伅銆傜劧鍚庢牴鎹甈CS鍙峰湪PNL甯冨眬淇℃伅涓壘鍒癙CS瀵瑰簲鐨剆et鍙�
+ string sql_set = "" +
+ "select distinct " +
+ " b.HSetNo " +
+ "from Gy_PNLInfo as a " +
+ "inner join Gy_PNLInfoSub as b on a.HInterID = b.HInterID " +
+ "where a.HLayOutName in " +
+ " ( " +
+ " select HLayOutName from Gy_BarCodeBill_PNL_Temp where HBarCode = '" + HBarCode + "' " +
+ //" union " +
+ //" select HLayOutName from Gy_BarCodeBill_PNL_His where HBarCode = '" + HBarCode + "' " +
+ " ) " +
+ "and b.HPCSNo = '" + HPCSNo + "' ";
+ ds = oCN.RunProcReturn(sql_set, "Gy_PNLInfo");
+ if(ds!=null && ds.Tables.Count>0 && ds.Tables[0].Rows.Count > 0)
+ {
+ HSetNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HSetNo"]);
+ }
+
+ string sql = "insert into QC_CheckNote_PNL_Temp(HBarCode,HSetNo,HPCSNo,HPosition_x,HPosition_y,HCheckProc,HPageIndex,HBadReason,HMaker,HMakeDate) " +
+ "values(" +
+ "'" + HBarCode + "'" +
+ ",'" + HSetNo + "'" +
+ ",'" + HPCSNo + "'" +
+ "," + HPosition_x + "" +
+ "," + HPosition_y + "" +
+ ",'" + HCheckProc + "'" +
+ "," + HPageIndex + "" +
+ ",'" + HBadReason + "'" +
+ ",'" + HMaker + "'" +
+ ",getdate() " +
+ ")";
+ oCN.RunProc(sql);
+
+ msg_success += JsonConvert.SerializeObject(vRSInner_SaveCheckNote_RequestParams[i].param[j], Formatting.Indented);
+ }
+ }
+
+ oCN.Commit();
+ result.code = "1";
+ result.msg = "涓婁紶鎴愬姛锛侊紒" + msg_success;
+ return result;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ result.code = "0";
+ result.msg = "涓婁紶澶辫触锛侊紒" + e.Message;
+ return result;
+ }
+ }
+ #endregion
+
+ #region 鐐．VRS澶栧眰鑾峰彇datamapping鏁版嵁 鎺ュ彛
+ [Route("VRSOuter/VRSOuter_getDataMapping")]
+ [HttpGet]
+ public VRSOuter_getDataMapping_RequestResult VRSOuter_getDataMapping(string HBarCode)
+ {
+ VRSOuter_getDataMapping_RequestResult result = new VRSOuter_getDataMapping_RequestResult();
+ List<VRSOuter_getDataMapping_RequestResult_data> dataList = new List<VRSOuter_getDataMapping_RequestResult_data>();
+ try
+ {
+ string sql = "" +
+ //"select * from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode + "' " +
+ //"union " +
+ "select * from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode + "'";
+ ds = oCN.RunProcReturn(sql, "QC_CheckNote_PNL_Temp");
+ for(int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ VRSOuter_getDataMapping_RequestResult_data data = new VRSOuter_getDataMapping_RequestResult_data();
+ data.HBarCode = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HBarCode"]);
+ data.HPCSNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HPCSNo"]);
+ data.HPosition_x = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_x"]);
+ data.HPosition_y = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_y"]);
+ dataList.Add(data);
+ }
+
+ result.code = "1";
+ result.msg = "";
+ result.data = dataList;
+ return result;
+ }
+ catch (Exception e)
+ {
+ result.code = "0";
+ result.msg = "" + e.Message;
+ result.data = null;
+ return result;
+ }
+ }
+ #endregion
+
+ #region 鐐．VRS澶栧眰妫�楠岀粨鏋滀笂浼犳帴鍙�
+ [Route("VRSOuter/VRSOuter_saveCheckNote")]
+ [HttpPost]
+ public VRSOuter_saveCheckNote_RequestResult VRSOuter_saveCheckNote([FromBody] JObject sMainSub)
+ {
+ VRSOuter_saveCheckNote_RequestResult result = new VRSOuter_saveCheckNote_RequestResult();
+ string msg_success = "";
+ try
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string msg2 = "[" + msg1 + "]";
+ List<VRSOuter_saveCheckNote_RequestParams> vRSOuter_SaveCheckNote_RequestParams = Newtonsoft.Json.JsonConvert.DeserializeObject<List<VRSOuter_saveCheckNote_RequestParams>>(msg2);
+
+ oCN.BeginTran();
+
+ for (int i = 0; i < vRSOuter_SaveCheckNote_RequestParams.Count; i++)
+ {
+ string HMaker = vRSOuter_SaveCheckNote_RequestParams[i].HMaker;
+ for (int j = 0; j < vRSOuter_SaveCheckNote_RequestParams[i].param.Count; j++)
+ {
+ string HBarCode = vRSOuter_SaveCheckNote_RequestParams[i].param[j].HBarCode;
+ string HSetNo = "";
+ string HPCSNo = vRSOuter_SaveCheckNote_RequestParams[i].param[j].HPCSNo;
+ int HPosition_x = vRSOuter_SaveCheckNote_RequestParams[i].param[j].HPosition_x;
+ int HPosition_y = vRSOuter_SaveCheckNote_RequestParams[i].param[j].HPosition_y;
+ string HCheckProc = "鐐．VRS澶栧眰";
+ int HPageIndex = vRSOuter_SaveCheckNote_RequestParams[i].param[j].HPageIndex;
+ string HBadReason = vRSOuter_SaveCheckNote_RequestParams[i].param[j].HBadReason;
+
+ //鏍规嵁PNL鏉＄爜鎵惧埌PNL瀵逛簬鐨凱NL甯冨眬淇℃伅銆傜劧鍚庢牴鎹甈CS鍙峰湪PNL甯冨眬淇℃伅涓壘鍒癙CS瀵瑰簲鐨剆et鍙�
+ string sql_set = "" +
+ "select distinct " +
+ " b.HSetNo " +
+ "from Gy_PNLInfo as a " +
+ "inner join Gy_PNLInfoSub as b on a.HInterID = b.HInterID " +
+ "where a.HLayOutName in " +
+ " ( " +
+ " select HLayOutName from Gy_BarCodeBill_PNL_Temp where HBarCode = '" + HBarCode + "' " +
+ //" union " +
+ //" select HLayOutName from Gy_BarCodeBill_PNL_His where HBarCode = '" + HBarCode + "' " +
+ " ) " +
+ "and b.HPCSNo = '" + HPCSNo + "' ";
+ ds = oCN.RunProcReturn(sql_set, "Gy_PNLInfo");
+ if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
+ {
+ HSetNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HSetNo"]);
+ }
+
+ string sql = "insert into QC_CheckNote_PNL_Temp(HBarCode,HSetNo,HPCSNo,HPosition_x,HPosition_y,HCheckProc,HPageIndex,HBadReason,HMaker,HMakeDate) " +
+ "values(" +
+ "'" + HBarCode + "'" +
+ ",'" + HSetNo + "'" +
+ ",'" + HPCSNo + "'" +
+ "," + HPosition_x + "" +
+ "," + HPosition_y + "" +
+ ",'" + HCheckProc + "'" +
+ "," + HPageIndex + "" +
+ ",'" + HBadReason + "'" +
+ ",'" + HMaker + "'" +
+ ",getdate() " +
+ ")";
+ oCN.RunProc(sql);
+
+ msg_success += JsonConvert.SerializeObject(vRSOuter_SaveCheckNote_RequestParams[i].param[j], Formatting.Indented);
+ }
+ }
+
+ oCN.Commit();
+ result.code = "1";
+ result.msg = "涓婁紶鎴愬姛锛侊紒" + msg_success;
+ return result;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ result.code = "0";
+ result.msg = "涓婁紶澶辫触锛侊紒" + e.Message;
+ return result;
+ }
+ }
+ #endregion
+
+ #region AVI鑾峰彇datamapping鏁版嵁 鎺ュ彛
+ [Route("AVI/AVI_getDataMapping")]
+ [HttpGet]
+ public AVI_getDataMapping_RequestResult AVI_getDataMapping(string HBarCode)
+ {
+ AVI_getDataMapping_RequestResult result = new AVI_getDataMapping_RequestResult();
+ List<AVI_getDataMapping_RequestResult_data> dataList = new List<AVI_getDataMapping_RequestResult_data>();
+ try
+ {
+ string sql = "" +
+ //"select * from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode + "' " +
+ //"union " +
+ "select * from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode + "'";
+ ds = oCN.RunProcReturn(sql, "QC_CheckNote_PNL_Temp");
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ AVI_getDataMapping_RequestResult_data data = new AVI_getDataMapping_RequestResult_data();
+ data.HBarCode = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HBarCode"]);
+ data.HPCSNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HPCSNo"]);
+ data.HPosition_x = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_x"]);
+ data.HPosition_y = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_y"]);
+ dataList.Add(data);
+ }
+
+ result.code = "1";
+ result.msg = "";
+ result.data = dataList;
+ return result;
+ }
+ catch (Exception e)
+ {
+ result.code = "0";
+ result.msg = "" + e.Message;
+ result.data = null;
+ return result;
+ }
+ }
+ #endregion
+
+ #region AVI妫�楠岀粨鏋滀笂浼犳帴鍙�
+ [Route("AVI/AVI_saveCheckNote")]
+ [HttpPost]
+ public AVI_saveCheckNote_RequestResult AVI_saveCheckNote([FromBody] JObject sMainSub)
+ {
+ AVI_saveCheckNote_RequestResult result = new AVI_saveCheckNote_RequestResult();
+ string msg_success = "";
+ try
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string msg2 = "[" + msg1 + "]";
+ List<AVI_saveCheckNote_RequestParams> aVI_SaveCheckNote_RequestParams = Newtonsoft.Json.JsonConvert.DeserializeObject<List<AVI_saveCheckNote_RequestParams>>(msg2);
+
+ oCN.BeginTran();
+
+ for (int i = 0; i < aVI_SaveCheckNote_RequestParams.Count; i++)
+ {
+ string HMaker = aVI_SaveCheckNote_RequestParams[i].HMaker;
+ for (int j = 0; j < aVI_SaveCheckNote_RequestParams[i].param.Count; j++)
+ {
+ string HBarCode = aVI_SaveCheckNote_RequestParams[i].param[j].HBarCode;
+ string HSetNo = "";
+ string HPCSNo = aVI_SaveCheckNote_RequestParams[i].param[j].HPCSNo;
+ int HPosition_x = aVI_SaveCheckNote_RequestParams[i].param[j].HPosition_x;
+ int HPosition_y = aVI_SaveCheckNote_RequestParams[i].param[j].HPosition_y;
+ string HCheckProc = "AVI";
+ int HPageIndex = aVI_SaveCheckNote_RequestParams[i].param[j].HPageIndex;
+ string HBadReason = aVI_SaveCheckNote_RequestParams[i].param[j].HBadReason;
+
+ //鏍规嵁PNL鏉＄爜鎵惧埌PNL瀵逛簬鐨凱NL甯冨眬淇℃伅銆傜劧鍚庢牴鎹甈CS鍙峰湪PNL甯冨眬淇℃伅涓壘鍒癙CS瀵瑰簲鐨剆et鍙�
+ string sql_set = "" +
+ "select distinct " +
+ " b.HSetNo " +
+ "from Gy_PNLInfo as a " +
+ "inner join Gy_PNLInfoSub as b on a.HInterID = b.HInterID " +
+ "where a.HLayOutName in " +
+ " ( " +
+ " select HLayOutName from Gy_BarCodeBill_PNL_Temp where HBarCode = '" + HBarCode + "' " +
+ //" union " +
+ //" select HLayOutName from Gy_BarCodeBill_PNL_His where HBarCode = '" + HBarCode + "' " +
+ " ) " +
+ "and b.HPCSNo = '" + HPCSNo + "' ";
+ ds = oCN.RunProcReturn(sql_set, "Gy_PNLInfo");
+ if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
+ {
+ HSetNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HSetNo"]);
+ }
+
+ string sql = "insert into QC_CheckNote_PNL_Temp(HBarCode,HSetNo,HPCSNo,HPosition_x,HPosition_y,HCheckProc,HPageIndex,HBadReason,HMaker,HMakeDate) " +
+ "values(" +
+ "'" + HBarCode + "'" +
+ ",'" + HSetNo + "'" +
+ ",'" + HPCSNo + "'" +
+ "," + HPosition_x + "" +
+ "," + HPosition_y + "" +
+ ",'" + HCheckProc + "'" +
+ "," + HPageIndex + "" +
+ ",'" + HBadReason + "'" +
+ ",'" + HMaker + "'" +
+ ",getdate() " +
+ ")";
+ oCN.RunProc(sql);
+
+ msg_success += JsonConvert.SerializeObject(aVI_SaveCheckNote_RequestParams[i].param[j], Formatting.Indented);
+ }
+ }
+
+ oCN.Commit();
+ result.code = "1";
+ result.msg = "涓婁紶鎴愬姛锛侊紒" + msg_success;
+ return result;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ result.code = "0";
+ result.msg = "涓婁紶澶辫触锛侊紒" + e.Message;
+ return result;
+ }
+ }
+ #endregion
+
+ #region 鐢垫祴鑾峰彇datamapping鏁版嵁 鎺ュ彛
+ [Route("DC/DC_getDataMapping")]
+ [HttpGet]
+ public DC_getDataMapping_RequestResult DC_getDataMapping(string HBarCode)
+ {
+ DC_getDataMapping_RequestResult result = new DC_getDataMapping_RequestResult();
+ List<DC_getDataMapping_RequestResult_data> dataList = new List<DC_getDataMapping_RequestResult_data>();
+ try
+ {
+ //鏍规嵁set鏉＄爜缂栧彿锛岃幏鍙杝et鎵�灞炵殑PNL鏉＄爜缂栧彿
+ string HBarCode_PNL = "";
+ string sql_PNLBarCode = "" +
+ //"select * from Gy_BarCodeBill_Set_His where HBarCode = '" + HBarCode + "' " +
+ //"union " +
+ "select * from Gy_BarCodeBill_Set_Temp where HBarCode = '" + HBarCode + "' ";
+ ds = oCN.RunProcReturn(sql_PNLBarCode, "Gy_BarCodeBill_Set_Temp");
+ if(ds!=null && ds.Tables.Count>0 && ds.Tables[0].Rows.Count > 0)
+ {
+ HBarCode_PNL = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBarCode_PNL"]);
+ }
+
+ //鏍规嵁set鏉＄爜缂栧彿锛岃幏鍙杝et鍙枫�傦紙set鏉＄爜缂栧彿瑙勫垯锛歽+ww+浜斾綅PNL娴佹按鍙�+涓や綅set鍙凤級
+ string HSetNo = HBarCode.Substring(HBarCode.Length-2,2);
+
+ //鏍规嵁PNL鏉＄爜缂栧彿銆乻et鍙凤紝浠嶱NL妫�楠屼俊鎭〃涓幏鍙杝et瀵瑰簲鐨勬楠屼俊鎭�
+ string sql = "" +
+ //"select * from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' " +
+ //"union " +
+ "select * from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' ";
+ ds = oCN.RunProcReturn(sql, "QC_CheckNote_PNL_Temp");
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ DC_getDataMapping_RequestResult_data data = new DC_getDataMapping_RequestResult_data();
+ data.HBarCode = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HBarCode"]);
+ data.HPCSNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HPCSNo"]);
+ data.HPosition_x = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_x"]);
+ data.HPosition_y = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_y"]);
+ dataList.Add(data);
+ }
+
+ result.code = "1";
+ result.msg = "";
+ result.data = dataList;
+ return result;
+ }
+ catch (Exception e)
+ {
+ result.code = "0";
+ result.msg = "" + e.Message;
+ result.data = null;
+ return result;
+ }
+ }
+ #endregion
+
+ #region 鐢垫祴妫�楠岀粨鏋滀笂浼犳帴鍙�
+ [Route("DC/DC_saveCheckNote")]
+ [HttpPost]
+ public DC_saveCheckNote_RequestResult DC_saveCheckNote([FromBody] JObject sMainSub)
+ {
+ DC_saveCheckNote_RequestResult result = new DC_saveCheckNote_RequestResult();
+ string msg_success = "";
+ try
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string msg2 = "[" + msg1 + "]";
+ List<DC_saveCheckNote_RequestParams> dC_SaveCheckNote_RequestParams = Newtonsoft.Json.JsonConvert.DeserializeObject<List<DC_saveCheckNote_RequestParams>>(msg2);
+
+ oCN.BeginTran();
+
+ for (int i = 0; i < dC_SaveCheckNote_RequestParams.Count; i++)
+ {
+ string HMaker = dC_SaveCheckNote_RequestParams[i].HMaker;
+ for (int j = 0; j < dC_SaveCheckNote_RequestParams[i].param.Count; j++)
+ {
+ string HBarCode = dC_SaveCheckNote_RequestParams[i].param[j].HBarCode;
+ string HBarCode_PNL = "";
+ string HSetNo = HBarCode.Substring(HBarCode.Length-2,2);
+ string HPCSNo = dC_SaveCheckNote_RequestParams[i].param[j].HPCSNo;
+ int HPosition_x = dC_SaveCheckNote_RequestParams[i].param[j].HPosition_x;
+ int HPosition_y = dC_SaveCheckNote_RequestParams[i].param[j].HPosition_y;
+ string HCheckProc = "鐢垫祴";
+ int HPageIndex = dC_SaveCheckNote_RequestParams[i].param[j].HPageIndex;
+ string HBadReason = dC_SaveCheckNote_RequestParams[i].param[j].HBadReason;
+
+ //鏍规嵁set鏉＄爜缂栧彿锛岃幏鍙杝et鎵�灞炵殑PNL鏉＄爜缂栧彿
+ string sql_PNLBarCode = "" +
+ //"select * from Gy_BarCodeBill_Set_His where HBarCode = '" + HBarCode + "' " +
+ //"union " +
+ "select * from Gy_BarCodeBill_Set_Temp where HBarCode = '" + HBarCode + "' ";
+ ds = oCN.RunProcReturn(sql_PNLBarCode, "Gy_BarCodeBill_Set_Temp");
+ if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
+ {
+ HBarCode_PNL = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBarCode_PNL"]);
+ }
+
+ string sql = "insert into QC_CheckNote_PNL_Temp(HBarCode,HSetNo,HPCSNo,HPosition_x,HPosition_y,HCheckProc,HPageIndex,HBadReason,HMaker,HMakeDate) " +
+ "values(" +
+ "'" + HBarCode_PNL + "'" +
+ ",'" + HSetNo + "'" +
+ ",'" + HPCSNo + "'" +
+ "," + HPosition_x + "" +
+ "," + HPosition_y + "" +
+ ",'" + HCheckProc + "'" +
+ "," + HPageIndex + "" +
+ ",'" + HBadReason + "'" +
+ ",'" + HMaker + "'" +
+ ",getdate() " +
+ ")";
+ oCN.RunProc(sql);
+
+ msg_success += JsonConvert.SerializeObject(dC_SaveCheckNote_RequestParams[i].param[j], Formatting.Indented);
+ }
+ }
+
+ oCN.Commit();
+ result.code = "1";
+ result.msg = "涓婁紶鎴愬姛锛侊紒" + msg_success;
+ return result;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ result.code = "0";
+ result.msg = "涓婁紶澶辫触锛侊紒" + e.Message;
+ return result;
+ }
+ }
+ #endregion
+
+ #region 婵�鍏夊壊鑾峰彇datamapping鏁版嵁 鎺ュ彛
+ [Route("JGG/JGG_getDataMapping")]
+ [HttpGet]
+ public JGG_getDataMapping_RequestResult JGG_getDataMapping(string HBarCode)
+ {
+ JGG_getDataMapping_RequestResult result = new JGG_getDataMapping_RequestResult();
+ List<JGG_getDataMapping_RequestResult_data> dataList = new List<JGG_getDataMapping_RequestResult_data>();
+ try
+ {
+ //鏍规嵁set鏉＄爜缂栧彿锛岃幏鍙杝et鎵�灞炵殑PNL鏉＄爜缂栧彿
+ string HBarCode_PNL = "";
+ string sql_PNLBarCode = "" +
+ //"select * from Gy_BarCodeBill_Set_His where HBarCode = '" + HBarCode + "' " +
+ //"union " +
+ "select * from Gy_BarCodeBill_Set_Temp where HBarCode = '" + HBarCode + "' ";
+ ds = oCN.RunProcReturn(sql_PNLBarCode, "Gy_BarCodeBill_Set_Temp");
+ if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
+ {
+ HBarCode_PNL = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBarCode_PNL"]);
+ }
+
+ //鏍规嵁set鏉＄爜缂栧彿锛岃幏鍙杝et鍙枫�傦紙set鏉＄爜缂栧彿瑙勫垯锛歽+ww+浜斾綅PNL娴佹按鍙�+涓や綅set鍙凤級
+ string HSetNo = HBarCode.Substring(HBarCode.Length - 2, 2);
+
+ //鏍规嵁PNL鏉＄爜缂栧彿銆乻et鍙凤紝浠嶱NL妫�楠屼俊鎭〃涓幏鍙杝et瀵瑰簲鐨勬楠屼俊鎭�
+ string sql = "" +
+ //"select * from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' " +
+ //"union " +
+ "select * from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' ";
+ ds = oCN.RunProcReturn(sql, "QC_CheckNote_PNL_Temp");
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ JGG_getDataMapping_RequestResult_data data = new JGG_getDataMapping_RequestResult_data();
+ data.HBarCode = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HBarCode"]);
+ data.HPCSNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HPCSNo"]);
+ data.HPosition_x = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_x"]);
+ data.HPosition_y = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_y"]);
+ dataList.Add(data);
+ }
+
+ result.code = "1";
+ result.msg = "";
+ result.data = dataList;
+ return result;
+ }
+ catch (Exception e)
+ {
+ result.code = "0";
+ result.msg = "" + e.Message;
+ result.data = null;
+ return result;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user
index 565bc74..d41398e 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user
@@ -4,12 +4,12 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2025-06-12T00:07:24.1394475Z;False|2025-06-12T08:06:50.5818604+08:00;True|2025-06-11T16:48:49.8379362+08:00;True|2025-06-11T16:46:41.1653890+08:00;True|2025-06-11T15:14:56.0474555+08:00;True|2025-06-11T14:49:30.2313205+08:00;True|2025-06-11T09:50:30.2697257+08:00;False|2025-06-11T09:49:07.3377795+08:00;False|2025-06-11T09:48:11.3043148+08:00;True|2025-06-10T14:53:27.3976234+08:00;True|2025-06-10T14:44:36.0667571+08:00;True|2025-06-10T12:37:55.9999249+08:00;True|2025-06-10T12:29:06.7152828+08:00;True|2025-06-10T11:19:52.9755229+08:00;True|2025-06-10T10:53:25.1516678+08:00;True|2025-06-10T10:49:46.3257234+08:00;True|2025-06-10T10:43:16.9567222+08:00;True|2025-06-10T10:35:40.8073924+08:00;True|2025-06-10T09:22:25.3761297+08:00;True|2025-06-10T08:53:14.1233640+08:00;False|2025-06-10T08:52:28.7445604+08:00;True|2025-06-09T15:47:05.0949232+08:00;True|2025-06-09T15:43:36.4410743+08:00;True|2025-06-09T15:34:26.1974700+08:00;True|2025-06-09T15:23:58.3542656+08:00;True|2025-06-09T10:03:14.0853098+08:00;True|2025-06-09T09:53:44.2860790+08:00;True|2025-06-09T09:50:36.4046416+08:00;True|2025-06-09T09:46:34.4404919+08:00;True|2025-06-09T09:43:11.5230900+08:00;True|2025-06-09T09:38:48.8356797+08:00;True|2025-06-09T09:19:56.4222144+08:00;False|2025-06-09T09:17:45.0139215+08:00;True|2025-06-06T16:03:17.1598940+08:00;True|2025-06-06T15:55:14.1548669+08:00;True|2025-06-06T15:45:09.1494579+08:00;True|2025-06-06T15:23:44.6000261+08:00;True|2025-06-06T09:05:20.9891447+08:00;True|2025-06-06T08:59:02.9102042+08:00;True|2025-06-06T08:53:57.5240160+08:00;True|2025-06-06T08:41:52.8398696+08:00;True|2025-06-06T08:26:11.0482137+08:00;False|2025-06-06T08:21:34.3977767+08:00;True|2025-06-05T17:02:46.4387841+08:00;True|2025-06-05T16:57:31.4312343+08:00;False|2025-06-05T16:56:51.6475141+08:00;</History>
+ <History>True|2025-06-09T01:28:27.1189869Z;False|2025-06-09T09:27:55.2102771+08:00;True|2025-06-09T09:17:12.8435993+08:00;False|2025-06-09T09:16:38.2325198+08:00;True|2025-06-04T14:37:33.1938810+08:00;False|2025-06-04T14:37:01.3631593+08:00;True|2025-06-04T13:26:20.8238933+08:00;False|2025-06-04T13:25:43.1503457+08:00;</History>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\LAYAPI</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="bin/AlibabaCloud.EndpointUtil.dll">
<publishTime>04/07/2020 16:33:48</publishTime>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>06/09/2025 09:19:24</publishTime>
+ <publishTime>06/04/2025 13:26:02</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>06/09/2025 09:19:24</publishTime>
+ <publishTime>06/04/2025 13:26:02</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>06/09/2025 09:19:22</publishTime>
+ <publishTime>06/04/2025 13:26:00</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>06/09/2025 09:19:22</publishTime>
+ <publishTime>06/04/2025 13:26:00</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>06/09/2025 09:19:18</publishTime>
+ <publishTime>06/04/2025 13:25:55</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>06/09/2025 09:19:18</publishTime>
+ <publishTime>06/04/2025 13:25:55</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -93,7 +93,7 @@
<publishTime>05/09/2021 01:08:30</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="bin/libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -111,13 +111,13 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>06/09/2025 09:19:18</publishTime>
+ <publishTime>06/04/2025 13:25:56</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>06/09/2025 09:19:18</publishTime>
+ <publishTime>06/04/2025 13:25:56</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>03/08/2023 15:09:56</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>06/09/2025 09:19:15</publishTime>
+ <publishTime>06/04/2025 13:25:51</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>06/09/2025 09:19:15</publishTime>
+ <publishTime>06/04/2025 13:25:51</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>06/09/2025 09:19:17</publishTime>
+ <publishTime>06/04/2025 13:25:54</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>06/09/2025 09:19:17</publishTime>
+ <publishTime>06/04/2025 13:25:54</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>06/09/2025 09:19:17</publishTime>
+ <publishTime>06/04/2025 13:25:54</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>06/09/2025 09:19:17</publishTime>
+ <publishTime>06/04/2025 13:25:54</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>06/06/2025 16:42:55</publishTime>
+ <publishTime>06/04/2025 13:25:49</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>06/06/2025 16:42:55</publishTime>
+ <publishTime>06/04/2025 13:25:49</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -252,7 +252,7 @@
<publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 12:02:18</publishTime>
@@ -285,22 +285,22 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>06/06/2025 16:42:55</publishTime>
+ <publishTime>06/04/2025 13:25:55</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>06/06/2025 16:42:55</publishTime>
+ <publishTime>06/04/2025 13:25:55</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>06/12/2025 08:07:04</publishTime>
+ <publishTime>06/09/2025 09:28:20</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>06/12/2025 08:07:04</publishTime>
+ <publishTime>06/09/2025 09:28:20</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>06/12/2025 08:07:22</publishTime>
+ <publishTime>06/09/2025 09:28:26</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -312,58 +312,58 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>04/21/2025 11:46:15</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>04/21/2025 11:46:15</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>04/21/2025 11:46:15</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>04/21/2025 11:46:15</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
<publishTime>03/22/2022 13:17:22</publishTime>
@@ -372,7 +372,7 @@
<publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -381,118 +381,118 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="libman.json">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>07/12/2023 08:14:21</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="packages.config">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>09/19/2024 10:10:46</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web.config">
- <publishTime>06/09/2025 09:19:56</publishTime>
+ <publishTime>06/04/2025 13:26:18</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
index 5317e54..f3a9758 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-01-10T05:10:47.2046185Z;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-09T08:45:52.0865612Z;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>01/10/2025 10:58:37</publishTime>
+ <publishTime>06/09/2025 16:45:33</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>01/10/2025 10:58:37</publishTime>
+ <publishTime>06/09/2025 16:45:33</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>01/10/2025 10:58:35</publishTime>
+ <publishTime>06/09/2025 16:45:32</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>01/10/2025 10:58:35</publishTime>
+ <publishTime>06/09/2025 16:45:32</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>12/31/2024 13:36:09</publishTime>
+ <publishTime>06/09/2025 16:45:27</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>12/31/2024 13:36:09</publishTime>
+ <publishTime>06/09/2025 16:45:27</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>12/31/2024 13:36:10</publishTime>
+ <publishTime>06/09/2025 16:45:28</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>12/31/2024 13:36:10</publishTime>
+ <publishTime>06/09/2025 16:45:28</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>12/31/2024 13:36:07</publishTime>
+ <publishTime>06/09/2025 16:45:25</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>12/31/2024 13:36:07</publishTime>
+ <publishTime>06/09/2025 16:45:25</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>12/31/2024 13:36:09</publishTime>
+ <publishTime>06/09/2025 16:45:26</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>12/31/2024 13:36:09</publishTime>
+ <publishTime>06/09/2025 16:45:26</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>12/31/2024 13:36:09</publishTime>
+ <publishTime>06/09/2025 16:45:27</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>12/31/2024 13:36:09</publishTime>
+ <publishTime>06/09/2025 16:45:27</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>12/31/2024 13:36:05</publishTime>
+ <publishTime>06/09/2025 16:45:23</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>12/31/2024 13:36:05</publishTime>
+ <publishTime>06/09/2025 16:45:23</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>12/31/2024 13:36:11</publishTime>
+ <publishTime>06/09/2025 16:45:28</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>12/31/2024 13:36:11</publishTime>
+ <publishTime>06/09/2025 16:45:28</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>01/10/2025 13:10:41</publishTime>
+ <publishTime>06/09/2025 16:45:41</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>01/10/2025 13:10:41</publishTime>
+ <publishTime>06/09/2025 16:45:41</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>01/10/2025 13:10:46</publishTime>
+ <publishTime>06/09/2025 16:45:45</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -492,7 +492,7 @@
<publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web.config">
- <publishTime>01/04/2025 14:35:40</publishTime>
+ <publishTime>06/09/2025 16:45:51</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 44fe9c9..ce811eb 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -464,6 +464,7 @@
<Compile Include="Controllers\浜轰簨绠＄悊\浜哄憳灞ュ巻\HR_PersonnelResumeController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\Kf_MoveStockBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鐢熶骇棰嗘枡\Kf_ProductReceiveMaterialBillController.cs" />
+ <Compile Include="Controllers\鍗庤繙datamapping\HY_DataMappingController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\鍩虹璧勬枡\Gy_BaseInformationController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\鐜妫�娴嬪崟\QC_EnvironmentTestDotCheckBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\璐ㄩ噺鏈堝害鐩爣鍗昞QC_MonthTarGetBillController.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 3029dd8..1c2b441 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -3,7 +3,7 @@
<PropertyGroup>
<LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
index a7e42c4..008a66e 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 0a5bf1c..a98e556 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/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index 579a602..0000000
--- a/sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index 952961b..f36f557 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,3 +1,11 @@
+<<<<<<< HEAD
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+=======
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
@@ -9,3 +17,4 @@
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+>>>>>>> 9b54060aab13ef42f1d251dad16bef4d0c9264d9
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
deleted file mode 100644
index 2eafeb3..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
index 13a0b3b..e19d767 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -1,10 +1,10 @@
-<<<<<<< HEAD
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
+<<<<<<< HEAD
+=======
=======
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
@@ -12,3 +12,4 @@
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
edcd7574e709748c5d3ccc0bd54930414ddcfc9a
+>>>>>>> 9b54060aab13ef42f1d251dad16bef4d0c9264d9
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
index a7e42c4..008a66e 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 0a5bf1c..a98e556 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1