From 7cc9010c7656af5da6321b62699efbe5b8e503e0 Mon Sep 17 00:00:00 2001
From: chenhaozhe <gaozhechen26@gmail.com>
Date: 星期三, 11 三月 2026 19:14:46 +0800
Subject: [PATCH] 合并分支
---
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 1
BLL/bin/Release/DAL.dll | 0
BLL/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/DBUtility.dll | 0
WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs | 4
DAL/bin/Release/Pub_Control.dll | 0
DBUtility/bin/Release/Pub_Control.pdb | 0
WebAPI/Controllers/品质管理/巡检单/QC_PatrolProcCheckOtherBillController.cs | 4
BLL/bin/Release/SQLHelper.dll | 0
DAL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/Model.dll | 0
Model/obj/x86/Release/Model.csproj.AssemblyReference.cache | 0
WebAPI/Models/KingdeeResponse.cs | 53 ++++
DBUtility/bin/Release/Pub_Class.dll | 0
DBUtility/bin/Release/Pub_Control.dll | 0
Model/bin/Release/SQLHelper.pdb | 0
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
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
DAL/bin/Release/Model.pdb | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
SQLHelper/obj/Release/SQLHelper.pdb | 0
Model/obj/Release/Model.pdb | 0
BLL/bin/Release/BLL.pdb | 0
DBUtility/bin/Release/DBUtility.pdb | 0
DBUtility/bin/Release/DBUtility.dll | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
Model/bin/Release/Pub_Control.dll | 0
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
Pub_Control/bin/Release/Pub_Class.pdb | 0
Pub_Control/bin/Release/Pub_Class.dll | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
WebAPI/WebAPI.csproj | 1
SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache | 0
BLL/bin/Release/Pub_Control.pdb | 0
Pub_Class/bin/Release/Pub_Class.pdb | 0
Pub_Control/bin/Release/Pub_Control.dll | 0
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 6
BLL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/SQLHelper.dll | 0
LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache | 0
Model/bin/Release/DBUtility.pdb | 0
SQLHelper/bin/Release/SQLHelper.dll | 0
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | 43 +-
WebAPI/Controllers/条码管理/WEBSController.cs | 547 ++++++++++++++++++++++++++++++++++++++++++
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.csproj.GenerateResource.Cache | 0
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 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
BLL/bin/Release/DBUtility.dll | 0
BLL/bin/Release/BLL.dll | 0
Pub_Control/bin/Release/Pub_Control.pdb | 0
DBUtility/obj/Release/DBUtility.dll | 0
WebAPI/Models/HBarCodeList.cs | 1
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
Model/obj/Release/Model.dll | 0
BLL/bin/Release/Pub_Class.dll | 0
NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache | 0
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 11
WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml | 16 +
DBUtility/bin/Release/SQLHelper.dll | 0
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
Model/bin/Release/Model.pdb | 0
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 3
DBUtility/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/Pub_Class.dll | 0
Model/bin/Release/Pub_Class.dll | 0
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs | 26 --
Model/bin/Release/Model.dll | 0
DBUtility/bin/Release/Pub_Class.pdb | 0
Model/质检管理/ClsQC_POStockInCheckBillSub.cs | 5
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache | 0
BLL/bin/Release/Pub_Class.pdb | 0
Model/bin/Release/SQLHelper.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user | 8
88 files changed, 659 insertions(+), 70 deletions(-)
diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
index 9f77423..3b98bf1 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 1344f40..7ecbbf5 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 cc1533e..5b09e0f 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 8a2e26c..e191240 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 e93454a..204ed2f 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 4bd746b..427c2a1 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 7e6c376..477a1c3 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 b22f68d..eca9e87 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 28afc8f..20ddf7d 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 82e2dc9..69c94a8 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 5e28d83..bbe65bc 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 2c608a3..6cac316 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 5c92dae..98f8897 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 6ef1c79..8503912 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 cc1533e..5b09e0f 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 8a2e26c..e191240 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 e93454a..204ed2f 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 4bd746b..427c2a1 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 7e6c376..477a1c3 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 b22f68d..eca9e87 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 28afc8f..20ddf7d 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 82e2dc9..69c94a8 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 5e28d83..bbe65bc 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 2c608a3..6cac316 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 5c92dae..98f8897 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 6ef1c79..8503912 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 e93454a..204ed2f 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 4bd746b..427c2a1 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 28afc8f..20ddf7d 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 82e2dc9..69c94a8 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 5e28d83..bbe65bc 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 2c608a3..6cac316 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 5c92dae..98f8897 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 6ef1c79..8503912 100644
--- a/DBUtility/bin/Release/SQLHelper.pdb
+++ b/DBUtility/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index 27acbd8..7592d96 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 7c45b82..4acb931 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.dll b/DBUtility/obj/Release/DBUtility.dll
index e93454a..204ed2f 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 4bd746b..427c2a1 100644
--- a/DBUtility/obj/Release/DBUtility.pdb
+++ b/DBUtility/obj/Release/DBUtility.pdb
Binary files differ
diff --git a/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache b/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache
index cd05dcb..8acfc35 100644
--- a/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache
+++ b/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/bin/Release/DBUtility.dll b/Model/bin/Release/DBUtility.dll
index e93454a..204ed2f 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 4bd746b..427c2a1 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 7e6c376..477a1c3 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 b22f68d..eca9e87 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 28afc8f..20ddf7d 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 82e2dc9..69c94a8 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 5e28d83..bbe65bc 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 2c608a3..6cac316 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 5c92dae..98f8897 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 6ef1c79..8503912 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 2e05c81..2885f01 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 7e6c376..477a1c3 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 b22f68d..eca9e87 100644
--- a/Model/obj/Release/Model.pdb
+++ b/Model/obj/Release/Model.pdb
Binary files differ
diff --git a/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache b/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
index 007c386..eb3b4f1 100644
--- a/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
+++ b/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBillSub.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBillSub.cs"
index e2f61f4..7297492 100644
--- "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBillSub.cs"
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBillSub.cs"
@@ -48,6 +48,11 @@
public Int64 HInspectMethodID; // 检验方法
public Int64 HInspectBasisID; // 检验依据
public decimal HInspectValQ; // 检验值(定量分析)
+ public Int64 HMaterID; //物料ID
+ public double HInStockQty; //入库数量
+ public double HCheckQty; //抽检数量
+ public double HRightQty; //合格数量
+ public double HBadQty; //不合格数量
}
}
diff --git a/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache b/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache
index 4cb28e4..a287311 100644
--- a/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache
+++ b/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache
Binary files differ
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 50d9417..38a9f38 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -2784,12 +2784,6 @@
omodel.Xt_grdAlignment_WMES_RemoteTransFileCTL = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
- // 是否启用开工单首检控制
- if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESBeginWorkBill_FirstCheckCtl")
- {
- omodel.Sc_MESBeginWorkBill_FirstCheckCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
- }
-
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_PatrolProcCheckOtherBill_FirstCheckCtl")
{
omodel.QC_PatrolProcCheckOtherBill_FirstCheckCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -5221,11 +5215,6 @@
}
// 是否启用开工单首检控制
- if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESBeginWorkBill_FirstCheckCtl")
- {
- omodel.Sc_MESBeginWorkBill_FirstCheckCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
- }
-
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_PatrolProcCheckOtherBill_FirstCheckCtl")
{
omodel.QC_PatrolProcCheckOtherBill_FirstCheckCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index 59c519f..cfe9986 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -869,9 +869,6 @@
// 多语言
public string Xt_grdAlignment_WMES_RemoteTransFileCTL; // APP 是否启用远程获取翻译文件功能
- // 开工单 首检控制
- public string Sc_MESBeginWorkBill_FirstCheckCtl; // 开工单 是否启用 首检控制
-
// 巡检单 首检控制
public string QC_PatrolProcCheckOtherBill_FirstCheckCtl; // 巡检单 是否启用 首检控制
diff --git a/Pub_Class/bin/Release/Pub_Class.dll b/Pub_Class/bin/Release/Pub_Class.dll
index 28afc8f..20ddf7d 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 82e2dc9..69c94a8 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 28afc8f..20ddf7d 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 82e2dc9..69c94a8 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 5e28d83..bbe65bc 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 2c608a3..6cac316 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 28afc8f..20ddf7d 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 82e2dc9..69c94a8 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 5c92dae..98f8897 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 6ef1c79..8503912 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 ef43f40..a23b616 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 5c92dae..98f8897 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 6ef1c79..8503912 100644
--- a/SQLHelper/obj/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/Release/SQLHelper.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 2a5b3fd..eb9cb8f 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -19,3 +19,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
+D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..67f5af4
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
index f181774..9d24ae1 100644
--- a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -376,30 +376,33 @@
{
if (oSystemParameter.omodel.WMS_CampanyName == "鏉窞鏂帿灏�")
{
-
- //鍒ゆ柇褰撳墠娴佽浆鍗� 褰撳墠宸ュ簭鏄惁鏄紑宸�
- ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceBillNo='" + HBarCode + "' and HICMOStatus<>'0' and HProcID='"+ HProcID + "'", "Sc_ICMOBillStatus_Tmp");
- //鏌ヤ笉鍒拌瘉鏄庢病鏈夊紑宸ヨ繘鍏ヤ笅涓�鍙ユ煡璇�
- if (ds.Tables[0].Rows.Count == 0)
+ if (HProcID == "90") //娓呮磥宸ュ簭杩涘叆鑷姩寮�宸ユā寮�
{
- //鍒ゆ柇褰撳墠娴佽浆鍗℃槸鍚﹀ⅷ瑗垮摜鐨�
- ds2 = oCN.RunProcReturn("select HPRDORGID from Sc_ProcessExchangeBillMain with(nolock) where HBillNo = '" + HBarCode + "' ", "Sc_ProcessExchangeBillMain");
- if (ds2.Tables[0].Rows[0]["HPRDORGID"].ToString() != "7667152")
+ //鍒ゆ柇褰撳墠娴佽浆鍗� 褰撳墠宸ュ簭鏄惁鏄紑宸�
+ ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceBillNo='" + HBarCode + "' and HICMOStatus<>'0' and HProcID='" + HProcID + "'", "Sc_ICMOBillStatus_Tmp");
+ //鏌ヤ笉鍒拌瘉鏄庢病鏈夊紑宸ヨ繘鍏ヤ笅涓�鍙ユ煡璇�
+ if (ds.Tables[0].Rows.Count == 0)
{
- //鑾峰彇鐢熶骇鐘舵�佷复鏃惰〃鏁版嵁
- ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceBillNo='" + HBarCode + "' and HProcID='" + HProcID + "'", "Sc_ICMOBillStatus_Tmp");
- //浼犲叆 鐢熶骇鐘舵�佷复鏃惰ˉ 鍗曟嵁绫诲瀷銆佷富id銆佹簮鍗曞瓙ID銆佹簮鍗曞崟鍙枫�佸綋鍓嶇櫥褰曚汉銆佹簮鍗曞崟鎹被鍨�
- objJsonResult = SaveMESBeginWorkFrom_ZD(ds.Tables[0].Rows[0]["HBillType"].ToString(),ds.Tables[0].Rows[0]["HInterID"].ToString(), ds.Tables[0].Rows[0]["HSourceEntryID"].ToString(), ds.Tables[0].Rows[0]["HSourceBillNo"].ToString(),user, ds.Tables[0].Rows[0]["HSourceBillType"].ToString());
- if (objJsonResult.code == "0")
+ //鍒ゆ柇褰撳墠娴佽浆鍗℃槸鍚﹀ⅷ瑗垮摜鐨�
+ ds2 = oCN.RunProcReturn("select HPRDORGID from Sc_ProcessExchangeBillMain with(nolock) where HBillNo = '" + HBarCode + "' ", "Sc_ProcessExchangeBillMain");
+ if (ds2.Tables[0].Rows[0]["HPRDORGID"].ToString() != "7667152")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = objJsonResult.Message;
- objJsonResult.data = null;
- return objJsonResult;
+ //鑾峰彇鐢熶骇鐘舵�佷复鏃惰〃鏁版嵁
+ ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceBillNo='" + HBarCode + "' and HProcID='" + HProcID + "'", "Sc_ICMOBillStatus_Tmp");
+ //浼犲叆 鐢熶骇鐘舵�佷复鏃惰ˉ 鍗曟嵁绫诲瀷銆佷富id銆佹簮鍗曞瓙ID銆佹簮鍗曞崟鍙枫�佸綋鍓嶇櫥褰曚汉銆佹簮鍗曞崟鎹被鍨�
+ objJsonResult = SaveMESBeginWorkFrom_ZD(ds.Tables[0].Rows[0]["HBillType"].ToString(), ds.Tables[0].Rows[0]["HInterID"].ToString(), ds.Tables[0].Rows[0]["HSourceEntryID"].ToString(), ds.Tables[0].Rows[0]["HSourceBillNo"].ToString(), user, ds.Tables[0].Rows[0]["HSourceBillType"].ToString());
+ if (objJsonResult.code == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
- }
- }
+ }
+ }
+
}
}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs
index cce07cd..4a06184 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs
@@ -2396,7 +2396,7 @@
if (OperationType == 1) // 鏂板
{
objJsonResult = AfterSave_MouldLowerBill(HInterID, HBillNo, 1);
- if (objJsonResult.count == 0)
+ if (objJsonResult.code == "0")
{
oCN.RollBack();
objJsonResult.code = "0";
@@ -2408,7 +2408,7 @@
else // 淇敼/澶嶅埗
{
objJsonResult = AfterSave_MouldLowerBill(HInterID, HBillNo, 2);
- if (objJsonResult.count == 0)
+ if (objJsonResult.code == "0")
{
oCN.RollBack();
objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index 8d605b1..f9a047e 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -1631,32 +1631,6 @@
objJsonResult.data = null;
return objJsonResult;
}
-
- oSystemParameter.ShowBill(ref DBUtility.ClsPub.sErrInfo);
- if(oSystemParameter.omodel.Sc_MESBeginWorkBill_FirstCheckCtl == "Y")
- {
- // 鍒ゆ柇鏄惁鍏佽 鏈妫�鍚堟牸鍓嶅紑宸�
- DataSet ds = oCN.RunProcReturn($@"select top 1 * from QC_FirstPieceCheckBillMain
- where HMainSourceBillType = '{HBillType}' and HMainSourceBillNo = '{HSourceBillNo}'
- order by HDate desc", "QC_FirstPieceCheckBillMain");
-
- if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "妫�楠岄浠舵楠屽け璐ワ紝璇ュ崟鎹病鏈夊仛瀵瑰嵃鐨勯妫�鍗�";
-
- return objJsonResult;
- }
-
- if (ds.Tables[0].Rows[0]["HLastResult"].ToString() == "0")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "棣栦欢妫�澶辫触锛岄浠舵妫�楠岀粨鏋滀负涓嶅悎鏍硷紝涓嶅厑璁镐笅鎺ㄥ崟鎹�";
- return objJsonResult;
- }
- }
//鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
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 45d5111..51de396 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"
@@ -2829,6 +2829,7 @@
HBarCode_Temp = HPOOrderBillMTO_TMN + "|" + HMaterNumber_BarCode + "|" + HInspectionDate_BarCode + "|" + HQty_BarCode + "|" + LSH;
HBarCodeList barcode = new HBarCodeList();
+ barcode.HSourceBillSEQ = ordrlist[i].HSourceBillSEQ; // 婧愬崟琛屽彿
barcode.HBarCode2 = HBarCode_Temp;
barcode.HBarCodeType2 = "鍞竴鏉＄爜";
barcode.HBarCodeSubType2 = "";
@@ -2974,10 +2975,10 @@
string HInspectionDate = ListRows[i].HInspectionDate;
int HInspectionCycle = ClsPub.isInt(ListRows[i].HInspectionCycle);
string HReInspectionDate = ListRows[i].HInspectionDate;
+ int HSourceBillSEQ = ClsPub.isInt(ListRows[i].HSourceBillSEQ);
string HCustomBatchNo = ClsPub.isStrNull(ListRows[i].HInspectionDate).Replace("-","");
string HBarCodeStatus = "姝ｅ父";
string HPOOrderBillNoMTO = ClsPub.isStrNull(ListRows[i].HPOOrderBillMTO);
-
string sql_produceBarCode = "insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HBarCodeSubType,HMaterID,HUnitID,HQty" +
",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
@@ -2987,7 +2988,7 @@
",HGiveAwayFlag " +
",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate,HEmpID,HCusModel,HCusMaterName,HCheckEmpName,HCustomBatchNo,HBarCodeStatus,HOrderBillNo" +
- ",HReInspectionFlag,HInspectionDate,HInspectionCycle,HReInspectionDate " +
+ ",HReInspectionFlag,HInspectionDate,HInspectionCycle,HReInspectionDate,HSourceBillSEQ " +
") values ("
+ "'" + HBarCode + "','" + HBarCodeType + "','" + HBarCodeSubType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
+ ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID2.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
@@ -2999,6 +3000,7 @@
+ ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "'"
+ ",'" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'," + HEmpID2.ToString() + ",'" + HCusModel2 + "','" + HCusMaterName2 + "','" + HCheckEmpName2 + "','" + HCustomBatchNo + "','" + HBarCodeStatus + "','" + HPOOrderBillNoMTO + "'" +
"," + HReInspectionFlag + "," + (HInspectionDate == null ? "null" : "'" + HInspectionDate + "'") + "," + HInspectionCycle + "," + (HReInspectionDate == null ? "null" : "'" + HReInspectionDate + "'") +
+ "," + HSourceBillSEQ +
")";
oCN.RunProc(sql_produceBarCode);
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\241\346\243\200\345\215\225/QC_PatrolProcCheckOtherBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\241\346\243\200\345\215\225/QC_PatrolProcCheckOtherBillController.cs"
index 2997fd9..d32106e 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\241\346\243\200\345\215\225/QC_PatrolProcCheckOtherBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\241\346\243\200\345\215\225/QC_PatrolProcCheckOtherBillController.cs"
@@ -265,10 +265,10 @@
oSystemParameter.ShowBill(ref DBUtility.ClsPub.sErrInfo);
if (oSystemParameter.omodel.QC_PatrolProcCheckOtherBill_FirstCheckCtl == "Y")
{
- // 鍒ゆ柇鏄惁鍏佽 鏈妫�鍚堟牸鍓嶅紑宸�
+ // 鍒ゆ柇鏄惁鍏佽 鏈妫�鍚堟牸鍓嶅贰妫�
DataSet ds = oCN.RunProcReturn($@"select top 1 * from QC_FirstPieceCheckBillMain
where HMainSourceBillType = '{BillNew.omodel.HMainSourceBillType}' and HMainSourceBillNo = '{BillNew.omodel.HMainSourceBillNo}'
- order by HDate desc", "QC_FirstPieceCheckBillMain");
+ order by HDate desc", "QC_FirstPieceCheckBillMain");
if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
{
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index 08884ed..b5586c1 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -5250,6 +5250,553 @@
#endregion
+ #region 妫�楠屽崟 涓婁紶鐢熷崟
+
+ #region 妫�楠屽崟 鍚堟牸鍝�
+
+ /// <summary>
+ /// 妫�楠屽崟鏂板涓婁紶
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/set_SaveQCPOStockInCheckBill_Json")]
+ [HttpPost]
+ public object set_SaveQCPOStockInCheckBill_Json(Int64 HInterID, string HBillNo, string HSourceBillType, string HSourceBillNo, Int64 HSourceInterID, string sHSourceEntryID, Int64 HFirstCheckEmp, string HMaker)
+ {
+ try
+ {
+ ClsQC_POStockInCheckBillMain oMain = new ClsQC_POStockInCheckBillMain();
+ oMain.HInterID = HInterID;
+ oMain.HBillNo = HBillNo;
+ oMain.HBillType = "7503";
+ oMain.HDate = DateTime.Today;
+ oMain.HMainSourceBillType = HSourceBillType;
+ oMain.HMainSourceBillNo = HSourceBillNo;
+ oMain.HMainSourceInterID = HSourceInterID;
+ oMain.HFirstCheckEmp = HFirstCheckEmp;
+ oMain.HMaker = HMaker;
+
+ if (set_SaveQCPOStockInCheckBill(oMain, HSourceBillType, sHSourceEntryID, ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "妫�楠屽崟涓婁紶澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //鐢熸垚妫�楠屽崟
+ public bool set_SaveQCPOStockInCheckBill(Model.ClsQC_POStockInCheckBillMain oMain, string HSourceBillType, string sHSourceEntryID, ref string sErrMsg)
+ {
+ string sRemark = "";
+ string HReturn;
+
+ //涓婁紶鍓嶅垽鏂�
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet BfDs = oCn.RunProcReturn("exec h_p_QC_BeforeUpload_POStockInCheckBill " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + HSourceBillType + "','" + sHSourceEntryID + "'," + oMain.HFirstCheckEmp.ToString(), "h_p_QC_BeforeUpload_POStockInCheckBill");
+ if (BfDs == null || BfDs.Tables[0].Rows.Count == 0)
+ {
+ sErrMsg = "涓婁紶鍓嶅垽鏂暟鎹畬鏁存�уけ璐ワ紒";
+ return false;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(BfDs.Tables[0].Rows[0][0]) == 1)
+ {
+ sErrMsg = "鍗曟嵁鍙凤細" + oMain.HBillNo + "锛屽崟鎹甀D锛�" + oMain.HInterID + "锛�" + DBUtility.ClsPub.isStrNull(BfDs.Tables[0].Rows[0]["HRemark"]);
+ return false;
+ }
+ }
+ sRemark = sRemark + " 锛涗笂浼犲墠鍒ゆ柇" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ //杩斿洖鎵�闇�鏁版嵁
+ DataSet Ds;
+ Ds = oCn.RunProcReturn("exec h_p_QC_POStockInCheckBill_CLD " + oMain.HMainSourceInterID.ToString() + ",'" + sHSourceEntryID + "'," + oMain.HFirstCheckEmp.ToString(), "h_p_QC_POStockInCheckBill_CLD");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
+ {
+ sErrMsg = "鏍规嵁鏀舵枡閫氱煡鍗曪細" + oMain.HMainSourceBillNo + " 鑾峰彇鏁版嵁澶辫触锛�";
+ return false;
+ }
+ sRemark = sRemark + " 锛涜幏鍙朇LOUD鍗曟嵁API閫掑叆鍊�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ //鑾峰彇鍗曟嵁涓昏〃鎵�闇�鏁版嵁
+ oMain.HSupID = Pub_Class.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupID"]);
+ oMain.HSTOCKORGID = Pub_Class.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSTOCKORGID"]);
+
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ if (oSystemParameter.ShowBillByOrgID(oMain.HSTOCKORGID, ref sErrMsg) == false)
+ {
+ sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ return false;
+ }
+
+ try
+ {
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(oMain.HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ sErrMsg = s;
+ return false;
+ }
+ oMain.HYear = sYear;
+ oMain.HPeriod = sPeriod;
+
+ oCn.BeginTran();
+ //鐢熸垚妫�楠屽崟
+ //鍐欏叆涓昏〃
+ oCn.RunProc("Insert Into QC_POStockInCheckBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
+ ",HYear,HPeriod,HRemark,HSTOCKORGID,HSupID,HMaterID" +
+ ",HInstockQty,HCheckQty,HRightQty,HBadQty,HFirstCheckEmp" +
+ ",HCheckerResult,HSteelStoveNo,HSteelCompReport,HAspect,HSize" +
+ ") " +
+ " values('" + oMain.HBillType + "','" + oMain.HBillType + "'," + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + oMain.HDate.ToShortDateString() + "','" + oMain.HMaker + "',getdate()" +
+ ", " + oMain.HYear.ToString() + "," + oMain.HPeriod.ToString() + ",'" + oMain.HRemark + "'," + oMain.HSTOCKORGID.ToString() + "," + oMain.HSupID.ToString() + "," + oMain.HMaterID.ToString() +
+ ", " + oMain.HCheckQty.ToString() + "," + oMain.HCheckQty.ToString() + "," + oMain.HRightQty.ToString() + "," + oMain.HBadQty.ToString() + "," + oMain.HFirstCheckEmp.ToString() +
+ ",'" + oMain.HCheckerResult + "','" + oMain.HSteelStoveNo + "','" + oMain.HSteelCompReport + "','" + oMain.HAspect + "','" + oMain.HSize + "'" +
+ ") ");
+
+ //鍐欏叆瀛愯〃
+ for (int i = 0; i < Ds.Tables[1].Rows.Count; i++)
+ {
+ Model.ClsQC_POStockInCheckBillSub oSub = new Model.ClsQC_POStockInCheckBillSub();
+ oSub.HEntryID = i + 1;
+ oSub.HSourceInterID = Pub_Class.ClsPub.isLong(Ds.Tables[1].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = Pub_Class.ClsPub.isLong(Ds.Tables[1].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillNo = Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["HSourceBillNo"]);
+ oSub.HSourceBillType = Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["HSourceBillType"]);
+ oSub.HResult = "鍚堟牸";
+ oSub.HProcCheckEmp = oMain.HFirstCheckEmp;
+ oSub.HMaterID = Pub_Class.ClsPub.isLong(Ds.Tables[1].Rows[i]["HMaterID"]);
+ oSub.HInStockQty = Pub_Class.ClsPub.isDoule(Ds.Tables[1].Rows[i]["HInStockQty"]);
+ oSub.HCheckQty = Pub_Class.ClsPub.isDoule(Ds.Tables[1].Rows[i]["HCheckQty"]);
+ oSub.HRightQty = Pub_Class.ClsPub.isDoule(Ds.Tables[1].Rows[i]["HRightQty"]);
+ oSub.HBadQty = Pub_Class.ClsPub.isDoule(Ds.Tables[1].Rows[i]["HBadQty"]);
+
+ oCn.RunProc("Insert Into QC_POStockInCheckBillSub " +
+ "(HInterID,HEntryID,,HBillNo_bak,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HQCCheckClassID,HQCCheckItemID,HQCStd,HQCRelValue" +
+ "HResult,HProcCheckEmp,HProcCheckTime" +
+ "HMaterID,HInStockQty,HCheckQty,HRightQty,HBadQty" +
+ ") " +
+ " values(" + oMain.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oMain.HBillNo + "','" + oSub.HRemark + "'" +
+ ", " + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
+ ", " + oSub.HQCCheckClassID.ToString() + "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCRelValue + "'" +
+ ",'" + oSub.HResult + "'," + oSub.HProcCheckEmp.ToString() + "',getdate()" +
+ ", " + oSub.HMaterID.ToString() + "," + oSub.HInStockQty.ToString() + "," + oSub.HCheckQty.ToString() + "," + oSub.HRightQty.ToString() + "," + oSub.HBadQty.ToString() +
+ ") ");
+ }
+ sRemark = sRemark + " 锛涚敓鎴愭楠屽崟鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ //鑾峰彇閲戣澏浜慉PI鎵�闇�閫掑叆鏁版嵁
+ string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
+ sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
+
+ string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\",\"IsEntryBatchFill\":\"True\",\"Model\":{\"FBillNo\":\"" + oMain.HBillNo + "\"," +
+ //\"FID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FID"]) + "\"," +
+ "\"FBillTypeID\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBillTypeID"]) + "\" }," +
+ "\"FBusinessType\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBusinessType"]) + "\"," +
+ "\"FDATE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDATE"]) + "\"," +
+ "\"FSourceOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FSourceOrgId"]) + "\"}," +
+ "\"FInspectOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FInspectOrgId"]) + "\"}," +
+ "\"FInspectDepId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FInspectDepId"]) + "\"}," +
+ //"\"FInspectGroupId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FInspectGroupId"]) + "\"}," +
+ "\"FInspectorId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FInspectorId"]) + "\"}," +
+ //"\"FDescription\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDescription"]) + "\"," +
+ //"\"FUpScanBox\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FUpScanBox"]) + "\"," +
+ //"\"FDefScanBox\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDefScanBox"]) + "\"," +
+ //"\"FCheckQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FCheckQty"]) + "\"," +
+ //"\"FInspectValScanBox\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FInspectValScanBox"]) + "\"," +
+ "\"FIsSynced\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FIsSynced"]) + "\"," +
+ sJson_MainCustom +
+ "\"FEntity\":[";
+ string sJson_Entry = "";
+ for (int i = 0; i < Ds.Tables[1].Rows.Count; i++)
+ {
+ if (sJson_Entry != "")
+ {
+ sJson_Entry = sJson_Entry + " , ";
+ }
+ string sJson_BatchNo = "";
+ string sJson_StockPlace = "";
+ string sJson_FProduceDate = ""; //鐢熶骇鏃ユ湡
+ string sJson_FExpiryDate = ""; //鏈夋晥鏈熻嚦
+ string sJson_FAUXPROPID = "";
+ string sJson_SubCustom = ""; //瀛愯〃鑷畾涔夊瓧娈�
+
+ //瀛愯〃鑷畾涔夊瓧娈�
+ sJson_SubCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["SubCustom"]);
+
+ //鏄惁鍚敤鎵规绠＄悊
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["HISBATCHMANAGE"]) == "1")
+ {
+ sJson_BatchNo = " \"FLOT\": {\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLOT"]) + "\"}, \"FLOT_TEXT\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLOT"]) + "\" , ";
+ }
+ else
+ {
+ sJson_BatchNo = "";
+ }
+
+ //鏄惁鍚敤淇濊川鏈熸帶鍒�
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
+ {
+ sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
+ sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
+ }
+ else
+ {
+ sJson_FProduceDate = "";
+ sJson_FExpiryDate = "";
+ }
+
+ //鏄惁鍚敤浠撲綅
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockLocId"]) == "")
+ {
+ sJson_StockPlace = "";
+ }
+ else
+ {
+ sJson_StockPlace = Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockLocId"]) + "\"}},";
+ }
+
+ //杈呭姪灞炴��
+ sJson_FAUXPROPID = " \"FAUXPROPID\":{\"FAUXPROPID__FF100002\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FAUXPROPID"]) + "\"}},";
+
+ sJson_Entry = sJson_Entry + "{" +
+ //"FEntryID": 0,
+ "\"FMaterialId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FMaterialId"]) + "\"}," +
+ //"FQCSchemeId": {"FNUMBER": ""},
+ "\"FUnitID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FUnitID"]) + "\"}," +
+ "\"FInspectQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FInspectQty"]) + "\"," + //妫�楠屾暟閲�
+ "\"FQualifiedQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FQualifiedQty"]) + "\"," + //鍚堟牸鏁伴噺
+ "\"FUnqualifiedQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FUnqualifiedQty"]) + "\"," + //涓嶅悎鏍兼暟閲�
+ //"FSampleDamageQty": 0,
+ //"FSUnqualifiedQty": 0,
+ "\"FInspectResult\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FInspectResult"]) + "\"," + //妫�楠岀粨鏋�
+ "\"FQCStatus\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FQCStatus"]) + "\"," + //璐ㄦ鐘舵��
+ //"FBaseSUnqualifiedQty": 0,
+ //"FSampleQty": 0,
+ //"FMemo": "",
+ "\"FIsRelated\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsRelated"]) + "\"," +
+ "\"FSrcBillType0\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcBillType0"]) + "\"," +
+ "\"FSrcBillNo0\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcBillNo0"]) + "\"," +
+ "\"FSrcInterId0\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcInterId0"]) + "\"," +
+ "\"FSrcEntryId0\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcEntryId0"]) + "\"," +
+ "\"FSrcEntrySeq0\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcEntrySeq0"]) + "\"," +
+ "\"FBaseUnitId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBaseUnitId"]) + "\"}," +
+ //"FQCBusinessType": "",
+ //"FBFLowId": {"FNAME": ""},
+ //"FSampleSchemeId": {"FNUMBER": ""},
+ //"FAcceptQty": 0,
+ //"FRejectQty": 0,
+ //"FInspectEndDate": "1900-01-01",
+ "\"FBaseInspectQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBaseInspectQty"]) + "\"," + //鍩烘湰鍗曚綅妫�楠屾暟閲�
+ "\"FSupplierId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSupplierId"]) + "\"}," +
+ //"FCustomerId": {"FNUMBER": ""},
+ //"FProductLineId": {"FNUMBER": ""},
+ //"FPrdLineLocation": {"FLOCATIONCODE": ""},
+ //"FWorkshopId": {"FNUMBER": ""},
+ "\"FStockId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockId"]) + "\"}," +
+ sJson_BatchNo +
+ "\"FInspectTimes\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FInspectTimes"]) + "\"," + //妫�楠屾鏁�
+ sJson_StockPlace +
+ //"FConsumeTime": 0,
+ //"FInspectStartDate": "1900-01-01",
+ "\"FTimeUnit\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FTimeUnit"]) + "\"," +
+ //"FBaseSampleDamageQty": 0,
+ //"FBaseUnqualifiedQty": 0,
+ //"FOperNumber": 0,
+ "\"FSampleDamageBearer\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSampleDamageBearer"]) + "\"," +
+ "\"FIsFirstInspect\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsFirstInspect"]) + "\"," +
+ "\"FBaseQualifiedQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBaseQualifiedQty"]) + "\"," + //鍩烘湰鍗曚綅鍚堟牸鏁�
+ "\"FBaseAcceptQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBaseAcceptQty"]) + "\"," + //鍩烘湰鍗曚綅鎺ユ敹鏁�
+ sJson_FAUXPROPID +
+ //"FPrdUnitId": {"FNumber": ""},
+ //"FBaseReAcceptQty": 0,
+ //"FOperDescription": "",
+ //"FUnitTransHeadQty": 0,
+ //"FUnitTransOperQty": 0,
+ //"FSNUnitID": {"FNumber": ""},
+ //"FBaseWBInspectQty": 0,
+ //"FBaseUnQuaSalQty": 0,
+ //"FSupplierLot": "",
+ sJson_FProduceDate +
+ sJson_FExpiryDate +
+ //"FNewExpiryDate": "1900-01-01",
+ "\"FCurrency\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FCurrency"]) + "\"}," +
+ //"FDiscountQty": 0,
+ "\"FIsSplitRow\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsSplitRow"]) + "\"," +
+ sJson_SubCustom +
+
+ //浣跨敤鍐崇瓥琛ㄤ綋
+ "\"FPolicyDetail\": [ { " +
+ //"FDetailID": 0,
+ "\"FPolicyMaterialId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPolicyMaterialId"]) + "\"}," +
+ "\"FPolicyStatus\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPolicyStatus"]) + "\"," +
+ "\"FPolicyQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPolicyQty"]) + "\"," +
+ "\"FBasePolicyQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBasePolicyQty"]) + "\"," +
+ "\"FUsePolicy\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FUsePolicy"]) + "\"," +
+ //"FSerialId": { "FNUMBER": ""},
+ "\"FIsCheck\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsCheck"]) + "\"," +
+ "\"FIsDefectProcess\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsDefectProcess"]) + "\"," +
+ "\"FCanSale\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FCanSale"]) + "\"," +
+ "\"FIsMRBReview\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsMRBReview"]) + "\"," +
+ "\"FIsReturn\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsReturn"]) + "\"," +
+ "\"FIsRelatedDefect\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsRelatedDefect"]) + "\"" +
+ //"FMRBReviewStatus": "",
+ //"FBoxNumber": "",
+ //"FMemo1": "",
+ //"FPolicyAuxPropId": {"FPOLICYAUXPROPID__FF100005": { "FNumber": ""},"FPOLICYAUXPROPID__FF100002": { "FNumber": ""}}
+ " } ]," +
+
+ //缂洪櫡璁板綍琛ㄤ綋
+ //"\"FDefectDetail\": [ { " +
+ ////"FDetailID": 0,
+ ////"FDSerialId": {"FNUMBER": ""},
+ ////"FDefectTypeId": {"FNUMBER": ""},
+ ////"FDefectQty": 0,
+ ////"FBaseDefectQty1": 0,
+ ////"FDefectReasonId": {"FNUMBER": ""},
+ ////"FDefectLevel": "",
+ ////"FDefectResultId": {"FNUMBER": ""},
+ ////"FDefectMemo": ""
+ //" } ]," +
+
+ //妫�楠岄」鐩〃浣�
+ //"\"FItemDetail\": [ { " +
+ ////"FDetailID": 0,
+ ////"FInspectItemId": { "FNUMBER": ""},
+ ////"FInspectResult1": "",
+ ////"FAnalysisMethod": "",
+ ////"FQualityStdId": { "FNUMBER": ""},
+ ////"FUnitId2": { "FNUMBER": ""},
+ ////"FInspectValQ": 0,
+ ////"FInspectValB": { "FNUMBER": ""},
+ ////"FInspectValT": "",
+ ////"FInspectMethodId": { "FNUMBER": ""},
+ ////"FInspectInstrumentId": { "FNUMBER": ""},
+ ////"FDefectlevel1": "",
+ ////"FDestructInspect": "false",
+ ////"FKeyInspect": "false",
+ ////"FInspectBasisId": { "FNUMBER": ""},
+ ////"FSampleSchemeId1": { "FNUMBER": ""},
+ ////"FItemStatus": "",
+ ////"FCompareSymbol": "",
+ ////"FSampleQty1": 0,
+ ////"FAcceptQty1": 0,
+ ////"FRejectQty1": 0,
+ ////"FSampleDamageQty1": 0,
+ ////"FBaseSampleDamageQty1": 0,
+ ////"FItemMemo": "",
+ ////"FSUnqualifiedQty1": 0,
+ ////"FBaseSUnqualifiedQty1": 0,
+ ////"FTargetVal": "",
+ ////"FInspectVal": "",
+ ////"FUpLimit": "",
+ ////"FDownLimit": "",
+ ////"FUpOffset": "",
+ ////"FDownOffset": "",
+ ////"FInspectValKey": "",
+ ////"FTargetValKey": "",
+ ////"FUpLimitKey": "",
+ ////"FDownLimitKey": "",
+ ////"FUpOffsetKey": "",
+ ////"FDownOffsetKey": "",
+ ////"FTargetValQ": 0,
+ ////"FUpLimitQ": 0,
+ ////"FDownLimitQ": 0,
+ ////"FUpOffsetQ": 0,
+ ////"FDownOffsetQ": 0,
+ ////"FTargetValB": { "FNUMBER": ""},
+ ////"FUpLimitB": { "FNUMBER": ""},
+ ////"FDownLimitB": { "FNUMBER": ""},
+ ////"FUpOffsetB": { "FNUMBER": ""},
+ ////"FDownOffsetB": { "FNUMBER": ""},
+ ////"FTargetValT": "",
+ ////"FUpLimitT": "",
+ ////"FDownLimitT": "",
+ ////"FUpOffsetT": "",
+ ////"FDownOffsetT": "",
+ ////"FValueGrid": [
+ //// {
+ //// "FGridId": 0,
+ //// "FInspectResult2": "",
+ //// "FInspectValueB": { "FNUMBER": ""},
+ //// "FInspectValueT": "",
+ //// "FInspectValue": 0,
+ //// "FVSerialId": { "FNUMBER": ""}
+ //// }
+ ////]
+ //" } ]," +
+
+ //鍙傝�冭〃浣�
+ "\"FReferDetail\": [ { " +
+ //"FDetailID": 0,
+ "\"FSrcBillType\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcBillType"]) + "\"," +
+ "\"FSrcBillNo\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcBillNo"]) + "\"," +
+ "\"FSrcInterId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcInterId"]) + "\"," +
+ "\"FSrcEntryId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcEntryId"]) + "\"," +
+ "\"FSrcEntrySeq\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcEntrySeq"]) + "\"," +
+ "\"FOrderType\":{\"FID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOrderType"]) + "\"}," +
+ "\"FOrderBillNo\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOrderBillNo"]) + "\"," +
+ "\"FOrderId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOrderId"]) + "\"," +
+ "\"FOrderEntryId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOrderEntryId"]) + "\"," +
+ "\"FOrderEntrySeq\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOrderEntrySeq"]) + "\"" +
+ " } ]," +
+
+ //鍏宠仈鍏崇郴琛�
+ "\"FEntity_Link\": [ { " +
+ "\"FEntity_Link_FFlowId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FFlowId"]) + "\"," +
+ "\"FEntity_Link_FFlowLineId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FFlowLineId"]) + "\"," +
+ "\"FEntity_Link_FRuleId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FRuleId"]) + "\"," +
+ "\"FEntity_Link_FSTableName\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FSTableName"]) + "\"," +
+ "\"FEntity_Link_FSBillId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FSBillId"]) + "\"," +
+ "\"FEntity_Link_FSId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FSId"]) + "\"," +
+ "\"FEntity_Link_FBaseAcceptQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FBaseAcceptQty"]) + "\"," +
+ "\"FEntity_Link_FBaseAcceptQtyOld\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FBaseAcceptQtyOld"]) + "\"," +
+ "\"FEntity_Link_FBaseInspectQtyOld\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FBaseInspectQtyOld"]) + "\"," +
+ "\"FEntity_Link_FInspectQtyOld\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FInspectQtyOld"]) + "\"" +
+ " } ] } ";
+ }
+ string sJson_End = " ] }}";
+ string sJson = sJson_Main + sJson_Entry + sJson_End;
+
+ //CLOUD閲戣澏浜戣处鍙峰瘑鐮佺櫥鍏�
+ var loginRet = InvokeHelper.LoginUser(oMain.HMaker);
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ sRemark = sRemark + " 锛涜幏鍙栭獙璇丆LOUD璐﹀彿瀵嗙爜" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ //鐢熸垚閲戣澏浜戝崟鎹�
+ if (isSuccess == 1)
+ {
+ string result = InvokeHelper.Save("QM_InspectBill", sJson); //淇濆瓨
+
+ sRemark = sRemark + " 锛涚敓鎴怌LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚妫�楠屽崟澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("鐢熸垚妫�楠屽崟澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
+ oCn.RollBack();
+ return false;
+ }
+ else
+ {
+ sRemark = sRemark + sJson;
+ oCn.Commit();
+ }
+ }
+ else
+ {
+ sErrMsg = "鐢熸垚妫�楠屽崟澶辫触锛侀噾铦朵簯鐧诲綍澶辫触锛�";
+ oCn.RollBack();
+ return false;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
+ sErrMsg = "鐢熸垚妫�楠屽崟澶辫触锛�" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+
+ if (oSystemParameter.omodel.QC_POStockInCheckBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ try
+ {
+ oCn.BeginTran();
+ //瀹℃牳WMS鍗曟嵁
+ oCn.RunProc("Update QC_POStockInCheckBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
+
+ //鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = InvokeHelper.Submit("QM_InspectBill", sJson2); //鎻愪氦
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ var result3 = InvokeHelper.Audit("QM_InspectBill", sJson2); //瀹℃牳
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString() + "," + result3.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚妫�楠屽崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞跺鏍告楠屽崟鎴愬姛锛�" + sRemark);
+ sErrMsg = "鐢熸垚骞跺鏍告楠屽崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "瀹℃牳妫�楠屽崟澶辫触锛�" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else
+ {
+ LogService.Write("鐢熸垚妫�楠屽崟鎴愬姛锛�" + sRemark);
+ sErrMsg = "鐢熸垚妫�楠屽崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ return true;
+ }
+ }
+
+ #endregion
+
+ #endregion
+
#region 鐢熶骇缁勬墭鍗� 涓婁紶鐢熷崟
/// <summary>
diff --git a/WebAPI/Models/HBarCodeList.cs b/WebAPI/Models/HBarCodeList.cs
index 1e2d123..eab2c47 100644
--- a/WebAPI/Models/HBarCodeList.cs
+++ b/WebAPI/Models/HBarCodeList.cs
@@ -22,6 +22,7 @@
public string HPinfanBarCode2 { get; set; } //HPinfanBarCode
public string HBatchNo2 { get; set; } //"鎵瑰彿";
public int HGiveAwayFlag2 { get; set; } //"鏄惁璧犲搧";
+ public string HSourceBillSEQ { get; set; } //婧愬崟琛屽彿
public string HUnitID2 { get; set; } //"璁￠噺鍗曚綅ID";
public string HUnitNumber2 { get; set; } //"璁￠噺鍗曚綅浠ｇ爜";
public string HUnitName2 { get; set; } //"璁￠噺鍗曚綅";
diff --git a/WebAPI/Models/KingdeeResponse.cs b/WebAPI/Models/KingdeeResponse.cs
new file mode 100644
index 0000000..2c5f5b5
--- /dev/null
+++ b/WebAPI/Models/KingdeeResponse.cs
@@ -0,0 +1,53 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WebAPI.Models
+{
+ public class KingdeeResponse
+ {
+ public _Result Result { get; set; }
+ }
+
+ public class _Result
+ {
+ public _ResponseStatus ResponseStatus { get; set; }
+ }
+
+ public class _ResponseStatus
+ {
+ public int ErrorCode { get; set; }
+ public bool IsSuccess { get; set; }
+
+ private List<_Error> _errors;
+ public List<_Error> Errors
+ {
+ get; set;
+ } = new List<_Error>();
+
+ private List<_SuccessEntity> _successEntitys;
+ public List<_SuccessEntity> SuccessEntitys
+ {
+ get; set;
+ }
+ public int MsgCode { get; set; }
+ }
+
+ public class _Error
+ {
+ public string FieldName { get; set; }
+ public string Message { get; set; }
+ public int DIndex { get; set; }
+ //閿欒鐨勫崟鎹紪鍙�
+ public string FNumber { get; set; }
+ }
+
+ public class _SuccessEntity
+ {
+ public int Id { get; set; }
+ public string Number { get; set; }
+ public int DIndex { get; set; }
+ }
+}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user
index 21bd014..d372467 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile4.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|2026-03-10T07:55:32.9056477Z;True|2026-03-10T15:49:13.7504397+08:00;True|2026-03-10T15:30:11.2410336+08:00;True|2026-03-10T15:02:21.0511892+08:00;True|2026-03-10T14:56:24.7926251+08:00;True|2026-03-10T14:46:46.6494829+08:00;True|2026-03-10T14:45:43.5585864+08:00;True|2026-03-10T14:02:58.4342478+08:00;True|2026-03-10T14:01:53.8022105+08:00;True|2026-03-10T10:58:29.0551739+08:00;False|2026-03-10T10:56:57.0183433+08:00;True|2026-03-09T12:41:36.6596225+08:00;True|2026-03-09T10:34:36.2852949+08:00;True|2026-03-09T10:20:00.0928587+08:00;True|2026-03-09T10:03:27.8600134+08:00;True|2026-03-09T09:55:30.6932647+08:00;True|2026-03-09T09:49:09.0648831+08:00;True|2026-03-09T09:33:01.3515991+08:00;True|2026-03-09T09:28:52.9160958+08:00;True|2026-03-09T09:18:11.2095513+08:00;True|2026-03-09T09:16:10.9243505+08:00;True|2026-03-09T09:14:54.2194356+08:00;True|2026-03-09T09:09:00.9798622+08:00;True|2026-03-09T08:30:34.9060328+08:00;False|2026-03-09T08:30:14.4254068+08:00;True|2026-03-09T01:28:43.0746681+08:00;True|2026-03-09T00:35:43.7572081+08:00;False|2026-03-09T00:34:44.1380553+08:00;True|2026-03-02T10:58:08.4918461+08:00;True|2026-02-28T14:36:37.1813756+08:00;True|2026-02-28T09:10:06.2035727+08:00;True|2026-02-28T08:45:06.8758170+08:00;False|2026-02-28T08:45:00.2780485+08:00;True|2026-02-27T16:29:24.9278951+08:00;False|2026-02-27T16:29:01.8985145+08:00;True|2026-02-27T15:25:58.1156917+08:00;False|2026-02-27T15:25:50.1203408+08:00;True|2026-02-27T08:48:32.3741487+08:00;False|2026-02-27T08:47:49.7647299+08:00;True|2026-02-26T13:55:29.1843761+08:00;True|2026-02-26T10:17:02.6775428+08:00;False|2026-02-26T10:15:56.8080083+08:00;True|2026-02-25T16:35:36.1616346+08:00;False|2026-02-25T16:35:02.7930400+08:00;True|2026-02-25T15:14:31.7665279+08:00;True|2026-02-25T15:06:38.2831461+08:00;True|2026-02-25T14:53:16.9553043+08:00;True|2026-02-25T14:18:12.0055193+08:00;True|2026-02-25T14:11:45.2316738+08:00;True|2026-02-25T14:02:16.3161429+08:00;True|2026-02-25T13:47:25.4930099+08:00;False|2026-02-25T13:46:34.1837894+08:00;True|2026-02-24T10:25:01.2146652+08:00;True|2026-02-24T10:16:06.3505078+08:00;True|2026-02-24T10:08:41.7064926+08:00;False|2026-02-24T10:07:25.4868308+08:00;True|2026-02-21T14:56:37.2206752+08:00;True|2026-02-21T14:53:44.6277903+08:00;True|2026-02-21T14:40:10.4687091+08:00;False|2026-02-21T14:39:13.1736140+08:00;True|2026-02-11T11:45:25.6746436+08:00;True|2026-02-11T11:44:47.3185555+08:00;True|2026-02-11T10:54:59.0679758+08:00;True|2026-02-11T10:43:35.2341241+08:00;True|2026-02-11T10:36:26.6768242+08:00;True|2026-02-11T10:26:54.7470684+08:00;True|2026-02-11T10:26:14.5696000+08:00;True|2026-02-11T10:19:17.3267746+08:00;True|2026-02-11T10:03:08.9096446+08:00;True|2026-02-11T10:00:03.1731421+08:00;False|2026-02-11T09:58:47.2916714+08:00;True|2026-02-10T15:11:02.0203382+08:00;True|2026-02-10T15:07:21.6761915+08:00;True|2026-02-10T14:56:44.3660951+08:00;True|2026-02-10T14:42:24.1573010+08:00;True|2026-02-10T14:17:49.6012996+08:00;True|2026-02-10T10:54:27.8849732+08:00;True|2026-02-10T10:37:09.4615737+08:00;True|2026-02-10T10:32:50.2882198+08:00;True|2026-02-10T10:16:38.5004114+08:00;True|2026-02-10T10:04:58.3653257+08:00;False|2026-02-10T10:04:05.6938724+08:00;True|2026-02-09T11:58:12.9122757+08:00;True|2026-02-09T11:52:51.2402774+08:00;True|2026-02-09T11:47:15.5230979+08:00;True|2026-02-09T10:53:15.6587025+08:00;False|2026-02-09T10:52:01.4586729+08:00;True|2026-02-05T12:04:14.1139398+08:00;True|2026-02-05T10:00:41.8883921+08:00;False|2026-02-05T09:59:49.2086159+08:00;True|2026-02-04T13:30:53.8564398+08:00;True|2026-02-04T13:30:06.5486103+08:00;True|2026-02-04T13:21:44.7322601+08:00;True|2026-02-04T13:15:45.0093895+08:00;True|2026-02-04T13:06:30.4891537+08:00;False|2026-02-04T13:05:35.5287589+08:00;True|2026-02-04T12:39:42.2682329+08:00;True|2026-02-04T12:21:52.9722100+08:00;True|2026-02-04T12:16:07.8303016+08:00;True|2026-02-04T12:08:43.8268899+08:00;True|2026-02-04T12:03:26.1174616+08:00;True|2026-02-04T10:33:15.5394044+08:00;False|2026-02-04T10:32:30.7038502+08:00;True|2026-02-02T15:42:04.9554792+08:00;True|2026-02-02T15:39:28.7017318+08:00;True|2026-02-02T15:38:33.5592835+08:00;True|2026-02-02T15:34:24.8450917+08:00;True|2026-02-02T15:30:36.5990146+08:00;True|2026-02-02T15:09:46.1965065+08:00;True|2026-02-02T15:09:24.9794288+08:00;True|2026-02-02T15:05:46.0763516+08:00;True|2026-02-02T14:56:30.1210013+08:00;True|2026-02-02T14:52:50.7435709+08:00;True|2026-02-02T14:47:49.5891710+08:00;True|2026-02-02T14:43:23.0006294+08:00;True|2026-02-02T14:31:10.1220612+08:00;True|2026-02-02T14:21:15.6540317+08:00;True|2026-02-02T14:15:41.6183116+08:00;True|2026-02-02T14:11:32.1234982+08:00;True|2026-02-02T14:01:34.6298901+08:00;True|2026-02-02T13:55:03.4760402+08:00;True|2026-02-02T13:49:00.0420220+08:00;True|2026-02-02T13:17:17.0678676+08:00;False|2026-02-02T13:15:46.0360589+08:00;False|2026-02-02T13:15:27.1689505+08:00;False|2026-02-02T13:14:27.3078641+08:00;True|2026-02-02T12:55:41.9272586+08:00;True|2026-02-02T12:55:22.0826476+08:00;True|2026-02-02T12:09:21.8247404+08:00;True|2026-02-02T12:03:58.9256304+08:00;True|2026-02-02T11:56:01.5744871+08:00;True|2026-02-02T11:42:30.2218073+08:00;True|2026-02-02T10:59:29.6077968+08:00;False|2026-02-02T10:59:08.7803594+08:00;True|2026-01-29T14:40:47.4658031+08:00;True|2026-01-29T14:36:18.2141550+08:00;True|2026-01-29T14:32:52.4872179+08:00;True|2026-01-29T14:32:06.4197291+08:00;True|2026-01-29T14:09:33.9372276+08:00;True|2026-01-29T14:08:17.6503129+08:00;True|2026-01-29T14:06:27.5784162+08:00;True|2026-01-29T13:10:48.6581055+08:00;True|2026-01-29T13:07:28.5589276+08:00;True|2026-01-29T12:44:24.3707488+08:00;True|2026-01-29T12:42:34.6204068+08:00;True|2026-01-29T12:39:55.3867683+08:00;True|2026-01-29T12:29:41.8565928+08:00;True|2026-01-29T12:17:04.5932345+08:00;True|2026-01-29T10:08:23.4550691+08:00;True|2026-01-29T10:04:05.4236307+08:00;False|2026-01-29T10:03:18.4044168+08:00;True|2026-01-28T16:00:38.3698743+08:00;True|2026-01-28T14:15:04.1203132+08:00;True|2026-01-28T14:03:32.3230252+08:00;False|2026-01-28T14:02:41.6157812+08:00;True|2026-01-28T13:18:24.5590390+08:00;True|2026-01-28T13:10:49.5716734+08:00;True|2026-01-28T12:25:03.3201915+08:00;True|2026-01-28T12:24:37.6029904+08:00;True|2026-01-28T12:16:13.3862190+08:00;True|2026-01-28T11:43:57.8268938+08:00;True|2026-01-28T10:57:22.9246991+08:00;True|2026-01-28T10:49:34.6185686+08:00;True|2026-01-28T10:44:07.6308515+08:00;True|2026-01-28T10:36:00.0391721+08:00;True|2026-01-28T10:27:26.1658915+08:00;False|2026-01-28T10:27:00.5898601+08:00;True|2026-01-27T15:02:41.1819512+08:00;True|2026-01-27T14:55:32.3962262+08:00;True|2026-01-27T14:31:09.0105130+08:00;True|2026-01-27T13:19:08.8705541+08:00;True|2026-01-27T11:43:17.0109305+08:00;True|2026-01-27T10:53:13.5941761+08:00;True|2026-01-27T10:49:18.5740094+08:00;True|2026-01-27T10:43:29.4337654+08:00;True|2026-01-27T10:00:49.1779297+08:00;False|2026-01-27T10:00:34.2083888+08:00;True|2026-01-26T16:29:09.5100352+08:00;False|2026-01-26T16:29:04.6554601+08:00;False|2026-01-26T14:39:05.7640208+08:00;True|2026-01-26T09:57:23.8775907+08:00;False|2026-01-26T09:56:43.8599383+08:00;True|2026-01-26T09:37:16.8828589+08:00;False|2026-01-26T09:36:35.9597492+08:00;True|2026-01-25T15:20:11.0096169+08:00;True|2026-01-25T14:52:25.7167654+08:00;True|2026-01-25T14:28:16.6779637+08:00;False|2026-01-25T14:27:32.6753765+08:00;True|2026-01-23T16:17:17.9227805+08:00;True|2026-01-23T14:37:25.7929932+08:00;True|2026-01-23T14:32:25.7611106+08:00;False|2026-01-23T14:31:28.4811198+08:00;True|2026-01-22T09:55:07.0908298+08:00;True|2026-01-22T09:38:49.9102490+08:00;False|2026-01-22T09:37:53.0384929+08:00;True|2026-01-21T16:50:27.5625267+08:00;True|2026-01-21T10:50:18.7634322+08:00;True|2026-01-21T10:47:56.7913811+08:00;True|2026-01-21T10:41:46.5883817+08:00;True|2026-01-21T09:29:22.5824101+08:00;False|2026-01-21T09:28:13.4362586+08:00;True|2026-01-20T14:26:36.7806712+08:00;True|2026-01-20T13:13:01.3064754+08:00;False|2026-01-20T13:12:08.1800841+08:00;True|2026-01-20T10:28:19.5250951+08:00;True|2026-01-20T10:27:41.5947282+08:00;True|2026-01-20T10:23:10.6474490+08:00;True|2026-01-20T10:07:24.8412652+08:00;True|2026-01-20T09:53:19.8583529+08:00;True|2026-01-20T08:21:20.5302494+08:00;False|2026-01-20T08:20:24.6093320+08:00;True|2026-01-19T15:58:34.1439056+08:00;True|2026-01-19T15:56:47.6488483+08:00;True|2026-01-19T15:12:36.9286562+08:00;True|2026-01-19T14:55:17.2807312+08:00;True|2026-01-19T14:47:03.8892836+08:00;True|2026-01-19T14:36:15.0507410+08:00;True|2026-01-19T14:26:05.5060287+08:00;True|2026-01-19T13:50:54.8654304+08:00;True|2026-01-19T13:37:47.2294303+08:00;True|2026-01-19T13:20:13.3781676+08:00;True|2026-01-19T13:07:18.8111360+08:00;True|2026-01-19T13:01:15.1432453+08:00;True|2026-01-19T11:54:26.6582081+08:00;True|2026-01-19T11:23:28.6100843+08:00;True|2026-01-19T08:41:23.8724527+08:00;True|2026-01-19T08:34:06.3247836+08:00;True|2026-01-19T07:48:11.5052413+08:00;False|2026-01-19T07:47:21.4586297+08:00;True|2026-01-18T14:27:24.9640228+08:00;True|2026-01-18T13:21:44.9690334+08:00;False|2026-01-18T13:20:08.6314025+08:00;False|2026-01-16T16:53:24.3290896+08:00;True|2026-01-16T09:03:14.4122067+08:00;True|2026-01-16T08:44:23.0342932+08:00;False|2026-01-16T08:43:34.3488415+08:00;True|2026-01-15T16:27:10.8480719+08:00;False|2026-01-15T16:26:06.6002625+08:00;True|2026-01-15T13:04:43.0602637+08:00;</History>
+ <History>True|2026-03-11T03:47:53.8278787Z;False|2026-03-11T11:46:12.2850771+08:00;True|2026-03-10T15:55:32.9056477+08:00;True|2026-03-10T15:49:13.7504397+08:00;True|2026-03-10T15:30:11.2410336+08:00;True|2026-03-10T15:02:21.0511892+08:00;True|2026-03-10T14:56:24.7926251+08:00;True|2026-03-10T14:46:46.6494829+08:00;True|2026-03-10T14:45:43.5585864+08:00;True|2026-03-10T14:02:58.4342478+08:00;True|2026-03-10T14:01:53.8022105+08:00;True|2026-03-10T10:58:29.0551739+08:00;False|2026-03-10T10:56:57.0183433+08:00;True|2026-03-09T12:41:36.6596225+08:00;True|2026-03-09T10:34:36.2852949+08:00;True|2026-03-09T10:20:00.0928587+08:00;True|2026-03-09T10:03:27.8600134+08:00;True|2026-03-09T09:55:30.6932647+08:00;True|2026-03-09T09:49:09.0648831+08:00;True|2026-03-09T09:33:01.3515991+08:00;True|2026-03-09T09:28:52.9160958+08:00;True|2026-03-09T09:18:11.2095513+08:00;True|2026-03-09T09:16:10.9243505+08:00;True|2026-03-09T09:14:54.2194356+08:00;True|2026-03-09T09:09:00.9798622+08:00;True|2026-03-09T08:30:34.9060328+08:00;False|2026-03-09T08:30:14.4254068+08:00;True|2026-03-09T01:28:43.0746681+08:00;True|2026-03-09T00:35:43.7572081+08:00;False|2026-03-09T00:34:44.1380553+08:00;True|2026-03-02T10:58:08.4918461+08:00;True|2026-02-28T14:36:37.1813756+08:00;True|2026-02-28T09:10:06.2035727+08:00;True|2026-02-28T08:45:06.8758170+08:00;False|2026-02-28T08:45:00.2780485+08:00;True|2026-02-27T16:29:24.9278951+08:00;False|2026-02-27T16:29:01.8985145+08:00;True|2026-02-27T15:25:58.1156917+08:00;False|2026-02-27T15:25:50.1203408+08:00;True|2026-02-27T08:48:32.3741487+08:00;False|2026-02-27T08:47:49.7647299+08:00;True|2026-02-26T13:55:29.1843761+08:00;True|2026-02-26T10:17:02.6775428+08:00;False|2026-02-26T10:15:56.8080083+08:00;True|2026-02-25T16:35:36.1616346+08:00;False|2026-02-25T16:35:02.7930400+08:00;True|2026-02-25T15:14:31.7665279+08:00;True|2026-02-25T15:06:38.2831461+08:00;True|2026-02-25T14:53:16.9553043+08:00;True|2026-02-25T14:18:12.0055193+08:00;True|2026-02-25T14:11:45.2316738+08:00;True|2026-02-25T14:02:16.3161429+08:00;True|2026-02-25T13:47:25.4930099+08:00;False|2026-02-25T13:46:34.1837894+08:00;True|2026-02-24T10:25:01.2146652+08:00;True|2026-02-24T10:16:06.3505078+08:00;True|2026-02-24T10:08:41.7064926+08:00;False|2026-02-24T10:07:25.4868308+08:00;True|2026-02-21T14:56:37.2206752+08:00;True|2026-02-21T14:53:44.6277903+08:00;True|2026-02-21T14:40:10.4687091+08:00;False|2026-02-21T14:39:13.1736140+08:00;True|2026-02-11T11:45:25.6746436+08:00;True|2026-02-11T11:44:47.3185555+08:00;True|2026-02-11T10:54:59.0679758+08:00;True|2026-02-11T10:43:35.2341241+08:00;True|2026-02-11T10:36:26.6768242+08:00;True|2026-02-11T10:26:54.7470684+08:00;True|2026-02-11T10:26:14.5696000+08:00;True|2026-02-11T10:19:17.3267746+08:00;True|2026-02-11T10:03:08.9096446+08:00;True|2026-02-11T10:00:03.1731421+08:00;False|2026-02-11T09:58:47.2916714+08:00;True|2026-02-10T15:11:02.0203382+08:00;True|2026-02-10T15:07:21.6761915+08:00;True|2026-02-10T14:56:44.3660951+08:00;True|2026-02-10T14:42:24.1573010+08:00;True|2026-02-10T14:17:49.6012996+08:00;True|2026-02-10T10:54:27.8849732+08:00;True|2026-02-10T10:37:09.4615737+08:00;True|2026-02-10T10:32:50.2882198+08:00;True|2026-02-10T10:16:38.5004114+08:00;True|2026-02-10T10:04:58.3653257+08:00;False|2026-02-10T10:04:05.6938724+08:00;True|2026-02-09T11:58:12.9122757+08:00;True|2026-02-09T11:52:51.2402774+08:00;True|2026-02-09T11:47:15.5230979+08:00;True|2026-02-09T10:53:15.6587025+08:00;False|2026-02-09T10:52:01.4586729+08:00;True|2026-02-05T12:04:14.1139398+08:00;True|2026-02-05T10:00:41.8883921+08:00;False|2026-02-05T09:59:49.2086159+08:00;True|2026-02-04T13:30:53.8564398+08:00;True|2026-02-04T13:30:06.5486103+08:00;True|2026-02-04T13:21:44.7322601+08:00;True|2026-02-04T13:15:45.0093895+08:00;True|2026-02-04T13:06:30.4891537+08:00;False|2026-02-04T13:05:35.5287589+08:00;True|2026-02-04T12:39:42.2682329+08:00;True|2026-02-04T12:21:52.9722100+08:00;True|2026-02-04T12:16:07.8303016+08:00;True|2026-02-04T12:08:43.8268899+08:00;True|2026-02-04T12:03:26.1174616+08:00;True|2026-02-04T10:33:15.5394044+08:00;False|2026-02-04T10:32:30.7038502+08:00;True|2026-02-02T15:42:04.9554792+08:00;True|2026-02-02T15:39:28.7017318+08:00;True|2026-02-02T15:38:33.5592835+08:00;True|2026-02-02T15:34:24.8450917+08:00;True|2026-02-02T15:30:36.5990146+08:00;True|2026-02-02T15:09:46.1965065+08:00;True|2026-02-02T15:09:24.9794288+08:00;True|2026-02-02T15:05:46.0763516+08:00;True|2026-02-02T14:56:30.1210013+08:00;True|2026-02-02T14:52:50.7435709+08:00;True|2026-02-02T14:47:49.5891710+08:00;True|2026-02-02T14:43:23.0006294+08:00;True|2026-02-02T14:31:10.1220612+08:00;True|2026-02-02T14:21:15.6540317+08:00;True|2026-02-02T14:15:41.6183116+08:00;True|2026-02-02T14:11:32.1234982+08:00;True|2026-02-02T14:01:34.6298901+08:00;True|2026-02-02T13:55:03.4760402+08:00;True|2026-02-02T13:49:00.0420220+08:00;True|2026-02-02T13:17:17.0678676+08:00;False|2026-02-02T13:15:46.0360589+08:00;False|2026-02-02T13:15:27.1689505+08:00;False|2026-02-02T13:14:27.3078641+08:00;True|2026-02-02T12:55:41.9272586+08:00;True|2026-02-02T12:55:22.0826476+08:00;True|2026-02-02T12:09:21.8247404+08:00;True|2026-02-02T12:03:58.9256304+08:00;True|2026-02-02T11:56:01.5744871+08:00;True|2026-02-02T11:42:30.2218073+08:00;True|2026-02-02T10:59:29.6077968+08:00;False|2026-02-02T10:59:08.7803594+08:00;True|2026-01-29T14:40:47.4658031+08:00;True|2026-01-29T14:36:18.2141550+08:00;True|2026-01-29T14:32:52.4872179+08:00;True|2026-01-29T14:32:06.4197291+08:00;True|2026-01-29T14:09:33.9372276+08:00;True|2026-01-29T14:08:17.6503129+08:00;True|2026-01-29T14:06:27.5784162+08:00;True|2026-01-29T13:10:48.6581055+08:00;True|2026-01-29T13:07:28.5589276+08:00;True|2026-01-29T12:44:24.3707488+08:00;True|2026-01-29T12:42:34.6204068+08:00;True|2026-01-29T12:39:55.3867683+08:00;True|2026-01-29T12:29:41.8565928+08:00;True|2026-01-29T12:17:04.5932345+08:00;True|2026-01-29T10:08:23.4550691+08:00;True|2026-01-29T10:04:05.4236307+08:00;False|2026-01-29T10:03:18.4044168+08:00;True|2026-01-28T16:00:38.3698743+08:00;True|2026-01-28T14:15:04.1203132+08:00;True|2026-01-28T14:03:32.3230252+08:00;False|2026-01-28T14:02:41.6157812+08:00;True|2026-01-28T13:18:24.5590390+08:00;True|2026-01-28T13:10:49.5716734+08:00;True|2026-01-28T12:25:03.3201915+08:00;True|2026-01-28T12:24:37.6029904+08:00;True|2026-01-28T12:16:13.3862190+08:00;True|2026-01-28T11:43:57.8268938+08:00;True|2026-01-28T10:57:22.9246991+08:00;True|2026-01-28T10:49:34.6185686+08:00;True|2026-01-28T10:44:07.6308515+08:00;True|2026-01-28T10:36:00.0391721+08:00;True|2026-01-28T10:27:26.1658915+08:00;False|2026-01-28T10:27:00.5898601+08:00;True|2026-01-27T15:02:41.1819512+08:00;True|2026-01-27T14:55:32.3962262+08:00;True|2026-01-27T14:31:09.0105130+08:00;True|2026-01-27T13:19:08.8705541+08:00;True|2026-01-27T11:43:17.0109305+08:00;True|2026-01-27T10:53:13.5941761+08:00;True|2026-01-27T10:49:18.5740094+08:00;True|2026-01-27T10:43:29.4337654+08:00;True|2026-01-27T10:00:49.1779297+08:00;False|2026-01-27T10:00:34.2083888+08:00;True|2026-01-26T16:29:09.5100352+08:00;False|2026-01-26T16:29:04.6554601+08:00;False|2026-01-26T14:39:05.7640208+08:00;True|2026-01-26T09:57:23.8775907+08:00;False|2026-01-26T09:56:43.8599383+08:00;True|2026-01-26T09:37:16.8828589+08:00;False|2026-01-26T09:36:35.9597492+08:00;True|2026-01-25T15:20:11.0096169+08:00;True|2026-01-25T14:52:25.7167654+08:00;True|2026-01-25T14:28:16.6779637+08:00;False|2026-01-25T14:27:32.6753765+08:00;True|2026-01-23T16:17:17.9227805+08:00;True|2026-01-23T14:37:25.7929932+08:00;True|2026-01-23T14:32:25.7611106+08:00;False|2026-01-23T14:31:28.4811198+08:00;True|2026-01-22T09:55:07.0908298+08:00;True|2026-01-22T09:38:49.9102490+08:00;False|2026-01-22T09:37:53.0384929+08:00;True|2026-01-21T16:50:27.5625267+08:00;True|2026-01-21T10:50:18.7634322+08:00;True|2026-01-21T10:47:56.7913811+08:00;True|2026-01-21T10:41:46.5883817+08:00;True|2026-01-21T09:29:22.5824101+08:00;False|2026-01-21T09:28:13.4362586+08:00;True|2026-01-20T14:26:36.7806712+08:00;True|2026-01-20T13:13:01.3064754+08:00;False|2026-01-20T13:12:08.1800841+08:00;True|2026-01-20T10:28:19.5250951+08:00;True|2026-01-20T10:27:41.5947282+08:00;True|2026-01-20T10:23:10.6474490+08:00;True|2026-01-20T10:07:24.8412652+08:00;True|2026-01-20T09:53:19.8583529+08:00;True|2026-01-20T08:21:20.5302494+08:00;False|2026-01-20T08:20:24.6093320+08:00;True|2026-01-19T15:58:34.1439056+08:00;True|2026-01-19T15:56:47.6488483+08:00;True|2026-01-19T15:12:36.9286562+08:00;True|2026-01-19T14:55:17.2807312+08:00;True|2026-01-19T14:47:03.8892836+08:00;True|2026-01-19T14:36:15.0507410+08:00;True|2026-01-19T14:26:05.5060287+08:00;True|2026-01-19T13:50:54.8654304+08:00;True|2026-01-19T13:37:47.2294303+08:00;True|2026-01-19T13:20:13.3781676+08:00;True|2026-01-19T13:07:18.8111360+08:00;True|2026-01-19T13:01:15.1432453+08:00;True|2026-01-19T11:54:26.6582081+08:00;True|2026-01-19T11:23:28.6100843+08:00;True|2026-01-19T08:41:23.8724527+08:00;True|2026-01-19T08:34:06.3247836+08:00;True|2026-01-19T07:48:11.5052413+08:00;False|2026-01-19T07:47:21.4586297+08:00;True|2026-01-18T14:27:24.9640228+08:00;True|2026-01-18T13:21:44.9690334+08:00;False|2026-01-18T13:20:08.6314025+08:00;False|2026-01-16T16:53:24.3290896+08:00;True|2026-01-16T09:03:14.4122067+08:00;True|2026-01-16T08:44:23.0342932+08:00;False|2026-01-16T08:43:34.3488415+08:00;True|2026-01-15T16:27:10.8480719+08:00;False|2026-01-15T16:26:06.6002625+08:00;True|2026-01-15T13:04:43.0602637+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -330,13 +330,13 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>03/10/2026 15:55:10</publishTime>
+ <publishTime>03/11/2026 11:47:17</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>03/10/2026 15:55:10</publishTime>
+ <publishTime>03/11/2026 11:47:17</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>03/10/2026 15:55:29</publishTime>
+ <publishTime>03/11/2026 11:47:50</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml
new file mode 100644
index 0000000..f9da2b4
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml
@@ -0,0 +1,16 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <DeleteExistingFiles>False</DeleteExistingFiles>
+ <ExcludeApp_Data>False</ExcludeApp_Data>
+ <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+ <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+ <LastUsedPlatform>Any CPU</LastUsedPlatform>
+ <PublishProvider>FileSystem</PublishProvider>
+ <PublishUrl>D:\gz\wy\MES-WEB-API</PublishUrl>
+ <WebPublishMethod>FileSystem</WebPublishMethod>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 18e97f5..f253dc2 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -986,6 +986,7 @@
<Compile Include="Models\Gy_RoutingBillSub_WorkQty.cs" />
<Compile Include="Models\ClsQC_CheckNote_PNL_Temp.cs" />
<Compile Include="Models\Gy_TechnologyParameterSub.cs" />
+ <Compile Include="Models\KingdeeResponse.cs" />
<Compile Include="Models\QC_OutCompCheckBillSub_ValueGrid.cs" />
<Compile Include="Models\Sc_StationOutBillSub_Sup.cs" />
<Compile Include="Models\Gy_MateNumRelation_Sec.cs" />
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index ac9bfcd..b852087 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 c398c9a..ef3c05f 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.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index ac9bfcd..b852087 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 c398c9a..ef3c05f 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1