From aa51348d3501aa3a9bbda287929f3c8a05825063 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 03 十二月 2025 18:14:31 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillController.cs | 801 ++++++
WebAPI/WebAPI.csproj.user | 34
Model/生产管理/模具管理/ClsSc_MouldProdMoveBillSub.cs | 74
PayM/bin/x86/Debug/Pub_Control.pdb | 0
DAL/生产管理/模具管理/ClsSc_MouldProdMoveBill.cs | 105
DBUtility/bin/Release/Pub_Class.dll | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache | 0
Model/bin/Release/Pub_Control.pdb | 0
PayM/bin/x86/Debug/Pub_Class.pdb | 0
PayM/bin/x86/Debug/Pub_Control.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml | 16
sdk_dingding/TopSdk/obj/Release/TopSdk.pdb | 0
DAL/基础资料/公用基础资料/ClsGy_Driver_Ctl.cs | 100
Model/bin/Release/Pub_Class.pdb | 0
PayM/bin/x86/Debug/Pub_Class.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml | 2
sdk_dingding/TopSdk/obj/Release/TopSdk.dll | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.dll | 0
Model/obj/Release/Model.pdb | 0
BLL/bin/Release/BLL.pdb | 0
DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources | 0
SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt | 31
Model/bin/Release/Pub_Control.dll | 0
Model/生产管理/模具管理/ClsSc_MouldProdBackBillMain.cs | 25
Pub_Control/bin/Release/Pub_Class.pdb | 0
WebAPI/Controllers/条码管理/MouldController.cs | 2
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb | 0
WebAPI/ListModels.cs | 24
DAL/生产管理/模具管理/ClsSc_MouldProdBackBill.cs | 112
Model/生产管理/模具管理/ClsSc_MouldProdMoveBillMain.cs | 31
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 4
WebAPI/Controllers/BaseSet/Gy_DriverController.cs | 1407 +++++++++++
Pub_Control/bin/Release/Pub_Class.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml.user | 174
WebAPI/WebAPI.csproj | 9
PayM/bin/x86/Debug/DBUtility.dll | 0
SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache | 0
BLL/bin/Release/Pub_Control.pdb | 0
DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources | 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
PayM/bin/x86/Debug/DAL.dll | 0
SQLHelper/bin/Release/SQLHelper.dll | 0
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | 2
PayM/bin/x86/Debug/DBUtility.pdb | 0
EAM/模具管理/模具仓库管理/Sc_MouldProdBackBill.cs | 6
Model/Model.csproj | 3
WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs | 12
BLL/bin/Release/Pub_Control.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user | 501 ++++
DAL/bin/Release/SQLHelper.pdb | 0
SQLHelper/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.pdb | 0
Model/bin/Release/DBUtility.dll | 0
Model/生产管理/模具管理/ClsGy_QCVerificationBillMain.cs | 14
WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs | 801 ++++++
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
WebAPI/Controllers/仓存管理/条码出入库记录/Kf_ICStockInOutBillController.cs | 43
WebAPI/Properties/PublishProfiles/YsjPath.pubxml | 17
DBUtility/obj/Release/DBUtility.dll | 0
Model/obj/Release/Model.dll | 0
BLL/bin/Release/Pub_Class.dll | 0
DBUtility/bin/Release/SQLHelper.dll | 0
Model/生产管理/模具管理/ClsGy_QCVerificationBillSub.cs | 15
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
DBUtility/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.Xt_BillType.resources | 0
Model/bin/Release/Pub_Class.dll | 0
WebAPI/Controllers/基础资料/基础资料/Gy_CarTypeController.cs | 510 ++++
PayM/bin/x86/Debug/DAL.pdb | 0
BLL/bin/Release/Pub_Class.pdb | 0
Model/生产管理/模具管理/ClsSc_MouldProdBackBillSub.cs | 86
PayM/bin/x86/Debug/SQLHelper.dll | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 42
BLL/bin/Release/DAL.dll | 0
BLL/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/DBUtility.dll | 0
PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt | 1
WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs | 239 +
DAL/bin/Release/Pub_Control.dll | 0
DBUtility/bin/Release/Pub_Control.pdb | 0
WebAPI/Controllers/QC_ManagementController.cs | 2
SyntacticSugar/bin/Debug/SyntacticSugar.pdb | 0
BLL/bin/Release/SQLHelper.dll | 0
DAL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/Model.dll | 0
WebAPI/Properties/PublishProfiles/YsjPath.pubxml.user | 498 ++++
SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs | 0
WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user | 46
SyntacticSugar/obj/Debug/SyntacticSugar.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
BLL/bin/Release/Model.dll | 0
BLL/bin/Release/DAL.pdb | 0
BLL/bin/Release/Model.pdb | 0
DAL/bin/Release/DAL.dll | 0
SyntacticSugar/bin/Debug/SyntacticSugar.dll | 0
PayM/bin/x86/Debug/SQLHelper.pdb | 0
DAL/bin/Release/Model.pdb | 0
WebAPI/Controllers/Sc_MouldController.cs | 4
SyntacticSugar/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache | 0
PayM/bin/x86/Debug/Model.pdb | 0
SQLHelper/obj/Release/SQLHelper.pdb | 0
PayM/bin/x86/Debug/BLL.dll | 0
DBUtility/bin/Release/DBUtility.pdb | 0
DBUtility/bin/Release/DBUtility.dll | 0
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 37
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 525 ++++
WebAPI/Controllers/WebAPIController.cs | 4
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
PayM/bin/x86/Debug/BLL.pdb | 0
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | 45
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 43
SyntacticSugar/obj/Debug/SyntacticSugar.pdb | 0
DAL/DAL.csproj | 2
Model/基础资料/基础资料/ClsGy_Driver_Model.cs | 22
Pub_Class/bin/Release/Pub_Class.pdb | 0
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 60
EAM/模具管理/模具仓库管理/Sc_MouldProdOutBill.cs | 6
SQLHelper/bin/Release/Pub_Class.pdb | 0
WorkM/流转卡管理/Sc_ProcessExchangeBill_DH.cs | 22
Pub_Class/bin/Release/Pub_Class.dll | 0
DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources | 0
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0
DAL/生产管理/模具管理/ClsGy_QCVerificationBillMain.cs | 277 ++
DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources | 0
SQLHelper/bin/Release/Pub_Class.dll | 0
WebAPI/Models/基础资料/Gy_CarType.cs | 38
DAL/bin/Release/Pub_Class.pdb | 0
PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll | 0
DAL/车间管理/ClsSc_StationOutBill.cs | 4
PayM/bin/x86/Debug/Model.dll | 0
DAL/基础资料/其他基础资料/ClsGy_QCCheckProjectMain.cs | 5
SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache | 1
PayM/bin/x86/Debug/Interop.gregn6Lib.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user | 170
EAM/模具管理/模具仓库管理/单模管理/Sc_MouldProdOut_SingleBill.cs | 6
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt | 25
Model/bin/Release/Model.pdb | 0
DAL/bin/Release/Pub_Class.dll | 0
DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources | 0
Model/bin/Release/Model.dll | 0
/dev/null | 1
DBUtility/bin/Release/Pub_Class.pdb | 0
Model/基础资料/其他基础资料/ClsGy_QCCheckProjectMain.cs | 1
Model/bin/Release/SQLHelper.dll | 0
PayM/bin/x86/Debug/PayM.dll | 0
WebAPI/Models/Driver.cs | 40
PayM/bin/x86/Debug/PayM.pdb | 0
EAM/模具管理/模具仓库管理/单模管理/Sc_MouldProdBack_SingleBill.cs | 6
158 files changed, 6,699 insertions(+), 434 deletions(-)
diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
index d51c2bb..b35c948 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 ddaee8a..8c68542 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 43f36b6..7d0a4ed 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 0a983b2..caff47f 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 b61cbe8..f42d779 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 45c8c32..2ccd693 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 a8165a5..adc007c 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 ed84da5..b5d8f00 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 38335c1..a76b2b2 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 a7c78d9..73a2a29 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 c2816a7..754d306 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 ca149ca..d7f28fc 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 a088fff..181a6e0 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 82bcfa4..e0a73c9 100644
--- a/BLL/bin/Release/SQLHelper.pdb
+++ b/BLL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index ea9786c..d6c76ec 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -83,6 +83,7 @@
<Compile Include="ClsGy_MaterialPackingRelation.cs" />
<Compile Include="MES\ClsSc_MESStopRestoreWorkBill.cs" />
<Compile Include="浠撳簱绠＄悊\灏忚溅閿佸畾\ClsKf_TrolleyPositionBill.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_Driver_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_PatrolCheckItemMethod_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_PatrolCheckItemClass_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_MaintainClass_Ctl.cs" />
@@ -111,6 +112,7 @@
<Compile Include="鐢熶骇绠＄悊\鎺掍骇閿佸畾鐢宠鍗昞ClsJIT_LockRequestBill.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldOutRequestBill.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldInRequestBill.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsGy_QCVerificationBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMoveStockRequestBill.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipPatrolCheckPlanBill.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipPatrolCheckBill.cs" />
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
index 43f36b6..7d0a4ed 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 0a983b2..caff47f 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 b61cbe8..f42d779 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 45c8c32..2ccd693 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 a8165a5..adc007c 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 ed84da5..b5d8f00 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 38335c1..a76b2b2 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 a7c78d9..73a2a29 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 c2816a7..754d306 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 ca149ca..d7f28fc 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 a088fff..181a6e0 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 82bcfa4..e0a73c9 100644
--- a/DAL/bin/Release/SQLHelper.pdb
+++ b/DAL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Driver_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Driver_Ctl.cs"
new file mode 100644
index 0000000..22addbc
--- /dev/null
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Driver_Ctl.cs"
@@ -0,0 +1,100 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsGy_Driver_Ctl: DBUtility.ClsGy_Base_Ctl
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
+ public string HOldNumber;
+ public Model.ClsGy_Driver_Model oModel = new Model.ClsGy_Driver_Model();
+ //鏂板
+ public override bool AddNew()
+ {
+
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Insert into " + MvarItemKey + " " +
+ " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,) " +
+ " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
+ "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'," + oModel.HEmpID + "," + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //淇敼
+ public override bool ModifyByID(Int64 sItemID)
+ {
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Update " + MvarItemKey + " set " +
+ " HNumber='" + oModel.HNumber + "'" +
+ ",HName='" + oModel.HName + "'" +
+ ",HShortNumber='" + oModel.HShortNumber + "'" +
+ ",HHelpCode='" + oModel.HHelpCode + "'" +
+ ",HLevel=" + oModel.HLevel +
+ ",HParentID=" + oModel.HParentID +
+ ",HEmpID=" + oModel.HEmpID +
+ ",HBarCodeForBase='" + oModel.HBarCode + "'" +
+ ",HEntityID=" + oModel.HEntityID +
+
+ ",HEndflag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) +
+ ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
+ ",HRemark= '" + oModel.HRemark + "' Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏍规嵁浠ｇ爜鍒ゆ柇淇℃伅
+ public override bool HavParentCode(string sCode, Int64 sItemID)
+ {
+ DataSet DS;
+ try
+ {
+ DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HStopflag=0 and HNumber='" + sCode + "' and HItemID<>" + sItemID, MvarItemKey, ref Pub_Class.ClsPub.sExeReturnInfo);
+ if (DS.Tables[0].Rows.Count == 0)
+ return false;
+ else
+ {
+ oModel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+ //鏋勯�犲嚱鏁�
+ public ClsGy_Driver_Ctl()
+ {
+ MvarItemKey = "Gy_Driver";
+ MvarReportTitle = "椹鹃┒鍛樿缃�";
+ oModel = new Model.ClsGy_Driver_Model();
+ }
+ }
+}
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectMain.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectMain.cs"
index ae270c2..3d8045e 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectMain.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectMain.cs"
@@ -83,6 +83,7 @@
",HDeptID=" + omodel.HDeptID.ToString() +
",HSampleSchemeID=" + omodel.HSampleSchemeID.ToString() +
",HSourceID=" + omodel.HSourceID.ToString() +
+ ",HCheckBillType='" + omodel.HCheckBillType.ToString() +"'"+
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -186,13 +187,13 @@
"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HRemark" +
",HMaterID,HName,HMaterNumber,HMaterTypeID,HUnitID" +
- ",HUnitNumber,HStandard,HProcID,HDeptID,HSampleSchemeID,HSourceID,HOrgID" +
+ ",HUnitNumber,HStandard,HProcID,HDeptID,HSampleSchemeID,HSourceID,HOrgID,HCheckBillType" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'"+
"," + omodel.HMaterID.ToString() + ",'" + omodel.HName + "','" + omodel.HMaterNumber + "'," + omodel.HMaterTypeID.ToString() + "," + omodel.HUnitID.ToString() +
",'" + omodel.HUnitNumber + "', " + Convert.ToString(omodel.HStandard ? 1 : 0) + "," + omodel.HProcID.ToString() + "," + omodel.HDeptID.ToString() +
- "," + omodel.HSampleSchemeID + ",'" + omodel.HSourceID + "','" + omodel.HOrgID + "') ");
+ "," + omodel.HSampleSchemeID + ",'" + omodel.HSourceID + "','" + omodel.HOrgID+"','"+ omodel.HCheckBillType + "') ");
//鎻掑叆瀛愯〃
foreach (Model.ClsGy_QCCheckProjectSub oSub in DetailColl)
{
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsGy_QCVerificationBillMain.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsGy_QCVerificationBillMain.cs"
new file mode 100644
index 0000000..25d1ce0
--- /dev/null
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsGy_QCVerificationBillMain.cs"
@@ -0,0 +1,277 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsGy_QCVerificationBillMain : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsGy_QCVerificationBillMain omodel = new Model.ClsGy_QCVerificationBillMain();
+ public List<Model.ClsGy_QCVerificationBillSub> DetailColl = new List<Model.ClsGy_QCVerificationBillSub>();
+
+
+ public ClsGy_QCVerificationBillMain()
+ {
+ base.MvarItemKeySub = "Gy_QCVerificationBillMain";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey= "Gy_QCVerificationBillMain";
+ base.MvarReportTitle = "鍣ㄥ叿鏍″噯璁板綍鍗�";
+ base.BillType = "3321";
+ base.HBillSubType = "3321";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsGy_QCVerificationBillMain()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Gy_QCVerificationBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HCheckEmp=" + omodel.HCheckEmp.ToString() +
+ ",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HMainSourceBillType='"+ omodel.HMainSourceBillType+"'"+
+ ",HMainSourceBillNo='" + omodel.HMainSourceBillNo + "'" +
+ ",HMainSourceInterID=" + omodel.HMainSourceInterID.ToString()+
+ ",HMainSourceEntryID="+ omodel.HMainSourceEntryID.ToString()+
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ oCn.RunProc("delete from Gy_QCVerificationBillSub where HInterID=" + lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Model.ClsGy_QCVerificationBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Gy_QCVerificationBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HInspectInstruMentID,HBeginDate,HEndDate,HHCalibrationStatus" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HInspectInstruMentID.ToString() + ",'" + oSub.HBeginDate + "','" + oSub.HEndDate.ToString() + "','" + oSub.HHCalibrationStatus.ToString() + "'" +
+ ") ");
+ oCn.RunProc("update UPDATE from Gy_InspectInstruMent set HValidDate='" + oSub.HBeginDate + "',HExpiryDay='" + oSub.HEndDate + "'where HItemID=" + omodel.HInterID);
+ }
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Sc_MouldRepairWorkBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1,1 ", "h_p_Sc_MouldRepairWorkBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+ oCn.RunProc("Insert Into Gy_QCVerificationBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate," +
+ "HMainSourceBillType,HMainSourceBillNo,HMainSourceInterID,HMainSourceEntryID," +
+ "HCheckEmp,HDeptID) " +
+ "values('" + (this.BillType ?? "") + "','" + (this.HBillSubType ?? "") + "'," +
+ (omodel.HInterID.ToString() ?? "0") + ",'" + (omodel.HBillNo ?? "") + "','" + (omodel.HDate) + "'" +
+ "," + (omodel.HYear.ToString() ?? "0") + "," + (omodel.HPeriod.ToString() ?? "0") +
+ ",'" + (omodel.HRemark ?? "") + "','" + (omodel.HMaker ?? "") + "',getdate(),'" +
+ (omodel.HMainSourceBillType ?? "") + "','" + (omodel.HMainSourceBillNo ?? "") + "'," +
+ (omodel.HMainSourceInterID.ToString() ?? "0") + "," + (omodel.HMainSourceEntryID.ToString() ?? "0") +
+ "," + (omodel.HCheckEmp.ToString() ?? "0") + "," + (omodel.HDeptID.ToString() ?? "0") + ")");
+ //涓昏〃
+ //oCn.RunProc("Insert Into Gy_QCVerificationBillMain " +
+ //"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ //",HYear,HPeriod,HRemark,HMaker,HMakeDate," +
+ //"HMainSourceBillType,HMainSourceBillNo,HMainSourceInterID,HMainSourceEntryID,"
+ //+ "HCheckEmp,HDeptID" +
+ //") " +
+ //" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ //"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" + ",'" + omodel.HMainSourceBillType + "','" + omodel.HMainSourceBillNo + "'," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + "," + omodel.HCheckEmp.ToString() + "," + omodel.HDeptID.ToString() + "') ");
+ //鎻掑叆瀛愯〃
+
+ foreach (Model.ClsGy_QCVerificationBillSub oSub in DetailColl)
+ {
+ if (oSub.HBeginDate.Trim()==""|| oSub.HBeginDate.Trim() == null)
+ {
+ oSub.HBeginDate = DateTime.Now.ToString();
+ oSub.HEndDate = DateTime.Now.AddYears(10).ToString();
+
+ }
+ if(oSub.HHCalibrationStatus==""|| oSub.HHCalibrationStatus==null)
+ {
+ oSub.HHCalibrationStatus = "鍚堟牸";
+ }
+ oCn.RunProc("Insert into Gy_QCVerificationBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HInspectInstruMentID,HBeginDate,HEndDate,HHCalibrationStatus" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HInspectInstruMentID.ToString() + ",'" + oSub.HBeginDate + "','" + oSub.HEndDate.ToString() + "','" + oSub.HHCalibrationStatus.ToString() +"'"+
+ ") ");
+ oCn.RunProc("update UPDATE from Gy_InspectInstruMent set HValidDate='" + oSub.HBeginDate + "',HExpiryDay='" + oSub.HEndDate + "'where HItemID="+ omodel.HInterID );
+ }
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ //DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sc_MouldRepairWorkBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1,1 ", "h_p_Sc_MouldRepairWorkBill_AfterSaveCtrl");
+
+
+ //if (ds2 == null)
+ //{
+ // sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ // oCn.RollBack();
+ // return false;
+ //}
+ //if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ //{
+ // sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ // oCn.RollBack();
+ // return false;
+ //}
+ //============================
+
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏄剧ず鍗曟嵁
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds ;
+ Ds = oCn.RunProcReturn("Select * from Gy_QCVerificationBillMain Where HInterID=" + lngBillKey.ToString(), "Gy_QCVerificationBillMain");
+ if(Ds.Tables[0].Rows.Count==0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+ //鍥哄畾璧嬪��===========================================
+ omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+ omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+ omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+ omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
+ omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
+ omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
+ omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+ omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
+ omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
+ omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
+ omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
+ omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
+ omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
+ omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
+ omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
+ omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
+ omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+ omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+ omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
+ omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+ omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+ omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
+ omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+ omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+ //========================================================
+ omodel.HCheckEmp = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckEmp"]);
+ omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
+
+
+ //
+
+ //寰幆
+ DataSet DsSub ;
+ DsSub = oCn.RunProcReturn("Select * from Gy_QCVerificationBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sc_MouldRepairWorkBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsGy_QCVerificationBillSub oSub = new Model.ClsGy_QCVerificationBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
+ oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ //===================================================
+ oSub.HInspectInstruMentID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInspectInstruMentID"]);
+ oSub.HBeginDate = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBeginDate"]);
+ oSub.HEndDate = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HEndDate"]);
+
+ oSub.HHCalibrationStatus = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HHCalibrationStatus"]);
+
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+
+ }
+
+}
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdBackBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdBackBill.cs"
index 70765e0..f142871 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdBackBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdBackBill.cs"
@@ -8,7 +8,7 @@
public class ClsSc_MouldProdBackBill:DBUtility.ClsXt_BaseBill
{
public Model.ClsSc_MouldProdBackBillMain omodel = new Model.ClsSc_MouldProdBackBillMain();
- public List<Model.ClsSc_MouldStockBillSub> DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
+ public List<Model.ClsSc_MouldProdBackBillSub> DetailColl = new List<Model.ClsSc_MouldProdBackBillSub>();
public ClsSc_MouldProdBackBill()
{
@@ -30,7 +30,7 @@
DetailColl = null;
}
- #endregion 鑷畾涔夋柟娉�
+ #endregion
//淇濆瓨鍓嶆帶鍒�
public bool BeforeSave(Int64 HInterID, string HBillNo, Int64 HSecManagerID, Int64 HKeeperID, Int64 HSupID, Int64 OperationType, ref string sReturn)
@@ -86,12 +86,43 @@
}
}
+ //鍒犻櫎鍏宠仈锛堟洿鏂版簮鍗曞叧鑱旀暟閲忥級
+ public override void DeleteRelation(ref string sReturn, Int64 lngBillKey)
+ {
+ try
+ {
+ if (DetailColl[0].HSourceBillType == "3851") //鍣ㄥ叿鍏ュ簱鐢宠鍗�
+ {
+ oCn.RunProc("exec h_p_Sc_UpDateRelation_MouldInRequestToMouldProdBack_Del " + lngBillKey.ToString());
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
+ //鏂板鍏宠仈锛堟洿鏂版簮鍗曞叧鑱旀暟閲忥級
+ public override void AddNewRelation(ref string sReturn, Int64 lngBillKey)
+ {
+ try
+ {
+ if (DetailColl[0].HSourceBillType == "3851") //鍣ㄥ叿鍏ュ簱鐢宠鍗�
+ {
+ oCn.RunProc("exec h_p_Sc_UpDateRelation_MouldInRequestToMouldProdBack_Add " + lngBillKey.ToString());
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
//淇敼鍗曟嵁
public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
{
try
{
- //
oCn.BeginTran();
//淇濆瓨鍓嶆帶鍒�
if (!BeforeSave(lngBillKey, omodel.HBillNo, omodel.HSecManagerID, omodel.HKeeperID, omodel.HSupID, 2, ref sReturn))
@@ -109,8 +140,8 @@
",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
",HUpDateDate=getdate()" +
//========================================
- ",HSupID=" + omodel.HSupID.ToString() +
",HSupTypeID=" + omodel.HSupTypeID.ToString() +
+ ",HSupID=" + omodel.HSupID.ToString() +
",HEmpID=" + omodel.HEmpID.ToString() +
",HManagerID=" + omodel.HManagerID.ToString() +
",HSecManagerID=" + omodel.HSecManagerID.ToString() +
@@ -129,7 +160,7 @@
DeleteBillSub(lngBillKey);
//鎻掑叆瀛愯〃
omodel.HInterID = lngBillKey;
- foreach (Model.ClsSc_MouldStockBillSub oSub in DetailColl)
+ foreach (Model.ClsSc_MouldProdBackBillSub oSub in DetailColl)
{
oCn.RunProc("Insert into Sc_MouldStockBillSub " +
" (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
@@ -140,6 +171,8 @@
",HSPID,HSCSPID,HSPGroupID,HBarCode,HCorrespondentTypeID,HCorrespondentID" +
",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
",HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID" +
+ ",HNewModel,HWallThickness,HHardness,HLastProdModel,HDiameter,HBackFlag" +
+ ",HMouldType,HInitModel,HInitDesignLife,HLifeUnitID,HNowModel,HNowLife" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
@@ -149,8 +182,12 @@
"," + oSub.HSPID.ToString() + "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBarCode + "'," + oSub.HCorrespondentTypeID.ToString() + "," + oSub.HCorrespondentID.ToString() +
"," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
"," + oSub.HStockOrgID.ToString() + "," + oSub.HOWNERID.ToString() + "," + oSub.HOtherOrgID.ToString() + ",'" + oSub.HOWNERTYPEID + "'" +
+ ",'" + oSub.HNewModel + "','" + oSub.HWallThickness + "','" + oSub.HHardness + "','" + oSub.HLastProdModel + "','" + oSub.HDiameter + "','" + oSub.HBackFlag + "'" +
+ "," + oSub.HMouldType.ToString() + ",'" + oSub.HInitModel + "'," + oSub.HInitDesignLife.ToString() + "," + oSub.HLifeUnitID.ToString() + ",'" + oSub.HNowModel + "'," + oSub.HNowLife.ToString() +
") ");
}
+ //鏂板鍏宠仈锛堟洿鏂版簮鍗曞叧鑱旀暟閲忥級
+ AddNewRelation(ref sReturn, omodel.HInterID);
//淇濆瓨鍚庢帶鍒�
if (!AfterSave(lngBillKey, omodel.HBillNo, 2, ref sReturn))
{
@@ -222,29 +259,32 @@
{
omodel.HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
}
+
+ oCn.BeginTran();
//淇濆瓨鍓嶆帶鍒�
if (!BeforeSave(omodel.HInterID, omodel.HBillNo, omodel.HSecManagerID, omodel.HKeeperID, omodel.HSupID, 1, ref sReturn))
{
+ oCn.RollBack();
return false;
}
-
- oCn.BeginTran();
//涓昏〃
oCn.RunProc("Insert Into Sc_MouldStockBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
",HSupID,HSupTypeID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HWHID,HSCWHID,HRedBlueFlag" +
",HExplanation,HInnerBillNo,HStockOrgID" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate.ToShortDateString() + "'" +
", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ ", " + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'" +
", " + omodel.HSupID.ToString() + "," + omodel.HSupTypeID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + omodel.HSTOCKORGID.ToString() +
") ");
//鎻掑叆瀛愯〃
- foreach (Model.ClsSc_MouldStockBillSub oSub in DetailColl)
+ foreach (Model.ClsSc_MouldProdBackBillSub oSub in DetailColl)
{
oCn.RunProc("Insert into Sc_MouldStockBillSub " +
" (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
@@ -255,6 +295,8 @@
",HSPID,HSCSPID,HSPGroupID,HBarCode,HCorrespondentTypeID,HCorrespondentID" +
",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
",HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID" +
+ ",HNewModel,HWallThickness,HHardness,HLastProdModel,HDiameter,HBackFlag" +
+ ",HMouldType,HInitModel,HInitDesignLife,HLifeUnitID,HNowModel,HNowLife" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
@@ -264,8 +306,12 @@
"," + oSub.HSPID.ToString() + "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBarCode + "'," + oSub.HCorrespondentTypeID.ToString() + "," + oSub.HCorrespondentID.ToString() +
"," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
"," + oSub.HStockOrgID.ToString() + "," + oSub.HOWNERID.ToString() + "," + oSub.HOtherOrgID.ToString() + ",'" + oSub.HOWNERTYPEID + "'" +
+ ",'" + oSub.HNewModel + "','" + oSub.HWallThickness + "','" + oSub.HHardness + "','" + oSub.HLastProdModel + "','" + oSub.HDiameter + "','" + oSub.HBackFlag + "'" +
+ "," + oSub.HMouldType.ToString() + ",'" + oSub.HInitModel + "'," + oSub.HInitDesignLife.ToString() + "," + oSub.HLifeUnitID.ToString() + ",'" + oSub.HNowModel + "'," + oSub.HNowLife.ToString() +
") ");
}
+ //鏂板鍏宠仈锛堟洿鏂版簮鍗曞叧鑱旀暟閲忥級
+ AddNewRelation(ref sReturn, omodel.HInterID);
//淇濆瓨鍚庢帶鍒�
if (!AfterSave(omodel.HInterID, omodel.HBillNo, 1, ref sReturn))
{
@@ -293,6 +339,7 @@
throw (e);
}
}
+
//鏄剧ず鍗曟嵁
public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
{
@@ -333,6 +380,7 @@
omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
//========================================================
+ omodel.HSupTypeID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupTypeID"]);
omodel.HSupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupID"]);
omodel.HWHID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWHID"]);
omodel.HSCWHID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSCWHID"]);
@@ -344,16 +392,15 @@
omodel.HExplanation = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExplanation"]);
omodel.HInnerBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"]);
omodel.HRedBlueFlag = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HRedBlueFlag"]);
-
- //
-
+ omodel.HSTOCKORGID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HStockOrgID"]);
+
//寰幆
DataSet DsSub ;
DsSub = oCn.RunProcReturn("Select * from Sc_MouldStockBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sc_MouldStockBillSub");
DetailColl.Clear();//娓呯┖
for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
{
- Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+ Model.ClsSc_MouldProdBackBillSub oSub = new Model.ClsSc_MouldProdBackBillSub();
// 鍥哄畾璧嬪��===============================================
oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
@@ -362,8 +409,8 @@
oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
- oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
- oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
@@ -373,32 +420,47 @@
oSub.HSecUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSecUnitID"]);
oSub.HSecUnitRate = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HSecUnitRate"]);
oSub.HUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HUnitID"]);
+ oSub.HBatchNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBatchNo"]);
oSub.HQtyMust = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQtyMust"]);
+ oSub.HQtyRel = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQtyRel"]);
oSub.HQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQty"]);
oSub.HPrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HPrice"]);
oSub.HMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HMoney"]);
+ oSub.HDesignLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HDesignLife"]);
+ oSub.HLeaveLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HLeaveLife"]);
+ oSub.HUseLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HUseLife"]);
+ oSub.HUseLifeQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HUseLifeQty"]);
+ oSub.HNewLifeQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HNewLifeQty"]);
oSub.HWHID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HWHID"]);
oSub.HSCWHID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSCWHID"]);
oSub.HSPID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSPID"]);
oSub.HSCSPID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSCSPID"]);
oSub.HSPGroupID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSPGroupID"]);
- oSub.HBatchNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBatchNo"]);
- oSub.HDesignLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HDesignLife"]);
- oSub.HLeaveLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HLeaveLife"]);
- oSub.HUseLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HUseLife"]);
- //oSub.HPOOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPOOrderInterID"]);
- //oSub.HPOOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPOOrderEntryID"]);
- //oSub.HPOOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPOOrderBillNo"]);
- //oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderInterID"]);
- //oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderEntryID"]);
- //oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSeOrderBillNo"]);
-
+ oSub.HBarCode = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBarCode"]);
+ oSub.HCorrespondentTypeID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HCorrespondentTypeID"]);
+ oSub.HCorrespondentID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HCorrespondentID"]);
+ oSub.HPOOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPOOrderInterID"]);
+ oSub.HPOOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPOOrderEntryID"]);
+ oSub.HPOOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPOOrderBillNo"]);
+ oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderInterID"]);
+ oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderEntryID"]);
+ oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSeOrderBillNo"]);
+ oSub.HStockOrgID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSTOCKORGID"]);
+ oSub.HOWNERID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HOWNERID"]);
+ oSub.HOtherOrgID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HOtherOrgID"]);
+ oSub.HOWNERTYPEID = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HOWNERTYPEID"]);
oSub.HNewModel = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HNewModel"]);
oSub.HWallThickness = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HWallThickness"]);
oSub.HHardness = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HHardness"]);
oSub.HLastProdModel = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HLastProdModel"]);
oSub.HDiameter = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HDiameter"]);
oSub.HBackFlag = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBackFlag"]);
+ oSub.HMouldType = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMouldType"]);
+ oSub.HInitModel = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HInitModel"]);
+ oSub.HInitDesignLife = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HInitDesignLife"]);
+ oSub.HLifeUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HLifeUnitID"]);
+ oSub.HNowModel = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HNowModel"]);
+ oSub.HNowLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HNowLife"]);
DetailColl.Add(oSub);
}
sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdMoveBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdMoveBill.cs"
index 2a26939..33d5872 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdMoveBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdMoveBill.cs"
@@ -30,7 +30,7 @@
DetailColl = null;
}
- #endregion 鑷畾涔夋柟娉�
+ #endregion
//淇濆瓨鍓嶆帶鍒�
public bool BeforeSave(Int64 HInterID, string HBillNo, Int64 HSecManagerID, Int64 HKeeperID, Int64 HSupID, Int64 OperationType, ref string sReturn)
@@ -86,12 +86,43 @@
}
}
+ //鍒犻櫎鍏宠仈锛堟洿鏂版簮鍗曞叧鑱旀暟閲忥級
+ public override void DeleteRelation(ref string sReturn, Int64 lngBillKey)
+ {
+ try
+ {
+ if (DetailColl[0].HSourceBillType == "3850") //鍣ㄥ叿璋冩嫧鐢宠鍗�
+ {
+ oCn.RunProc("exec h_p_Sc_UpDateRelation_MouldMoveStockRequestToMouldProdMove_Del " + lngBillKey.ToString());
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
+ //鏂板鍏宠仈锛堟洿鏂版簮鍗曞叧鑱旀暟閲忥級
+ public override void AddNewRelation(ref string sReturn, Int64 lngBillKey)
+ {
+ try
+ {
+ if (DetailColl[0].HSourceBillType == "3850") //鍣ㄥ叿璋冩嫧鐢宠鍗�
+ {
+ oCn.RunProc("exec h_p_Sc_UpDateRelation_MouldMoveStockRequestToMouldProdMove_Add " + lngBillKey.ToString());
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
//淇敼鍗曟嵁
public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
{
try
{
- //
oCn.BeginTran();
//淇濆瓨鍓嶆帶鍒�
if (!BeforeSave(lngBillKey, omodel.HBillNo, omodel.HSecManagerID, omodel.HKeeperID, omodel.HSupID, 2, ref sReturn))
@@ -109,8 +140,8 @@
",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
",HUpDateDate=getdate()" +
//========================================
- ",HSupID=" + omodel.HSupID.ToString() +
",HSupTypeID=" + omodel.HSupTypeID.ToString() +
+ ",HSupID=" + omodel.HSupID.ToString() +
",HEmpID=" + omodel.HEmpID.ToString() +
",HManagerID=" + omodel.HManagerID.ToString() +
",HSecManagerID=" + omodel.HSecManagerID.ToString() +
@@ -143,6 +174,8 @@
",HSPID,HSCSPID,HSPGroupID,HBarCode,HCorrespondentTypeID,HCorrespondentID" +
",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
",HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID" +
+ ",HNewModel,HWallThickness,HHardness,HLastProdModel,HDiameter,HBackFlag" +
+ ",HMouldType,HInitModel,HInitDesignLife,HLifeUnitID,HNowModel,HNowLife" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
@@ -152,8 +185,12 @@
"," + oSub.HSPID.ToString() + "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBarCode + "'," + oSub.HCorrespondentTypeID.ToString() + "," + oSub.HCorrespondentID.ToString() +
"," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
"," + oSub.HStockOrgID.ToString() + "," + oSub.HOWNERID.ToString() + "," + oSub.HOtherOrgID.ToString() + ",'" + oSub.HOWNERTYPEID + "'" +
+ ",'" + oSub.HNewModel + "','" + oSub.HWallThickness + "','" + oSub.HHardness + "','" + oSub.HLastProdModel + "','" + oSub.HDiameter + "','" + oSub.HBackFlag + "'" +
+ "," + oSub.HMouldType.ToString() + ",'" + oSub.HInitModel + "'," + oSub.HInitDesignLife.ToString() + "," + oSub.HLifeUnitID.ToString() + ",'" + oSub.HNowModel + "'," + oSub.HNowLife.ToString() +
") ");
}
+ //鏂板鍏宠仈锛堟洿鏂版簮鍗曞叧鑱旀暟閲忥級
+ AddNewRelation(ref sReturn, omodel.HInterID);
//淇濆瓨鍚庢帶鍒�
if (!AfterSave(lngBillKey, omodel.HBillNo, 2, ref sReturn))
{
@@ -188,23 +225,26 @@
{
omodel.HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
}
+
+ oCn.BeginTran();
//淇濆瓨鍓嶆帶鍒�
if (!BeforeSave(omodel.HInterID, omodel.HBillNo, omodel.HSecManagerID, omodel.HKeeperID, omodel.HSupID, 1, ref sReturn))
{
+ oCn.RollBack();
return false;
}
-
- oCn.BeginTran();
//涓昏〃
oCn.RunProc("Insert Into Sc_MouldStockBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
",HSupID,HSupTypeID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HWHID,HSCWHID,HRedBlueFlag" +
",HExplanation,HInnerBillNo,HStockOrgID,HStockStyle,HStockInOrgID,HStockOutOrgID" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate.ToShortDateString() + "'" +
", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ ", " + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'" +
", " + omodel.HSupID.ToString() + "," + omodel.HSupTypeID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + omodel.HSTOCKORGID.ToString() + ",'" + omodel.HStockStyle + "'," + omodel.HStockInOrgID.ToString() + "," + omodel.HStockOutOrgID.ToString() +
@@ -221,6 +261,8 @@
",HSPID,HSCSPID,HSPGroupID,HBarCode,HCorrespondentTypeID,HCorrespondentID" +
",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
",HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID" +
+ ",HNewModel,HWallThickness,HHardness,HLastProdModel,HDiameter,HBackFlag" +
+ ",HMouldType,HInitModel,HInitDesignLife,HLifeUnitID,HNowModel,HNowLife" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
@@ -230,8 +272,12 @@
"," + oSub.HSPID.ToString() + "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBarCode + "'," + oSub.HCorrespondentTypeID.ToString() + "," + oSub.HCorrespondentID.ToString() +
"," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
"," + oSub.HStockOrgID.ToString() + "," + oSub.HOWNERID.ToString() + "," + oSub.HOtherOrgID.ToString() + ",'" + oSub.HOWNERTYPEID + "'" +
+ ",'" + oSub.HNewModel + "','" + oSub.HWallThickness + "','" + oSub.HHardness + "','" + oSub.HLastProdModel + "','" + oSub.HDiameter + "','" + oSub.HBackFlag + "'" +
+ "," + oSub.HMouldType.ToString() + ",'" + oSub.HInitModel + "'," + oSub.HInitDesignLife.ToString() + "," + oSub.HLifeUnitID.ToString() + ",'" + oSub.HNowModel + "'," + oSub.HNowLife.ToString() +
") ");
}
+ //鏂板鍏宠仈锛堟洿鏂版簮鍗曞叧鑱旀暟閲忥級
+ AddNewRelation(ref sReturn, omodel.HInterID);
//淇濆瓨鍚庢帶鍒�
if (!AfterSave(omodel.HInterID, omodel.HBillNo, 1, ref sReturn))
{
@@ -299,6 +345,7 @@
omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
//========================================================
+ omodel.HSupTypeID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupTypeID"]);
omodel.HSupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupID"]);
omodel.HWHID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWHID"]);
omodel.HSCWHID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSCWHID"]);
@@ -310,9 +357,11 @@
omodel.HExplanation = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExplanation"]);
omodel.HInnerBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"]);
omodel.HRedBlueFlag = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HRedBlueFlag"]);
-
- //
-
+ omodel.HSTOCKORGID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HStockOrgID"]);
+ omodel.HStockStyle = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HStockStyle"]);
+ omodel.HStockInOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HStockInOrgID"]);
+ omodel.HStockOutOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HStockOutOrgID"]);
+
//寰幆
DataSet DsSub ;
DsSub = oCn.RunProcReturn("Select * from Sc_MouldStockBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sc_MouldStockBillSub");
@@ -328,8 +377,8 @@
oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
- oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
- oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
@@ -339,19 +388,47 @@
oSub.HSecUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSecUnitID"]);
oSub.HSecUnitRate = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HSecUnitRate"]);
oSub.HUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HUnitID"]);
+ oSub.HBatchNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBatchNo"]);
oSub.HQtyMust = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQtyMust"]);
+ oSub.HQtyRel = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQtyRel"]);
oSub.HQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQty"]);
oSub.HPrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HPrice"]);
oSub.HMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HMoney"]);
+ oSub.HDesignLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HDesignLife"]);
+ oSub.HLeaveLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HLeaveLife"]);
+ oSub.HUseLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HUseLife"]);
+ oSub.HUseLifeQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HUseLifeQty"]);
+ oSub.HNewLifeQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HNewLifeQty"]);
oSub.HWHID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HWHID"]);
oSub.HSCWHID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSCWHID"]);
oSub.HSPID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSPID"]);
oSub.HSCSPID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSCSPID"]);
oSub.HSPGroupID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSPGroupID"]);
- oSub.HBatchNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBatchNo"]);
- oSub.HDesignLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HDesignLife"]);
- oSub.HLeaveLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HLeaveLife"]);
- oSub.HUseLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HUseLife"]);
+ oSub.HBarCode = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBarCode"]);
+ oSub.HCorrespondentTypeID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HCorrespondentTypeID"]);
+ oSub.HCorrespondentID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HCorrespondentID"]);
+ oSub.HPOOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPOOrderInterID"]);
+ oSub.HPOOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPOOrderEntryID"]);
+ oSub.HPOOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPOOrderBillNo"]);
+ oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderInterID"]);
+ oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderEntryID"]);
+ oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSeOrderBillNo"]);
+ oSub.HStockOrgID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSTOCKORGID"]);
+ oSub.HOWNERID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HOWNERID"]);
+ oSub.HOtherOrgID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HOtherOrgID"]);
+ oSub.HOWNERTYPEID = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HOWNERTYPEID"]);
+ oSub.HNewModel = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HNewModel"]);
+ oSub.HWallThickness = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HWallThickness"]);
+ oSub.HHardness = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HHardness"]);
+ oSub.HLastProdModel = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HLastProdModel"]);
+ oSub.HDiameter = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HDiameter"]);
+ oSub.HBackFlag = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBackFlag"]);
+ oSub.HMouldType = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMouldType"]);
+ oSub.HInitModel = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HInitModel"]);
+ oSub.HInitDesignLife = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HInitDesignLife"]);
+ oSub.HLifeUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HLifeUnitID"]);
+ oSub.HNowModel = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HNowModel"]);
+ oSub.HNowLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HNowLife"]);
DetailColl.Add(oSub);
}
sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs"
index 767dd74..fb41ba4 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs"
@@ -591,7 +591,7 @@
{
//鏌ヨ涓昏〃
DataSet Ds ;
- Ds = oCn.RunProcReturn("Select * from Sc_StationOutBillMain Where HInterID=" + lngBillKey.ToString(), "Sc_StationOutBillMain");
+ Ds = oCn.RunProcReturn("Select * from Sc_StationOutBillMain with(nolock) Where HInterID=" + lngBillKey.ToString(), "Sc_StationOutBillMain");
if(Ds.Tables[0].Rows.Count==0)
{
sReturn = "鍗曟嵁鏈壘鍒帮紒";
@@ -685,7 +685,7 @@
//
//寰幆
DataSet DsSub ;
- DsSub = oCn.RunProcReturn("Select * from Sc_StationOutBillSub Where HInterID=" + lngBillKey.ToString(), "Sc_StationOutBillSub");
+ DsSub = oCn.RunProcReturn("Select * from Sc_StationOutBillSub with(nolock) Where HInterID=" + lngBillKey.ToString(), "Sc_StationOutBillSub");
DetailColl.Clear();//娓呯┖
for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
{
diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
index b61cbe8..f42d779 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 45c8c32..2ccd693 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 38335c1..a76b2b2 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 a7c78d9..73a2a29 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 c2816a7..754d306 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 ca149ca..d7f28fc 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 a088fff..181a6e0 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 82bcfa4..e0a73c9 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 552e300..4409d1f 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 561c1c7..c956059 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 9103b7d..de8645b 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 fe71e8f..dc6af89 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 ae4f855..4bdcdb9 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 89f77dc..3d487c6 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 0f34119..c84040d 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.ResolveComReference.cache b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
index 59940f0..430deb8 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 b61cbe8..f42d779 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 45c8c32..2ccd693 100644
--- a/DBUtility/obj/Release/DBUtility.pdb
+++ b/DBUtility/obj/Release/DBUtility.pdb
Binary files differ
diff --git "a/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBill.cs" "b/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBill.cs"
index e91bf07..47c815a 100644
--- "a/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBill.cs"
+++ "b/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBill.cs"
@@ -960,7 +960,7 @@
//鍔犺浇琛ㄤ綋
initGrid();
int i = 0;
- foreach (Model.ClsSc_MouldStockBillSub oSub in BillOld.DetailColl)
+ foreach (Model.ClsSc_MouldProdBackBillSub oSub in BillOld.DetailColl)
{
if (i >= grdMain.RowCount - 1)
grdMain.Rows.Add();
@@ -1201,12 +1201,12 @@
BillNew.omodel.HInnerBillNo = ClsPub.isStrNull(this.txtHInnerBillNo.Text);
BillNew.omodel.HRedBlueFlag = redblue.Checked;
//鏄庣粏绫昏祴鍊�
- BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
+ BillNew.DetailColl = new List<Model.ClsSc_MouldProdBackBillSub>();
for (i = 0; i <= grdMain.RowCount - 1; i++)
{
if (ClsPub.isLong( grdMain.Rows[i].Cells[HMaterIDCol].Value) != 0 )
{
- Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+ Model.ClsSc_MouldProdBackBillSub oSub = new Model.ClsSc_MouldProdBackBillSub();
//鍥哄畾璧嬪��========================================
oSub.HEntryID = i + 1;
oSub.HRemark = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HRemarkCol].Value);
diff --git "a/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBill.cs" "b/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBill.cs"
index f5aa1d1..6325046 100644
--- "a/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBill.cs"
+++ "b/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBill.cs"
@@ -956,7 +956,7 @@
//鍔犺浇琛ㄤ綋
initGrid();
int i = 0;
- foreach (Model.ClsSc_MouldStockBillSub oSub in BillOld.DetailColl)
+ foreach (Model.ClsSc_MouldProdOutBillSub oSub in BillOld.DetailColl)
{
if (i >= grdMain.RowCount - 1)
grdMain.Rows.Add();
@@ -1189,12 +1189,12 @@
BillNew.omodel.HInnerBillNo = ClsPub.isStrNull(this.txtHInnerBillNo.Text);
BillNew.omodel.HRedBlueFlag = redblue.Checked;
//鏄庣粏绫昏祴鍊�
- BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
+ BillNew.DetailColl = new List<Model.ClsSc_MouldProdOutBillSub>();
for (i = 0; i <= grdMain.RowCount - 1; i++)
{
if (ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value) != 0)
{
- Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+ Model.ClsSc_MouldProdOutBillSub oSub = new Model.ClsSc_MouldProdOutBillSub();
//鍥哄畾璧嬪��========================================
oSub.HEntryID = i + 1;
oSub.HRemark = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HRemarkCol].Value);
diff --git "a/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/\345\215\225\346\250\241\347\256\241\347\220\206/Sc_MouldProdBack_SingleBill.cs" "b/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/\345\215\225\346\250\241\347\256\241\347\220\206/Sc_MouldProdBack_SingleBill.cs"
index 0be1564..383196c 100644
--- "a/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/\345\215\225\346\250\241\347\256\241\347\220\206/Sc_MouldProdBack_SingleBill.cs"
+++ "b/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/\345\215\225\346\250\241\347\256\241\347\220\206/Sc_MouldProdBack_SingleBill.cs"
@@ -893,7 +893,7 @@
//鍔犺浇琛ㄤ綋
initGrid();
int i = 0;
- foreach (Model.ClsSc_MouldStockBillSub oSub in BillOld.DetailColl)
+ foreach (Model.ClsSc_MouldProdBackBillSub oSub in BillOld.DetailColl)
{
//鍗曟嵁鍥哄畾璧嬪��
@@ -1164,12 +1164,12 @@
BillNew.omodel.HInnerBillNo = ClsPub.isStrNull(this.txtHInnerBillNo.Text);
BillNew.omodel.HRedBlueFlag = redblue.Checked;
//鏄庣粏绫昏祴鍊�
- BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
+ BillNew.DetailColl = new List<Model.ClsSc_MouldProdBackBillSub>();
//for (i = 0; i <= grdMain.RowCount - 1; i++)
//{
// if (ClsPub.isLong( grdMain.Rows[i].Cells[HMaterIDCol].Value) != 0 )
// {
- Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+ Model.ClsSc_MouldProdBackBillSub oSub = new Model.ClsSc_MouldProdBackBillSub();
//鍥哄畾璧嬪��========================================
oSub.HEntryID = 1;
oSub.HRemark = DBUtility.ClsPub.isStrNull(txtHRemark_Sub.Text);
diff --git "a/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/\345\215\225\346\250\241\347\256\241\347\220\206/Sc_MouldProdOut_SingleBill.cs" "b/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/\345\215\225\346\250\241\347\256\241\347\220\206/Sc_MouldProdOut_SingleBill.cs"
index 9882a4f..a9dc256 100644
--- "a/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/\345\215\225\346\250\241\347\256\241\347\220\206/Sc_MouldProdOut_SingleBill.cs"
+++ "b/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/\345\215\225\346\250\241\347\256\241\347\220\206/Sc_MouldProdOut_SingleBill.cs"
@@ -928,7 +928,7 @@
//鍔犺浇琛ㄤ綋
initGrid();
int i = 0;
- foreach (Model.ClsSc_MouldStockBillSub oSub in BillOld.DetailColl)
+ foreach (Model.ClsSc_MouldProdOutBillSub oSub in BillOld.DetailColl)
{
//鍗曟嵁鍥哄畾璧嬪��
@@ -1169,12 +1169,12 @@
BillNew.omodel.HInnerBillNo = ClsPub.isStrNull(this.txtHInnerBillNo.Text);
BillNew.omodel.HRedBlueFlag = redblue.Checked;
//鏄庣粏绫昏祴鍊�
- BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
+ BillNew.DetailColl = new List<Model.ClsSc_MouldProdOutBillSub>();
//for (i = 0; i <= grdMain.RowCount - 1; i++)
//{
// if (ClsPub.isLong( grdMain.Rows[i].Cells[HMaterIDCol].Value) != 0 )
// {
- Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+ Model.ClsSc_MouldProdOutBillSub oSub = new Model.ClsSc_MouldProdOutBillSub();
//鍥哄畾璧嬪��========================================
oSub.HEntryID = 1;
oSub.HRemark = DBUtility.ClsPub.isStrNull(txtHRemark_Sub.Text);
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 9451ece..db7b1a7 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -105,6 +105,7 @@
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_MatePrice_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_AssistantData.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_AssistantDataEntry.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Driver_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_DiscountList.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_OperatorGroup.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsSc_PackUnionBillBarCode_temp_Model.cs" />
@@ -182,6 +183,8 @@
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldOutRequestBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldOutRequestBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainPlanBillSub_Plan.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsGy_QCVerificationBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsGy_QCVerificationBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldInRequestBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMoveStockRequestBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldInRequestBillSub.cs" />
diff --git a/Model/bin/Release/DBUtility.dll b/Model/bin/Release/DBUtility.dll
index b61cbe8..f42d779 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 45c8c32..2ccd693 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 a8165a5..adc007c 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 ed84da5..b5d8f00 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 38335c1..a76b2b2 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 a7c78d9..73a2a29 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 c2816a7..754d306 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 ca149ca..d7f28fc 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 a088fff..181a6e0 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 82bcfa4..e0a73c9 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 acf4c70..1733e06 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 a8165a5..adc007c 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 ed84da5..b5d8f00 100644
--- a/Model/obj/Release/Model.pdb
+++ b/Model/obj/Release/Model.pdb
Binary files differ
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectMain.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectMain.cs"
index 75b36f7..f470056 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectMain.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectMain.cs"
@@ -19,5 +19,6 @@
public Int64 HSampleSchemeID;
public Int64 HSourceID;
public Int64 HOrgID;
+ public string HCheckBillType;
}
}
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Driver_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Driver_Model.cs"
new file mode 100644
index 0000000..716e1b5
--- /dev/null
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Driver_Model.cs"
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_Driver_Model : DBUtility.ClsGy_Base_Model
+ {
+ //
+ public Int64 HEmpID;
+ public string HBarCode;
+ public Int64 HEntityID;
+ public string HIDCard;
+ public string HPhone;
+ public string HDriverCardPic;
+ public string HDriverCardType;
+ public string HIDCardPic;
+ public string HEmpType;
+ public int HCompID;
+
+ }
+}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsGy_QCVerificationBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsGy_QCVerificationBillMain.cs"
new file mode 100644
index 0000000..a638e68
--- /dev/null
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsGy_QCVerificationBillMain.cs"
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_QCVerificationBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HCheckEmp;//
+ public Int64 HDeptID;//
+ public Int64 HEmpID;//
+
+ }
+}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsGy_QCVerificationBillSub.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsGy_QCVerificationBillSub.cs"
new file mode 100644
index 0000000..24349f2
--- /dev/null
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsGy_QCVerificationBillSub.cs"
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_QCVerificationBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public Int64 HInspectInstruMentID;//
+ public string HBeginDate;//
+ public string HEndDate;//
+ public string HHCalibrationStatus;
+
+ }
+}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdBackBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdBackBillMain.cs"
index ed53605..10b0a60 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdBackBillMain.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdBackBillMain.cs"
@@ -6,18 +6,17 @@
{
public class ClsSc_MouldProdBackBillMain : DBUtility.ClsXt_BaseBillMain
{
- public Int64 HSupID;// int --供应商
- public Int64 HSupTypeID;// int --往来类型
- public Int64 HWHID;// int --仓库
- public Int64 HSCWHID;// int --调出仓库
- public Int64 HEmpID;// int --业务员
- public Int64 HManagerID;// int --负责人
- public Int64 HSecManagerID;// int --验收
- public Int64 HKeeperID;// int --保管员
- public Int64 HDeptID;// int --部门
- public string HExplanation;// varchar(200) --摘要
- public string HInnerBillNo;// varchar(50) --内部单据号
- public string HRemark; //加工要求
- public bool HRedBlueFlag;// bit --红蓝单
+ public Int64 HSupID; // int --往来单位
+ public Int64 HSupTypeID; // int --往来类型（1 供应商、2 客户、 3 车间部门）
+ public Int64 HEmpID; // int --业务员
+ public Int64 HManagerID; // int --负责人
+ public Int64 HSecManagerID; // int --验收
+ public Int64 HKeeperID; // int --保管员
+ public Int64 HDeptID; // int --部门
+ public Int64 HWHID; // int --仓库
+ public Int64 HSCWHID; // int --调出仓库
+ public string HExplanation; // varchar(200) --摘要
+ public string HInnerBillNo; // varchar(50) --内部单据号
+ public bool HRedBlueFlag; // bit --红蓝单
}
}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdBackBillSub.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdBackBillSub.cs"
index fcb14b4..0f9f405 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdBackBillSub.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdBackBillSub.cs"
@@ -5,45 +5,51 @@
namespace Model
{
public class ClsSc_MouldProdBackBillSub : DBUtility.ClsXt_BaseBillSub
- {
- public DateTime HEntryCloseDate;// datetime --行关闭 (默认为'') new
- public string HRemark;// varchar(200) --备注
- public Int64 HMaterID;// int --物料ID
- public Int64 HPropertyID;// int --辅助属性
- public Int64 HSecUnitID;// int --辅助计量单位
- public Single HSecUnitRate;// money --换算率
- public Int64 HUnitID;// int --计量单位
- public double HDesignLife;// dec(18,8) --设计寿命
- public double HLeaveLife;// dec(18,8) --剩余寿命
- public double HUseLife;// dec(18,8) --使用寿命
- public double HQtyMust;// dec(18,8) --应收数量
- public double HQty;// dec(18,8) --实收数量
- public double HPrice;// dec(18,8) --单价
- public double HMoney;// dec(18,8) --金额
- public Int64 HWHID;// int --收料仓库
- public Int64 HSCWHID;// int --调出仓库ID
- public Int64 HSPID;// int --仓位ID
- public Int64 HSCSPID;// int --调出仓位ID
- public Int64 HSPGroupID;// int --仓位组ID(仓库选择完自动带出)
- public string HBatchNo;// varchar(50) --批次
- public string HEngineNum;// varchar(50) --发动机号
- public string HUnderPanNum;// varchar(50) --地盘号
- public string HLeaveFactCard;// varchar(50) --出厂证
- public Int64 HPOOrderInterID;// int --采购订单主内码
- public Int64 HPOOrderEntryID;// int --采购订单子内码
- public string HPOOrderBillNo;// varchar(50) --采购订单号
- public Int64 HSeOrderInterID;// int --销售订单主内码
- public Int64 HSeOrderEntryID;// int --销售订单子内码
- public string HSeOrderBillNo;// varchar(50) --销售订单号
-
- public string HNewModel;// varchar(100) --新规格 addnew
- public string HWallThickness;// varchar(100) --壁厚 addnew
- public string HHardness;// varchar(100) --硬度 addnew
- public string HLastProdModel;// varchar(100) --最后生产产品 addnew
- public string HDiameter;// varchar(100) --直径 addnew
- public string HBackFlag;// varchar(100)--退库类型（正常使用，调试不合格） addnew
- public int HStockOrgID; //调出组织
-
-
+ {
+ public Int64 HMaterID; // int --模具ID
+ public Int64 HPropertyID; // int --辅助属性
+ public Int64 HSecUnitID; // int --辅助计量单位
+ public Single HSecUnitRate; // money --换算率
+ public Int64 HUnitID; // int --计量单位
+ public string HBatchNo; // varchar(50) --批次
+ public double HQtyMust; // dec(18,8) --应收数量
+ public double HQtyRel; // dec(18,8)
+ public double HQty; // dec(18,8) --实收数量
+ public double HPrice; // dec(18,8) --单价
+ public double HMoney; // dec(18,8) --金额
+ public double HDesignLife; // dec(18,8) --设计寿命
+ public double HLeaveLife; // dec(18,8) --剩余寿命
+ public double HUseLife; // dec(18,8) --使用寿命
+ public double HUseLifeQty; // dec(18,8)
+ public double HNewLifeQty; // dec(18,8)
+ public Int64 HWHID; // int --收料仓库
+ public Int64 HSCWHID; // int --调出仓库ID
+ public Int64 HSPID; // int --仓位ID
+ public Int64 HSCSPID; // int --调出仓位ID
+ public Int64 HSPGroupID; // int --仓位组ID(仓库选择完自动带出)
+ public string HEngineNum; // varchar(50) --发动机号
+ public string HUnderPanNum; // varchar(50) --地盘号
+ public string HLeaveFactCard; // varchar(50) --出厂证
+ public Int64 HPOOrderInterID; // int --采购订单主内码
+ public Int64 HPOOrderEntryID; // int --采购订单子内码
+ public string HPOOrderBillNo; // varchar(50) --采购订单号
+ public Int64 HSeOrderInterID; // int --销售订单主内码
+ public Int64 HSeOrderEntryID; // int --销售订单子内码
+ public string HSeOrderBillNo; // varchar(50) --销售订单号
+ public string HBarCode;
+ public Int64 HCorrespondentTypeID; // int --往来单位类型（1 供应商、2 客户、 3 车间部门）
+ public Int64 HCorrespondentID; // int --往来单位内码
+ public string HNewModel;
+ public string HWallThickness;
+ public string HHardness;
+ public string HLastProdModel;
+ public string HDiameter;
+ public string HBackFlag;
+ public Int64 HMouldType;
+ public string HInitModel;
+ public Single HInitDesignLife;
+ public Int64 HLifeUnitID;
+ public string HNowModel;
+ public double HNowLife;
}
}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdMoveBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdMoveBillMain.cs"
index df9504b..0da5260 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdMoveBillMain.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdMoveBillMain.cs"
@@ -6,21 +6,20 @@
{
public class ClsSc_MouldProdMoveBillMain : DBUtility.ClsXt_BaseBillMain
{
- public Int64 HSupID;// int --供应商
- public Int64 HSupTypeID;// int --往来类型
- public Int64 HWHID;// int --仓库
- public Int64 HSCWHID;// int --调出仓库
- public Int64 HEmpID;// int --业务员
- public Int64 HManagerID;// int --负责人
- public Int64 HSecManagerID;// int --验收
- public Int64 HKeeperID;// int --保管员
- public Int64 HDeptID;// int --部门
- public string HExplanation;// varchar(200) --摘要
- public string HInnerBillNo;// varchar(50) --内部单据号
- public string HRemark; //加工要求
- public bool HRedBlueFlag;// bit --红蓝单
- public string HStockStyle; // varchar(100) //调拨类型
- public int HStockInOrgID; // int //调入组织ID
- public int HStockOutOrgID; // int //调出组织ID
+ public Int64 HSupID; // int --往来单位
+ public Int64 HSupTypeID; // int --往来类型（1 供应商、2 客户、 3 车间部门）
+ public Int64 HEmpID; // int --业务员
+ public Int64 HManagerID; // int --负责人
+ public Int64 HSecManagerID; // int --验收
+ public Int64 HKeeperID; // int --保管员
+ public Int64 HDeptID; // int --部门
+ public Int64 HWHID; // int --仓库
+ public Int64 HSCWHID; // int --调出仓库
+ public string HExplanation; // varchar(200) --摘要
+ public string HInnerBillNo; // varchar(50) --内部单据号
+ public bool HRedBlueFlag; // bit --红蓝单
+ public string HStockStyle; // varchar(100) --调拨类型
+ public Int64 HStockInOrgID; // int --调入组织ID
+ public Int64 HStockOutOrgID;// int --调出组织ID
}
}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdMoveBillSub.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdMoveBillSub.cs"
index af3d982..2d0bf0c 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdMoveBillSub.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdMoveBillSub.cs"
@@ -6,48 +6,50 @@
{
public class ClsSc_MouldProdMoveBillSub : DBUtility.ClsXt_BaseBillSub
{
- public long HMaterID; // int --物料ID
- public long HPropertyID; // int --辅助属性
- public long HSecUnitID; // int --辅助计量单位
- public Single HSecUnitRate; // money --换算率
- public long HUnitID; // int --计量单位
- public string HBatchNo; // varchar(50) --批次
- public double HQtyMust; // --账存数量
- public double HQtyRel; // --实存数量
- public double HQty; // --盈亏数量
- public double HPrice; // --单价
- public double HMoney; // --盈亏金额
- public double HDesignLife; // money --设计寿命
- public double HLeaveLife; // money --剩余寿命
- public double HUseLife; // money --使用寿命
- public long HWHID; // int --收料仓库
- public long HSCWHID; // int --调出仓库ID 界面上不需要显示，存0进去
- public long HSPID; // int --仓位ID
- public long HSCSPID; // int --调出仓位ID 界面上不需要显示，存0进去
- public long HSPGroupID; // int --仓位组ID 界面上不需要显示，存0进去
+ public Int64 HMaterID; // int --模具ID
+ public Int64 HPropertyID; // int --辅助属性
+ public Int64 HSecUnitID; // int --辅助计量单位
+ public Single HSecUnitRate; // money --换算率
+ public Int64 HUnitID; // int --计量单位
+ public string HBatchNo; // varchar(50) --批次
+ public double HQtyMust; // dec(18,8) --应收数量
+ public double HQtyRel; // dec(18,8)
+ public double HQty; // dec(18,8) --实收数量
+ public double HPrice; // dec(18,8) --单价
+ public double HMoney; // dec(18,8) --金额
+ public double HDesignLife; // dec(18,8) --设计寿命
+ public double HLeaveLife; // dec(18,8) --剩余寿命
+ public double HUseLife; // dec(18,8) --使用寿命
+ public double HUseLifeQty; // dec(18,8)
+ public double HNewLifeQty; // dec(18,8)
+ public Int64 HWHID; // int --收料仓库
+ public Int64 HSCWHID; // int --调出仓库ID
+ public Int64 HSPID; // int --仓位ID
+ public Int64 HSCSPID; // int --调出仓位ID
+ public Int64 HSPGroupID; // int --仓位组ID(仓库选择完自动带出)
+ public string HEngineNum; // varchar(50) --发动机号
+ public string HUnderPanNum; // varchar(50) --地盘号
+ public string HLeaveFactCard; // varchar(50) --出厂证
+ public Int64 HPOOrderInterID; // int --采购订单主内码
+ public Int64 HPOOrderEntryID; // int --采购订单子内码
+ public string HPOOrderBillNo; // varchar(50) --采购订单号
+ public Int64 HSeOrderInterID; // int --销售订单主内码
+ public Int64 HSeOrderEntryID; // int --销售订单子内码
+ public string HSeOrderBillNo; // varchar(50) --销售订单号
public string HBarCode;
- public double HUseLifeQty;
- public string HNowModel;
- public double HNowLife;
- public Int64 HMouldType;
- public string HInitModel;
- public Single HInitDesignLife;
- public Int64 HLifeUnitID;
+ public Int64 HCorrespondentTypeID; // int --往来单位类型（1 供应商、2 客户、 3 车间部门）
+ public Int64 HCorrespondentID; // int --往来单位内码
public string HNewModel;
public string HWallThickness;
public string HHardness;
public string HLastProdModel;
public string HDiameter;
public string HBackFlag;
- public double HNewLifeQty;
- public Int64 HPOOrderInterID; // int --采购订单主内码
- public Int64 HPOOrderEntryID; // int --采购订单子内码
- public string HPOOrderBillNo; // varchar(50) --采购订单号
- public Int64 HSeOrderInterID; // int --销售订单主内码
- public Int64 HSeOrderEntryID; // int --销售订单子内码
- public string HSeOrderBillNo; // varchar(50) --销售订单号
- public Int64 HCorrespondentTypeID; // int --往来单位类型（1 供应商、2 客户、 3 车间部门）
- public Int64 HCorrespondentID; // int --往来单位内码
-
+ public Int64 HMouldType;
+ public string HInitModel;
+ public Single HInitDesignLife;
+ public Int64 HLifeUnitID;
+ public string HNowModel;
+ public double HNowLife;
}
}
diff --git a/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll b/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll
index 7fb52d0..06c5998 100644
--- a/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll
+++ b/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/BLL.dll b/PayM/bin/x86/Debug/BLL.dll
index 15495a7..17deca0 100644
--- a/PayM/bin/x86/Debug/BLL.dll
+++ b/PayM/bin/x86/Debug/BLL.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/BLL.pdb b/PayM/bin/x86/Debug/BLL.pdb
index ab05846..63b3f2b 100644
--- a/PayM/bin/x86/Debug/BLL.pdb
+++ b/PayM/bin/x86/Debug/BLL.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/DAL.dll b/PayM/bin/x86/Debug/DAL.dll
index fea0982..7920168 100644
--- a/PayM/bin/x86/Debug/DAL.dll
+++ b/PayM/bin/x86/Debug/DAL.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/DAL.pdb b/PayM/bin/x86/Debug/DAL.pdb
index 6f192a3..ba0f098 100644
--- a/PayM/bin/x86/Debug/DAL.pdb
+++ b/PayM/bin/x86/Debug/DAL.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/DBUtility.dll b/PayM/bin/x86/Debug/DBUtility.dll
index 0f25648..b34bfde 100644
--- a/PayM/bin/x86/Debug/DBUtility.dll
+++ b/PayM/bin/x86/Debug/DBUtility.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/DBUtility.pdb b/PayM/bin/x86/Debug/DBUtility.pdb
index 823f21c..1248cd5 100644
--- a/PayM/bin/x86/Debug/DBUtility.pdb
+++ b/PayM/bin/x86/Debug/DBUtility.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Interop.gregn6Lib.dll b/PayM/bin/x86/Debug/Interop.gregn6Lib.dll
index 9dd0542..d77acef 100644
--- a/PayM/bin/x86/Debug/Interop.gregn6Lib.dll
+++ b/PayM/bin/x86/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Model.dll b/PayM/bin/x86/Debug/Model.dll
index bac61cd..063ff8d 100644
--- a/PayM/bin/x86/Debug/Model.dll
+++ b/PayM/bin/x86/Debug/Model.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Model.pdb b/PayM/bin/x86/Debug/Model.pdb
index 549e068..2a3efcd 100644
--- a/PayM/bin/x86/Debug/Model.pdb
+++ b/PayM/bin/x86/Debug/Model.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/PayM.dll b/PayM/bin/x86/Debug/PayM.dll
index eec3a6f..b6c77fe 100644
--- a/PayM/bin/x86/Debug/PayM.dll
+++ b/PayM/bin/x86/Debug/PayM.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/PayM.pdb b/PayM/bin/x86/Debug/PayM.pdb
index 447d9c6..ed8a8a1 100644
--- a/PayM/bin/x86/Debug/PayM.pdb
+++ b/PayM/bin/x86/Debug/PayM.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Class.dll b/PayM/bin/x86/Debug/Pub_Class.dll
index df548db..3dd8718 100644
--- a/PayM/bin/x86/Debug/Pub_Class.dll
+++ b/PayM/bin/x86/Debug/Pub_Class.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Class.pdb b/PayM/bin/x86/Debug/Pub_Class.pdb
index 28fd125..ac6f72a 100644
--- a/PayM/bin/x86/Debug/Pub_Class.pdb
+++ b/PayM/bin/x86/Debug/Pub_Class.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Control.dll b/PayM/bin/x86/Debug/Pub_Control.dll
index 689225f..307f8ac 100644
--- a/PayM/bin/x86/Debug/Pub_Control.dll
+++ b/PayM/bin/x86/Debug/Pub_Control.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Control.pdb b/PayM/bin/x86/Debug/Pub_Control.pdb
index 9bb85bf..1aad3e6 100644
--- a/PayM/bin/x86/Debug/Pub_Control.pdb
+++ b/PayM/bin/x86/Debug/Pub_Control.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/SQLHelper.dll b/PayM/bin/x86/Debug/SQLHelper.dll
index 99cdf4a..2be9791 100644
--- a/PayM/bin/x86/Debug/SQLHelper.dll
+++ b/PayM/bin/x86/Debug/SQLHelper.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/SQLHelper.pdb b/PayM/bin/x86/Debug/SQLHelper.pdb
index aec54db..de47788 100644
--- a/PayM/bin/x86/Debug/SQLHelper.pdb
+++ b/PayM/bin/x86/Debug/SQLHelper.pdb
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt b/PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt
index 4c58320..6e11701 100644
--- a/PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt
+++ b/PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt
@@ -2478,7 +2478,6 @@
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\PayM\bin\x86\Debug\SQLHelper.pdb
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\PayM\bin\x86\Debug\Interop.gregn6Lib.dll
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\PayM\bin\x86\Debug\AxInterop.gregn6Lib.dll
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.AssemblyReference.cache
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\PayM\obj\x86\Debug\Interop.gregn6Lib.dll
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\PayM\obj\x86\Debug\AxInterop.gregn6Lib.dll
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.ResolveComReference.cache
diff --git a/Pub_Class/bin/Release/Pub_Class.dll b/Pub_Class/bin/Release/Pub_Class.dll
index 38335c1..a76b2b2 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 a7c78d9..73a2a29 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 38335c1..a76b2b2 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 a7c78d9..73a2a29 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 c2816a7..754d306 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 ca149ca..d7f28fc 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 38335c1..a76b2b2 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 a7c78d9..73a2a29 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 a088fff..181a6e0 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 82bcfa4..e0a73c9 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 ef65cbf..d453b33 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 a088fff..181a6e0 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 82bcfa4..e0a73c9 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 d8e48a9..a7e7f70 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 9679f05..75e66e8 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 48caaab..0000000
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-f95e56b5f9755e3380309c272e92c6c4a10dd4c5
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index c653349..e9c70d6 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,6 +1,48 @@
+<<<<<<< HEAD
+
+D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+D:\gz\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
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+=======
+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:\WMES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+D:\WMES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+D:\WMES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\WMES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+D:\WMES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+=======
+>>>>>>> 3758c91a8f9b3ca8409da3a8fa5330d52e237a0f
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+<<<<<<< HEAD
+=======
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+D:\GitHub\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+D:\GitHub\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+
+=======
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+>>>>>>> 3758c91a8f9b3ca8409da3a8fa5330d52e237a0f
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.dll b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
index d8e48a9..a7e7f70 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 9679f05..75e66e8 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttributes.cs b/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs
similarity index 100%
rename from SyntacticSugar/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttributes.cs
rename to SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs
diff --git a/SyntacticSugar/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/SyntacticSugar/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..cf598b0
--- /dev/null
+++ b/SyntacticSugar/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..fea44e6
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..bfb772c
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+5dd9c82feb12f833c78ecebea7d9a46c99f29e3f
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..ebef3fb
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -0,0 +1,31 @@
+<<<<<<< HEAD
+=======
+D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
+D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
+D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
+=======
+>>>>>>> 72d1aaa4af401fe25e5f2f7ba07163d7fc8fe8e8
+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.AssemblyReference.cache
+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
+<<<<<<< HEAD
+=======
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
+D:\WMES\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
+D:\WMES\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
+D:\WMES\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
+D:\WMES\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\WMES\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
+D:\WMES\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
+D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
+D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
+>>>>>>> 72d1aaa4af401fe25e5f2f7ba07163d7fc8fe8e8
diff --git a/WebAPI/Controllers/BaseSet/Gy_DriverController.cs b/WebAPI/Controllers/BaseSet/Gy_DriverController.cs
new file mode 100644
index 0000000..858a78f
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Gy_DriverController.cs
@@ -0,0 +1,1407 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using SyntacticSugar.constant;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
+using WebAPI.Models;
+namespace WebAPI.Controllers
+{
+ public class Gy_DriverController : ApiController
+ {
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+
+ /// <summary>
+ /// 杩斿洖鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_DriverController/list")]
+ [HttpGet]
+ public object list(string sWhere, string user, string Organization)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ ////鏌ョ湅鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_Department", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳煡鐪嬫潈闄�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //string sql1 = string.Format(@"select * from h_v_IF_DepartmentList where 缁勭粐鍚嶇О='" + Organization + "'");
+ string sql1 = string.Format(@"select * from h_v_Gy_driver where 1=1 ");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn(sql1 + sWhere , "h_v_Gy_driver");
+ }
+ else
+ {
+ string sql = sql1 + sWhere ;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_driver");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ //if (ds.Tables[0].Rows.Count > 0 && ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //}
+ //else
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鏌ヨ鍒伴儴闂ㄦ暟鎹紝璇疯仈绯荤郴缁熺鐞嗗憳杩涜鏍稿";
+ // objJsonResult.data = ds.Tables[0];
+ // objJsonResult.list = columnNameList;
+ // return objJsonResult;
+ //}
+
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+
+ #region 閮ㄩ棬 鏍戝舰鍥�
+ public class TreeModel
+ {
+ public string id { get; set; }
+ public string title { get; set; }
+ public List<TreeModel> children = new List<TreeModel>();
+ }
+ [Route("Gy_Department/Gy_DepartmentTreeList")]
+ [HttpGet]
+ public object Gy_DepartmentTreeList(string sWhere)
+ {
+ try
+ {
+ string sql1 = string.Format("select hitemid,hnumber,hname from Gy_Department where 1=1 " + sWhere + " order by hnumber");
+
+ ds = oCN.RunProcReturn(sql1, "Gy_Department");
+
+ List<TreeModel> treeModels = new List<TreeModel>();
+ TreeModel first = new TreeModel();
+ first.id = "0";
+ first.title = "閮ㄩ棬璁剧疆";
+ treeModels.Add(first);
+
+ foreach (DataRow row in ds.Tables[0].Rows)
+ {
+ var strLen = row["hitemid"].ToString().Split('.');
+ if (strLen.Length == 1)
+ {
+ TreeModel tree = new TreeModel();
+ tree.id = row["hitemid"].ToString();
+ tree.title = row["hname"].ToString();
+ treeModels[0].children.Add(tree);
+ }
+ }
+ digui(ds.Tables[0], treeModels[0].children, 2);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = Newtonsoft.Json.JsonConvert.SerializeObject(treeModels);
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 閫掑綊鍑芥暟
+ /// </summary>
+ public void digui(DataTable dt, List<TreeModel> tree, int num)
+ {
+ for (int m = 0; m < tree.Count; m++)
+ {
+ tree[m].children = new List<TreeModel>();
+ for (int i = 0; i < dt.Rows.Count; i++)//绗竴娆″惊鐜紝寰楀埌鎵�鏈夋牴鑺傜偣鐨勫瓙闆�
+ {
+ var strLen = dt.Rows[i]["hnumber"].ToString().Split('.');
+ if (strLen.Length == num && dt.Rows[i]["hnumber"].ToString().Contains(tree[m].id + "."))
+ {
+ TreeModel tbjson = new TreeModel();
+ tbjson.id = dt.Rows[i]["hitemid"].ToString();
+ tbjson.title = dt.Rows[i]["hname"].ToString();
+ tree[m].children.Add(tbjson);
+ }
+ }
+ var strLens = tree[m].id.Split('.');
+ for (int i = 0; i < tree[m].children.Count; i++)
+ {
+ digui(dt, tree[m].children, strLens.Length + 2);//鍐嶆鐢ㄥ瓙闆嗗幓寰幆锛屾嬁鍑哄瓙闆嗙殑瀛愰泦
+ }
+ }
+
+ }
+ #endregion
+
+ /// <summary>
+ /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Driver/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_driver where HitemID = " + HInterID, "h_v_Gy_driver");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鍒楄〃鍒犻櫎鍔熻兘
+ /// </summary>
+ /// <returns></returns>
+ [Route("DeltetGy_Driver")]
+ [HttpGet]
+ public object DeltetGy_Driver(string HItemID, string user)
+ {
+ DataSet ds;
+ DataSet ds1;
+ try
+ {
+ ////鍒犻櫎鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_Department_Delete", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (string.IsNullOrWhiteSpace(HItemID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HItemID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+ ds = oCN.RunProcReturn("select * from gy_driver where HItemID=" + HItemID, "gy_driver");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ ds1 = oCN.RunProcReturn("Select HItemID from gy_driver Where HParentID='" + HItemID + "'", "gy_driver");
+ if (ds1.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰锛屼笉鑳藉垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string HUseFlag = Convert.ToString(ds.Tables[0].Rows[0]["HUseFlag"]);
+ if (HUseFlag == "宸蹭娇鐢�")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩凡浣跨敤锛屼笉鑳藉垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ oCN.RunProc("delete from gy_driver where HItemID=" + HItemID);
+ oCN.Commit();//鎻愪氦浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //[Route("Gy_Department/LoadTree")]
+ //[HttpGet]
+ //public object LoadTree_Json()
+ //{
+ // DBUtility.Gy_BaseFun.LoadTree(tv, imageList1, this.Text, BillName);
+ //}
+
+
+ /// <summary>
+ /// 閮ㄩ棬鍒楄〃绂佺敤鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Department/JY_Json")]
+ [HttpGet]
+ public object JY_Json(long HItemID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("update Gy_Department set HStopFlag = 1 where HItemID = " + HItemID, "Gy_Department");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 閮ㄩ棬鍒楄〃鍙嶇鐢ㄦ寜閽�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Department/FJY_Json")]
+ [HttpGet]
+ public object FJY_Json(long HItemID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("update Gy_Department set HStopFlag = 0 where HItemID = " + HItemID, "Gy_Department");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶇鐢ㄦ垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Department/AddBill")]
+ [HttpPost]
+ public object AddBill([FromBody] JObject oMain)
+ {
+ try
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ //鍙嶅簭鍒楀寲
+ msg1 = "[" + msg1.ToString() + "]";
+
+ DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl();
+ DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View();
+
+
+
+ List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg1);
+
+ long HItemID = list[0].HItemID;
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HShortNumber = list[0].HShortNumber;
+ string HRemark = list[0].HRemark;
+ string HUseFlag = list[0].HUseFlag;
+ long HParentID = list[0].HParentID;
+ string HBarCode = list[0].HBarCode;
+ string HHelpCode = list[0].HHelpCode;
+ long HSecManagerID = list[0].HSecManagerID;
+ string HCreator = list[0].HCreator;
+ long HCreateOrgID = list[0].HCreateOrgID;
+ //DateTime HCreateDate = list[0].HCreateDate;
+ long HUseOrgID = list[0].HUseOrgID;
+ string HUpdater = list[0].HUpDater;
+ //DateTime HUpdateDate = list[0].HUpDateDate;
+ string HChecker = list[0].HChecker;
+ //DateTime HCheckDate = list[0].HCheckDate;
+ string HDeleteMan = list[0].HDeleteMan;
+ //DateTime HDeleteDate = list[0].HDeleteDate;
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Insert Into Gy_Department " +
+ "(HNumber,HShortNumber,HName,HParentID" +
+ ",HLevel,HEndFlag,HRemark,HStopFlag,HUseFlag" +
+ ",HCREATEORGID,HUSEORGID" +
+ ") " +
+ " values('" + HNumber + "','" + HShortNumber + "','" + HName + "',0" +
+ ",'',0,'" + HRemark + "',0,''" +
+ "," + HCreateOrgID + "," + HUseOrgID + "" +
+ ") ");
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ /// <summary>
+ /// 淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Driver/AddBill1")]
+ [HttpPost]
+ public object AddBill1([FromBody] JObject oMain)
+ {
+
+ try
+ {
+ DAL.ClsGy_Driver_Ctl oDept = new DAL.ClsGy_Driver_Ctl();
+ DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View();
+
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
+ //string msg4 = sArray[2].ToString();
+ //string msg5 = sArray[3].ToString();
+
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Department_Edit", 1, false, msg3))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅簭鍒楀寲
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+ msg2 = "[" + msg2.ToString() + "]";
+ List<Driver> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Driver>>(msg2);
+
+ long HItemID = list[0].HItemID;
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HRemark = list[0].HRemark;
+ string HUseFlag = list[0].HUseFlag;
+ string HHelpCode = list[0].HHelpCode;
+ string HModifyEmp = msg3;
+ string HMakeEmp = msg3;
+ bool HStopflag = list[0].HStopflag==null?false:true;
+ long HCREATEORGID = list[0].HCREATEORGID;
+ long HUSEORGID = list[0].HUSEORGID;
+ long HCompID = list[0].HCompID;
+
+ //zidingyi
+ string HIDCard = list[0].HIDCard;
+ string HPhone = list[0].HPhone;
+ string HDriverCardPic = list[0].HDriverCardPic;
+ string HDriverCardType = list[0].HDriverCardType;
+ string HIDCardPic = list[0].HIDCardPic;
+ string HEmpType = list[0].HEmpType;
+
+ //鏈骇鏍囧織
+ bool HEndFlag = true;
+ long HEntityID = 1;
+
+ //寰楀埌鐭唬鐮�
+ string HShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);
+ if (HShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //绛夌骇
+ int HLevel = DBUtility.ClsPub.GetLevel(HNumber);
+
+ //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ long HParentID = 0;
+ string sParent = DBUtility.ClsPub.GetParentCode(HNumber);
+ if (sParent.Trim() == "")
+ {
+ HParentID = 0;
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("select * from Gy_Driver where HNumber='" + sParent + "' and HStopFlag=0 ", "Gy_Driver");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ HParentID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+
+ //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+ ds = oCN.RunProcReturn("Select HItemID from gy_driver Where HItemID<>" + HItemID + " and HNumber='" + HNumber + "' and HUSEORGID=" + HUSEORGID, "Gy_Warehouse");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ if (HItemID == 0)
+ {
+ //鏂板
+ oCN.BeginTran();
+ oCN.RunProc("Insert into Gy_Driver " +
+ " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HUSEORGID,HCREATEORGID,HMakeEmp,HMakeTime,HIDCard,HPhone,HDriverCardPic,HDriverCardType,HIDCardPic,HEmpType,HCompID) " +
+ " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
+ "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'" +
+ "," + HUSEORGID + "," + HCREATEORGID + ",'" + msg3 + "',getdate()," +"'"+ HIDCard +"',"+
+ "'"+ HPhone+"','"+ HDriverCardPic+"','"+ HDriverCardType + "','"+ HIDCardPic +"','"+ HEmpType+"',"+ HCompID+
+ ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCN.RunProc("Update Gy_Driver set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ }
+ else
+ {
+ oCN.BeginTran();
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_Driver where HItemID=" + HItemID, "Gy_Driver");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //涓昏〃
+ oCN.RunProc("Update Gy_Driver set " +
+ " HNumber='" + HNumber + "'" +
+ ",HName='" + HName + "'" +
+ ",HHelpCode='" + HHelpCode + "'" +
+ ",HLevel='" + HLevel + "'" +
+ ",HShortNumber='" + HShortNumber + "'" +
+ ",HParentID=" + HParentID +
+ ",HUSEORGID=" + HUSEORGID.ToString() +
+ ",HCREATEORGID=" + HCREATEORGID.ToString() +
+ ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
+ ",HModifyEmp='" + HModifyEmp + "'" +
+ ",HModifyTime='" + DateTime.Now + "'" +
+ ",HIDCard='" + HIDCard + "'" +
+ ",HPhone='" + HPhone + "'" +
+ ",HDriverCardPic='" + HDriverCardPic + "'" +
+ ",HDriverCardType='" + HDriverCardType + "'" +
+ ",HIDCardPic='" + HIDCardPic + "'" +
+ ",HEmpType='" + HEmpType + "'" +
+ ",HCompID=" + HCompID + "" +
+
+
+ ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCN.RunProc("Update Gy_Driver set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ //oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鏈�澶у熀纭�璧勬枡ID
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Department/GetMAXBillID")]
+ [HttpGet]
+ public object GetMAXBillID()
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select max(hitemid)+1 hitemid from Gy_Department", "Gy_Department");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ /// <summary>
+ /// 閮ㄩ棬鍒楄〃淇敼鎸夐挳鏂规硶
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Department/xg")]
+ [HttpGet]
+ public object xg(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from Gy_Department where HItemID=" + HInterID, "Gy_Department");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+
+ [Route("Gy_Department/LoadTree")]
+ [HttpGet]
+ public object LoadTree_Json(string sWhere)
+ {
+ SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
+ //ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
+ ds = oCN.RunProcReturn("select * from h_v_DepartmentLoadTree", "h_v_DepartmentLoadTree");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+
+ [Route("Gy_Department/SaveGy_DepartmentListApi")]
+ [HttpPost]
+ public object SaveGy_DepartmentListApi([FromBody] JObject oMain)
+ {
+ try
+ {
+ var model = oMain["model"].ToString();
+ //鍙嶅簭鍒楀寲
+ model = "[" + model + "]";
+ List<Department> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(model);
+ string sql = string.Empty;
+ oCN.BeginTran();
+ sql = $"delete Gy_Department where HItemID = {lsmain[0].HItemID}";
+ oCN.RunProc(sql);
+ sql = "set identity_insert Gy_Department on";
+ oCN.RunProc(sql);
+ //涓昏〃
+ oCN.RunProc("Insert Into Gy_Department " +
+ "(HItemID,HNumber,HShortNumber,HName,HParentID" +
+ ",HLevel,HEndFlag,HRemark,HStopFlag,HUseFlag" +
+ ",HCREATEORGID,HUSEORGID,HERPItemID" +
+ ") " +
+ " values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HShortNumber + "','" + lsmain[0].HName + "',0" +
+ ",'',0,'" + lsmain[0].HRemark + "',0,''" +
+ "," + lsmain[0].HCreateOrgID + "," + lsmain[0].HUseOrgID + "," + lsmain[0].HItemID +
+ ") ");
+ sql = "set identity_insert Gy_Department off";
+ oCN.RunProc(sql);
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #region [鍚屾鍩虹璧勬枡]
+ [Route("Gy_Department/Gy_DepartmentViewApi")]
+ [HttpGet]
+ public json Gy_DepartmentViewApi(string Number, string Type, string HUseOrgID)
+ {
+ string sql = string.Empty;
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ //绯荤粺鍙傛暟鏄惁涓虹鏈変簯妯″紡,N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡
+ if (oSystemParameter.omodel.WMS_CloudMode == "Y")
+ {
+ #region [绉佹湁浜戞ā寮忥紝鐩存帴璋冪敤鏁版嵁搴撳瓨鍌ㄨ繃绋嬫洿鏂癩
+ try
+ {
+ oCN.BeginTran();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet DS = oCn.RunProcReturn("exec h_p_WMS_ERPBasicInfoToLocal '" + Number + "','" + Type + "'", "h_p_WMS_ERPBasicInfoToLocal");
+ if (DS == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍩虹璧勬枡鍚屾澶辫触";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HBack"]) == "2")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "ERP涓笉瀛樺湪璇ヤ唬鐮�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍩虹璧勬枡鍚屾鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ #endregion
+ }
+ else
+ {
+ #region [鍏湁浜戞ā寮忥紝璋冪敤WEBAPI鐨勬柟寮忚繘琛屾洿鏂癩
+ var json = new
+ //{
+ // CreateOrgId = 0,
+ // Number = Number,
+ // Id = ""
+ //};
+ {
+ FormId = "BD_Department",
+ FieldKeys = "FMASTERID, FNUMBER, FNAME, FFORBIDSTATUS, FCREATEDATE, FCREATEORGID, FUSEORGID",
+ FilterString = $@"FNUMBER = '{Number}' AND FUSEORGID = {HUseOrgID}",
+ OrderString = "",
+ TopRowCount = 0,
+ StartRow = 0,
+ Limit = 0
+ };
+ #region [閲戣澏閮ㄥ垎]
+ //鐧诲綍閲戣澏
+ var loginRet = InvokeHelper.Login();
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ //鍒ゆ柇鏄惁鐧诲綍鎴愬姛
+ if (isSuccess < 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = loginRet;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鏌ョ湅 鑾峰彇鏁版嵁
+ var _result = InvokeHelper.Query("BD_Department", JsonConvert.SerializeObject(json));
+ var _saveObj = JArray.Parse(_result);
+ //鍒ゆ柇鏁版嵁鏄惁鑾峰彇鎴愬姛
+ // if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "閲戣澏閮ㄩ棬鍚屾澶辫触jsonRoot锛�" + _result;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ if (_saveObj.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閲戣澏瀹㈡埛鍚屾澶辫触锛屼娇鐢ㄧ粍缁囧搴旂殑閮ㄩ棬浠ｇ爜鏃犲搴旂殑閮ㄩ棬";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ #endregion
+ //鑾峰彇鏁版嵁
+ DataSet Ds;
+ Ds = oCN.RunProcReturn("select * from Gy_Department where HNumber = '" + Number + "'", "Gy_Department");
+ if (Ds.Tables[0].Rows.Count != 0 && ClsPub.isLong(Ds.Tables[0].Rows[0]["HItemID"].ToString()) != 0)
+ {
+
+ }
+
+ #region [琛ㄦ暟鎹祴鍊糫
+ var jsonData = new
+ // {
+ // HItemID = _saveObj["Result"]["Result"]["Id"],
+ // HERPItemID = _saveObj["Result"]["Result"]["Id"],
+ // HNumber = _saveObj["Result"]["Result"]["Number"],
+ // HName = _saveObj["Result"]["Result"]["Name"][0]["Value"],
+ // HShortNumber = _saveObj["Result"]["Result"]["Number"],
+ // HParentID = 0,
+ // HLevel = 1,
+ // HEndFlag = 1,
+ // HStopflag = _saveObj["Result"]["Result"]["ForbidStatus"].ToString() == "A" ? 0 : 1,
+ // HRemark = "CLD-ERP瀵煎叆",
+ // HUseFlag = "宸蹭娇鐢�",
+ // HMakeTime = _saveObj["Result"]["Result"]["CreateDate"],
+ // HCREATEORGID = _saveObj["Result"]["Result"]["CreateOrgId_Id"],
+ // HUSEORGID = _saveObj["Result"]["Result"]["UseOrgId_Id"],
+ // };
+ {
+ HItemID = _saveObj[0][0],
+ HERPItemID = _saveObj[0][0],
+ HNumber = _saveObj[0][1],
+ HName = _saveObj[0][2],
+ HShortNumber = _saveObj[0][1],
+ HParentID = 0,
+ HLevel = 1,
+ HEndFlag = 1,
+ HStopflag = _saveObj[0][3].ToString() == "A" ? 0 : 1,
+ HRemark = "CLD-ERP瀵煎叆",
+ HUseFlag = "宸蹭娇鐢�",
+ HMakeTime = _saveObj[0][4],
+ HCREATEORGID = _saveObj[0][5],
+ HUSEORGID = _saveObj[0][6],
+ };
+ #endregion
+ // 鍒犻櫎涓昏〃瀵瑰簲鏁版嵁
+ sql = $"delete from Gy_Department where HItemID = " + jsonData.HItemID + " and HNumber = '" + Number + "'";
+ oCN.RunProc(sql);
+
+ sql = "set identity_insert Gy_Department on";
+ oCN.RunProc(sql);
+
+ //鎻掑叆琛�
+ sql = $@"
+ insert into Gy_Department
+ (HItemID,HERPItemID,HNumber,HName,HShortNumber,HParentID
+ ,HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HMakeTime,HCREATEORGID,HUSEORGID
+ )
+ values
+ ({jsonData.HItemID},{jsonData.HItemID},'{jsonData.HNumber}','{jsonData.HName}',
+ '{jsonData.HShortNumber}',{jsonData.HParentID},{jsonData.HLevel},{jsonData.HEndFlag},{jsonData.HStopflag},'{jsonData.HRemark}','{jsonData.HUseFlag}','{jsonData.HMakeTime}',{jsonData.HCREATEORGID},{jsonData.HUSEORGID})";
+
+ oCN.RunProc(sql);
+
+ sql = "set identity_insert Gy_Department off";
+ oCN.RunProc(sql);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "閮ㄩ棬鍚屾鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ #endregion
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍩虹璧勬枡璇诲彇澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 瀹℃牳銆佸弽瀹℃牳
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Gy_Driver/AuditGy_Driver")]
+ [HttpGet]
+ public object AuditGy_Driver(int HInterID, int IsAudit, string CurUserName)
+ {
+ try
+ {
+ ////瀹℃牳鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_Department_Check", 1, false, CurUserName))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ var ds = oCN.RunProcReturn("select * from Gy_Driver where HItemID=" + HInterID, "Gy_Driver");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ oCN.RunProc("update Gy_Driver set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ oCN.RunProc("update Gy_Driver set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 绂佺敤銆佸弽绂佺敤
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsStop">绂佺敤(0),鍙嶇鐢�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Gy_Driver/StopGy_Driver")]
+ [HttpGet]
+ public object StopGy_Driver(int HInterID, int IsStop, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_Department_Stop", 1, false, CurUserName))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "绂佺敤澶辫触锛佹棤鏉冮檺锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ var ds = oCN.RunProcReturn("select * from Gy_Driver where HItemID=" + HInterID, "Gy_Driver");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsStop == 0) //绂佺敤鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬鐢�!涓嶈兘鍐嶆绂佺敤锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鐢�!涓嶉渶瑕佸弽绂佺敤!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsStop == 0) //绂佺敤鍒ゆ柇
+ {
+ oCN.RunProc("update Gy_Driver set HStopEmp='" + CurUserName + "',HStopTime=getdate(),HStopflag=1 where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+ {
+ oCN.RunProc("update Gy_Driver set HStopEmp='',HStopTime=null,HStopflag=0 where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶇鐢ㄦ垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤澶辫触鎴栬�呭弽绂佺敤澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閮ㄩ棬鍒楄〃 鏂囦欢涓婁紶
+ //[Route("Gy_Department/Gy_Process_Excel")]
+ //[HttpPost]
+ //public json Gy_Department_Excel()
+ //{
+ // json res = new json();
+ // try
+ // {
+ // //鑾峰彇鏂囦欢鍚嶇О
+ // var file = HttpContext.Current.Request.Files[0];
+ // //鑾峰彇鏂囦欢鐗╃悊璺緞
+ // string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ // //淇濆瓨鏂囦欢
+ // file.SaveAs(ExcelPath);
+
+ // NpoiHelper np = new NpoiHelper();
+ // DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
+
+ // //鍒犻櫎鏂囦欢
+ // File.Delete(ExcelPath);
+
+ // //鍒涘缓涓存椂琛�
+ // DataTable provisional = new DataTable("dt2");
+
+ // //娣诲姞鍒楀悕
+ // for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ // {
+ // provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ // }
+
+ // //娣诲姞鏁版嵁
+ // for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ // {
+ // DataRow row = provisional.NewRow();
+ // for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ // {
+ // row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ // }
+ // provisional.Rows.Add(row);
+ // }
+
+ // //鍒ゆ柇鍒�
+ // string error = JudgmentColumns(provisional);
+ // if (error.Length > 0)
+ // {
+ // res.code = "0";
+ // res.count = 0;
+ // res.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+ // res.data = null;
+ // return res;
+ // }
+
+ // for (int i = 0; i <= provisional.Rows.Count - 1; i++)
+ // {
+ // string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["閮ㄩ棬浠ｇ爜"].ToString());
+ // string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["閮ㄩ棬鍚嶇О"].ToString());
+ // string HEmpNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["璐熻矗浜轰唬鐮�"].ToString());
+ // string HEmpName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["璐熻矗浜哄悕绉�"].ToString());
+ // string HBarCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鏉″舰鐮�"].ToString());
+ // string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍔╄鐮�"]);
+ // string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["澶囨敞"].ToString());
+
+ // //鍒ゆ柇璐熻矗浜烘槸鍚﹀瓨鍦�
+ // if (JudgeEmp(HEmpNumber, HEmpName))
+ // {
+ // res.code = CodeConstant.FAIL;
+ // res.count = CountConstant.FAIL;
+ // res.Message = "褰撳墠鑱屽憳涓嶅瓨鍦�";
+ // res.data = null;
+ // return res;
+ // }
+ // //鑾峰彇鐪熷疄琛屾暟
+ // int line = i + 1;
+ // }
+
+ // res.code = "1";
+ // res.count = 1;
+ // res.Message = error;
+ // res.data = provisional;
+ // return res;
+ // }
+ // catch (Exception e)
+ // {
+ // res.code = "0";
+ // res.count = 0;
+ // res.Message = "Exception锛�" + e.ToString();
+ // res.data = null;
+ // return res;
+ // }
+ //}
+
+ /// <summary>
+ /// 鍒ゆ柇褰撳墠鑱屽憳鏄惁瀛樺湪
+ /// </summary>
+ /// <param name="HEmpNumber"></param>
+ /// <param name="HEmpName"></param>
+ /// <returns></returns>
+ //private bool JudgeEmp(string HEmpNumber, string HEmpName)
+ //{
+ // if (!String.IsNullOrEmpty(HEmpNumber) && !String.IsNullOrEmpty(HEmpName))
+ // {
+ // DataSet emp = oCN.RunProcReturn("select * from Gy_Employee where HNumber = '" + HEmpNumber + "' and HName = '" + HEmpName + "'", "Gy_Employee");
+ // return emp.Tables[0].Rows.Count <= EmptyConstant.EMPTY ? true : false;
+ // }
+ // return false;
+ //}
+
+ /// <summary>
+ /// 鍒ゆ柇鍒�
+ /// </summary>
+ /// <param name="provisional"></param>
+ /// <returns></returns>
+ private static string JudgmentColumns(DataTable provisional)
+ {
+ var error = "";
+
+ //鏌ヨ娌℃湁鐨勫垪
+ if (!provisional.Columns.Contains("閮ㄩ棬浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愰儴闂ㄤ唬鐮併�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("閮ㄩ棬鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愰儴闂ㄥ悕绉般�戠殑鏍囬,";
+ return error;
+ }
+ #endregion
+
+ #region 閮ㄩ棬鍒楄〃 瀵煎叆(淇濆瓨)
+ [Route("Gy_Department/Gy_Process_btnSave")]
+ [HttpPost]
+ public object Gy_InspectBasis_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+ string organ = sArray[2].ToString();
+ json res = new json();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_Group_Edit", 1, false, user))
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "鏃犱繚瀛樻潈闄愶紒";
+ res.data = null;
+ return res;
+ }
+
+ List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+
+ foreach (JObject item in Excel)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+ oCN.BeginTran();
+ int i = 1;
+ foreach (Dictionary<string, string> item in list)
+ {
+ string HNumber = item["閮ㄩ棬浠ｇ爜"].ToString();
+ string HName = item["閮ㄩ棬鍚嶇О"].ToString();
+ string HEmpNumber = item["璐熻矗浜轰唬鐮�"].ToString();
+ string HEmpName = item["璐熻矗浜哄悕绉�"].ToString();
+ string HBarCode = item["鏉″舰鐮�"].ToString();
+ string HHelpCode = item["鍔╄鐮�"].ToString();
+ string HRemark = item["澶囨敞"].ToString();
+ int HEmpID = 0;
+ if (!String.IsNullOrEmpty(HEmpName) && !String.IsNullOrEmpty(HEmpNumber))
+ {
+ DataSet emp = oCN.RunProcReturn("select HItemID from Gy_Employee where HNumber = '" + HEmpNumber + "' and HName = '" + HEmpName + "'", "Gy_Employee");
+ HEmpID = (int)emp.Tables[0].Rows[0]["HItemID"];
+ }
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//鐭唬鐮�
+ if (sShortNumber.Trim() == "")
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ res.data = 1;
+ return res;
+ }
+ int HEndFlag = 1;//鏈骇鏍囧織
+ int HLevel = DBUtility.ClsPub.GetLevel(HNumber); //绛夌骇
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber.Trim()))
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ res.data = 1;
+ return res;
+ }
+
+ ds = oCN.RunProcReturn("select * from Gy_Department where HNumber='" + HNumber + "'", "Gy_InspectInstruMent");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+
+ string sql = "insert into Gy_Department (HName,HNumber,HShortNumber,HLevel,HHelpCode,HParentID,HStopflag,HEndFlag,HRemark,HUseFlag, HUSEORGID, HCREATEORGID, HEmpID, HBarCodeForBase)" +
+ $"values('{HName}', '{HNumber}', '{sShortNumber}',{HLevel},'',0,'0','0','{HRemark}', '鏈娇鐢�', '{organ}', '{organ}', '{HEmpID}', '{HBarCode}')";
+ oCN.RunProc(sql);
+ }
+ else
+ {
+ oCN.RunProc("update Gy_Department set HName ='" + HName + "' , HHelpCode = '" + HHelpCode + " ', HBarCodeForBase = '" + HBarCode + "', HEmpID = '" + HEmpID + "', HModifyEmp = '" + user + "', HModifyTime = '" + System.DateTime.Now.ToString("G") + "' where HNumber= '" + HNumber + "'");
+ }
+
+ i++;
+ }
+
+ oCN.Commit();
+
+ res.code = "1";
+ res.count = 1;
+ res.Message = "瀵煎叆鎴愬姛!";
+ res.data = null;
+ return res;
+ }
+ catch (Exception e)
+ {
+ LogService.Write(e);
+ res.code = "0";
+ res.count = 0;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
index 43fdb49..014336e 100644
--- a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -1496,7 +1496,7 @@
sql = "delete from Sc_StationOutBillSub_SN where HInterID = " + HInterID + " and HEntryID = " + HEntryID;
oCN.RunProc(sql);
//鍙嶅啓宸ュ簭鍑虹珯鍗曠殑鍚堟牸鏁伴噺
- oCN.RunProc("update Sc_StationOutBillMain WITH (TABLOCKX) set HQty-=1 where HProcExchInterID='" + HProcExchInterID + "' and HProcExchEntryID=" + HProcExchEntryID+ " and HBillNo='"+ HBillNo_bak + "'");
+ oCN.RunProc("update Sc_StationOutBillMain set HQty-=1 where HProcExchInterID='" + HProcExchInterID + "' and HProcExchEntryID=" + HProcExchEntryID+ " and HBillNo='"+ HBillNo_bak + "'");
oCN.Commit();
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 2560108..af1c550 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -292,7 +292,7 @@
//鍒ゆ柇褰撳墠宸ュ崟鏄惁寮�宸�
else if (oSystemParameter.omodel.MES_StationOutBill_MustBeginWorkCtl == "Y")
{
- ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceID = '" + HSourceID + "' and HICMOBillNo = '" + HICMOBillNo + "' and HInterID = '" + HICMOInterID + "' and hicmostatus =1", "Sc_ICMOBillStatus_Tmp");
+ ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp with(nolock) where HSourceID = '" + HSourceID + "' and HICMOBillNo = '" + HICMOBillNo + "' and HInterID = '" + HICMOInterID + "' and hicmostatus =1", "Sc_ICMOBillStatus_Tmp");
if (ds.Tables[0].Rows[0]["HICMOStatus"].ToString() != "1")
{
objJsonResult.code = "0";
@@ -437,7 +437,7 @@
else if ("Modify".Equals(eventType))
{
num = 2;
- oCN.RunProc("UpDate Sc_StationOutBillMain set " +
+ oCN.RunProc("UpDate a set " +
"HUpDater='" + HMaker + "'" +
",HUpDateDate=getdate()" +
",HSourceName='" + HSourceName + "'" +
@@ -479,6 +479,7 @@
//",HIsTimeFlag=" + HIsTimeFlag +
//",HRelBeginTime='" + HRelBeginTime + "'" +
//",HRelEndTime='" + HRelEndTime + "'" +
+ " from Sc_StationOutBillMain a with(nolock)" +
" where HInterID=" + HInterID);
LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",淇敼宸ュ簭鍑虹珯鍗曟嵁:" + HBillNo);
@@ -534,8 +535,8 @@
oCN.RunProc("exec h_p_Mes_StationOutBillBackBarCode " + HInterID + " ");
LogService.Write($"7.瀛樺偍杩囩▼缁撴潫锛岀敤鏃�" + sw.Elapsed);
//鍒ゆ柇鏄惁鏄� 鏈亾宸ュ簭
- ds1 = oCN.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a " +
- " inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID " +
+ ds1 = oCN.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a with(nolock) " +
+ " inner join Sc_ProcessExchangeBillSub b with(nolock) on a.HInterID=b.HInterID " +
" Where a.HInterID=" + HProcExchInterID + " and b.HEntryID=" + HProcExchEntryID + " ", "Sc_ProcessExchangeBillMain");
LogService.Write($"7.1.鏌ヨ锛岀敤鏃�" + sw.Elapsed);
//鍒ゆ柇鏄惁鏄柊澧�
@@ -648,8 +649,8 @@
//娴嬭瘯璇彞===========================================================================================================
string msg_str = "";
string sql_str = "select a.HQty HQty_Main,b.HQty HQty_Sub " +
- "from Sc_ProcessExchangeBillMain as a " +
- "inner join Sc_ProcessExchangeBillSub as b on a.HInterID = b.HInterID " +
+ "from Sc_ProcessExchangeBillMain as a with(nolock)" +
+ "inner join Sc_ProcessExchangeBillSub as b with(nolock) on a.HInterID = b.HInterID " +
"where a.HInterID = " + HProcExchInterID;
DataSet ds_str = oCN.RunProcReturn(sql_str, "Sc_ProcessExchangeBillMain");
if (ds_str.Tables[0].Rows.Count > 0)
@@ -951,7 +952,7 @@
Int64 HInterID = DBUtility.ClsPub.CreateBillID("3711", ref DBUtility.ClsPub.sExeReturnInfo);
string HBillNo = DBUtility.ClsPub.CreateBillCode("3711", ref DBUtility.ClsPub.sExeReturnInfo, true);
//鑾峰彇缁勭粐浠ｇ爜
- string OrganizationNUM = oCN.RunProcReturn("select HNumber from Xt_ORGANIZATIONS where HItemID=" + OrganizationID, "Xt_ORGANIZATIONS").Tables[0].Rows[0]["HNumber"].ToString();
+ string OrganizationNUM = oCN.RunProcReturn("select HNumber from Xt_ORGANIZATIONS with(nolock) where HItemID=" + OrganizationID, "Xt_ORGANIZATIONS").Tables[0].Rows[0]["HNumber"].ToString();
//鏍规嵁宸ュ簭姹囨姤鍗曚富ID鑾峰彇宸ュ簭姹囨姤鍏ュ簱鍗曠殑鏁版嵁
DataSet ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_LastProc where HInterID=" + InterID, "h_v_MES_StationOutBillList_LastProc");
if (ds.Tables[0].Rows.Count <= 0)
@@ -966,7 +967,7 @@
//淇濆瓨
//oCN.BeginTran();
- DataSet DsTable = oCN.RunProcReturn($"select * from Sc_ICMOReportBillMain where HBillNo='{HBillNo}'", "Sc_ICMOReportBillMain");
+ DataSet DsTable = oCN.RunProcReturn($"select * from Sc_ICMOReportBillMain with(nolock) where HBillNo='{HBillNo}'", "Sc_ICMOReportBillMain");
if (DsTable.Tables[0].Rows.Count > 0)
{
objJsonResult.code = "0";
@@ -1128,7 +1129,7 @@
return objJsonResult;
}
- oCN.RunProc("update Sc_StationOutBillMain set HRelationQty=1 where HBillNo='" + BillNo + "'");
+ oCN.RunProc("update a set HRelationQty=1 from Sc_StationOutBillMain a with(nolock) where HBillNo='" + BillNo + "'");
//oCN.Commit();
objJsonResult.code = "0";
@@ -1344,7 +1345,7 @@
return objJsonResult;
}
- oCN.RunProc("update Sc_StationOutBillMain set HRelationQty=1 where HBillNo='" + BillNo + "'");
+ oCN.RunProc("update a set HRelationQty=1 from Sc_StationOutBillMain a with(nolock) where HBillNo='" + BillNo + "'");
//oCN.Commit();
objJsonResult.code = "0";
@@ -3099,21 +3100,21 @@
string HChecker = CurUserName;
string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
oCN.BeginTran();
- ds = oCN.RunProcReturn("Select * from Sc_StationOutBillMain Where HInterID=" + lngBillKey.ToString(), "Sc_StationOutBillMain");
+ ds = oCN.RunProcReturn("Select * from Sc_StationOutBillMain with(nolock) Where HInterID=" + lngBillKey.ToString(), "Sc_StationOutBillMain");
if (ds.Tables[0].Rows.Count == 0)
{
sReturn = "鍗曟嵁鏈壘鍒帮紒";
return false;
}
- oCN.RunProc(" Update Sc_StationOutBillMain set HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
+ oCN.RunProc(" Update a set HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' from Sc_StationOutBillMain with(nolock) Where HInterID=" + lngBillKey.ToString());
oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Check_In " + lngBillKey.ToString() + ",1");
//鍒ゆ柇鏄惁鏄� 鏈亾宸ュ簭
DataSet ds1;
ds1 = oCN.RunProcReturn("select HLastProc,HFstProc " +
- " from Sc_ProcessExchangeBillMain a " +
- " inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID " +
- " Where a.HInterID=(Select HProcExchInterID from Sc_StationOutBillMain Where HInterID=" + lngBillKey + ") " +
- " and b.HEntryID=(Select HProcExchEntryID from Sc_StationOutBillMain Where HInterID=" + lngBillKey + ")", "Sc_ProcessExchangeBillMain");
+ " from Sc_ProcessExchangeBillMain a with(nolock)" +
+ " inner join Sc_ProcessExchangeBillSub b with(nolock) on a.HInterID=b.HInterID " +
+ " Where a.HInterID=(Select HProcExchInterID from Sc_StationOutBillMain with(nolock) Where HInterID=" + lngBillKey + ") " +
+ " and b.HEntryID=(Select HProcExchEntryID from Sc_StationOutBillMain with(nolock) Where HInterID=" + lngBillKey + ")", "Sc_ProcessExchangeBillMain");
if (ds1 == null || ds1.Tables[0].Rows.Count == 0 || HLastSubProc ==false)
{
}
@@ -3121,8 +3122,8 @@
{
}
- DataSet dataSet = oCN.RunProcReturn(@"select a.HProcExchBillNo,a.HQty,b.HQty HProcExchQty from Sc_StationOutBillMain a
-inner join Sc_ProcessExchangeBillMain b on a.HProcExchInterID = b.HInterID
+ DataSet dataSet = oCN.RunProcReturn(@"select a.HProcExchBillNo,a.HQty,b.HQty HProcExchQty from Sc_StationOutBillMain a with(nolock)
+inner join Sc_ProcessExchangeBillMain b with(nolock) on a.HProcExchInterID = b.HInterID
where a.HInterID = " + lngBillKey, "Sc_ProcessExchangeBillMain");
if (dataSet.Tables[0].Rows.Count > 0)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs
new file mode 100644
index 0000000..841a496
--- /dev/null
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs
@@ -0,0 +1,801 @@
+锘縰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.Web.Http;
+using WebAPI.Models;
+using System.Windows.Forms;
+using SyntacticSugar.constant;
+namespace WebAPI.Controllers
+{
+
+ public class Sc_MouldProdBackBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public const string ModName = "3803"; //鍗曟嵁绫诲瀷
+ public const string ModCaption = "鍣ㄥ叿棰嗙敤閫�搴撳崟"; //鍗曟嵁鍚嶇О
+ public const string ModRightName = "Sc_MouldProdBackBill";
+ public const string ModRightNameList = ModRightName + "List"; //鍒楄〃
+ public const string ModRightNameEdit = ModRightName + "_Edit"; //缂栬緫
+ public const string ModRightNameCheck = ModRightName + "_Check"; //瀹℃牳
+ public const string ModRightNameClose = ModRightName + "_Close"; //鍏抽棴
+ public const string ModRightNameDelete = ModRightName + "_Delete"; //浣滃簾
+ public const string ModRightNameDrop = ModRightName + "_Drop"; //鍒犻櫎
+ public DataSet ds = new DataSet();
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ public DAL.ClsSc_MouldProdBackBill oBill = new DAL.ClsSc_MouldProdBackBill();
+
+
+ #region 鍣ㄥ叿棰嗙敤閫�搴撳崟鍒嗛〉鍒楄〃
+ [Route("Sc_MouldProdBackBillController/page")]
+ [HttpGet]
+ public json Sc_MouldProdBackBillPage(string sWhere, string user, int page, int size, string Type)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒楄〃杩涘叆鏃跺垽鏂潈闄愶紝閫夋簮鍗曡繘鍏ヤ笉鍒ゆ柇鏉冮檺
+ if (Type == ModName)
+ {
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameList, 3, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ sWhere = sWhere.Replace("'", "''");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCn.RunProcReturn("exec h_p_Sc_MouldProdBackBillList_New " + page + "," + size + ",'','" + Type + "'", "h_p_Sc_MouldProdBackBillList_New");
+ }
+ else
+ {
+ ds = oCn.RunProcReturn("exec h_p_Sc_MouldProdBackBillList_New " + page + "," + size + ",'" + sWhere + "','" + Type + "'", "h_p_Sc_MouldProdBackBillList_New");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏌ヨ鍒楄〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿棰嗙敤閫�搴撳崟 鍒犻櫎
+ /// <summary>
+ /// 鍒犻櫎鍣ㄥ叿棰嗙敤閫�搴撳崟
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_MouldProdBackBillController/GetSc_MouldProdBackBill_Delete_Json")]
+ [HttpGet]
+ public object GetSc_MouldProdBackBill_Delete_Json(Int64 HInterID, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDrop, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鍒犻櫎鍔熻兘鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ //鍒犻櫎鍓嶆帶鍒�
+ DataSet BeforeDs = oCn.RunProcReturn("Exec h_p_Sc_MouldProdBackBill_BeforeDelCtrl " + HInterID.ToString() + ",'" + oBill.omodel.HBillNo + "','" + HMaker + "'", "h_p_Sc_MouldProdBackBill_BeforeDelCtrl");
+ if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //鍒犻櫎鍗曟嵁锛堝寘鍚垹闄ゅ悗鎺у埗銆佸啓鍏ユ棩蹇楋級
+ if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Sc_MouldProdBackBill_AfterDelCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鍣ㄥ叿棰嗙敤閫�搴撳崟鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ櫒鍏烽鐢ㄩ��搴撳崟锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎鍣ㄥ叿棰嗙敤閫�搴撳崟澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿棰嗙敤閫�搴撳崟 瀹℃牳/鍙嶅鏍�
+ /// <summary>
+ /// 瀹℃牳/鍙嶅鏍稿櫒鍏烽鐢ㄩ��搴撳崟
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">瀹℃牳(1),鍙嶅鏍�(2)</param>
+ /// <param name="HMaker">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MouldProdBackBillController/GetSc_MouldProdBackBill_Check_Json")]
+ [HttpGet]
+ public object GetSc_MouldProdBackBill_Check_Json(Int64 HInterID, int Type, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡瀹℃牳/鍙嶅鏍稿姛鑳芥潈闄�,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍革紝涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂紝涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴燂紝涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //瀹℃牳鍓嶆帶鍒�
+ DataSet BeforeDs = oCn.RunProcReturn("Exec h_p_Sc_MouldProdBackBill_BeforeCheckCtrl " + HInterID.ToString() + ",'" + oBill.omodel.HBillNo + "','" + HMaker + "'", "h_p_Sc_MouldProdBackBill_BeforeCheckCtrl");
+ if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛�" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //瀹℃牳鍗曟嵁
+ if (!oBill.CheckBill(HInterID, oBill.omodel.HBillNo, "h_p_Sc_MouldProdBackBill_AfterCheckCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 瀹℃牳鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ else
+ {
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍革紝涓嶉渶瑕佸弽瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅鏍稿墠鎺у埗
+ DataSet BeforeDs = oCn.RunProcReturn("Exec h_p_Sc_MouldProdBackBill_BeforeUnCheckCtrl " + HInterID.ToString() + ",'" + oBill.omodel.HBillNo + "','" + HMaker + "'", "h_p_Sc_MouldProdBackBill_BeforeUnCheckCtrl");
+ if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿墠鍒ゆ柇澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐ワ紒" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //鍙嶅鏍稿崟鎹�
+ if (!oBill.AbandonCheck(HInterID, oBill.omodel.HBillNo, "h_p_Sc_MouldProdBackBill_AfterUnCheckCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍙嶅鏍告垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ櫒鍏烽鐢ㄩ��搴撳崟锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鎴栧弽瀹℃牳鍣ㄥ叿棰嗙敤閫�搴撳崟澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿棰嗙敤閫�搴撳崟 鎵归噺瀹℃牳
+ /// <summary>
+ /// 鎵归噺瀹℃牳/鍙嶅鏍稿櫒鍏烽鐢ㄩ��搴撳崟
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">瀹℃牳(1),鍙嶅鏍�(2)</param>
+ /// <param name="HMaker">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MouldProdBackBillController/CheckAll")]
+ [HttpGet]
+ public object CheckAll(string ids, int Type, string HMaker)
+ {
+ try
+ {
+ //澶勭悊瀛楃涓�
+ if (!string.IsNullOrEmpty(ids))
+ {
+ long[] idArray = Array.ConvertAll(ids.Split(','), long.Parse);
+ // 澶勭悊idArray...
+ oCn.BeginTran();
+ for (int i = 0; i < idArray.Length; i++)
+ {
+ objJsonResult = (json)GetSc_MouldProdBackBill_Check_Json(idArray[i], Type, HMaker);//瀹℃牳鎵ц
+ if (objJsonResult.count == 0)
+ {
+ oCn.RollBack();
+ objJsonResult.Message += "绗�" + (i + 1) + "琛屽嚭鐜伴棶棰樻棤娉曠户缁畬鎴�";
+ return objJsonResult;
+ }
+ }
+ oCn.Commit();
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇烽�夋嫨姝ｇ‘琛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鎴栧弽瀹℃牳鍣ㄥ叿棰嗙敤閫�搴撳崟澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿棰嗙敤閫�搴撳崟 鍏抽棴/鍙嶅叧闂�
+ /// <summary>
+ /// 鍏抽棴/鍙嶅叧闂櫒鍏烽鐢ㄩ��搴撳崟
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">鍏抽棴(1),鍙嶅叧闂�(2)</param>
+ /// <param name="HMaker">鍏抽棴浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MouldProdBackBillController/GetSc_MouldProdBackBill_Close_Json")]
+ [HttpGet]
+ public object GetSc_MouldProdBackBill_Close_Json(Int64 HInterID, int Type, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameClose, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鍏抽棴/鍙嶅叧闂姛鑳芥潈闄�,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂紝涓嶈兘鍐嶆鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍏抽棴鍗曟嵁
+ if (!oBill.CloseBill(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍏抽棴鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ else
+ {
+ if (oBill.omodel.HCloseMan.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈叧闂紝涓嶉渶瑕佸弽鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅叧闂崟鎹�
+ if (!oBill.CancelClose(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍙嶅叧闂垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ櫒鍏烽鐢ㄩ��搴撳崟锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴鎴栧弽鍏抽棴鍣ㄥ叿棰嗙敤閫�搴撳崟澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿棰嗙敤閫�搴撳崟 浣滃簾/鍙嶄綔搴�
+ /// <summary>
+ /// 浣滃簾/鍙嶄綔搴� 鍣ㄥ叿棰嗙敤閫�搴撳崟
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">浣滃簾(1),鍙嶄綔搴�(2)</param>
+ /// <param name="HMaker">浣滃簾浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MouldProdBackBillController/GetSc_MouldProdBackBill_Cancelltion_Json")]
+ [HttpGet]
+ public object GetSc_MouldProdBackBill_Cancelltion_Json(Int64 HInterID, int Type, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡浣滃簾/鍙嶄綔搴熷姛鑳芥潈闄�,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ //Type 1 浣滃簾 2 鍙嶄綔搴�
+ if (Type == 1)
+ {
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴燂紝涓嶈兘鍐嶆浣滃簾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //浣滃簾鍗曟嵁
+ if (!oBill.Cancelltion(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 浣滃簾鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ else
+ {
+ if (oBill.omodel.HDeleteMan.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈綔搴燂紝涓嶉渶瑕佸弽浣滃簾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶄綔搴熷崟鎹�
+ if (!oBill.AbandonCancelltion(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍙嶄綔搴熸垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ櫒鍏烽鐢ㄩ��搴撳崟锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾鎴栧弽浣滃簾鍣ㄥ叿棰嗙敤閫�搴撳崟澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿棰嗙敤閫�搴撳崟 淇濆瓨
+ /// <summary>
+ /// 鍣ㄥ叿棰嗙敤閫�搴撳崟淇濆瓨
+ /// </summary>
+ [Route("Sc_MouldProdBackBillController/GetSc_MouldProdBackBill_Save_Json")]
+ [HttpPost]
+ public object GetSc_MouldProdBackBill_Save_Json([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string sMainStr = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string sSubStr = sArray[1].ToString(); //瀛愯〃鏁版嵁
+ string OperationType = sArray[2].ToString(); //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫锛�
+ string HMaker = sArray[3].ToString(); //鍒跺崟浜�
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (OperationType == "1")
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ //鍒ゆ柇鏂板鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightName, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏂板鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify;
+ //鍒ゆ柇缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡缂栬緫鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //琛ㄥご璧嬪��
+ sMainStr = sMainStr.Replace("\\", "");
+ sMainStr = sMainStr.Replace("\n", "");
+ sMainStr = "[" + sMainStr.ToString() + "]";
+ List<Model.ClsSc_MouldProdBackBillMain> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldProdBackBillMain>>(sMainStr);
+ foreach (Model.ClsSc_MouldProdBackBillMain oItem in lsmain)
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (oBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, oItem.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(oItem.HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oItem.HYear = sYear;
+ oItem.HPeriod = sPeriod;
+ DBUtility.ClsPub.CurUserName = oItem.HMaker;
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋璧嬪��
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ sSubStr = sSubStr.Substring(1, sSubStr.Length - 2);
+ sSubStr = sSubStr.Replace("\\", "");
+ sSubStr = sSubStr.Replace("\n", "");
+ sSubStr = "[" + sSubStr.ToString() + "]";
+ List<Model.ClsSc_MouldProdBackBillSub> ls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldProdBackBillSub>>(sSubStr);
+ int i = 0;
+ foreach (Model.ClsSc_MouldProdBackBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+ oBill.DetailColl.Add(oItemSub);
+ }
+
+ //淇濆瓨
+ bool bResult;
+ if (OperationType == "1") //鏂板淇濆瓨
+ {
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else //缂栬緫淇濆瓨
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鍣ㄥ叿棰嗙敤閫�搴撳崟 杩斿洖婧愬崟鏁版嵁
+ /// <summary>
+ /// 杩斿洖婧愬崟鏁版嵁
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_MouldProdBackBillController/GetSourceBill_MouldProdBack_Json")]
+ [HttpGet]
+ public object GetSourceBill_MouldProdBack_Json(Int64 HInterID, Int64 HEntryID, string HBillType)
+ {
+ try
+ {
+ string sViewName = "";
+ //鍣ㄥ叿鍏ュ簱鐢宠鍗�
+ if (HBillType== "3851")
+ {
+ sViewName = "h_p_Sc_MouldInRequestBill_Source_MouldProdBack";
+ }
+
+ if (sViewName == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓嶆敮鎸佽婧愬崟绫诲瀷锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCn.RunProcReturn("exec " + sViewName + " " + HInterID.ToString() + "," + HEntryID.ToString(), sViewName);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌婧愬崟淇℃伅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇婧愬崟淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillController.cs
new file mode 100644
index 0000000..65192ec
--- /dev/null
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillController.cs
@@ -0,0 +1,801 @@
+锘縰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.Web.Http;
+using WebAPI.Models;
+using System.Windows.Forms;
+using SyntacticSugar.constant;
+namespace WebAPI.Controllers
+{
+
+ public class Sc_MouldProdMoveBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public const string ModName = "3814"; //鍗曟嵁绫诲瀷
+ public const string ModCaption = "鍣ㄥ叿璋冩嫧鍗�"; //鍗曟嵁鍚嶇О
+ public const string ModRightName = "Sc_MouldProdMoveBill";
+ public const string ModRightNameList = ModRightName + "List"; //鍒楄〃
+ public const string ModRightNameEdit = ModRightName + "_Edit"; //缂栬緫
+ public const string ModRightNameCheck = ModRightName + "_Check"; //瀹℃牳
+ public const string ModRightNameClose = ModRightName + "_Close"; //鍏抽棴
+ public const string ModRightNameDelete = ModRightName + "_Delete"; //浣滃簾
+ public const string ModRightNameDrop = ModRightName + "_Drop"; //鍒犻櫎
+ public DataSet ds = new DataSet();
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ public DAL.ClsSc_MouldProdMoveBill oBill = new DAL.ClsSc_MouldProdMoveBill();
+
+
+ #region 鍣ㄥ叿璋冩嫧鍗曞垎椤靛垪琛�
+ [Route("Sc_MouldProdMoveBillController/page")]
+ [HttpGet]
+ public json Sc_MouldProdMoveBillPage(string sWhere, string user, int page, int size, string Type)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒楄〃杩涘叆鏃跺垽鏂潈闄愶紝閫夋簮鍗曡繘鍏ヤ笉鍒ゆ柇鏉冮檺
+ if (Type == ModName)
+ {
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameList, 3, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ sWhere = sWhere.Replace("'", "''");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCn.RunProcReturn("exec h_p_Sc_MouldProdMoveBillList_New " + page + "," + size + ",'','" + Type + "'", "h_p_Sc_MouldProdMoveBillList_New");
+ }
+ else
+ {
+ ds = oCn.RunProcReturn("exec h_p_Sc_MouldProdMoveBillList_New " + page + "," + size + ",'" + sWhere + "','" + Type + "'", "h_p_Sc_MouldProdMoveBillList_New");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏌ヨ鍒楄〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿璋冩嫧鍗� 鍒犻櫎
+ /// <summary>
+ /// 鍒犻櫎鍣ㄥ叿璋冩嫧鍗�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_MouldProdMoveBillController/GetSc_MouldProdMoveBill_Delete_Json")]
+ [HttpGet]
+ public object GetSc_MouldProdMoveBill_Delete_Json(Int64 HInterID, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDrop, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鍒犻櫎鍔熻兘鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ //鍒犻櫎鍓嶆帶鍒�
+ DataSet BeforeDs = oCn.RunProcReturn("Exec h_p_Sc_MouldProdMoveBill_BeforeDelCtrl " + HInterID.ToString() + ",'" + oBill.omodel.HBillNo + "','" + HMaker + "'", "h_p_Sc_MouldProdMoveBill_BeforeDelCtrl");
+ if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //鍒犻櫎鍗曟嵁锛堝寘鍚垹闄ゅ悗鎺у埗銆佸啓鍏ユ棩蹇楋級
+ if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Sc_MouldProdMoveBill_AfterDelCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鍣ㄥ叿璋冩嫧鍗曟垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ櫒鍏疯皟鎷ㄥ崟锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎鍣ㄥ叿璋冩嫧鍗曞け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿璋冩嫧鍗� 瀹℃牳/鍙嶅鏍�
+ /// <summary>
+ /// 瀹℃牳/鍙嶅鏍稿櫒鍏疯皟鎷ㄥ崟
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">瀹℃牳(1),鍙嶅鏍�(2)</param>
+ /// <param name="HMaker">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MouldProdMoveBillController/GetSc_MouldProdMoveBill_Check_Json")]
+ [HttpGet]
+ public object GetSc_MouldProdMoveBill_Check_Json(Int64 HInterID, int Type, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡瀹℃牳/鍙嶅鏍稿姛鑳芥潈闄�,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍革紝涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂紝涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴燂紝涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //瀹℃牳鍓嶆帶鍒�
+ DataSet BeforeDs = oCn.RunProcReturn("Exec h_p_Sc_MouldProdMoveBill_BeforeCheckCtrl " + HInterID.ToString() + ",'" + oBill.omodel.HBillNo + "','" + HMaker + "'", "h_p_Sc_MouldProdMoveBill_BeforeCheckCtrl");
+ if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛�" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //瀹℃牳鍗曟嵁
+ if (!oBill.CheckBill(HInterID, oBill.omodel.HBillNo, "h_p_Sc_MouldProdMoveBill_AfterCheckCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 瀹℃牳鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ else
+ {
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍革紝涓嶉渶瑕佸弽瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅鏍稿墠鎺у埗
+ DataSet BeforeDs = oCn.RunProcReturn("Exec h_p_Sc_MouldProdMoveBill_BeforeUnCheckCtrl " + HInterID.ToString() + ",'" + oBill.omodel.HBillNo + "','" + HMaker + "'", "h_p_Sc_MouldProdMoveBill_BeforeUnCheckCtrl");
+ if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿墠鍒ゆ柇澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐ワ紒" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //鍙嶅鏍稿崟鎹�
+ if (!oBill.AbandonCheck(HInterID, oBill.omodel.HBillNo, "h_p_Sc_MouldProdMoveBill_AfterUnCheckCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍙嶅鏍告垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ櫒鍏疯皟鎷ㄥ崟锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鎴栧弽瀹℃牳鍣ㄥ叿璋冩嫧鍗曞け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿璋冩嫧鍗� 鎵归噺瀹℃牳
+ /// <summary>
+ /// 鎵归噺瀹℃牳/鍙嶅鏍稿櫒鍏疯皟鎷ㄥ崟
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">瀹℃牳(1),鍙嶅鏍�(2)</param>
+ /// <param name="HMaker">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MouldProdMoveBillController/CheckAll")]
+ [HttpGet]
+ public object CheckAll(string ids, int Type, string HMaker)
+ {
+ try
+ {
+ //澶勭悊瀛楃涓�
+ if (!string.IsNullOrEmpty(ids))
+ {
+ long[] idArray = Array.ConvertAll(ids.Split(','), long.Parse);
+ // 澶勭悊idArray...
+ oCn.BeginTran();
+ for (int i = 0; i < idArray.Length; i++)
+ {
+ objJsonResult = (json)GetSc_MouldProdMoveBill_Check_Json(idArray[i], Type, HMaker);//瀹℃牳鎵ц
+ if (objJsonResult.count == 0)
+ {
+ oCn.RollBack();
+ objJsonResult.Message += "绗�" + (i + 1) + "琛屽嚭鐜伴棶棰樻棤娉曠户缁畬鎴�";
+ return objJsonResult;
+ }
+ }
+ oCn.Commit();
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇烽�夋嫨姝ｇ‘琛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鎴栧弽瀹℃牳鍣ㄥ叿璋冩嫧鍗曞け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿璋冩嫧鍗� 鍏抽棴/鍙嶅叧闂�
+ /// <summary>
+ /// 鍏抽棴/鍙嶅叧闂櫒鍏疯皟鎷ㄥ崟
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">鍏抽棴(1),鍙嶅叧闂�(2)</param>
+ /// <param name="HMaker">鍏抽棴浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MouldProdMoveBillController/GetSc_MouldProdMoveBill_Close_Json")]
+ [HttpGet]
+ public object GetSc_MouldProdMoveBill_Close_Json(Int64 HInterID, int Type, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameClose, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鍏抽棴/鍙嶅叧闂姛鑳芥潈闄�,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂紝涓嶈兘鍐嶆鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍏抽棴鍗曟嵁
+ if (!oBill.CloseBill(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍏抽棴鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ else
+ {
+ if (oBill.omodel.HCloseMan.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈叧闂紝涓嶉渶瑕佸弽鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅叧闂崟鎹�
+ if (!oBill.CancelClose(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍙嶅叧闂垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ櫒鍏疯皟鎷ㄥ崟锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴鎴栧弽鍏抽棴鍣ㄥ叿璋冩嫧鍗曞け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿璋冩嫧鍗� 浣滃簾/鍙嶄綔搴�
+ /// <summary>
+ /// 浣滃簾/鍙嶄綔搴� 鍣ㄥ叿璋冩嫧鍗�
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">浣滃簾(1),鍙嶄綔搴�(2)</param>
+ /// <param name="HMaker">浣滃簾浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MouldProdMoveBillController/GetSc_MouldProdMoveBill_Cancelltion_Json")]
+ [HttpGet]
+ public object GetSc_MouldProdMoveBill_Cancelltion_Json(Int64 HInterID, int Type, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡浣滃簾/鍙嶄綔搴熷姛鑳芥潈闄�,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ //Type 1 浣滃簾 2 鍙嶄綔搴�
+ if (Type == 1)
+ {
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴燂紝涓嶈兘鍐嶆浣滃簾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //浣滃簾鍗曟嵁
+ if (!oBill.Cancelltion(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 浣滃簾鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ else
+ {
+ if (oBill.omodel.HDeleteMan.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈綔搴燂紝涓嶉渶瑕佸弽浣滃簾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶄綔搴熷崟鎹�
+ if (!oBill.AbandonCancelltion(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍙嶄綔搴熸垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ櫒鍏疯皟鎷ㄥ崟锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾鎴栧弽浣滃簾鍣ㄥ叿璋冩嫧鍗曞け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿璋冩嫧鍗� 淇濆瓨
+ /// <summary>
+ /// 鍣ㄥ叿璋冩嫧鍗曚繚瀛�
+ /// </summary>
+ [Route("Sc_MouldProdMoveBillController/GetSc_MouldProdMoveBill_Save_Json")]
+ [HttpPost]
+ public object GetSc_MouldProdMoveBill_Save_Json([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string sMainStr = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string sSubStr = sArray[1].ToString(); //瀛愯〃鏁版嵁
+ string OperationType = sArray[2].ToString(); //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫锛�
+ string HMaker = sArray[3].ToString(); //鍒跺崟浜�
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (OperationType == "1")
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ //鍒ゆ柇鏂板鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightName, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏂板鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify;
+ //鍒ゆ柇缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡缂栬緫鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //琛ㄥご璧嬪��
+ sMainStr = sMainStr.Replace("\\", "");
+ sMainStr = sMainStr.Replace("\n", "");
+ sMainStr = "[" + sMainStr.ToString() + "]";
+ List<Model.ClsSc_MouldProdMoveBillMain> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldProdMoveBillMain>>(sMainStr);
+ foreach (Model.ClsSc_MouldProdMoveBillMain oItem in lsmain)
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (oBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, oItem.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(oItem.HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oItem.HYear = sYear;
+ oItem.HPeriod = sPeriod;
+ DBUtility.ClsPub.CurUserName = oItem.HMaker;
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋璧嬪��
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ sSubStr = sSubStr.Substring(1, sSubStr.Length - 2);
+ sSubStr = sSubStr.Replace("\\", "");
+ sSubStr = sSubStr.Replace("\n", "");
+ sSubStr = "[" + sSubStr.ToString() + "]";
+ List<Model.ClsSc_MouldProdMoveBillSub> ls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldProdMoveBillSub>>(sSubStr);
+ int i = 0;
+ foreach (Model.ClsSc_MouldProdMoveBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+ oBill.DetailColl.Add(oItemSub);
+ }
+
+ //淇濆瓨
+ bool bResult;
+ if (OperationType == "1") //鏂板淇濆瓨
+ {
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else //缂栬緫淇濆瓨
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鍣ㄥ叿璋冩嫧鍗� 杩斿洖婧愬崟鏁版嵁
+ /// <summary>
+ /// 杩斿洖婧愬崟鏁版嵁
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_MouldProdMoveBillController/GetSourceBill_MouldProdMove_Json")]
+ [HttpGet]
+ public object GetSourceBill_MouldProdMove_Json(Int64 HInterID, Int64 HEntryID, string HBillType)
+ {
+ try
+ {
+ string sViewName = "";
+ //鍣ㄥ叿璋冩嫧鐢宠鍗�
+ if (HBillType== "3850")
+ {
+ sViewName = "h_p_Sc_MouldMoveStockRequestBill_Source_MouldProdMove";
+ }
+
+ if (sViewName == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓嶆敮鎸佽婧愬崟绫诲瀷锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCn.RunProcReturn("exec " + sViewName + " " + HInterID.ToString() + "," + HEntryID.ToString(), sViewName);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌婧愬崟淇℃伅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇婧愬崟淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs
index bbe2115..9975a34 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs
@@ -604,14 +604,14 @@
}
#endregion
- #region 鍣ㄥ叿棰嗙敤鍑哄簱鍗曟ā鍧� 浠庡垪琛ㄩ�変腑鎵撳紑鍗曟嵁锛岃繑鍥炲崟鎹俊鎭椂璋冪敤
+ #region 鍣ㄥ叿鍑哄叆搴撳崟妯″潡 浠庡垪琛ㄩ�変腑鎵撳紑鍗曟嵁锛岃繑鍥炲崟鎹俊鎭椂璋冪敤
/// <summary>
- /// 鍣ㄥ叿棰嗙敤鍑哄簱鍗曠紪杈戞椂锛屾牴鎹崟鎹甀D鑾峰彇鍗曟嵁淇℃伅
+ ///鍣ㄥ叿鍑哄叆搴撳崟缂栬緫鏃讹紝鏍规嵁鍗曟嵁ID鑾峰彇鍗曟嵁淇℃伅
/// </summary>
/// <returns></returns>
- [Route("Sc_MouldProdOutBillController/GetSc_MouldProdOutBill_Json")]
+ [Route("Sc_MouldStockBillController/GetSc_MouldStockBill_Json")]
[HttpGet]
- public object GetSc_MouldProdOutBill_Json(Int64 HInterID, string HMaker)
+ public object GetSc_MouldStockBill_Json(Int64 HInterID, string HMaker)
{
List<object> list = new List<object>();
try
@@ -632,7 +632,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏈煡璇㈠埌璇ュ櫒鍏烽鐢ㄥ嚭搴撳崟锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ櫒鍏峰嚭鍏ュ簱鍗曪紝璇峰埛鏂版暟鎹悗閲嶆柊閫夋嫨锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -651,7 +651,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "杩斿洖鍣ㄥ叿棰嗙敤鍑哄簱鍗曚俊鎭け璐ワ紒" + e.ToString();
+ objJsonResult.Message = "杩斿洖鍣ㄥ叿鍑哄叆搴撳崟淇℃伅澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs
index 4658a51..9bd958b 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs
@@ -328,10 +328,10 @@
oCN.RunProc(@"Insert Into Sc_MouldUpperBillSub
(HInterID, HBillNo_bak, HEntryID, HMouldID, HQty
- , HSourceID, HICMOInterID, HICMOEntryID, HICMOBillNo)
+ , HSourceID, HICMOInterID, HICMOEntryID, HICMOBillNo,HScanDate,HBarCode)
values("
+ HInterID + ",'"+ HBillNo + "'," + i + "," + oSub.HMouldID.ToString() + ",'" + oSub.HQty
- + "'," + oSub.HSourceID.ToString() + "," + oSub.HICMOInterID.ToString() + "," + oSub.HICMOEntryID.ToString()+",'"+ oSub.HICMOBillNo.ToString() +
+ + "'," + oSub.HSourceID.ToString() + "," + oSub.HICMOInterID.ToString() + "," + oSub.HICMOEntryID.ToString()+",'"+ oSub.HICMOBillNo.ToString() + "','getdate()','" + oSub.HBarCode.ToString() +
"') ");
}
@@ -2471,5 +2471,240 @@
}
#endregion
+
+ #region 涓婃ā鍗� APP鏂板
+ /// <summary>
+ /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Sc_MouldUpperBill/AddSc_MouldUpperBill_APP")]
+ [HttpPost]
+ public object AddSc_MouldUpperBill_APP([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = AddBillMain_APP(msg1);
+ if (objJsonResult.code == "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+
+ public json AddBillMain_APP(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ int OperationType = int.Parse(sArray[2].ToString());//鏁版嵁绫诲瀷 1娣诲姞 3淇敼 2 澶嶅埗
+ string user = sArray[3].ToString();//鐢ㄦ埛鍚�
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldUpperBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愮紪杈�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ msg2 = "[" + msg2.ToString() + "]";
+ List<ClsSc_MouldUpperBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSc_MouldUpperBillMain>>(msg2);
+ string HBillType = "3846";
+ long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ DateTime HDate = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd"));//鏃ユ湡
+ int HYear = DateTime.Now.Year;
+ double HPeriod = DateTime.Now.Month;
+ string HRemark = mainList[0].HRemark;//澶囨敞
+ string HMaker = mainList[0].HMaker;//鍒跺崟浜�
+ int HOrgID = mainList[0].HOrgID; //缁勭粐
+ Int64 HDeptID = mainList[0].HDeptID;
+ Int64 HEmpID = mainList[0].HEmpID;
+ Int64 HMangerID = mainList[0].HMangerID;
+
+ ds = oCN.RunProcReturn("select * from h_v_Qj_Sc_MouldUpperBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_Qj_Sc_MouldUpperBillList");
+
+ if ((OperationType == 1) && ds.Tables[0].Rows.Count == 0)//鏂板
+ {
+ //淇濆瓨鍓嶆帶鍒�
+ objJsonResult = BeforeSave_MouldUpperBill(HInterID, HBillNo, 1);
+ if (objJsonResult.count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //涓昏〃
+ oCN.RunProc(@"Insert Into Sc_MouldUpperBillMain
+ (HBillType,HBillStatus, HBillSubType, HInterID, HBillNo, HDate
+ , HYear, HPeriod, HRemark, HMaker, HMakeDate, HOrgID
+ , HDeptID, HEmpID, HMangerID)" +
+ " values('" + HBillType + "','1','" + HBillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
+ "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()," + HOrgID +
+ "," + HDeptID + "," + HEmpID + "," + HMangerID + ") ");
+
+ }
+ else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
+ {
+ //淇濆瓨鍓嶆帶鍒�
+ objJsonResult = BeforeSave_MouldUpperBill(HInterID, HBillNo, 2);
+ if (objJsonResult.count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //淇敼
+ oCN.RunProc("update Sc_MouldUpperBillMain set " +
+ "HDate='" + HDate +
+ "',HYear='" + HYear + "',HPeriod='" + HPeriod + "',HRemark='" + HRemark + "',hupdater='" + HMaker +
+ "',hupdatedate=getdate(),HDeptID=" + HDeptID + ",HEmpID=" + HEmpID + ",HMangerID=" + HMangerID + " where HInterID='" + HInterID + "'");
+
+ //鍒犻櫎瀛愯〃
+ oCN.RunProc("delete from Sc_MouldUpperBillSub where HInterID='" + HInterID + "'");
+ }
+ //淇濆瓨瀛愯〃
+ objJsonResult = AddBillSub_APP(msg3, HInterID, HBillNo, OperationType);
+ if (objJsonResult.code == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public json AddBillSub_APP(string msg3, long HInterID, string HBillNo, Int64 OperationType)
+ {
+ List<ClsSc_MouldUpperBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSc_MouldUpperBillSub>>(msg3);
+ int i = 0;
+ foreach (ClsSc_MouldUpperBillSub oSub in DetailColl)
+ {
+ i++;
+
+ oCN.RunProc(@"Insert Into Sc_MouldUpperBillSub
+ (HInterID, HBillNo_bak, HEntryID, HMouldID, HQty
+ , HSourceID, HICMOInterID, HICMOEntryID, HICMOBillNo,HScanDate,HBarCode)
+ values("
+ + HInterID + ",'" + HBillNo + "'," + i + "," + oSub.HMouldID.ToString() + ",'" + oSub.HQty
+ + "'," + oSub.HSourceID.ToString() + "," + oSub.HICMOInterID.ToString() + "," + oSub.HICMOEntryID.ToString() + ",'" + oSub.HICMOBillNo.ToString() + "',getdate(),'" + oSub.HBarCode.ToString() +
+ "') ");
+ }
+
+ if (OperationType == 1)//鏂板
+ {
+ //淇濆瓨鍚庢帶鍒�
+ objJsonResult = AfterSave_MouldUpperBill(HInterID, HBillNo, 1);
+ if (objJsonResult.count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ //淇濆瓨鍚庢帶鍒�
+ objJsonResult = AfterSave_MouldUpperBill(HInterID, HBillNo, 2);
+ if (objJsonResult.count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ #endregion
+
+ #region 涓婃ā鍗曟壂鎻忔潯鐮佹煡璇㈡槸鍚﹀瓨鍦� 骞舵牎楠屼骇鍝侀槻閿欎俊鎭�
+ [Route("Sc_MouldUpperBill/GetBarCode_FC")]
+ [HttpGet]
+ public object GetBarCode_FC(string HBarCode, int HMaterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("exec h_p_Sc_MouldFill_Verification '" + HBarCode + "','" + HMaterID + "'", "h_p_Sc_MouldFill_Verification");
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ユ棤鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0; //澶辫触锛�
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1; //鎴愬姛锛�
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/QC_ManagementController.cs b/WebAPI/Controllers/QC_ManagementController.cs
index 03097aa..82ca164 100644
--- a/WebAPI/Controllers/QC_ManagementController.cs
+++ b/WebAPI/Controllers/QC_ManagementController.cs
@@ -1083,6 +1083,7 @@
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
lsmain = oListModels.getObjectByJson_Gy_QCCheckProjectMain(msg2);
+ string ts;
foreach (Model.ClsGy_QCCheckProjectMain oItem in lsmain)
{
//oItem.HMaker = "";
@@ -1107,6 +1108,7 @@
return objJsonResult;
}
oBill.omodel = oItem;
+ ts = oItem.HCheckBillType;
}
//琛ㄤ綋鏁版嵁
//鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
index 5ead2e8..e92ce44 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
@@ -1545,9 +1545,9 @@
string sErrMsg = "";
if (oSystemParameter.ShowBill(ref sErrMsg) == true)
{
- if (oSystemParameter.omodel.WMS_CampanyName == "甯呭▉"
- || oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒"
+ if (oSystemParameter.omodel.WMS_CampanyName == "甯呭▉"
|| oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧"
+ || oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒"
|| oSystemParameter.omodel.WMS_CampanyName == "瀹濆伐") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
objJsonResult = (json)JIT_CompleteSetAnalysis_Old(sWhere, user);
diff --git a/WebAPI/Controllers/Sc_MouldController.cs b/WebAPI/Controllers/Sc_MouldController.cs
index f367f72..ce565e6 100644
--- a/WebAPI/Controllers/Sc_MouldController.cs
+++ b/WebAPI/Controllers/Sc_MouldController.cs
@@ -979,8 +979,8 @@
BillNew.omodel.HExplanation = mainList[0].HExplanation;
BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
BillNew.omodel.HRedBlueFlag = mainList[0].HRedBlueFlag;
- BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
- Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+ BillNew.DetailColl = new List<Model.ClsSc_MouldProdBackBillSub>();
+ Model.ClsSc_MouldProdBackBillSub oSub = new Model.ClsSc_MouldProdBackBillSub();
oSub.HEntryID = 1;
oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index 16a5dc1..8d5de2c 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -11684,9 +11684,9 @@
sSubStr = sSubStr.Replace("\\", "");
sSubStr = sSubStr.Replace("\n", "");
sSubStr = "[" + sSubStr.ToString() + "]";
- List<Model.ClsSc_MouldStockBillSub> ls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldStockBillSub>>(sSubStr);
+ List<Model.ClsSc_MouldProdBackBillSub> ls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldProdBackBillSub>>(sSubStr);
int i = 0;
- foreach (Model.ClsSc_MouldStockBillSub oItemSub in ls)
+ foreach (Model.ClsSc_MouldProdBackBillSub oItemSub in ls)
{
i++;
oItemSub.HEntryID = i;
@@ -14989,5 +14989,526 @@
#endregion
+ #region 鍣ㄥ叿鏍″噯璁板綍鍗�
+ #region 妯″叿鏍″噯璁板綍鍗曡〃鍒嗛〉鍒楄〃
+ [Route("Gy_QCVerificationBillMain/GetListPage")]
+ [HttpGet]
+ public object GetListPage(string sWhere, string user, int page, int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ if (!DBUtility.ClsPub.Security_Log("Gy_QCVerificationBillMain", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_Gy_QCVerificationBillMainList " + page + "," + size + ",'" + sWhere + "'", "h_p_Gy_QCVerificationBillMainList");
+ }
+ else
+ {
+ sWhere = sWhere.Replace("'", "''");
+ ds = oCN.RunProcReturn("exec h_p_Gy_QCVerificationBillMainList " + page + "," + size + ",'" + sWhere + "'", "h_p_Gy_QCVerificationBillMainList");
+ }
+
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region [鍣ㄥ叿鏍″噯鍗曞垹闄ゅ姛鑳絔
+ /// <summary>
+ /// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Gy_QCVerificationBillMain/DeltetGy_QCVerificationBillMain")]
+ [HttpGet]
+ public object DeltetGy_QCVerificationBillMain(string HInterID, string user)
+ {
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_QCVerificationBillMain_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ if (lngBillKey == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ DAL.ClsGy_QCVerificationBillMain oBill = new DAL.ClsGy_QCVerificationBillMain();
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (oBill.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒犻櫎鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Sb_MouldRepairWorkBill_BeforeDelCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + user + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Sb_MouldRepairWorkBill_BeforeDelCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:鍒犻櫎鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ bool IsDete = oBill.DeleteBill(lngBillKey, oBill.omodel.HBillNo, "h_p_Sb_MouldRepairWorkBill_AfterDelCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ if (IsDete)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region [妯″叿缁翠慨鍗曞鏍搞�佸弽瀹℃牳]
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Gy_QCVerificationBillMain/AuditQCVerificationBillMain")]
+ [HttpGet]
+ public object AuditQCVerificationBillMain(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Gy_QCVerificationBillMain_Check";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ DAL.ClsGy_QCVerificationBillMain oBill = new DAL.ClsGy_QCVerificationBillMain();
+ //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //瀹℃牳鎻愪氦
+ {
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Sb_MouldRepairWorkBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Sb_MouldRepairWorkBill_BeforeCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ if (!oBill.CheckBill(HInterID, oBill.omodel.HBillNo, "h_p_Sb_MouldRepairWorkBill_AfterCheckCtrl", CurUserName, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍告彁浜�
+ {
+ //鍙嶅鏍稿墠鎺у埗=========================================
+ string sql1 = "exec h_p_Sb_MouldRepairWorkBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Sb_MouldRepairWorkBill_BeforeUnCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿墠鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //===========================================================
+
+ if (!oBill.AbandonCheck(HInterID, oBill.omodel.HBillNo, "h_p_Sb_MouldRepairWorkBill_AfterUnCheckCtrl", CurUserName, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ #region[缂栬緫鏃惰幏鍙栬〃澶存暟鎹甝
+ [Route("Gy_QCVerificationBillMain/Gy_QCVerificationBillMainCheckDetai")]
+ [HttpGet]
+ public ApiResult<DataSet> Gy_QCVerificationBillMainCheckDetai(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_QCVerificationBillMain where hmainid= " + HID + " ", "h_v_Gy_QCVerificationBillMain");
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄥ崟鍙�" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ #endregion
+
+ #region[缂栬緫鏃惰幏鍙栬〃浣撴暟鎹甝
+ [Route("Gy_QCVerificationBillMain/SGy_QCVerificationBillMainListProjectDetai")]
+ [HttpGet]
+ public object SGy_QCVerificationBillMainListProjectDetai(string sqlWhere)
+ {
+ DataSet ds, ds1;
+ List<object> list = new List<object>();
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ string sql = "select HInspectInstruMentID,妫�楠屼华鍣ㄤ唬鐮� HInspectInstruMentNumber,妫�楠屼华鍣ㄥ悕绉� HInspectInstruMentName,鐢熸晥鏃ユ湡 HBeginDate,澶辨晥鏃ユ湡 HEndDate,鏍″噯鐘舵�� HHCalibrationStatus from h_v_Gy_QCVerificationBillMain where 1 = 1 " + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairWorkBillList_Edit");
+
+
+
+ list.Add(ds.Tables[0]);
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = null;
+ objJsonResult.list = list;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+
+ #region 妯″叿缁翠慨璁板綍鍗曚繚瀛�/缂栬緫
+ /// <summary>
+ /// 淇濆瓨妯″叿缁翠慨鍗�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Gy_QCVerificationBillMain/SaveGetMQCVerificationBillList")]
+ [HttpPost]
+ public object SaveGetMQCVerificationBillList([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
+ //string msg5 = sArray[3].ToString();
+
+
+ string UserName = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_QCVerificationBillMain_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsGy_QCVerificationBillMain oBill = new DAL.ClsGy_QCVerificationBillMain();
+ List<Model.ClsGy_QCVerificationBillMain> lsmain = new List<Model.ClsGy_QCVerificationBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_QCVerificationBillMain(msg2);
+ foreach (Model.ClsGy_QCVerificationBillMain oItem in lsmain)
+ {
+ oItem.HMaker = msg4;
+ UserName = msg4; //鍒跺崟浜�
+ oItem.HBillType = "3321";
+ oItem.HBillSubType = "3321";
+ //oItem.HBillNo = ""; //鍗曟嵁鍙�
+ //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
+ //oItem.HPeriod = 0;
+ oItem.HCheckEmp = oItem.HEmpID; //缁翠慨浜�(Gy_Employee)
+ //oItem.HDeptID = 0; //缁翠慨閮ㄩ棬(Gy_Department)
+ //oItem.HMainSourceInterID = oItem.HInterID;
+
+ //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsGy_QCVerificationBillSub> ls = new List<Model.ClsGy_QCVerificationBillSub>();
+ ls = oListModels.getObjectByJson_Gy_QCVerificationBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsGy_QCVerificationBillSub oItem in ls)
+ {
+
+ i++;
+ oItem.HEntryID = i;
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItem.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItem.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItem.HInspectInstruMentID =1; //澶囨敞
+ //oItem.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItem.HBeginDate = DateTime.Now.ToString(); //鍏宠仈鏁伴噺
+ //oItem.HEndDate = DateTime.Now.AddYears(1).ToString(); //鍏宠仈鏁伴噺
+ //oItem.HHCalibrationStatus = "鍚堟牸"; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
+ //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
+ //oItemSub.HManagerID = 0; //璐熻矗浜篒D
+ //oItemSub.HMoney = 0; //缁翠慨璐圭敤
+ oBill.DetailColl.Add(oItem);
+
+ }
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ #endregion
+
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index f52ff93..797bf97 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -20230,7 +20230,7 @@
/// <returns></returns>
[Route("Web/GetCheckItemByCheckProjectID")]
[HttpGet]
- public object GetCheckItemByCheckProjectID(int CheckProjectID, int HBatchQty)
+ public object GetCheckItemByCheckProjectID(int CheckProjectID, int HBatchQty, int HMaterID, string HBillType)
{
if (CheckProjectID <= 0)
{
@@ -20243,7 +20243,7 @@
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- string sql = "exec h_p_Gy_GetQCCheckItemByProject " + CheckProjectID + "," + HBatchQty;
+ string sql = "exec h_p_Gy_GetQCCheckItemByProject " + CheckProjectID + "," + HBatchQty + "," + HMaterID + ",'" + HBillType + "'";
ds = oCN.RunProcReturn(sql, "h_p_Gy_GetQCCheckItemByProject");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/Kf_ICStockInOutBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/Kf_ICStockInOutBillController.cs"
index 50ddd72..3173f83 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/Kf_ICStockInOutBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/Kf_ICStockInOutBillController.cs"
@@ -107,8 +107,47 @@
return objJsonResult;
}
#endregion
-
-
+
+ #region 鍖呰瀹瑰櫒鍑哄叆搴撴槑缁嗘煡璇�
+ [Route("Kf_ICStockInOutBill/Kf_PackStockDetailQuery")]
+ [HttpGet]
+ public object Kf_PackStockDetailQuery(string sWhere)
+ {
+ List<object> columnNameList = new List<object>();
+
+ try
+ {
+ string sql = "select * from h_v_Kf_PackStockDetailQuery where 1=1 " + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Kf_PackStockDetailQuery");
+
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = ds.Tables[0].Rows.Count;
+ objJsonResult.Message = "鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
+ objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
#region 鍑哄叆搴撳崟鎹潯鐮佹槑缁嗘煡璇�
[Route("Kf_ICStockInOutBill/Kf_BarCodeDetailQuery")]
[HttpGet]
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 01cff2b..d8bf4c3 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"
@@ -2658,7 +2658,7 @@
string sql = "insert into Gy_BarCodeBill (HInterID, HEntryID, HBarCode, HBarCodeType, HBarCodeSubType, HMaterID, HUnitID, HQty, HBatchNo, HSupID, HGroupID, HMaker, HMakeDate, " +
"HPrintQty, HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType, HinitQty, HEndQty, HBarcodeQtys, HBarcodeNo, HDeptID, HWhID, HSPID, HRemark, " +
"HCusID, HCusType, HEndDate, HWorkLineName, HBarCodeDate, HSTOCKORGID, HOWNERID, HSeOrderBillNo, HGiveAwayFlag, HMaterName, HMaterModel, " +
- "HPinfan, HAuxPropID, HMTONo, HInnerBillNo, HCoilNO, HFurnaceNO, HFactory, HAuxQty, HheatNO, HProduceDate, HExpiryDate, HEmpID, HCusModel, HCusMaterName, HCheckEmpName, HZZRQ" +
+ "HPinfan, HAuxPropID, HMTONo, HInnerBillNo, HCoilNO, HFurnaceNO, HFactory, HAuxQty, HheatNO, HProduceDate, HExpiryDate, HEmpID, HCusModel, HCusMaterName, HCheckEmpName, HZZRQ,HSupMaterNumber,HSupBatchNo" +
") values (" +
"'" + ds.Tables[0].Rows[0]["HInterID"].ToString() + "', " +
"'" + (int.Parse(ds.Tables[0].Rows[0]["HEntryID"].ToString()) + 1).ToString() + "', " +
@@ -2711,7 +2711,9 @@
"'" + ds.Tables[0].Rows[0]["HCusModel"].ToString() + "', " +
"'" + ds.Tables[0].Rows[0]["HCusMaterName"].ToString() + "', " +
"'" + ds.Tables[0].Rows[0]["HCheckEmpName"].ToString() + "', " +
- "'" + ds.Tables[0].Rows[0]["HZZRQ"].ToString() + "'" +
+ "'" + ds.Tables[0].Rows[0]["HZZRQ"].ToString() + "', " +
+ "'" + ds.Tables[0].Rows[0]["HSupBatchNo"].ToString() + "', " +
+ "'" + ds.Tables[0].Rows[0]["HSupMaterNumber"].ToString() + "'" +
")";
//鎻掑叆鎷嗗垎鏉＄爜
oCN.RunProc(sql);
@@ -2750,6 +2752,60 @@
}
#endregion
+ #region [app 鏉＄爜鎷嗙爜鑾峰彇鎷嗙爜鎵撳嵃鏁版嵁]
+ [Route("Sc_BarCode/GetSplitBarCode_SubList")]
+ [HttpGet]
+ public object GetSplitBarCode_SubList(string HBarCodeNo)
+ {
+ try
+ {
+ if (string.IsNullOrWhiteSpace(HBarCodeNo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇疯緭鍏ユ潯鐮佺紪鍙�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+
+
+ var sql = "select * from h_v_Gy_BarCodeBillList_APP where 鏉＄爜缂栧彿='"+ HBarCodeNo + "'";
+
+ DataSet ds = oCn.RunProcReturn(sql, "h_v_Gy_BarCodeBillList_APP");
+
+ //鍒ゆ柇鏉＄爜鏄惁瀛樺湪鏉＄爜妗ｆ
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "[0000-1-037]鏌ヨ鎴愬姛";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛佸綋鍓嶆潯鐮佷笉瀛樺湪鏉＄爜妗ｆ";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "寮傚父锛�" + ex.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region [鏉＄爜鐢熸垚鎺ュ彛_灏忓崼闀洉鐮乚
[Route("Sc_BarCode/SaveSNByICMO_XW")]
[HttpGet]
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
index 3df6d9d..4e7f4fe 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
@@ -2407,5 +2407,50 @@
}
#endregion
+
+ #region 璐ㄩ噺妯″潡 閲忓叿涓存湡璇彞鎶ヨ〃
+ [Route("QC_CustomerAppealReport/GetQC_MeasuringToolsReport")]
+ [HttpGet]
+ public object GetQC_MeasuringToolsReport(string sWhere, string user,int HOrgID)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+
+ string HNumber = dic["HNumber"].ToString();
+ string HName = dic["HName"].ToString();
+ string HDayWarning = dic["HDayWarning"].ToString();
+
+
+ ds = oCN.RunProcReturn("exec h_p_Gy_InspectWarningReport '" + HNumber + "','" + HName + "','" + HDayWarning + "','"+ HOrgID + "'", "h_p_Gy_InspectWarningReport");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarTypeController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarTypeController.cs"
new file mode 100644
index 0000000..95b3abf
--- /dev/null
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarTypeController.cs"
@@ -0,0 +1,510 @@
+锘縰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.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ public class Gy_CarTypeController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+
+ #region 杞﹀瀷 淇濆瓨
+ [Route("Gy_CarTypeBill/ModifyByID")]
+ [HttpPost]
+ public object ModifyByID([FromBody] JObject oMain)
+ {
+ try
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+
+ //鍙嶅簭鍒楀寲
+ msg2 = "[" + msg2.ToString() + "]";
+ List<Gy_CarType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_CarType>>(msg2);
+
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HHelpCode = list[0].HHelpCode;
+ int HStopflag = list[0].HStopflag ? 1 : 0;
+ int HCREATEORGID = list[0].HCREATEORGID;
+ int HUSEORGID = list[0].HUSEORGID;
+ string HRemark = list[0].HRemark;
+ long HItemID = list[0].HItemID;
+ string HShortNumber = list[0].HShortNumber;
+ long HParentID = list[0].HParentID;
+ int HLevel = ClsPub.GetLevel(list[0].HNumber.Trim());
+ int HEndFlag = list[0].HEndFlag ? 1 : 0;
+
+ string HUseFlag = list[0].HUseFlag;
+
+ decimal HLong = list[0].HLong;
+ decimal HWeight = list[0].HWeight;
+ decimal HHeight = list[0].HHeight;
+ decimal HMaxVolume = list[0].HMaxVolume;
+
+ string Emp = user;
+ string Time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+
+ #region [鏉冮檺鍜岄獙璇乚
+ // 鏉冮檺妫�鏌ヤ唬鐮�...
+ #endregion
+
+ //淇濆瓨
+ if (HItemID == 0)
+ {
+ oCN.BeginTran();
+ string sql = "Insert into Gy_CarType" +
+ "(HNumber,HName,HHelpCode,HStopflag,HCREATEORGID,HUSEORGID,HRemark,HShortNumber,HParentID,HEndFlag,HLevel,HMakeEmp,HMakeTime," +
+ "HLong,HWeight,HHeight,HMaxVolume,HUseFlag)" +
+ " values(" +
+ "'" + HNumber + "','" + HName + "','" + HHelpCode + "'," + HStopflag + "," + HCREATEORGID + "," + HUSEORGID +
+ ",'" + HRemark + "','" + HShortNumber + "'," + HParentID + "," + HEndFlag + "," + HLevel +
+ ",'" + Emp + "','" + Time + "'," + HLong + "," + HWeight + "," + HHeight + "," + HMaxVolume + ",'" + HUseFlag + "')"; // 娣诲姞 HUseFlag
+
+ oCN.RunProc(sql, ref DBUtility.ClsPub.sExeReturnInfo);
+ //鏂板鍚庝笂绾т负闈炴湯绾т唬鐮�
+ oCN.RunProc("Update Gy_CarType set HEndFlag=0 where HItemID = " + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ }
+ else //缂栬緫淇濆瓨
+ {
+ oCN.BeginTran();
+
+ //鍒ゆ柇璇ヨ褰曟洿鏀瑰悗锛岃璁板綍鐨勪笂绾ц褰曟槸鍚︿负鏈骇锛屽苟鏇存敼鏈骇鏍囪
+ string sql = @"select * from Gy_CarType AS a where a.HParentID in (select b.HParentID from Gy_CarType AS b where b.HItemID = " + HItemID + ")";
+ ds = oCN.RunProcReturn(sql, "Gy_CarType");
+ if (ds != null && ds.Tables[0].Rows.Count == 1)
+ {
+ sql = "update Gy_CarType set HEndFlag = 1 where HItemID = " + ds.Tables[0].Rows[0]["HParentID"].ToString();
+ oCN.RunProc(sql);
+ }
+
+ if (HStopflag == 1)
+ {
+ //鏇存柊璁板綍 - 娣诲姞 HUseFlag
+ sql = "Update Gy_CarType set " +
+ " HNumber = '" + HNumber + "', HName = '" + HName + "', HHelpCode = '" + HHelpCode +
+ "', HStopflag = " + HStopflag + ", HCREATEORGID = " + HCREATEORGID + ", HUSEORGID = " + HUSEORGID +
+ ", HRemark = '" + HRemark + "', HShortNumber = '" + HShortNumber + "', HParentID = " + HParentID +
+ ", HEndFlag = " + HEndFlag + ", HLevel = " + HLevel + ", HUseFlag = '" + HUseFlag +
+ "', HModifyEmp = '" + Emp + "', HModifyTime = '" + Time +
+ "', HStopEmp = '" + Emp + "', HStopTime = '" + Time + "', HLong = " + HLong + ", HWeight = " + HWeight +
+ ", HHeight = " + HHeight + ", HMaxVolume = " + HMaxVolume + " Where HItemID=" + HItemID;
+ }
+ else
+ {
+ //鏇存柊璁板綍 - 娣诲姞 HUseFlag
+ sql = "Update Gy_CarType set " +
+ " HNumber = '" + HNumber + "', HName = '" + HName + "', HHelpCode = '" + HHelpCode +
+ "', HStopflag = " + HStopflag + ", HCREATEORGID = " + HCREATEORGID + ", HUSEORGID = " + HUSEORGID +
+ ", HRemark = '" + HRemark + "', HShortNumber = '" + HShortNumber + "', HParentID = " + HParentID +
+ ", HEndFlag = " + HEndFlag + ", HLevel = " + HLevel + ", HUseFlag = '" + HUseFlag +
+ "', HModifyEmp = '" + Emp + "', HModifyTime = '" + Time +
+ "', HStopEmp = '" + "" + "', HStopTime = " + "null" + ", HLong = " + HLong + ", HWeight = " + HWeight +
+ ", HHeight = " + HHeight + ", HMaxVolume = " + HMaxVolume + " Where HItemID=" + HItemID;
+ }
+ oCN.RunProc(sql, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //淇敼鍚庯紝灏嗘柊涓婄骇鏇存柊涓洪潪鏈骇
+ oCN.RunProc("Update Gy_CarType set HEndFlag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ oCN.Commit();
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ #region 杞﹀瀷-鏌ヨ
+ [Route("Gy_CarType/list")]
+ [HttpGet]
+ public object getCarType(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ if (!DBUtility.ClsPub.Security_Log("Gy_CarType_Query" , 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_CarTypeList order by HItemID desc", "h_v_Gy_CarTypeList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_CarTypeList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by HItemID desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_CarTypeList");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 杞﹀瀷 缂栬緫-椤甸潰璧嬪��
+ [Route("Gy_CarType/editInit")]
+ [HttpGet]
+ public object getCarTypeeditInit(string HInterID, string user)
+ {
+ try
+ {
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_CarType_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犵紪杈戞潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (HInterID == null || HInterID.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sql = "select * from Gy_CarType where HItemID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, "Gy_CarType");
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇ヨ溅鍨嬪凡瀹℃牳锛屼笉鍙紪杈戯紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 杞﹀瀷 鍒犻櫎
+ [Route("Gy_CarType/delete")]
+ [HttpGet]
+ public object deleteCarType(string HInterID, string user)
+ {
+ try
+ {
+ // 鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_CarType_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (HInterID == null || HInterID.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鏍规嵁璁板綍鐘舵�佸垽鏂槸鍚﹀彲浠ュ垹闄�
+ string sql = "select * from Gy_CarType where HItemID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, "Gy_CarType");
+ if (ds != null && ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "" && ds.Tables[0].Rows[0]["HStopEmp"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇ヨ溅鍨嬩笉鍙垹闄わ紝璇锋鏌ヨ杞﹀瀷鐨勭姸鎬侊紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ //鍒ゆ柇璇ヨ褰曞垹闄ゅ悗锛岃璁板綍鐨勪笂绾ц褰曟槸鍚︿负鏈骇锛屽苟鏇存敼鏈骇鏍囪
+ sql = @"select * from Gy_CarType AS a where a.HParentID in (select b.HParentID from Gy_CarType AS b where b.HItemID = " + HInterID + ")";
+ ds = oCN.RunProcReturn(sql, "Gy_CarType");
+ if (ds != null && ds.Tables[0].Rows.Count == 1)
+ {
+ sql = "update Gy_CarType set HEndFlag = 1 where HItemID = " + ds.Tables[0].Rows[0]["HParentID"].ToString();
+ oCN.RunProc(sql);
+ }
+
+ //鍒犻櫎璇ヨ褰�
+ oCN.RunProc("delete from Gy_CarType where HItemID = " + HInterID);
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 杞﹀瀷 瀹℃牳/鍙嶅鏍�
+ [Route("Gy_CarType/AuditGy_CarType")]
+ [HttpGet]
+ public object AuditGy_CarType(int HInterID, int IsAudit, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_CarType_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from Gy_CarType where HItemID=" + HInterID, "Gy_CarType");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsAudit == 0) //瀹℃牳
+ {
+ oCN.RunProc("update Gy_CarType set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍�
+ {
+ oCN.RunProc("update Gy_CarType set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 杞﹀瀷 绂佺敤銆佸弽绂佺敤
+ [Route("Gy_CarType/StopGy_CarType")]
+ [HttpGet]
+ public object StopGy_CarType(int HInterID, int IsStop, string CurUserName)
+ {
+ try
+ {
+ // 绂佺敤鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_CarType_Stop", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_CarType where HItemID=" + HInterID, "Gy_CarType");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsStop == 0) //绂佺敤鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬鐢�!涓嶈兘鍐嶆绂佺敤锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鐢�!涓嶉渶瑕佸弽绂佺敤!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsStop == 0) //绂佺敤
+ {
+ oCN.RunProc("update Gy_CarType set HStopEmp='" + CurUserName + "',HStopTime=getdate(),HStopflag=1 where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsStop == 1) //鍙嶇鐢�
+ {
+ oCN.RunProc("update Gy_CarType set HStopEmp='',HStopTime=null,HStopflag=0 where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶇鐢ㄦ垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤澶辫触鎴栬�呭弽绂佺敤澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs"
index 8aa23fb..0757f38 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs"
@@ -792,7 +792,7 @@
{
for (int i = 0; i <= ds.Tables[0].Rows.Count - 1; i++)
{
- Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+ Model.ClsSc_MouldProdBackBillSub oSub = new Model.ClsSc_MouldProdBackBillSub();
//鍥哄畾璧嬪��========================================
oSub.HEntryID = i + 1;
oSub.HRemark = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HRemark"]);
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index a5ccc91..f174c97 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -699,7 +699,17 @@
return list;
}
-
+ /// <summary>
+ /// 澶勭悊妫�楠屼华鍣ㄨ褰曞崟鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_QCVerificationBillMain> getObjectByJson_Gy_QCVerificationBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_QCVerificationBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_QCVerificationBillMain>>(jsonString);
+ return list;
+ }
/// <summary>
/// 澶勭悊鏂板妯″叿缁翠慨瀛愯〃淇濆吇淇℃伅鐨刯son
/// </summary>
@@ -723,6 +733,18 @@
List<Model.ClsSb_MouldRepairWorkBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_MouldRepairWorkBillSub_Item>>(jsonString);
return list;
}
+ /// <summary>
+ /// 澶勭悊鏂板妯″叿缁翠慨瀛愯〃閰嶄欢淇℃伅鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_QCVerificationBillSub> getObjectByJson_Gy_QCVerificationBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_QCVerificationBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_QCVerificationBillSub>>(jsonString);
+ return list;
+ }
+
/// <summary>
/// 澶勭悊鏂板妯″叿缁翠慨楠屾敹鍗曚富琛ㄧ殑json
diff --git a/WebAPI/Models/Driver.cs b/WebAPI/Models/Driver.cs
new file mode 100644
index 0000000..25e5607
--- /dev/null
+++ b/WebAPI/Models/Driver.cs
@@ -0,0 +1,40 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class Driver
+ {
+ public long HItemID { get; set; }
+ public string HNumber { get; set; }
+ public string HName { get; set; }
+ public string HShortNumber { get; set; }
+ public string HRemark { get; set; }
+ public string HUseFlag { get; set; }
+ public long HParentID { get; set; }
+
+ public long HCREATEORGID { get; set; }
+ public long HUSEORGID { get; set; }
+ public string HHelpCode { get; set; }
+ public int? HStopflag { get; set; }
+ public string HModifyEmp { get; set; }
+ public string HStopEmp { get; set; }
+ public string HStopTime { get; set; }
+ public string HModifyTime { get; set; }
+ public string HCheckTime { get; set; }
+ public string HMakeTime { get; set; }
+ public string HMakeEmp { get; set; }
+
+ //zidingyi
+ public string HIDCard { get; set; }
+ public string HPhone { get; set; }
+ public string HDriverCardPic { get; set; }
+ public string HDriverCardType { get; set; }
+ public string HIDCardPic { get; set; }
+ public string HEmpType { get; set; }
+ public int HCompID { get; set; }
+
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarType.cs" "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarType.cs"
new file mode 100644
index 0000000..847ea12
--- /dev/null
+++ "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarType.cs"
@@ -0,0 +1,38 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class Gy_CarType
+ {
+ public long HItemID { get; set; } // 涓婚敭
+ public string HNumber { get; set; } // 浠ｇ爜
+ public string HName { get; set; } // 鍚嶇О
+ public string HShortNumber { get; set; } // 鐭唬鐮�
+ public long HParentID { get; set; } // 鐖剁骇ID
+ public int HLevel { get; set; } // 绛夌骇
+ public bool HEndFlag { get; set; } // 鏈骇鏍囧織
+ public bool HStopflag { get; set; } // 绂佺敤鏍囧織
+ public string HRemark { get; set; } // 澶囨敞
+ public string HHelpCode { get; set; } // 鍔╄鐮�
+ public string HUseFlag { get; set; } // 浣跨敤鐘舵�侊紙鏈娴嬶紝鏈娇鐢紝宸蹭娇鐢級
+ public DateTime? HMakeTime { get; set; } // 寤虹珛鏃堕棿
+ public string HMakeEmp { get; set; } // 鍒涘缓浜�
+ public string HCheckEmp { get; set; } // 瀹℃牳浜�
+ public DateTime? HCheckTime { get; set; } // 瀹℃牳鏃堕棿
+ public string HModifyEmp { get; set; } // 淇敼浜�
+ public DateTime? HModifyTime { get; set; } // 淇敼鏃堕棿
+ public string HStopEmp { get; set; } // 绂佺敤浜�
+ public DateTime? HStopTime { get; set; } // 绂佺敤鏃堕棿
+ public int HUSEORGID { get; set; } // 浣跨敤缁勭粐
+ public int HCREATEORGID { get; set; } // 鍒涘缓缁勭粐
+
+ // 杞﹁締灏哄鐩稿叧灞炴��
+ public decimal HLong { get; set; } // 闀匡紙绫筹級
+ public decimal HWeight { get; set; } // 瀹斤紙绫筹級
+ public decimal HHeight { get; set; } // 楂橈紙绫筹級
+ public decimal HMaxVolume { get; set; } // 杞﹁締鎵胯繍鏈�澶т綋绉�(绔嬫柟绫�)
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
index b380dc7..f85f496 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<History>True|2025-08-08T02:12:39.6115833Z;True|2025-08-08T10:11:05.4976467+08:00;False|2025-08-08T10:10:56.7508294+08:00;True|2025-08-07T13:09:32.3688293+08:00;False|2025-08-07T13:09:23.7335601+08:00;True|2025-08-06T15:13:44.9956787+08:00;True|2025-08-06T12:29:30.0783854+08:00;False|2025-08-06T12:29:22.9174579+08:00;True|2025-08-05T11:46:04.9109530+08:00;True|2025-08-05T09:12:36.4757799+08:00;False|2025-08-05T09:12:29.5152051+08:00;True|2025-08-04T22:16:55.8153764+08:00;False|2025-08-04T22:16:45.6812380+08:00;True|2025-08-04T17:48:30.5101840+08:00;True|2025-08-04T16:18:16.1499446+08:00;True|2025-08-04T11:40:28.5722111+08:00;False|2025-08-04T10:45:46.8681527+08:00;True|2025-07-31T15:11:55.0100072+08:00;False|2025-07-31T15:10:51.6681759+08:00;True|2025-07-30T16:00:10.5159335+08:00;True|2025-07-30T15:41:51.5648646+08:00;True|2025-07-30T15:13:07.2401528+08:00;False|2025-07-30T15:12:40.5946471+08:00;True|2025-07-29T23:14:46.2298438+08:00;False|2025-07-29T23:13:41.1630729+08:00;True|2025-07-29T14:02:02.2575808+08:00;True|2025-07-29T13:43:01.6607651+08:00;True|2025-07-29T13:21:53.3427945+08:00;False|2025-07-29T13:21:12.3710695+08:00;True|2025-07-02T16:19:48.0004187+08:00;True|2025-07-02T16:15:36.5831869+08:00;True|2025-07-02T16:09:00.5399469+08:00;True|2025-07-02T15:56:09.9783494+08:00;True|2025-07-02T15:14:06.9937801+08:00;True|2025-07-02T15:09:36.8804234+08:00;True|2025-07-02T15:05:41.0676357+08:00;True|2025-07-02T15:00:26.6768478+08:00;True|2025-07-02T14:57:55.9749557+08:00;True|2025-07-02T14:54:09.4801906+08:00;True|2025-07-02T14:48:13.1406954+08:00;True|2025-07-02T14:43:16.6621615+08:00;False|2025-07-02T14:42:39.8858427+08:00;True|2025-06-30T14:07:33.6198921+08:00;False|2025-06-30T14:06:54.9141774+08:00;True|2025-06-27T16:10:37.5346733+08:00;True|2025-06-27T15:53:52.6099110+08:00;True|2025-06-27T15:49:37.6381262+08:00;True|2025-06-27T15:45:18.4426363+08:00;True|2025-06-27T15:09:40.0483579+08:00;True|2025-06-27T15:03:45.2696849+08:00;True|2025-06-27T14:59:53.6972427+08:00;True|2025-06-27T14:56:36.5300707+08:00;True|2025-06-27T14:52:12.7121868+08:00;True|2025-06-27T14:31:22.7250138+08:00;True|2025-06-27T14:23:27.1058306+08:00;True|2025-06-27T14:13:54.1440171+08:00;True|2025-06-27T14:04:48.1872541+08:00;True|2025-06-27T14:00:10.1802914+08:00;False|2025-06-27T13:59:47.2300395+08:00;True|2025-06-26T17:03:34.2617207+08:00;True|2025-06-26T16:59:16.3043451+08:00;True|2025-06-26T16:47:46.3910675+08:00;True|2025-06-26T16:40:45.0917549+08:00;True|2025-06-26T16:19:04.7496278+08:00;True|2025-06-26T13:40:17.4650939+08:00;True|2025-06-26T08:46:10.4559278+08:00;False|2025-06-26T08:45:48.2231639+08:00;True|2025-06-25T16:40:12.2933893+08:00;True|2025-06-25T16:33:19.5628638+08:00;True|2025-06-25T16:28:13.3282882+08:00;True|2025-06-25T14:26:38.1487280+08:00;True|2025-06-25T14:23:03.3981021+08:00;True|2025-06-25T14:20:01.5127640+08:00;True|2025-06-25T14:12:47.4447383+08:00;True|2025-06-25T14:09:39.8493477+08:00;True|2025-06-25T14:04:07.9655837+08:00;False|2025-06-25T14:03:01.5528773+08:00;True|2025-06-24T14:39:55.5403167+08:00;True|2025-06-24T14:36:51.3363222+08:00;True|2025-06-24T14:33:34.6605389+08:00;True|2025-06-24T14:29:44.9508636+08:00;True|2025-06-24T14:24:49.4487525+08:00;True|2025-06-24T14:19:31.0243854+08:00;True|2025-06-24T14:15:42.8043990+08:00;True|2025-06-24T14:10:25.3126511+08:00;True|2025-06-24T14:01:11.7808866+08:00;True|2025-06-24T13:56:29.6124906+08:00;True|2025-06-24T13:42:27.5554459+08:00;True|2025-06-24T13:35:02.3147995+08:00;True|2025-06-24T13:31:15.2833438+08:00;True|2025-06-24T13:26:22.4759378+08:00;True|2025-06-24T13:22:58.0143749+08:00;False|2025-06-24T13:22:30.7295943+08:00;True|2025-06-24T13:20:08.9526835+08:00;True|2025-06-24T13:15:10.2719394+08:00;True|2025-06-20T15:38:22.6724181+08:00;True|2025-06-20T14:44:29.4284749+08:00;True|2025-06-20T14:34:29.3160274+08:00;True|2025-06-20T14:29:26.1084681+08:00;False|2025-06-20T14:28:47.7761889+08:00;True|2025-06-18T16:26:56.9181027+08:00;True|2025-06-18T16:22:48.3649541+08:00;True|2025-06-18T09:45:22.1840933+08:00;True|2025-06-18T09:38:27.4616553+08:00;True|2025-06-18T09:24:22.0260493+08:00;True|2025-06-18T08:58:42.0314631+08:00;True|2025-06-18T08:54:57.3762593+08:00;True|2025-06-18T08:52:30.6977045+08:00;True|2025-06-18T08:44:16.3868101+08:00;True|2025-06-18T08:38:06.2335478+08:00;False|2025-06-18T08:37:43.3356541+08:00;True|2025-06-18T08:32:29.9036211+08:00;True|2025-06-18T08:19:00.7253184+08:00;True|2025-06-18T08:14:01.8413793+08:00;True|2025-06-18T08:06:59.1976807+08:00;False|2025-06-18T08:06:29.3417533+08:00;True|2025-06-17T15:36:04.6217443+08:00;True|2025-06-17T15:31:43.3563632+08:00;True|2025-06-17T14:58:43.8735144+08:00;True|2025-06-17T14:39:01.2795873+08:00;True|2025-06-17T14:34:00.1695810+08:00;True|2025-06-17T14:30:54.8417757+08:00;False|2025-06-17T14:30:22.5535404+08:00;True|2025-06-17T14:26:29.1534249+08:00;True|2025-06-17T14:23:01.5750276+08:00;True|2025-06-17T14:13:44.7734613+08:00;True|2025-06-17T13:20:22.6676313+08:00;True|2025-06-17T12:45:59.6935151+08:00;True|2025-06-17T11:26:53.3105073+08:00;True|2025-06-17T11:21:58.4556792+08:00;True|2025-06-17T11:17:39.0062665+08:00;True|2025-06-17T11:14:12.1161810+08:00;True|2025-06-17T11:09:51.0123982+08:00;True|2025-06-17T11:03:35.4540889+08:00;True|2025-06-17T10:58:06.1870442+08:00;True|2025-06-17T10:47:25.6201207+08:00;True|2025-06-17T09:22:36.4275453+08:00;True|2025-06-17T09:15:44.1593969+08:00;True|2025-06-17T09:12:05.5473137+08:00;True|2025-06-17T09:08:48.4974735+08:00;True|2025-06-17T09:04:26.9345188+08:00;True|2025-06-17T09:03:36.0326872+08:00;True|2025-06-17T08:57:42.1551977+08:00;True|2025-06-17T08:53:55.5708883+08:00;True|2025-06-17T08:49:04.2922881+08:00;True|2025-06-17T08:41:04.9647614+08:00;True|2025-06-17T08:34:49.0188503+08:00;True|2025-06-17T08:29:57.4868889+08:00;True|2025-06-17T08:23:10.2489747+08:00;True|2025-06-17T08:17:38.8483538+08:00;False|2025-06-17T08:16:14.0757416+08:00;True|2025-06-13T15:52:22.7401602+08:00;False|2025-06-13T15:52:01.7388701+08:00;True|2025-06-13T15:35:05.4281004+08:00;True|2025-06-13T15:24:25.2717953+08:00;True|2025-06-13T15:13:54.7230551+08:00;True|2025-06-13T14:02:03.6551564+08:00;True|2025-06-13T11:18:18.1123581+08:00;True|2025-06-13T10:40:20.8774077+08:00;True|2025-06-13T10:36:36.1411085+08:00;False|2025-06-13T10:35:41.3893604+08:00;True|2025-06-13T10:32:13.4521145+08:00;True|2025-06-13T10:30:35.6640860+08:00;True|2025-06-03T10:51:41.3862145+08:00;False|2025-06-03T10:51:16.5345521+08:00;True|2025-05-30T20:09:32.5107276+08:00;False|2025-05-30T20:09:00.9663790+08:00;False|2025-05-30T17:15:54.5728888+08:00;True|2025-05-30T15:31:12.6393961+08:00;True|2025-05-30T14:59:23.7338679+08:00;True|2025-05-30T14:47:49.7374652+08:00;False|2025-05-30T14:46:56.5791293+08:00;True|2025-05-30T09:13:25.7216738+08:00;False|2025-05-30T09:12:56.3890721+08:00;True|2025-05-29T20:42:40.3409827+08:00;False|2025-05-29T20:42:06.9658631+08:00;True|2025-05-29T20:21:44.3234619+08:00;False|2025-05-29T20:21:05.8899839+08:00;True|2025-05-27T15:28:35.5206538+08:00;True|2025-05-27T14:10:48.2114238+08:00;True|2025-05-27T11:21:56.3013946+08:00;True|2025-05-27T11:12:39.5518701+08:00;True|2025-05-27T11:01:46.8317706+08:00;True|2025-05-27T10:58:06.6334127+08:00;True|2025-05-27T10:50:01.5656763+08:00;True|2025-05-27T09:32:10.3357581+08:00;False|2025-05-27T09:31:40.1660002+08:00;True|2025-05-22T19:13:07.9924074+08:00;True|2025-05-22T18:44:05.4014437+08:00;False|2025-05-22T18:43:42.8647214+08:00;True|2025-05-20T14:23:23.3914216+08:00;False|2025-05-20T14:22:55.1487818+08:00;True|2025-05-20T14:02:04.1738192+08:00;False|2025-05-20T14:01:35.3257179+08:00;True|2025-05-16T10:26:39.2771408+08:00;True|2025-05-16T09:56:14.9524606+08:00;True|2025-05-16T09:41:14.7986426+08:00;False|2025-05-16T09:40:49.7515669+08:00;True|2025-05-15T16:11:15.6104624+08:00;False|2025-05-15T16:10:29.3231781+08:00;True|2025-05-08T08:33:00.5573071+08:00;False|2025-05-08T08:32:20.5353159+08:00;True|2025-04-23T15:11:05.1490455+08:00;True|2025-04-23T14:22:24.5406543+08:00;False|2025-04-23T14:21:47.8685695+08:00;True|2025-04-18T13:54:27.4746888+08:00;False|2025-04-18T13:53:45.2296528+08:00;False|2025-04-18T13:53:29.7890054+08:00;False|2025-04-18T13:53:23.5770264+08:00;False|2025-04-18T13:53:18.0054565+08:00;True|2025-04-18T13:51:28.8449212+08:00;True|2025-04-18T13:24:50.1548645+08:00;True|2025-04-18T13:17:41.8781012+08:00;True|2025-04-18T13:07:11.4243777+08:00;True|2025-04-18T13:03:51.8972162+08:00;True|2025-04-18T12:59:24.3674835+08:00;True|2025-04-18T12:54:51.7546338+08:00;True|2025-04-18T12:51:54.3531129+08:00;False|2025-04-18T12:51:42.0198325+08:00;True|2025-04-18T09:11:06.5087174+08:00;False|2025-04-18T09:10:56.3178793+08:00;True|2025-04-17T11:20:10.9926709+08:00;True|2025-04-17T11:01:50.8902725+08:00;True|2025-04-17T10:53:40.1335186+08:00;True|2025-04-17T10:50:33.6109824+08:00;True|2025-04-17T10:31:35.1972930+08:00;True|2025-04-17T10:27:13.0718237+08:00;False|2025-04-17T10:27:05.4243104+08:00;True|2025-04-17T10:21:17.1039399+08:00;True|2025-04-17T10:17:30.5257362+08:00;True|2025-04-17T09:04:16.5959099+08:00;False|2025-04-17T09:04:08.5643163+08:00;True|2025-04-16T16:50:10.4001088+08:00;True|2025-04-16T16:37:30.0492166+08:00;False|2025-04-16T16:37:20.9070255+08:00;True|2025-04-15T14:55:05.4396103+08:00;True|2025-04-15T14:48:11.6729078+08:00;True|2025-04-15T14:18:53.0805178+08:00;True|2025-04-15T13:48:11.5252569+08:00;True|2025-04-15T13:37:14.4720847+08:00;True|2025-04-15T11:19:10.1766439+08:00;True|2025-04-15T11:16:15.9677953+08:00;True|2025-04-15T11:01:18.4337723+08:00;False|2025-04-15T11:01:06.9132978+08:00;True|2025-04-15T10:55:53.9650790+08:00;False|2025-04-15T10:55:45.2763971+08:00;True|2025-04-09T11:24:21.9466324+08:00;True|2025-04-09T11:14:25.0603792+08:00;True|2025-04-09T11:03:10.0252216+08:00;False|2025-04-09T11:03:01.0837419+08:00;True|2025-04-08T15:00:39.6673341+08:00;True|2025-04-08T14:55:20.5714659+08:00;True|2025-04-08T14:41:57.1855163+08:00;True|2025-04-08T13:31:03.4382266+08:00;True|2025-04-08T11:20:45.0300955+08:00;True|2025-04-08T10:59:59.6997668+08:00;False|2025-04-08T10:59:53.2827828+08:00;True|2025-04-08T10:48:17.4232977+08:00;False|2025-04-08T10:48:09.5363986+08:00;True|2025-04-03T13:53:30.6471699+08:00;False|2025-04-03T13:53:22.8762999+08:00;True|2025-04-02T12:47:31.3375226+08:00;False|2025-04-02T12:47:24.2095072+08:00;True|2025-04-01T16:29:52.7465502+08:00;False|2025-04-01T16:29:33.7844649+08:00;True|2025-03-28T16:22:29.8664470+08:00;True|2025-03-28T15:53:12.1106288+08:00;False|2025-03-28T15:53:01.4674242+08:00;True|2025-03-28T13:34:17.5506822+08:00;False|2025-03-28T13:34:09.5853308+08:00;True|2025-03-26T12:42:08.9630741+08:00;True|2025-03-26T12:40:07.7144561+08:00;True|2025-03-26T12:30:37.3503331+08:00;True|2025-03-26T12:26:47.5061658+08:00;True|2025-03-26T10:54:47.2556717+08:00;True|2025-03-26T10:49:59.7897145+08:00;True|2025-03-26T10:47:02.6195828+08:00;False|2025-03-26T10:46:54.9421244+08:00;True|2025-03-26T01:10:19.1227462+08:00;True|2025-03-26T01:00:04.3583740+08:00;True|2025-03-26T00:38:57.4757071+08:00;True|2025-03-26T00:28:24.9370188+08:00;True|2025-03-26T00:04:05.4507425+08:00;True|2025-03-25T23:06:56.2284828+08:00;False|2025-03-25T23:06:46.7023339+08:00;True|2025-03-25T22:57:08.3127897+08:00;False|2025-03-25T22:55:05.8028873+08:00;False|2025-03-25T22:54:51.2053101+08:00;False|2025-03-04T11:23:36.7757604+08:00;True|2025-02-12T14:05:06.1068587+08:00;False|2025-02-12T14:03:43.3961038+08:00;True|2025-01-18T09:42:50.3629397+08:00;True|2025-01-18T09:39:16.1773412+08:00;True|2025-01-17T11:15:39.4147082+08:00;False|2025-01-17T11:15:09.0033498+08:00;True|2025-01-14T10:20:31.1504093+08:00;False|2025-01-14T10:19:59.1429931+08:00;True|2025-01-10T16:29:54.8671377+08:00;False|2025-01-10T16:29:05.0650370+08:00;True|2025-01-04T14:30:56.5041884+08:00;True|2025-01-04T14:26:52.7448761+08:00;True|2025-01-04T14:23:27.9956967+08:00;True|2025-01-04T14:12:46.2410106+08:00;True|2025-01-04T14:09:33.1727375+08:00;True|2025-01-04T14:07:16.3373347+08:00;False|2025-01-04T14:06:33.4982458+08:00;True|2024-12-31T13:36:55.7394582+08:00;False|2024-12-31T13:35:58.6205647+08:00;True|2024-12-28T15:59:32.1394796+08:00;True|2024-12-28T13:48:20.4283118+08:00;True|2024-12-28T13:43:39.8159616+08:00;True|2024-12-28T13:23:58.4183285+08:00;True|2024-12-28T13:19:13.0583263+08:00;True|2024-12-28T13:12:03.2648502+08:00;True|2024-12-28T13:04:22.6803754+08:00;False|2024-12-28T13:03:56.5993252+08:00;True|2024-12-28T10:50:06.1597154+08:00;True|2024-12-28T10:27:58.7075320+08:00;False|2024-12-28T10:27:09.9450571+08:00;True|2024-12-24T10:52:25.3403292+08:00;False|2024-12-24T10:51:41.8017370+08:00;True|2024-12-23T15:45:21.7729300+08:00;True|2024-12-23T15:31:38.8549407+08:00;True|2024-12-23T15:20:26.2361671+08:00;True|2024-12-23T13:40:03.2774116+08:00;False|2024-12-23T13:39:39.8510770+08:00;True|2024-12-23T13:11:15.3232454+08:00;True|2024-12-23T13:05:43.3057458+08:00;True|2024-12-16T10:57:23.0694936+08:00;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
- <History>True|2025-11-07T08:34:43.8454867Z;True|2025-11-07T16:05:28.9073909+08:00;True|2025-11-07T16:01:49.1416161+08:00;True|2025-11-07T14:46:13.2471475+08:00;True|2025-11-07T14:19:47.9318085+08:00;False|2025-11-07T14:19:41.1003987+08:00;True|2025-11-05T16:02:11.0615592+08:00;False|2025-11-05T16:01:56.9412646+08:00;False|2025-11-05T15:53:20.8449563+08:00;True|2025-10-20T15:21:47.5140367+08:00;True|2025-10-20T14:04:18.3367894+08:00;False|2025-10-20T14:03:49.0696842+08:00;True|2025-10-17T10:00:49.9734449+08:00;False|2025-10-17T10:00:00.3400111+08:00;True|2025-10-16T14:33:50.0143974+08:00;True|2025-10-16T14:14:19.8272515+08:00;False|2025-10-16T14:13:52.8518376+08:00;True|2025-10-16T13:44:11.7580081+08:00;False|2025-10-16T13:43:40.6391342+08:00;True|2025-10-13T17:32:19.0994950+08:00;False|2025-10-13T17:31:43.3980965+08:00;True|2025-10-12T22:15:36.2044271+08:00;False|2025-10-12T22:15:05.5130292+08:00;True|2025-10-12T22:02:48.0519352+08:00;False|2025-10-12T22:02:03.0640348+08:00;False|2025-10-12T21:55:51.1042699+08:00;False|2025-10-12T21:55:25.7755321+08:00;False|2025-10-12T21:54:38.5630629+08:00;False|2025-10-12T21:54:00.2904646+08:00;False|2025-10-12T21:52:49.1718673+08:00;True|2025-09-29T14:19:56.3493999+08:00;True|2025-09-29T13:45:50.3942453+08:00;True|2025-09-29T13:42:06.1110553+08:00;True|2025-09-29T13:36:03.8122720+08:00;True|2025-09-29T08:02:25.4433936+08:00;False|2025-09-29T08:01:34.9956194+08:00;True|2025-09-28T16:32:32.1205217+08:00;False|2025-09-28T16:32:22.2949617+08:00;True|2025-09-26T14:52:29.3520681+08:00;True|2025-09-26T14:32:54.2746904+08:00;True|2025-09-26T14:30:03.3405779+08:00;True|2025-09-26T14:27:07.1365132+08:00;True|2025-09-26T14:17:38.1278517+08:00;False|2025-09-26T14:17:15.2222928+08:00;True|2025-09-26T13:27:46.3116713+08:00;True|2025-09-26T13:20:12.4936518+08:00;True|2025-09-26T10:02:30.8281583+08:00;False|2025-09-26T10:02:03.9362462+08:00;True|2025-09-26T09:53:20.0008961+08:00;True|2025-09-26T09:50:19.6692823+08:00;False|2025-09-26T09:49:53.3697350+08:00;True|2025-09-25T09:30:42.4579039+08:00;True|2025-09-25T09:28:06.6361895+08:00;True|2025-09-25T09:21:03.5626551+08:00;True|2025-09-25T09:07:49.5781444+08:00;True|2025-09-25T09:05:39.3361215+08:00;True|2025-09-25T08:57:49.0092670+08:00;True|2025-09-25T08:53:18.1932158+08:00;False|2025-09-25T08:52:41.4831686+08:00;True|2025-09-24T10:55:06.7583576+08:00;True|2025-09-24T10:42:07.4293256+08:00;True|2025-09-24T10:35:21.5131843+08:00;True|2025-09-24T10:01:34.6039507+08:00;False|2025-09-24T10:01:02.2423847+08:00;True|2025-09-23T14:10:09.5716580+08:00;False|2025-09-23T14:09:16.6824875+08:00;True|2025-09-23T10:19:03.9148941+08:00;False|2025-09-23T10:18:54.9945094+08:00;True|2025-09-22T16:10:40.3493996+08:00;True|2025-09-22T16:06:30.7648048+08:00;True|2025-09-22T15:58:01.2588123+08:00;True|2025-09-22T13:22:29.7402684+08:00;True|2025-09-22T10:50:24.6032398+08:00;True|2025-09-22T10:18:57.4239252+08:00;True|2025-09-22T09:44:34.1606021+08:00;True|2025-09-22T09:37:22.2102591+08:00;False|2025-09-22T09:37:13.3244518+08:00;False|2025-09-22T09:37:05.6707374+08:00;True|2025-09-22T09:20:00.1335697+08:00;True|2025-09-22T08:50:45.0839990+08:00;False|2025-09-22T08:50:39.5078616+08:00;True|2025-09-19T16:54:50.1840540+08:00;True|2025-09-19T15:58:56.7629702+08:00;True|2025-09-19T15:34:55.4164772+08:00;True|2025-09-19T15:19:17.0615575+08:00;False|2025-09-19T15:17:40.3055696+08:00;True|2025-09-17T16:33:38.7832139+08:00;False|2025-09-17T16:32:33.8056170+08:00;True|2025-09-15T15:31:28.0110309+08:00;True|2025-09-15T08:59:48.0264567+08:00;True|2025-09-15T08:55:35.9132476+08:00;False|2025-09-15T08:55:15.9462000+08:00;True|2025-09-10T15:37:27.9811453+08:00;True|2025-09-10T15:31:46.7985512+08:00;True|2025-09-10T15:25:13.0432246+08:00;True|2025-09-10T15:04:50.9925337+08:00;True|2025-09-10T14:45:51.9588268+08:00;True|2025-09-10T13:39:21.5732215+08:00;True|2025-09-10T13:30:34.6821425+08:00;False|2025-09-10T13:29:58.0985305+08:00;True|2025-09-10T11:09:10.4474163+08:00;True|2025-09-10T11:01:18.2664245+08:00;False|2025-09-10T11:01:11.7600095+08:00;True|2025-09-09T11:11:08.2737365+08:00;True|2025-09-09T10:48:12.8653988+08:00;True|2025-09-09T10:45:55.8371735+08:00;False|2025-09-09T10:45:50.0271007+08:00;True|2025-09-05T15:34:30.9324454+08:00;True|2025-09-05T15:25:04.5703586+08:00;True|2025-09-05T15:18:44.7836555+08:00;True|2025-09-05T15:18:15.3564889+08:00;True|2025-09-05T15:14:02.2490100+08:00;True|2025-09-05T15:13:22.0106066+08:00;True|2025-09-05T15:07:13.1733932+08:00;True|2025-09-05T14:34:49.5160527+08:00;True|2025-09-05T14:25:56.7476432+08:00;True|2025-09-05T14:11:06.6130566+08:00;True|2025-09-05T14:06:03.3723817+08:00;True|2025-09-05T13:59:08.2676824+08:00;True|2025-09-05T13:55:29.3608816+08:00;True|2025-09-05T13:50:19.1500461+08:00;True|2025-09-05T13:44:07.8244320+08:00;True|2025-09-05T13:32:55.8727194+08:00;True|2025-09-05T13:32:31.4266652+08:00;True|2025-09-05T13:29:54.4476848+08:00;True|2025-09-05T13:20:46.5358233+08:00;True|2025-09-05T13:12:44.2176702+08:00;True|2025-09-05T13:01:20.7462374+08:00;True|2025-09-05T13:00:45.2360436+08:00;True|2025-09-05T12:50:48.1213509+08:00;False|2025-09-05T12:50:41.6099269+08:00;True|2025-09-04T10:26:10.4040299+08:00;True|2025-09-04T10:22:55.8468850+08:00;True|2025-09-04T10:12:00.1744374+08:00;True|2025-09-04T10:11:20.8053602+08:00;False|2025-09-04T10:10:37.1981071+08:00;True|2025-09-03T16:53:33.7806439+08:00;True|2025-09-03T16:23:53.1760759+08:00;True|2025-09-03T16:13:51.7648089+08:00;True|2025-09-01T11:27:28.5171063+08:00;True|2025-09-01T09:10:26.2807200+08:00;True|2025-08-30T16:17:23.6280447+08:00;True|2025-08-30T16:08:45.2704012+08:00;False|2025-08-30T16:07:49.5332724+08:00;True|2025-08-29T13:42:08.9331590+08:00;True|2025-08-29T09:30:26.3865231+08:00;True|2025-08-29T09:26:59.6931531+08:00;True|2025-08-29T09:24:15.7633865+08:00;True|2025-08-29T09:20:15.7248945+08:00;True|2025-08-29T09:16:10.8305341+08:00;False|2025-08-29T09:15:37.6509149+08:00;True|2025-08-29T09:10:52.5758523+08:00;True|2025-08-29T09:07:28.0167672+08:00;True|2025-08-29T08:37:03.5161584+08:00;False|2025-08-29T08:36:22.9701878+08:00;True|2025-08-28T09:09:16.5053336+08:00;False|2025-08-28T09:08:31.8483468+08:00;True|2025-08-27T15:23:37.2451244+08:00;True|2025-08-27T14:08:19.4652541+08:00;True|2025-08-27T10:30:22.9583542+08:00;True|2025-08-27T10:24:39.3809926+08:00;True|2025-08-27T10:19:14.5440743+08:00;False|2025-08-27T10:18:22.9365507+08:00;True|2025-08-26T16:22:15.9301705+08:00;True|2025-08-26T16:15:50.6064453+08:00;False|2025-08-26T16:13:43.3734036+08:00;True|2025-08-26T10:03:33.2470619+08:00;True|2025-08-26T09:56:19.7100523+08:00;True|2025-08-26T09:51:10.1388633+08:00;True|2025-08-26T09:44:17.2173284+08:00;True|2025-08-26T09:36:15.5978463+08:00;False|2025-08-26T09:35:33.7420993+08:00;True|2025-08-25T15:01:50.5666742+08:00;True|2025-08-25T14:36:52.7376096+08:00;True|2025-08-25T14:29:34.9048354+08:00;True|2025-08-25T13:55:21.2896736+08:00;False|2025-08-25T13:53:29.3900423+08:00;True|2025-08-21T16:22:43.4480748+08:00;True|2025-08-21T16:13:59.7952292+08:00;True|2025-08-21T16:08:00.4465834+08:00;True|2025-08-21T15:47:33.0090744+08:00;False|2025-08-21T15:44:54.3140769+08:00;True|2025-08-20T13:59:43.5478179+08:00;True|2025-08-20T09:42:23.4176514+08:00;True|2025-08-20T08:58:41.0775117+08:00;False|2025-08-20T08:57:48.1366515+08:00;True|2025-08-19T16:07:02.0546263+08:00;True|2025-08-19T13:54:20.3065647+08:00;True|2025-08-19T13:04:16.6242527+08:00;False|2025-08-19T13:03:35.6928433+08:00;True|2025-08-18T13:03:14.7153952+08:00;True|2025-08-18T10:28:34.6874829+08:00;False|2025-08-18T10:22:59.8356232+08:00;True|2025-08-15T08:49:26.9915062+08:00;True|2025-08-15T08:40:21.8574257+08:00;True|2025-08-15T08:33:10.0952126+08:00;True|2025-08-12T11:00:19.2136555+08:00;True|2025-08-12T08:16:54.4308560+08:00;False|2025-08-12T08:16:20.5681009+08:00;True|2025-08-11T09:33:02.5662651+08:00;True|2025-08-11T09:29:33.8368533+08:00;True|2025-08-11T09:21:37.6200426+08:00;True|2025-08-11T09:17:43.9802106+08:00;True|2025-08-11T08:52:44.9690249+08:00;True|2025-08-11T08:26:58.0223608+08:00;False|2025-08-11T08:26:23.1079192+08:00;True|2025-08-08T15:39:38.6720210+08:00;True|2025-08-08T14:20:03.4053835+08:00;True|2025-08-08T13:13:34.5963008+08:00;False|2025-08-08T13:12:52.5341192+08:00;True|2025-08-07T13:09:32.3688293+08:00;False|2025-08-07T13:09:23.7335601+08:00;True|2025-08-06T15:13:44.9956787+08:00;True|2025-08-06T12:29:30.0783854+08:00;False|2025-08-06T12:29:22.9174579+08:00;True|2025-08-05T11:46:04.9109530+08:00;True|2025-08-05T09:12:36.4757799+08:00;False|2025-08-05T09:12:29.5152051+08:00;True|2025-08-04T22:16:55.8153764+08:00;False|2025-08-04T22:16:45.6812380+08:00;True|2025-08-04T17:48:30.5101840+08:00;True|2025-08-04T16:18:16.1499446+08:00;True|2025-08-04T11:40:28.5722111+08:00;False|2025-08-04T10:45:46.8681527+08:00;True|2025-07-31T15:11:55.0100072+08:00;False|2025-07-31T15:10:51.6681759+08:00;True|2025-07-30T16:00:10.5159335+08:00;True|2025-07-30T15:41:51.5648646+08:00;True|2025-07-30T15:13:07.2401528+08:00;False|2025-07-30T15:12:40.5946471+08:00;True|2025-07-29T23:14:46.2298438+08:00;False|2025-07-29T23:13:41.1630729+08:00;True|2025-07-29T14:02:02.2575808+08:00;True|2025-07-29T13:43:01.6607651+08:00;True|2025-07-29T13:21:53.3427945+08:00;False|2025-07-29T13:21:12.3710695+08:00;True|2025-07-02T16:19:48.0004187+08:00;True|2025-07-02T16:15:36.5831869+08:00;True|2025-07-02T16:09:00.5399469+08:00;True|2025-07-02T15:56:09.9783494+08:00;True|2025-07-02T15:14:06.9937801+08:00;True|2025-07-02T15:09:36.8804234+08:00;True|2025-07-02T15:05:41.0676357+08:00;True|2025-07-02T15:00:26.6768478+08:00;True|2025-07-02T14:57:55.9749557+08:00;True|2025-07-02T14:54:09.4801906+08:00;True|2025-07-02T14:48:13.1406954+08:00;True|2025-07-02T14:43:16.6621615+08:00;False|2025-07-02T14:42:39.8858427+08:00;True|2025-06-30T14:07:33.6198921+08:00;False|2025-06-30T14:06:54.9141774+08:00;True|2025-06-27T16:10:37.5346733+08:00;True|2025-06-27T15:53:52.6099110+08:00;True|2025-06-27T15:49:37.6381262+08:00;True|2025-06-27T15:45:18.4426363+08:00;True|2025-06-27T15:09:40.0483579+08:00;True|2025-06-27T15:03:45.2696849+08:00;True|2025-06-27T14:59:53.6972427+08:00;True|2025-06-27T14:56:36.5300707+08:00;True|2025-06-27T14:52:12.7121868+08:00;True|2025-06-27T14:31:22.7250138+08:00;True|2025-06-27T14:23:27.1058306+08:00;True|2025-06-27T14:13:54.1440171+08:00;True|2025-06-27T14:04:48.1872541+08:00;True|2025-06-27T14:00:10.1802914+08:00;False|2025-06-27T13:59:47.2300395+08:00;True|2025-06-26T17:03:34.2617207+08:00;True|2025-06-26T16:59:16.3043451+08:00;True|2025-06-26T16:47:46.3910675+08:00;True|2025-06-26T16:40:45.0917549+08:00;True|2025-06-26T16:19:04.7496278+08:00;True|2025-06-26T13:40:17.4650939+08:00;True|2025-06-26T08:46:10.4559278+08:00;False|2025-06-26T08:45:48.2231639+08:00;True|2025-06-25T16:40:12.2933893+08:00;True|2025-06-25T16:33:19.5628638+08:00;True|2025-06-25T16:28:13.3282882+08:00;True|2025-06-25T14:26:38.1487280+08:00;True|2025-06-25T14:23:03.3981021+08:00;True|2025-06-25T14:20:01.5127640+08:00;True|2025-06-25T14:12:47.4447383+08:00;True|2025-06-25T14:09:39.8493477+08:00;True|2025-06-25T14:04:07.9655837+08:00;False|2025-06-25T14:03:01.5528773+08:00;True|2025-06-24T14:39:55.5403167+08:00;True|2025-06-24T14:36:51.3363222+08:00;True|2025-06-24T14:33:34.6605389+08:00;True|2025-06-24T14:29:44.9508636+08:00;True|2025-06-24T14:24:49.4487525+08:00;True|2025-06-24T14:19:31.0243854+08:00;True|2025-06-24T14:15:42.8043990+08:00;True|2025-06-24T14:10:25.3126511+08:00;True|2025-06-24T14:01:11.7808866+08:00;True|2025-06-24T13:56:29.6124906+08:00;True|2025-06-24T13:42:27.5554459+08:00;True|2025-06-24T13:35:02.3147995+08:00;True|2025-06-24T13:31:15.2833438+08:00;True|2025-06-24T13:26:22.4759378+08:00;True|2025-06-24T13:22:58.0143749+08:00;False|2025-06-24T13:22:30.7295943+08:00;True|2025-06-24T13:20:08.9526835+08:00;True|2025-06-24T13:15:10.2719394+08:00;True|2025-06-20T15:38:22.6724181+08:00;True|2025-06-20T14:44:29.4284749+08:00;True|2025-06-20T14:34:29.3160274+08:00;True|2025-06-20T14:29:26.1084681+08:00;False|2025-06-20T14:28:47.7761889+08:00;True|2025-06-18T16:26:56.9181027+08:00;True|2025-06-18T16:22:48.3649541+08:00;True|2025-06-18T09:45:22.1840933+08:00;True|2025-06-18T09:38:27.4616553+08:00;True|2025-06-18T09:24:22.0260493+08:00;True|2025-06-18T08:58:42.0314631+08:00;True|2025-06-18T08:54:57.3762593+08:00;True|2025-06-18T08:52:30.6977045+08:00;True|2025-06-18T08:44:16.3868101+08:00;True|2025-06-18T08:38:06.2335478+08:00;False|2025-06-18T08:37:43.3356541+08:00;True|2025-06-18T08:32:29.9036211+08:00;True|2025-06-18T08:19:00.7253184+08:00;True|2025-06-18T08:14:01.8413793+08:00;True|2025-06-18T08:06:59.1976807+08:00;False|2025-06-18T08:06:29.3417533+08:00;True|2025-06-17T15:36:04.6217443+08:00;True|2025-06-17T15:31:43.3563632+08:00;True|2025-06-17T14:58:43.8735144+08:00;True|2025-06-17T14:39:01.2795873+08:00;True|2025-06-17T14:34:00.1695810+08:00;True|2025-06-17T14:30:54.8417757+08:00;False|2025-06-17T14:30:22.5535404+08:00;True|2025-06-17T14:26:29.1534249+08:00;True|2025-06-17T14:23:01.5750276+08:00;True|2025-06-17T14:13:44.7734613+08:00;True|2025-06-17T13:20:22.6676313+08:00;True|2025-06-17T12:45:59.6935151+08:00;True|2025-06-17T11:26:53.3105073+08:00;True|2025-06-17T11:21:58.4556792+08:00;True|2025-06-17T11:17:39.0062665+08:00;True|2025-06-17T11:14:12.1161810+08:00;True|2025-06-17T11:09:51.0123982+08:00;True|2025-06-17T11:03:35.4540889+08:00;True|2025-06-17T10:58:06.1870442+08:00;True|2025-06-17T10:47:25.6201207+08:00;True|2025-06-17T09:22:36.4275453+08:00;True|2025-06-17T09:15:44.1593969+08:00;True|2025-06-17T09:12:05.5473137+08:00;True|2025-06-17T09:08:48.4974735+08:00;True|2025-06-17T09:04:26.9345188+08:00;True|2025-06-17T09:03:36.0326872+08:00;True|2025-06-17T08:57:42.1551977+08:00;True|2025-06-17T08:53:55.5708883+08:00;True|2025-06-17T08:49:04.2922881+08:00;True|2025-06-17T08:41:04.9647614+08:00;True|2025-06-17T08:34:49.0188503+08:00;True|2025-06-17T08:29:57.4868889+08:00;True|2025-06-17T08:23:10.2489747+08:00;True|2025-06-17T08:17:38.8483538+08:00;False|2025-06-17T08:16:14.0757416+08:00;True|2025-06-13T15:52:22.7401602+08:00;False|2025-06-13T15:52:01.7388701+08:00;True|2025-06-13T15:35:05.4281004+08:00;True|2025-06-13T15:24:25.2717953+08:00;True|2025-06-13T15:13:54.7230551+08:00;True|2025-06-13T14:02:03.6551564+08:00;True|2025-06-13T11:18:18.1123581+08:00;True|2025-06-13T10:40:20.8774077+08:00;True|2025-06-13T10:36:36.1411085+08:00;False|2025-06-13T10:35:41.3893604+08:00;True|2025-06-13T10:32:13.4521145+08:00;True|2025-06-13T10:30:35.6640860+08:00;True|2025-06-03T10:51:41.3862145+08:00;False|2025-06-03T10:51:16.5345521+08:00;True|2025-05-30T20:09:32.5107276+08:00;False|2025-05-30T20:09:00.9663790+08:00;False|2025-05-30T17:15:54.5728888+08:00;True|2025-05-30T15:31:12.6393961+08:00;True|2025-05-30T14:59:23.7338679+08:00;True|2025-05-30T14:47:49.7374652+08:00;False|2025-05-30T14:46:56.5791293+08:00;True|2025-05-30T09:13:25.7216738+08:00;False|2025-05-30T09:12:56.3890721+08:00;True|2025-05-29T20:42:40.3409827+08:00;False|2025-05-29T20:42:06.9658631+08:00;True|2025-05-29T20:21:44.3234619+08:00;False|2025-05-29T20:21:05.8899839+08:00;True|2025-05-27T15:28:35.5206538+08:00;True|2025-05-27T14:10:48.2114238+08:00;True|2025-05-27T11:21:56.3013946+08:00;True|2025-05-27T11:12:39.5518701+08:00;True|2025-05-27T11:01:46.8317706+08:00;True|2025-05-27T10:58:06.6334127+08:00;True|2025-05-27T10:50:01.5656763+08:00;True|2025-05-27T09:32:10.3357581+08:00;False|2025-05-27T09:31:40.1660002+08:00;True|2025-05-22T19:13:07.9924074+08:00;True|2025-05-22T18:44:05.4014437+08:00;False|2025-05-22T18:43:42.8647214+08:00;True|2025-05-20T14:23:23.3914216+08:00;False|2025-05-20T14:22:55.1487818+08:00;True|2025-05-20T14:02:04.1738192+08:00;False|2025-05-20T14:01:35.3257179+08:00;True|2025-05-16T10:26:39.2771408+08:00;True|2025-05-16T09:56:14.9524606+08:00;True|2025-05-16T09:41:14.7986426+08:00;False|2025-05-16T09:40:49.7515669+08:00;True|2025-05-15T16:11:15.6104624+08:00;False|2025-05-15T16:10:29.3231781+08:00;True|2025-05-08T08:33:00.5573071+08:00;False|2025-05-08T08:32:20.5353159+08:00;True|2025-04-23T15:11:05.1490455+08:00;True|2025-04-23T14:22:24.5406543+08:00;False|2025-04-23T14:21:47.8685695+08:00;True|2025-04-18T13:54:27.4746888+08:00;False|2025-04-18T13:53:45.2296528+08:00;False|2025-04-18T13:53:29.7890054+08:00;False|2025-04-18T13:53:23.5770264+08:00;False|2025-04-18T13:53:18.0054565+08:00;True|2025-04-18T13:51:28.8449212+08:00;True|2025-04-18T13:24:50.1548645+08:00;True|2025-04-18T13:17:41.8781012+08:00;True|2025-04-18T13:07:11.4243777+08:00;True|2025-04-18T13:03:51.8972162+08:00;True|2025-04-18T12:59:24.3674835+08:00;True|2025-04-18T12:54:51.7546338+08:00;True|2025-04-18T12:51:54.3531129+08:00;False|2025-04-18T12:51:42.0198325+08:00;True|2025-04-18T09:11:06.5087174+08:00;False|2025-04-18T09:10:56.3178793+08:00;True|2025-04-17T11:20:10.9926709+08:00;True|2025-04-17T11:01:50.8902725+08:00;True|2025-04-17T10:53:40.1335186+08:00;True|2025-04-17T10:50:33.6109824+08:00;True|2025-04-17T10:31:35.1972930+08:00;True|2025-04-17T10:27:13.0718237+08:00;False|2025-04-17T10:27:05.4243104+08:00;True|2025-04-17T10:21:17.1039399+08:00;True|2025-04-17T10:17:30.5257362+08:00;True|2025-04-17T09:04:16.5959099+08:00;False|2025-04-17T09:04:08.5643163+08:00;True|2025-04-16T16:50:10.4001088+08:00;True|2025-04-16T16:37:30.0492166+08:00;False|2025-04-16T16:37:20.9070255+08:00;True|2025-04-15T14:55:05.4396103+08:00;True|2025-04-15T14:48:11.6729078+08:00;True|2025-04-15T14:18:53.0805178+08:00;True|2025-04-15T13:48:11.5252569+08:00;True|2025-04-15T13:37:14.4720847+08:00;True|2025-04-15T11:19:10.1766439+08:00;True|2025-04-15T11:16:15.9677953+08:00;True|2025-04-15T11:01:18.4337723+08:00;False|2025-04-15T11:01:06.9132978+08:00;True|2025-04-15T10:55:53.9650790+08:00;False|2025-04-15T10:55:45.2763971+08:00;True|2025-04-09T11:24:21.9466324+08:00;True|2025-04-09T11:14:25.0603792+08:00;True|2025-04-09T11:03:10.0252216+08:00;False|2025-04-09T11:03:01.0837419+08:00;True|2025-04-08T15:00:39.6673341+08:00;True|2025-04-08T14:55:20.5714659+08:00;True|2025-04-08T14:41:57.1855163+08:00;True|2025-04-08T13:31:03.4382266+08:00;True|2025-04-08T11:20:45.0300955+08:00;True|2025-04-08T10:59:59.6997668+08:00;False|2025-04-08T10:59:53.2827828+08:00;True|2025-04-08T10:48:17.4232977+08:00;False|2025-04-08T10:48:09.5363986+08:00;True|2025-04-03T13:53:30.6471699+08:00;False|2025-04-03T13:53:22.8762999+08:00;True|2025-04-02T12:47:31.3375226+08:00;False|2025-04-02T12:47:24.2095072+08:00;True|2025-04-01T16:29:52.7465502+08:00;False|2025-04-01T16:29:33.7844649+08:00;True|2025-03-28T16:22:29.8664470+08:00;True|2025-03-28T15:53:12.1106288+08:00;False|2025-03-28T15:53:01.4674242+08:00;True|2025-03-28T13:34:17.5506822+08:00;False|2025-03-28T13:34:09.5853308+08:00;True|2025-03-26T12:42:08.9630741+08:00;True|2025-03-26T12:40:07.7144561+08:00;True|2025-03-26T12:30:37.3503331+08:00;True|2025-03-26T12:26:47.5061658+08:00;True|2025-03-26T10:54:47.2556717+08:00;True|2025-03-26T10:49:59.7897145+08:00;True|2025-03-26T10:47:02.6195828+08:00;False|2025-03-26T10:46:54.9421244+08:00;True|2025-03-26T01:10:19.1227462+08:00;True|2025-03-26T01:00:04.3583740+08:00;True|2025-03-26T00:38:57.4757071+08:00;True|2025-03-26T00:28:24.9370188+08:00;True|2025-03-26T00:04:05.4507425+08:00;True|2025-03-25T23:06:56.2284828+08:00;False|2025-03-25T23:06:46.7023339+08:00;True|2025-03-25T22:57:08.3127897+08:00;False|2025-03-25T22:55:05.8028873+08:00;False|2025-03-25T22:54:51.2053101+08:00;False|2025-03-04T11:23:36.7757604+08:00;True|2025-02-12T14:05:06.1068587+08:00;False|2025-02-12T14:03:43.3961038+08:00;True|2025-01-18T09:42:50.3629397+08:00;True|2025-01-18T09:39:16.1773412+08:00;True|2025-01-17T11:15:39.4147082+08:00;False|2025-01-17T11:15:09.0033498+08:00;True|2025-01-14T10:20:31.1504093+08:00;False|2025-01-14T10:19:59.1429931+08:00;True|2025-01-10T16:29:54.8671377+08:00;False|2025-01-10T16:29:05.0650370+08:00;True|2025-01-04T14:30:56.5041884+08:00;True|2025-01-04T14:26:52.7448761+08:00;True|2025-01-04T14:23:27.9956967+08:00;True|2025-01-04T14:12:46.2410106+08:00;True|2025-01-04T14:09:33.1727375+08:00;True|2025-01-04T14:07:16.3373347+08:00;False|2025-01-04T14:06:33.4982458+08:00;True|2024-12-31T13:36:55.7394582+08:00;False|2024-12-31T13:35:58.6205647+08:00;True|2024-12-28T15:59:32.1394796+08:00;True|2024-12-28T13:48:20.4283118+08:00;True|2024-12-28T13:43:39.8159616+08:00;True|2024-12-28T13:23:58.4183285+08:00;True|2024-12-28T13:19:13.0583263+08:00;True|2024-12-28T13:12:03.2648502+08:00;True|2024-12-28T13:04:22.6803754+08:00;False|2024-12-28T13:03:56.5993252+08:00;True|2024-12-28T10:50:06.1597154+08:00;True|2024-12-28T10:27:58.7075320+08:00;False|2024-12-28T10:27:09.9450571+08:00;True|2024-12-24T10:52:25.3403292+08:00;False|2024-12-24T10:51:41.8017370+08:00;True|2024-12-23T15:45:21.7729300+08:00;True|2024-12-23T15:31:38.8549407+08:00;True|2024-12-23T15:20:26.2361671+08:00;True|2024-12-23T13:40:03.2774116+08:00;False|2024-12-23T13:39:39.8510770+08:00;True|2024-12-23T13:11:15.3232454+08:00;True|2024-12-23T13:05:43.3057458+08:00;True|2024-12-16T10:57:23.0694936+08:00;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
+ <History>True|2025-12-01T07:20:44.9386037Z;False|2025-12-01T15:20:36.4207021+08:00;True|2025-11-25T10:22:20.8997856+08:00;False|2025-11-25T10:22:12.6515291+08:00;True|2025-11-07T16:34:43.8454867+08:00;True|2025-11-07T16:05:28.9073909+08:00;True|2025-11-07T16:01:49.1416161+08:00;True|2025-11-07T14:46:13.2471475+08:00;True|2025-11-07T14:19:47.9318085+08:00;False|2025-11-07T14:19:41.1003987+08:00;True|2025-11-05T16:02:11.0615592+08:00;False|2025-11-05T16:01:56.9412646+08:00;False|2025-11-05T15:53:20.8449563+08:00;True|2025-10-20T15:21:47.5140367+08:00;True|2025-10-20T14:04:18.3367894+08:00;False|2025-10-20T14:03:49.0696842+08:00;True|2025-10-17T10:00:49.9734449+08:00;False|2025-10-17T10:00:00.3400111+08:00;True|2025-10-16T14:33:50.0143974+08:00;True|2025-10-16T14:14:19.8272515+08:00;False|2025-10-16T14:13:52.8518376+08:00;True|2025-10-16T13:44:11.7580081+08:00;False|2025-10-16T13:43:40.6391342+08:00;True|2025-10-13T17:32:19.0994950+08:00;False|2025-10-13T17:31:43.3980965+08:00;True|2025-10-12T22:15:36.2044271+08:00;False|2025-10-12T22:15:05.5130292+08:00;True|2025-10-12T22:02:48.0519352+08:00;False|2025-10-12T22:02:03.0640348+08:00;False|2025-10-12T21:55:51.1042699+08:00;False|2025-10-12T21:55:25.7755321+08:00;False|2025-10-12T21:54:38.5630629+08:00;False|2025-10-12T21:54:00.2904646+08:00;False|2025-10-12T21:52:49.1718673+08:00;True|2025-09-29T14:19:56.3493999+08:00;True|2025-09-29T13:45:50.3942453+08:00;True|2025-09-29T13:42:06.1110553+08:00;True|2025-09-29T13:36:03.8122720+08:00;True|2025-09-29T08:02:25.4433936+08:00;False|2025-09-29T08:01:34.9956194+08:00;True|2025-09-28T16:32:32.1205217+08:00;False|2025-09-28T16:32:22.2949617+08:00;True|2025-09-26T14:52:29.3520681+08:00;True|2025-09-26T14:32:54.2746904+08:00;True|2025-09-26T14:30:03.3405779+08:00;True|2025-09-26T14:27:07.1365132+08:00;True|2025-09-26T14:17:38.1278517+08:00;False|2025-09-26T14:17:15.2222928+08:00;True|2025-09-26T13:27:46.3116713+08:00;True|2025-09-26T13:20:12.4936518+08:00;True|2025-09-26T10:02:30.8281583+08:00;False|2025-09-26T10:02:03.9362462+08:00;True|2025-09-26T09:53:20.0008961+08:00;True|2025-09-26T09:50:19.6692823+08:00;False|2025-09-26T09:49:53.3697350+08:00;True|2025-09-25T09:30:42.4579039+08:00;True|2025-09-25T09:28:06.6361895+08:00;True|2025-09-25T09:21:03.5626551+08:00;True|2025-09-25T09:07:49.5781444+08:00;True|2025-09-25T09:05:39.3361215+08:00;True|2025-09-25T08:57:49.0092670+08:00;True|2025-09-25T08:53:18.1932158+08:00;False|2025-09-25T08:52:41.4831686+08:00;True|2025-09-24T10:55:06.7583576+08:00;True|2025-09-24T10:42:07.4293256+08:00;True|2025-09-24T10:35:21.5131843+08:00;True|2025-09-24T10:01:34.6039507+08:00;False|2025-09-24T10:01:02.2423847+08:00;True|2025-09-23T14:10:09.5716580+08:00;False|2025-09-23T14:09:16.6824875+08:00;True|2025-09-23T10:19:03.9148941+08:00;False|2025-09-23T10:18:54.9945094+08:00;True|2025-09-22T16:10:40.3493996+08:00;True|2025-09-22T16:06:30.7648048+08:00;True|2025-09-22T15:58:01.2588123+08:00;True|2025-09-22T13:22:29.7402684+08:00;True|2025-09-22T10:50:24.6032398+08:00;True|2025-09-22T10:18:57.4239252+08:00;True|2025-09-22T09:44:34.1606021+08:00;True|2025-09-22T09:37:22.2102591+08:00;False|2025-09-22T09:37:13.3244518+08:00;False|2025-09-22T09:37:05.6707374+08:00;True|2025-09-22T09:20:00.1335697+08:00;True|2025-09-22T08:50:45.0839990+08:00;False|2025-09-22T08:50:39.5078616+08:00;True|2025-09-19T16:54:50.1840540+08:00;True|2025-09-19T15:58:56.7629702+08:00;True|2025-09-19T15:34:55.4164772+08:00;True|2025-09-19T15:19:17.0615575+08:00;False|2025-09-19T15:17:40.3055696+08:00;True|2025-09-17T16:33:38.7832139+08:00;False|2025-09-17T16:32:33.8056170+08:00;True|2025-09-15T15:31:28.0110309+08:00;True|2025-09-15T08:59:48.0264567+08:00;True|2025-09-15T08:55:35.9132476+08:00;False|2025-09-15T08:55:15.9462000+08:00;True|2025-09-10T15:37:27.9811453+08:00;True|2025-09-10T15:31:46.7985512+08:00;True|2025-09-10T15:25:13.0432246+08:00;True|2025-09-10T15:04:50.9925337+08:00;True|2025-09-10T14:45:51.9588268+08:00;True|2025-09-10T13:39:21.5732215+08:00;True|2025-09-10T13:30:34.6821425+08:00;False|2025-09-10T13:29:58.0985305+08:00;True|2025-09-10T11:09:10.4474163+08:00;True|2025-09-10T11:01:18.2664245+08:00;False|2025-09-10T11:01:11.7600095+08:00;True|2025-09-09T11:11:08.2737365+08:00;True|2025-09-09T10:48:12.8653988+08:00;True|2025-09-09T10:45:55.8371735+08:00;False|2025-09-09T10:45:50.0271007+08:00;True|2025-09-05T15:34:30.9324454+08:00;True|2025-09-05T15:25:04.5703586+08:00;True|2025-09-05T15:18:44.7836555+08:00;True|2025-09-05T15:18:15.3564889+08:00;True|2025-09-05T15:14:02.2490100+08:00;True|2025-09-05T15:13:22.0106066+08:00;True|2025-09-05T15:07:13.1733932+08:00;True|2025-09-05T14:34:49.5160527+08:00;True|2025-09-05T14:25:56.7476432+08:00;True|2025-09-05T14:11:06.6130566+08:00;True|2025-09-05T14:06:03.3723817+08:00;True|2025-09-05T13:59:08.2676824+08:00;True|2025-09-05T13:55:29.3608816+08:00;True|2025-09-05T13:50:19.1500461+08:00;True|2025-09-05T13:44:07.8244320+08:00;True|2025-09-05T13:32:55.8727194+08:00;True|2025-09-05T13:32:31.4266652+08:00;True|2025-09-05T13:29:54.4476848+08:00;True|2025-09-05T13:20:46.5358233+08:00;True|2025-09-05T13:12:44.2176702+08:00;True|2025-09-05T13:01:20.7462374+08:00;True|2025-09-05T13:00:45.2360436+08:00;True|2025-09-05T12:50:48.1213509+08:00;False|2025-09-05T12:50:41.6099269+08:00;True|2025-09-04T10:26:10.4040299+08:00;True|2025-09-04T10:22:55.8468850+08:00;True|2025-09-04T10:12:00.1744374+08:00;True|2025-09-04T10:11:20.8053602+08:00;False|2025-09-04T10:10:37.1981071+08:00;True|2025-09-03T16:53:33.7806439+08:00;True|2025-09-03T16:23:53.1760759+08:00;True|2025-09-03T16:13:51.7648089+08:00;True|2025-09-01T11:27:28.5171063+08:00;True|2025-09-01T09:10:26.2807200+08:00;True|2025-08-30T16:17:23.6280447+08:00;True|2025-08-30T16:08:45.2704012+08:00;False|2025-08-30T16:07:49.5332724+08:00;True|2025-08-29T13:42:08.9331590+08:00;True|2025-08-29T09:30:26.3865231+08:00;True|2025-08-29T09:26:59.6931531+08:00;True|2025-08-29T09:24:15.7633865+08:00;True|2025-08-29T09:20:15.7248945+08:00;True|2025-08-29T09:16:10.8305341+08:00;False|2025-08-29T09:15:37.6509149+08:00;True|2025-08-29T09:10:52.5758523+08:00;True|2025-08-29T09:07:28.0167672+08:00;True|2025-08-29T08:37:03.5161584+08:00;False|2025-08-29T08:36:22.9701878+08:00;True|2025-08-28T09:09:16.5053336+08:00;False|2025-08-28T09:08:31.8483468+08:00;True|2025-08-27T15:23:37.2451244+08:00;True|2025-08-27T14:08:19.4652541+08:00;True|2025-08-27T10:30:22.9583542+08:00;True|2025-08-27T10:24:39.3809926+08:00;True|2025-08-27T10:19:14.5440743+08:00;False|2025-08-27T10:18:22.9365507+08:00;True|2025-08-26T16:22:15.9301705+08:00;True|2025-08-26T16:15:50.6064453+08:00;False|2025-08-26T16:13:43.3734036+08:00;True|2025-08-26T10:03:33.2470619+08:00;True|2025-08-26T09:56:19.7100523+08:00;True|2025-08-26T09:51:10.1388633+08:00;True|2025-08-26T09:44:17.2173284+08:00;True|2025-08-26T09:36:15.5978463+08:00;False|2025-08-26T09:35:33.7420993+08:00;True|2025-08-25T15:01:50.5666742+08:00;True|2025-08-25T14:36:52.7376096+08:00;True|2025-08-25T14:29:34.9048354+08:00;True|2025-08-25T13:55:21.2896736+08:00;False|2025-08-25T13:53:29.3900423+08:00;True|2025-08-21T16:22:43.4480748+08:00;True|2025-08-21T16:13:59.7952292+08:00;True|2025-08-21T16:08:00.4465834+08:00;True|2025-08-21T15:47:33.0090744+08:00;False|2025-08-21T15:44:54.3140769+08:00;True|2025-08-20T13:59:43.5478179+08:00;True|2025-08-20T09:42:23.4176514+08:00;True|2025-08-20T08:58:41.0775117+08:00;False|2025-08-20T08:57:48.1366515+08:00;True|2025-08-19T16:07:02.0546263+08:00;True|2025-08-19T13:54:20.3065647+08:00;True|2025-08-19T13:04:16.6242527+08:00;False|2025-08-19T13:03:35.6928433+08:00;True|2025-08-18T13:03:14.7153952+08:00;True|2025-08-18T10:28:34.6874829+08:00;False|2025-08-18T10:22:59.8356232+08:00;True|2025-08-15T08:49:26.9915062+08:00;True|2025-08-15T08:40:21.8574257+08:00;True|2025-08-15T08:33:10.0952126+08:00;True|2025-08-12T11:00:19.2136555+08:00;True|2025-08-12T08:16:54.4308560+08:00;False|2025-08-12T08:16:20.5681009+08:00;True|2025-08-11T09:33:02.5662651+08:00;True|2025-08-11T09:29:33.8368533+08:00;True|2025-08-11T09:21:37.6200426+08:00;True|2025-08-11T09:17:43.9802106+08:00;True|2025-08-11T08:52:44.9690249+08:00;True|2025-08-11T08:26:58.0223608+08:00;False|2025-08-11T08:26:23.1079192+08:00;True|2025-08-08T15:39:38.6720210+08:00;True|2025-08-08T14:20:03.4053835+08:00;True|2025-08-08T13:13:34.5963008+08:00;False|2025-08-08T13:12:52.5341192+08:00;True|2025-08-07T13:09:32.3688293+08:00;False|2025-08-07T13:09:23.7335601+08:00;True|2025-08-06T15:13:44.9956787+08:00;True|2025-08-06T12:29:30.0783854+08:00;False|2025-08-06T12:29:22.9174579+08:00;True|2025-08-05T11:46:04.9109530+08:00;True|2025-08-05T09:12:36.4757799+08:00;False|2025-08-05T09:12:29.5152051+08:00;True|2025-08-04T22:16:55.8153764+08:00;False|2025-08-04T22:16:45.6812380+08:00;True|2025-08-04T17:48:30.5101840+08:00;True|2025-08-04T16:18:16.1499446+08:00;True|2025-08-04T11:40:28.5722111+08:00;False|2025-08-04T10:45:46.8681527+08:00;True|2025-07-31T15:11:55.0100072+08:00;False|2025-07-31T15:10:51.6681759+08:00;True|2025-07-30T16:00:10.5159335+08:00;True|2025-07-30T15:41:51.5648646+08:00;True|2025-07-30T15:13:07.2401528+08:00;False|2025-07-30T15:12:40.5946471+08:00;True|2025-07-29T23:14:46.2298438+08:00;False|2025-07-29T23:13:41.1630729+08:00;True|2025-07-29T14:02:02.2575808+08:00;True|2025-07-29T13:43:01.6607651+08:00;True|2025-07-29T13:21:53.3427945+08:00;False|2025-07-29T13:21:12.3710695+08:00;True|2025-07-02T16:19:48.0004187+08:00;True|2025-07-02T16:15:36.5831869+08:00;True|2025-07-02T16:09:00.5399469+08:00;True|2025-07-02T15:56:09.9783494+08:00;True|2025-07-02T15:14:06.9937801+08:00;True|2025-07-02T15:09:36.8804234+08:00;True|2025-07-02T15:05:41.0676357+08:00;True|2025-07-02T15:00:26.6768478+08:00;True|2025-07-02T14:57:55.9749557+08:00;True|2025-07-02T14:54:09.4801906+08:00;True|2025-07-02T14:48:13.1406954+08:00;True|2025-07-02T14:43:16.6621615+08:00;False|2025-07-02T14:42:39.8858427+08:00;True|2025-06-30T14:07:33.6198921+08:00;False|2025-06-30T14:06:54.9141774+08:00;True|2025-06-27T16:10:37.5346733+08:00;True|2025-06-27T15:53:52.6099110+08:00;True|2025-06-27T15:49:37.6381262+08:00;True|2025-06-27T15:45:18.4426363+08:00;True|2025-06-27T15:09:40.0483579+08:00;True|2025-06-27T15:03:45.2696849+08:00;True|2025-06-27T14:59:53.6972427+08:00;True|2025-06-27T14:56:36.5300707+08:00;True|2025-06-27T14:52:12.7121868+08:00;True|2025-06-27T14:31:22.7250138+08:00;True|2025-06-27T14:23:27.1058306+08:00;True|2025-06-27T14:13:54.1440171+08:00;True|2025-06-27T14:04:48.1872541+08:00;True|2025-06-27T14:00:10.1802914+08:00;False|2025-06-27T13:59:47.2300395+08:00;True|2025-06-26T17:03:34.2617207+08:00;True|2025-06-26T16:59:16.3043451+08:00;True|2025-06-26T16:47:46.3910675+08:00;True|2025-06-26T16:40:45.0917549+08:00;True|2025-06-26T16:19:04.7496278+08:00;True|2025-06-26T13:40:17.4650939+08:00;True|2025-06-26T08:46:10.4559278+08:00;False|2025-06-26T08:45:48.2231639+08:00;True|2025-06-25T16:40:12.2933893+08:00;True|2025-06-25T16:33:19.5628638+08:00;True|2025-06-25T16:28:13.3282882+08:00;True|2025-06-25T14:26:38.1487280+08:00;True|2025-06-25T14:23:03.3981021+08:00;True|2025-06-25T14:20:01.5127640+08:00;True|2025-06-25T14:12:47.4447383+08:00;True|2025-06-25T14:09:39.8493477+08:00;True|2025-06-25T14:04:07.9655837+08:00;False|2025-06-25T14:03:01.5528773+08:00;True|2025-06-24T14:39:55.5403167+08:00;True|2025-06-24T14:36:51.3363222+08:00;True|2025-06-24T14:33:34.6605389+08:00;True|2025-06-24T14:29:44.9508636+08:00;True|2025-06-24T14:24:49.4487525+08:00;True|2025-06-24T14:19:31.0243854+08:00;True|2025-06-24T14:15:42.8043990+08:00;True|2025-06-24T14:10:25.3126511+08:00;True|2025-06-24T14:01:11.7808866+08:00;True|2025-06-24T13:56:29.6124906+08:00;True|2025-06-24T13:42:27.5554459+08:00;True|2025-06-24T13:35:02.3147995+08:00;True|2025-06-24T13:31:15.2833438+08:00;True|2025-06-24T13:26:22.4759378+08:00;True|2025-06-24T13:22:58.0143749+08:00;False|2025-06-24T13:22:30.7295943+08:00;True|2025-06-24T13:20:08.9526835+08:00;True|2025-06-24T13:15:10.2719394+08:00;True|2025-06-20T15:38:22.6724181+08:00;True|2025-06-20T14:44:29.4284749+08:00;True|2025-06-20T14:34:29.3160274+08:00;True|2025-06-20T14:29:26.1084681+08:00;False|2025-06-20T14:28:47.7761889+08:00;True|2025-06-18T16:26:56.9181027+08:00;True|2025-06-18T16:22:48.3649541+08:00;True|2025-06-18T09:45:22.1840933+08:00;True|2025-06-18T09:38:27.4616553+08:00;True|2025-06-18T09:24:22.0260493+08:00;True|2025-06-18T08:58:42.0314631+08:00;True|2025-06-18T08:54:57.3762593+08:00;True|2025-06-18T08:52:30.6977045+08:00;True|2025-06-18T08:44:16.3868101+08:00;True|2025-06-18T08:38:06.2335478+08:00;False|2025-06-18T08:37:43.3356541+08:00;True|2025-06-18T08:32:29.9036211+08:00;True|2025-06-18T08:19:00.7253184+08:00;True|2025-06-18T08:14:01.8413793+08:00;True|2025-06-18T08:06:59.1976807+08:00;False|2025-06-18T08:06:29.3417533+08:00;True|2025-06-17T15:36:04.6217443+08:00;True|2025-06-17T15:31:43.3563632+08:00;True|2025-06-17T14:58:43.8735144+08:00;True|2025-06-17T14:39:01.2795873+08:00;True|2025-06-17T14:34:00.1695810+08:00;True|2025-06-17T14:30:54.8417757+08:00;False|2025-06-17T14:30:22.5535404+08:00;True|2025-06-17T14:26:29.1534249+08:00;True|2025-06-17T14:23:01.5750276+08:00;True|2025-06-17T14:13:44.7734613+08:00;True|2025-06-17T13:20:22.6676313+08:00;True|2025-06-17T12:45:59.6935151+08:00;True|2025-06-17T11:26:53.3105073+08:00;True|2025-06-17T11:21:58.4556792+08:00;True|2025-06-17T11:17:39.0062665+08:00;True|2025-06-17T11:14:12.1161810+08:00;True|2025-06-17T11:09:51.0123982+08:00;True|2025-06-17T11:03:35.4540889+08:00;True|2025-06-17T10:58:06.1870442+08:00;True|2025-06-17T10:47:25.6201207+08:00;True|2025-06-17T09:22:36.4275453+08:00;True|2025-06-17T09:15:44.1593969+08:00;True|2025-06-17T09:12:05.5473137+08:00;True|2025-06-17T09:08:48.4974735+08:00;True|2025-06-17T09:04:26.9345188+08:00;True|2025-06-17T09:03:36.0326872+08:00;True|2025-06-17T08:57:42.1551977+08:00;True|2025-06-17T08:53:55.5708883+08:00;True|2025-06-17T08:49:04.2922881+08:00;True|2025-06-17T08:41:04.9647614+08:00;True|2025-06-17T08:34:49.0188503+08:00;True|2025-06-17T08:29:57.4868889+08:00;True|2025-06-17T08:23:10.2489747+08:00;True|2025-06-17T08:17:38.8483538+08:00;False|2025-06-17T08:16:14.0757416+08:00;True|2025-06-13T15:52:22.7401602+08:00;False|2025-06-13T15:52:01.7388701+08:00;True|2025-06-13T15:35:05.4281004+08:00;True|2025-06-13T15:24:25.2717953+08:00;True|2025-06-13T15:13:54.7230551+08:00;True|2025-06-13T14:02:03.6551564+08:00;True|2025-06-13T11:18:18.1123581+08:00;True|2025-06-13T10:40:20.8774077+08:00;True|2025-06-13T10:36:36.1411085+08:00;False|2025-06-13T10:35:41.3893604+08:00;True|2025-06-13T10:32:13.4521145+08:00;True|2025-06-13T10:30:35.6640860+08:00;True|2025-06-03T10:51:41.3862145+08:00;False|2025-06-03T10:51:16.5345521+08:00;True|2025-05-30T20:09:32.5107276+08:00;False|2025-05-30T20:09:00.9663790+08:00;False|2025-05-30T17:15:54.5728888+08:00;True|2025-05-30T15:31:12.6393961+08:00;True|2025-05-30T14:59:23.7338679+08:00;True|2025-05-30T14:47:49.7374652+08:00;False|2025-05-30T14:46:56.5791293+08:00;True|2025-05-30T09:13:25.7216738+08:00;False|2025-05-30T09:12:56.3890721+08:00;True|2025-05-29T20:42:40.3409827+08:00;False|2025-05-29T20:42:06.9658631+08:00;True|2025-05-29T20:21:44.3234619+08:00;False|2025-05-29T20:21:05.8899839+08:00;True|2025-05-27T15:28:35.5206538+08:00;True|2025-05-27T14:10:48.2114238+08:00;True|2025-05-27T11:21:56.3013946+08:00;True|2025-05-27T11:12:39.5518701+08:00;True|2025-05-27T11:01:46.8317706+08:00;True|2025-05-27T10:58:06.6334127+08:00;True|2025-05-27T10:50:01.5656763+08:00;True|2025-05-27T09:32:10.3357581+08:00;False|2025-05-27T09:31:40.1660002+08:00;True|2025-05-22T19:13:07.9924074+08:00;True|2025-05-22T18:44:05.4014437+08:00;False|2025-05-22T18:43:42.8647214+08:00;True|2025-05-20T14:23:23.3914216+08:00;False|2025-05-20T14:22:55.1487818+08:00;True|2025-05-20T14:02:04.1738192+08:00;False|2025-05-20T14:01:35.3257179+08:00;True|2025-05-16T10:26:39.2771408+08:00;True|2025-05-16T09:56:14.9524606+08:00;True|2025-05-16T09:41:14.7986426+08:00;False|2025-05-16T09:40:49.7515669+08:00;True|2025-05-15T16:11:15.6104624+08:00;False|2025-05-15T16:10:29.3231781+08:00;True|2025-05-08T08:33:00.5573071+08:00;False|2025-05-08T08:32:20.5353159+08:00;True|2025-04-23T15:11:05.1490455+08:00;True|2025-04-23T14:22:24.5406543+08:00;False|2025-04-23T14:21:47.8685695+08:00;True|2025-04-18T13:54:27.4746888+08:00;False|2025-04-18T13:53:45.2296528+08:00;False|2025-04-18T13:53:29.7890054+08:00;False|2025-04-18T13:53:23.5770264+08:00;False|2025-04-18T13:53:18.0054565+08:00;True|2025-04-18T13:51:28.8449212+08:00;True|2025-04-18T13:24:50.1548645+08:00;True|2025-04-18T13:17:41.8781012+08:00;True|2025-04-18T13:07:11.4243777+08:00;True|2025-04-18T13:03:51.8972162+08:00;True|2025-04-18T12:59:24.3674835+08:00;True|2025-04-18T12:54:51.7546338+08:00;True|2025-04-18T12:51:54.3531129+08:00;False|2025-04-18T12:51:42.0198325+08:00;True|2025-04-18T09:11:06.5087174+08:00;False|2025-04-18T09:10:56.3178793+08:00;True|2025-04-17T11:20:10.9926709+08:00;True|2025-04-17T11:01:50.8902725+08:00;True|2025-04-17T10:53:40.1335186+08:00;True|2025-04-17T10:50:33.6109824+08:00;True|2025-04-17T10:31:35.1972930+08:00;True|2025-04-17T10:27:13.0718237+08:00;False|2025-04-17T10:27:05.4243104+08:00;True|2025-04-17T10:21:17.1039399+08:00;True|2025-04-17T10:17:30.5257362+08:00;True|2025-04-17T09:04:16.5959099+08:00;False|2025-04-17T09:04:08.5643163+08:00;True|2025-04-16T16:50:10.4001088+08:00;True|2025-04-16T16:37:30.0492166+08:00;False|2025-04-16T16:37:20.9070255+08:00;True|2025-04-15T14:55:05.4396103+08:00;True|2025-04-15T14:48:11.6729078+08:00;True|2025-04-15T14:18:53.0805178+08:00;True|2025-04-15T13:48:11.5252569+08:00;True|2025-04-15T13:37:14.4720847+08:00;True|2025-04-15T11:19:10.1766439+08:00;True|2025-04-15T11:16:15.9677953+08:00;True|2025-04-15T11:01:18.4337723+08:00;False|2025-04-15T11:01:06.9132978+08:00;True|2025-04-15T10:55:53.9650790+08:00;False|2025-04-15T10:55:45.2763971+08:00;True|2025-04-09T11:24:21.9466324+08:00;True|2025-04-09T11:14:25.0603792+08:00;True|2025-04-09T11:03:10.0252216+08:00;False|2025-04-09T11:03:01.0837419+08:00;True|2025-04-08T15:00:39.6673341+08:00;True|2025-04-08T14:55:20.5714659+08:00;True|2025-04-08T14:41:57.1855163+08:00;True|2025-04-08T13:31:03.4382266+08:00;True|2025-04-08T11:20:45.0300955+08:00;True|2025-04-08T10:59:59.6997668+08:00;False|2025-04-08T10:59:53.2827828+08:00;True|2025-04-08T10:48:17.4232977+08:00;False|2025-04-08T10:48:09.5363986+08:00;True|2025-04-03T13:53:30.6471699+08:00;False|2025-04-03T13:53:22.8762999+08:00;True|2025-04-02T12:47:31.3375226+08:00;False|2025-04-02T12:47:24.2095072+08:00;True|2025-04-01T16:29:52.7465502+08:00;False|2025-04-01T16:29:33.7844649+08:00;True|2025-03-28T16:22:29.8664470+08:00;True|2025-03-28T15:53:12.1106288+08:00;False|2025-03-28T15:53:01.4674242+08:00;True|2025-03-28T13:34:17.5506822+08:00;False|2025-03-28T13:34:09.5853308+08:00;True|2025-03-26T12:42:08.9630741+08:00;True|2025-03-26T12:40:07.7144561+08:00;True|2025-03-26T12:30:37.3503331+08:00;True|2025-03-26T12:26:47.5061658+08:00;True|2025-03-26T10:54:47.2556717+08:00;True|2025-03-26T10:49:59.7897145+08:00;True|2025-03-26T10:47:02.6195828+08:00;False|2025-03-26T10:46:54.9421244+08:00;True|2025-03-26T01:10:19.1227462+08:00;True|2025-03-26T01:00:04.3583740+08:00;True|2025-03-26T00:38:57.4757071+08:00;True|2025-03-26T00:28:24.9370188+08:00;True|2025-03-26T00:04:05.4507425+08:00;True|2025-03-25T23:06:56.2284828+08:00;False|2025-03-25T23:06:46.7023339+08:00;True|2025-03-25T22:57:08.3127897+08:00;False|2025-03-25T22:55:05.8028873+08:00;False|2025-03-25T22:54:51.2053101+08:00;False|2025-03-04T11:23:36.7757604+08:00;True|2025-02-12T14:05:06.1068587+08:00;False|2025-02-12T14:03:43.3961038+08:00;True|2025-01-18T09:42:50.3629397+08:00;True|2025-01-18T09:39:16.1773412+08:00;True|2025-01-17T11:15:39.4147082+08:00;False|2025-01-17T11:15:09.0033498+08:00;True|2025-01-14T10:20:31.1504093+08:00;False|2025-01-14T10:19:59.1429931+08:00;True|2025-01-10T16:29:54.8671377+08:00;False|2025-01-10T16:29:05.0650370+08:00;True|2025-01-04T14:30:56.5041884+08:00;True|2025-01-04T14:26:52.7448761+08:00;True|2025-01-04T14:23:27.9956967+08:00;True|2025-01-04T14:12:46.2410106+08:00;True|2025-01-04T14:09:33.1727375+08:00;True|2025-01-04T14:07:16.3373347+08:00;False|2025-01-04T14:06:33.4982458+08:00;True|2024-12-31T13:36:55.7394582+08:00;False|2024-12-31T13:35:58.6205647+08:00;True|2024-12-28T15:59:32.1394796+08:00;True|2024-12-28T13:48:20.4283118+08:00;True|2024-12-28T13:43:39.8159616+08:00;True|2024-12-28T13:23:58.4183285+08:00;True|2024-12-28T13:19:13.0583263+08:00;True|2024-12-28T13:12:03.2648502+08:00;True|2024-12-28T13:04:22.6803754+08:00;False|2024-12-28T13:03:56.5993252+08:00;True|2024-12-28T10:50:06.1597154+08:00;True|2024-12-28T10:27:58.7075320+08:00;False|2024-12-28T10:27:09.9450571+08:00;True|2024-12-24T10:52:25.3403292+08:00;False|2024-12-24T10:51:41.8017370+08:00;True|2024-12-23T15:45:21.7729300+08:00;True|2024-12-23T15:31:38.8549407+08:00;True|2024-12-23T15:20:26.2361671+08:00;True|2024-12-23T13:40:03.2774116+08:00;False|2024-12-23T13:39:39.8510770+08:00;True|2024-12-23T13:11:15.3232454+08:00;True|2024-12-23T13:05:43.3057458+08:00;True|2024-12-16T10:57:23.0694936+08:00;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
<!-- <History>True|2025-05-30T12:09:45.0529442Z;True|2025-05-30T20:00:10.4746636+08:00;True|2025-05-30T19:57:36.8909388+08:00;True|2025-05-30T19:54:23.3709863+08:00;True|2025-05-30T19:45:59.1224560+08:00;True|2025-05-30T16:11:23.1078874+08:00;True|2025-05-30T15:25:44.1369253+08:00;False|2025-05-30T15:22:59.6023666+08:00;True|2025-05-29T16:10:27.4758580+08:00;True|2025-05-29T15:52:51.1913782+08:00;True|2025-05-29T15:04:09.5789210+08:00;True|2025-05-29T15:02:08.3369006+08:00;True|2025-05-29T14:56:02.6701408+08:00;True|2025-05-29T14:53:01.2526336+08:00;True|2025-05-29T14:06:14.4134236+08:00;True|2025-05-29T10:41:57.8589729+08:00;False|2025-05-29T10:39:13.1065954+08:00;True|2025-05-28T20:49:52.1040536+08:00;True|2025-05-28T20:29:58.7610235+08:00;True|2025-05-28T18:15:25.8543366+08:00;True|2025-05-28T18:08:49.2159745+08:00;True|2025-05-28T16:42:11.4418993+08:00;True|2025-05-28T16:28:22.4271997+08:00;True|2025-05-28T15:04:01.9930101+08:00;True|2025-05-28T14:59:50.5569363+08:00;False|2025-05-28T14:56:53.2197560+08:00;True|2025-05-27T18:43:26.0645332+08:00;True|2025-05-27T18:39:48.9213232+08:00;True|2025-05-27T18:31:00.6833134+08:00;True|2025-05-27T18:14:59.2401391+08:00;True|2025-05-27T18:08:30.5462780+08:00;True|2025-05-27T10:38:24.2792089+08:00;True|2025-05-27T10:35:14.0648253+08:00;True|2025-05-27T09:16:15.6299226+08:00;True|2025-05-27T09:12:14.8112320+08:00;False|2025-05-27T09:10:17.1762667+08:00;True|2025-05-26T20:46:47.2266490+08:00;True|2025-05-26T20:11:25.6943227+08:00;True|2025-05-26T20:06:54.0567323+08:00;True|2025-05-26T20:02:04.0505311+08:00;True|2025-05-26T19:52:14.7038690+08:00;False|2025-05-26T19:46:38.1383433+08:00;True|2025-05-26T14:58:12.1359700+08:00;True|2025-05-26T14:54:29.9414372+08:00;True|2025-05-26T14:50:27.3163470+08:00;True|2025-05-26T14:44:56.5112541+08:00;False|2025-05-26T14:40:09.3953370+08:00;True|2025-05-26T14:25:54.4627693+08:00;False|2025-05-26T14:24:14.2496726+08:00;True|2025-05-22T15:38:35.3926523+08:00;True|2025-05-22T15:35:00.5689883+08:00;True|2025-05-22T14:42:49.5863941+08:00;True|2025-05-22T14:36:46.1020298+08:00;True|2025-05-22T14:32:53.2788353+08:00;True|2025-05-22T14:29:17.0533776+08:00;True|2025-05-22T14:24:40.1069304+08:00;False|2025-05-22T14:23:17.8312640+08:00;True|2025-05-21T15:28:11.4510589+08:00;True|2025-05-21T15:15:40.5460368+08:00;False|2025-05-21T15:12:30.3957240+08:00;True|2025-05-20T20:28:55.1865798+08:00;True|2025-05-20T20:15:51.1649682+08:00;True|2025-05-20T20:02:38.4286705+08:00;True|2025-05-20T19:56:10.5284769+08:00;True|2025-05-20T19:45:37.6791824+08:00;False|2025-05-20T19:42:43.1477567+08:00;True|2025-05-19T15:21:07.7633659+08:00;True|2025-05-19T15:18:18.7396942+08:00;True|2025-05-19T15:13:00.1330400+08:00;True|2025-05-19T14:49:49.2534084+08:00;True|2025-05-19T14:37:59.0451180+08:00;True|2025-05-19T14:33:11.8539600+08:00;True|2025-05-19T14:27:59.3745627+08:00;True|2025-05-19T14:18:26.3913082+08:00;True|2025-05-19T14:00:37.9360187+08:00;False|2025-05-19T13:58:41.7143238+08:00;True|2025-05-12T14:57:55.0385595+08:00;True|2025-05-12T13:06:26.8782755+08:00;True|2025-05-12T12:53:08.7545688+08:00;True|2025-05-12T12:27:23.2918738+08:00;True|2025-05-12T12:14:00.1464431+08:00;True|2025-05-12T11:30:29.5971323+08:00;True|2025-05-12T11:25:21.8905995+08:00;True|2025-05-12T11:19:11.3233309+08:00;True|2025-05-12T11:06:09.4136287+08:00;True|2025-05-12T10:10:42.1771130+08:00;True|2025-05-12T10:09:14.6246190+08:00;True|2025-05-12T08:44:01.0613625+08:00;False|2025-05-12T08:42:33.7100817+08:00;True|2025-05-09T09:52:01.5341669+08:00;True|2025-05-09T09:47:27.3989887+08:00;True|2025-05-09T09:42:36.2617901+08:00;False|2025-05-09T09:40:08.0947782+08:00;True|2025-05-08T16:00:29.8759120+08:00;True|2025-05-08T13:24:39.2927841+08:00;True|2025-05-08T13:14:18.5422608+08:00;True|2025-05-08T12:47:12.7136145+08:00;True|2025-05-08T12:41:36.1177461+08:00;True|2025-05-08T12:41:04.5029523+08:00;True|2025-05-08T12:32:03.0031025+08:00;True|2025-05-08T12:00:14.8603925+08:00;True|2025-05-08T11:23:29.4928832+08:00;True|2025-05-08T11:22:57.1560531+08:00;True|2025-05-08T11:16:10.4999105+08:00;False|2025-05-08T11:14:23.0464674+08:00;True|2025-05-07T13:31:07.7140287+08:00;False|2025-05-07T13:30:22.3469816+08:00;True|2025-05-06T13:31:16.7226626+08:00;True|2025-05-06T11:05:36.8250941+08:00;True|2025-05-06T10:25:27.0035953+08:00;True|2025-05-06T09:55:27.8816646+08:00;True|2025-05-06T09:48:24.2023114+08:00;True|2025-05-06T09:36:31.5646471+08:00;True|2025-05-06T09:31:22.0639528+08:00;False|2025-05-06T09:30:02.7830632+08:00;True|2025-04-30T15:20:59.1827605+08:00;True|2025-04-30T15:14:37.3331777+08:00;True|2025-04-30T13:14:51.3154029+08:00;True|2025-04-30T13:14:15.0963455+08:00;True|2025-04-30T13:10:13.3727222+08:00;False|2025-04-30T13:06:39.8843484+08:00;False|2025-04-30T13:05:01.8963304+08:00;True|2025-04-30T10:23:53.7061459+08:00;True|2025-04-30T10:18:28.2879871+08:00;True|2025-04-30T10:14:38.6366499+08:00;True|2025-04-30T10:02:44.3278308+08:00;True|2025-04-30T09:53:29.6346041+08:00;True|2025-04-30T09:45:29.5572300+08:00;True|2025-04-30T09:14:32.0665725+08:00;True|2025-04-30T09:07:25.5826394+08:00;True|2025-04-30T09:01:28.5360494+08:00;False|2025-04-30T08:59:36.4959754+08:00;True|2025-04-29T16:32:47.7145278+08:00;True|2025-04-29T15:41:44.7116258+08:00;True|2025-04-29T15:32:49.4490248+08:00;False|2025-04-29T15:25:51.5282600+08:00;False|2025-04-29T15:23:33.1022530+08:00;True|2025-04-29T14:39:42.0427387+08:00;True|2025-04-29T14:14:37.1424704+08:00;True|2025-04-29T13:53:06.8818046+08:00;True|2025-04-29T13:38:29.5948294+08:00;True|2025-04-29T08:50:02.3834885+08:00;True|2025-04-29T08:45:53.9723523+08:00;True|2025-04-29T08:41:10.0539041+08:00;True|2025-04-29T08:40:36.8094165+08:00;True|2025-04-29T08:36:14.3169515+08:00;True|2025-04-29T08:18:50.9294272+08:00;True|2025-04-29T08:13:21.0111785+08:00;True|2025-04-29T08:08:41.1470031+08:00;False|2025-04-29T08:08:00.8674071+08:00;True|2025-04-24T14:03:47.0390589+08:00;True|2025-04-24T13:08:57.8491077+08:00;True|2025-04-24T11:15:53.7224800+08:00;True|2025-04-24T11:12:55.2113887+08:00;False|2025-04-24T11:09:59.9499198+08:00;True|2025-04-21T16:51:11.0234671+08:00;False|2025-04-21T16:50:27.9924375+08:00;True|2025-04-21T16:28:02.4554241+08:00;True|2025-04-21T16:26:45.7389516+08:00;True|2025-04-21T16:17:59.3641418+08:00;True|2025-04-21T16:11:42.4953735+08:00;False|2025-04-21T16:10:57.0902986+08:00;False|2025-04-21T16:08:30.7814654+08:00;False|2025-04-21T16:06:31.1495468+08:00;False|2025-04-21T15:32:02.6951071+08:00;False|2025-04-21T15:31:03.0207208+08:00;False|2025-04-21T15:27:46.3232315+08:00;False|2025-04-21T15:26:04.3356811+08:00;False|2025-04-21T15:24:39.2075383+08:00;True|2025-04-03T13:53:30.6471699+08:00;False|2025-04-03T13:53:22.8762999+08:00;True|2025-04-02T12:47:31.3375226+08:00;False|2025-04-02T12:47:24.2095072+08:00;True|2025-04-01T16:29:52.7465502+08:00;False|2025-04-01T16:29:33.7844649+08:00;True|2025-03-28T16:22:29.8664470+08:00;True|2025-03-28T15:53:12.1106288+08:00;False|2025-03-28T15:53:01.4674242+08:00;True|2025-03-28T13:34:17.5506822+08:00;False|2025-03-28T13:34:09.5853308+08:00;True|2025-03-26T12:42:08.9630741+08:00;True|2025-03-26T12:40:07.7144561+08:00;True|2025-03-26T12:30:37.3503331+08:00;True|2025-03-26T12:26:47.5061658+08:00;True|2025-03-26T10:54:47.2556717+08:00;True|2025-03-26T10:49:59.7897145+08:00;True|2025-03-26T10:47:02.6195828+08:00;False|2025-03-26T10:46:54.9421244+08:00;True|2025-03-26T01:10:19.1227462+08:00;True|2025-03-26T01:00:04.3583740+08:00;True|2025-03-26T00:38:57.4757071+08:00;True|2025-03-26T00:28:24.9370188+08:00;True|2025-03-26T00:04:05.4507425+08:00;True|2025-03-25T23:06:56.2284828+08:00;False|2025-03-25T23:06:46.7023339+08:00;True|2025-03-25T22:57:08.3127897+08:00;False|2025-03-25T22:55:05.8028873+08:00;False|2025-03-25T22:54:51.2053101+08:00;False|2025-03-04T11:23:36.7757604+08:00;True|2025-02-12T14:05:06.1068587+08:00;False|2025-02-12T14:03:43.3961038+08:00;True|2025-01-18T09:42:50.3629397+08:00;True|2025-01-18T09:39:16.1773412+08:00;True|2025-01-17T11:15:39.4147082+08:00;False|2025-01-17T11:15:09.0033498+08:00;True|2025-01-14T10:20:31.1504093+08:00;False|2025-01-14T10:19:59.1429931+08:00;True|2025-01-10T16:29:54.8671377+08:00;False|2025-01-10T16:29:05.0650370+08:00;True|2025-01-04T14:30:56.5041884+08:00;True|2025-01-04T14:26:52.7448761+08:00;True|2025-01-04T14:23:27.9956967+08:00;True|2025-01-04T14:12:46.2410106+08:00;True|2025-01-04T14:09:33.1727375+08:00;True|2025-01-04T14:07:16.3373347+08:00;False|2025-01-04T14:06:33.4982458+08:00;True|2024-12-31T13:36:55.7394582+08:00;False|2024-12-31T13:35:58.6205647+08:00;True|2024-12-28T15:59:32.1394796+08:00;True|2024-12-28T13:48:20.4283118+08:00;True|2024-12-28T13:43:39.8159616+08:00;True|2024-12-28T13:23:58.4183285+08:00;True|2024-12-28T13:19:13.0583263+08:00;True|2024-12-28T13:12:03.2648502+08:00;True|2024-12-28T13:04:22.6803754+08:00;False|2024-12-28T13:03:56.5993252+08:00;True|2024-12-28T10:50:06.1597154+08:00;True|2024-12-28T10:27:58.7075320+08:00;False|2024-12-28T10:27:09.9450571+08:00;True|2024-12-24T10:52:25.3403292+08:00;False|2024-12-24T10:51:41.8017370+08:00;True|2024-12-23T15:45:21.7729300+08:00;True|2024-12-23T15:31:38.8549407+08:00;True|2024-12-23T15:20:26.2361671+08:00;True|2024-12-23T13:40:03.2774116+08:00;False|2024-12-23T13:39:39.8510770+08:00;True|2024-12-23T13:11:15.3232454+08:00;True|2024-12-23T13:05:43.3057458+08:00;True|2024-12-16T10:57:23.0694936+08:00;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History> -->
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
</PropertyGroup>
@@ -51,28 +51,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>11/07/2025 16:34:21</publishTime>
+ <publishTime>12/01/2025 15:11:01</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>11/07/2025 16:34:21</publishTime>
+ <publishTime>12/01/2025 15:11:01</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>11/07/2025 16:34:20</publishTime>
+ <publishTime>12/01/2025 15:10:59</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>11/07/2025 16:34:20</publishTime>
+ <publishTime>12/01/2025 15:10:59</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>11/07/2025 16:34:15</publishTime>
+ <publishTime>12/01/2025 15:10:55</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>11/07/2025 16:34:15</publishTime>
+ <publishTime>12/01/2025 15:10:55</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -118,10 +118,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>11/07/2025 16:34:16</publishTime>
+ <publishTime>12/01/2025 15:10:56</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>11/07/2025 16:34:16</publishTime>
+ <publishTime>12/01/2025 15:10:56</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/06/2023 15:57:02</publishTime>
@@ -154,34 +154,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>11/07/2025 16:34:13</publishTime>
+ <publishTime>12/01/2025 15:10:52</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>11/07/2025 16:34:13</publishTime>
+ <publishTime>12/01/2025 15:10:52</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>11/07/2025 16:34:14</publishTime>
+ <publishTime>12/01/2025 15:10:53</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>11/07/2025 16:34:14</publishTime>
+ <publishTime>12/01/2025 15:10:53</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>11/07/2025 16:34:14</publishTime>
+ <publishTime>12/01/2025 15:10:54</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>11/07/2025 16:34:14</publishTime>
+ <publishTime>12/01/2025 15:10:54</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>11/07/2025 16:34:10</publishTime>
+ <publishTime>12/01/2025 15:10:51</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>11/07/2025 16:34:10</publishTime>
+ <publishTime>12/01/2025 15:10:51</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -292,22 +292,22 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>11/07/2025 16:34:15</publishTime>
+ <publishTime>12/01/2025 15:10:53</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>11/07/2025 16:34:15</publishTime>
+ <publishTime>12/01/2025 15:10:53</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>11/07/2025 16:34:32</publishTime>
+ <publishTime>12/01/2025 15:11:10</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>11/07/2025 16:34:32</publishTime>
+ <publishTime>12/01/2025 15:11:10</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>11/07/2025 16:34:36</publishTime>
+ <publishTime>12/01/2025 15:11:14</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -505,7 +505,7 @@
<publishTime>05/06/2024 13:47:57</publishTime>
</File>
<File Include="Web.config">
- <publishTime>11/07/2025 16:34:42</publishTime>
+ <publishTime>12/01/2025 15:20:43</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml.user
index 95dfd4b..1151162 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml.user
@@ -4,12 +4,17 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
+<<<<<<< HEAD
<_PublishTargetUrl>D:\gz\缃戠珯鍙戝竷\MES-WEB-API</_PublishTargetUrl>
- <History>True|2025-11-26T00:17:26.0542037Z;False|2025-11-26T08:17:21.0094689+08:00;True|2025-11-25T16:08:56.9678959+08:00;True|2025-11-25T15:46:01.1567757+08:00;True|2025-11-25T15:40:57.2093513+08:00;True|2025-11-25T15:40:52.1981381+08:00;True|2025-11-25T15:40:10.9831365+08:00;True|2025-11-25T15:37:47.6041135+08:00;True|2025-11-25T14:56:39.2692143+08:00;True|2025-11-25T14:47:46.7382144+08:00;True|2025-11-25T14:37:56.4543437+08:00;True|2025-11-25T14:26:35.4950277+08:00;True|2025-11-25T14:19:46.8024652+08:00;True|2025-11-25T14:06:07.3386431+08:00;False|2025-11-25T14:05:55.0762072+08:00;True|2025-11-24T16:25:40.5924284+08:00;True|2025-11-24T16:25:36.2813598+08:00;True|2025-11-24T16:14:30.2878654+08:00;True|2025-11-24T16:03:25.8027841+08:00;True|2025-11-24T15:43:48.3169669+08:00;True|2025-11-24T15:06:43.4834120+08:00;False|2025-11-24T15:06:37.8868519+08:00;True|2025-11-21T10:52:06.9288486+08:00;False|2025-11-21T10:51:46.7867333+08:00;True|2025-11-12T10:53:06.6815915+08:00;</History>
+ <History>False|2025-11-28T05:59:04.9171053Z;False|2025-11-28T13:58:54.8610002+08:00;False|2025-11-28T13:58:51.8059090+08:00;False|2025-11-28T13:58:48.9118327+08:00;True|2025-11-26T08:17:26.0542037+08:00;False|2025-11-26T08:17:21.0094689+08:00;True|2025-11-25T16:08:56.9678959+08:00;True|2025-11-25T15:46:01.1567757+08:00;True|2025-11-25T15:40:57.2093513+08:00;True|2025-11-25T15:40:52.1981381+08:00;True|2025-11-25T15:40:10.9831365+08:00;True|2025-11-25T15:37:47.6041135+08:00;True|2025-11-25T14:56:39.2692143+08:00;True|2025-11-25T14:47:46.7382144+08:00;True|2025-11-25T14:37:56.4543437+08:00;True|2025-11-25T14:26:35.4950277+08:00;True|2025-11-25T14:19:46.8024652+08:00;True|2025-11-25T14:06:07.3386431+08:00;False|2025-11-25T14:05:55.0762072+08:00;True|2025-11-24T16:25:40.5924284+08:00;True|2025-11-24T16:25:36.2813598+08:00;True|2025-11-24T16:14:30.2878654+08:00;True|2025-11-24T16:03:25.8027841+08:00;True|2025-11-24T15:43:48.3169669+08:00;True|2025-11-24T15:06:43.4834120+08:00;False|2025-11-24T15:06:37.8868519+08:00;True|2025-11-21T10:52:06.9288486+08:00;False|2025-11-21T10:51:46.7867333+08:00;True|2025-11-12T10:53:06.6815915+08:00;</History>
+=======
+ <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
+ <History>True|2025-12-01T03:56:35.8710305Z;True|2025-12-01T11:51:32.4665294+08:00;True|2025-12-01T11:06:02.7468456+08:00;False|2025-12-01T11:04:57.6926682+08:00;True|2025-11-30T16:03:44.3971182+08:00;False|2025-11-30T16:03:19.8504844+08:00;True|2025-11-26T18:01:50.7863694+08:00;</History>
+>>>>>>> 3758c91a8f9b3ca8409da3a8fa5330d52e237a0f
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>11/12/2025 10:43:48</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="bin/AlibabaCloud.EndpointUtil.dll">
<publishTime>04/07/2020 16:33:48</publishTime>
@@ -45,28 +50,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>11/26/2025 08:16:32</publishTime>
+ <publishTime>11/26/2025 18:01:41</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>11/26/2025 08:16:32</publishTime>
+ <publishTime>11/26/2025 18:01:41</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>11/26/2025 08:16:31</publishTime>
+ <publishTime>11/26/2025 18:01:38</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>11/26/2025 08:16:31</publishTime>
+ <publishTime>11/26/2025 18:01:38</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>11/26/2025 08:16:29</publishTime>
+ <publishTime>11/26/2025 18:01:35</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>11/26/2025 08:16:29</publishTime>
+ <publishTime>11/26/2025 18:01:35</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -93,7 +98,7 @@
<publishTime>05/09/2021 01:08:30</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="bin/libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -111,13 +116,13 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>11/26/2025 08:16:29</publishTime>
+ <publishTime>11/26/2025 18:01:37</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>11/26/2025 08:16:29</publishTime>
+ <publishTime>11/26/2025 18:01:37</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>03/08/2023 15:09:56</publishTime>
@@ -147,34 +152,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>11/26/2025 08:16:27</publishTime>
+ <publishTime>11/26/2025 18:01:32</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>11/26/2025 08:16:27</publishTime>
+ <publishTime>11/26/2025 18:01:32</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>11/26/2025 08:16:28</publishTime>
+ <publishTime>11/26/2025 18:01:33</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>11/26/2025 08:16:28</publishTime>
+ <publishTime>11/26/2025 18:01:33</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>11/26/2025 08:16:28</publishTime>
+ <publishTime>11/26/2025 18:01:33</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>11/26/2025 08:16:28</publishTime>
+ <publishTime>11/26/2025 18:01:33</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>11/26/2025 08:16:26</publishTime>
+ <publishTime>11/25/2025 16:59:09</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>11/26/2025 08:16:26</publishTime>
+ <publishTime>11/25/2025 16:59:09</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -252,7 +257,7 @@
<publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 12:02:18</publishTime>
@@ -285,22 +290,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>11/26/2025 08:16:28</publishTime>
+ <publishTime>11/25/2025 16:59:12</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>11/26/2025 08:16:28</publishTime>
+ <publishTime>11/25/2025 16:59:12</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>11/26/2025 08:16:37</publishTime>
+ <publishTime>12/01/2025 11:56:33</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>11/26/2025 08:16:37</publishTime>
- </File>
- <File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>11/26/2025 08:16:40</publishTime>
+ <publishTime>12/01/2025 11:56:33</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -312,58 +314,58 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>11/12/2025 10:43:48</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>11/12/2025 10:43:48</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>11/12/2025 10:43:48</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>11/12/2025 10:43:48</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
<publishTime>03/22/2022 13:17:22</publishTime>
@@ -372,7 +374,7 @@
<publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -381,121 +383,121 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="libman.json">
- <publishTime>11/12/2025 10:43:48</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="packages.config">
- <publishTime>11/12/2025 10:43:48</publishTime>
+ <publishTime>10/13/2025 14:50:13</publishTime>
</File>
<File Include="Template/barCodeTemplateStorage.json">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>09/05/2025 16:16:48</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web.config">
- <publishTime>11/26/2025 08:17:25</publishTime>
+ <publishTime>11/26/2025 18:01:48</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml
new file mode 100644
index 0000000..a21a6fd
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile17.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\缃戠珯鍙戝竷\MES-WEB-API</PublishUrl>
+ <WebPublishMethod>FileSystem</WebPublishMethod>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user
new file mode 100644
index 0000000..99e73f5
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user
@@ -0,0 +1,501 @@
+锘�<?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>
+ <_PublishTargetUrl>D:\gz\缃戠珯鍙戝竷\MES-WEB-API</_PublishTargetUrl>
+ <History>True|2025-12-01T03:30:09.3809914Z;True|2025-12-01T11:19:30.5598558+08:00;True|2025-12-01T11:15:45.0580785+08:00;True|2025-12-01T11:15:36.3372463+08:00;True|2025-12-01T08:41:58.9342211+08:00;True|2025-12-01T08:34:40.5643002+08:00;False|2025-12-01T08:34:34.1712047+08:00;True|2025-11-28T16:56:46.9372466+08:00;False|2025-11-28T16:54:57.8126796+08:00;False|2025-11-28T16:54:34.3567917+08:00;False|2025-11-28T16:54:22.5875981+08:00;False|2025-11-28T16:54:18.8357708+08:00;True|2025-11-28T16:09:19.7706533+08:00;True|2025-11-28T15:27:38.7722530+08:00;True|2025-11-28T15:16:20.5824019+08:00;True|2025-11-28T15:01:37.0768917+08:00;True|2025-11-28T14:09:57.0103401+08:00;True|2025-11-28T14:00:30.4339573+08:00;True|2025-11-28T14:00:24.1489586+08:00;</History>
+ </PropertyGroup>
+ <ItemGroup>
+ <File Include="apiapp.json">
+ <publishTime>11/12/2025 10:43:48</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.EndpointUtil.dll">
+ <publishTime>04/07/2020 16:33:48</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
+ <publishTime>04/25/2023 17:49:04</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.GatewaySpi.dll">
+ <publishTime>07/31/2024 20:50:30</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.OpenApiClient.dll">
+ <publishTime>08/06/2024 18:07:52</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.OpenApiUtil.dll">
+ <publishTime>11/22/2022 11:24:18</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
+ <publishTime>08/08/2024 19:43:22</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.TeaUtil.dll">
+ <publishTime>07/15/2024 20:25:56</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.TeaXML.dll">
+ <publishTime>08/03/2022 21:46:08</publishTime>
+ </File>
+ <File Include="bin/Aliyun.Credentials.dll">
+ <publishTime>07/24/2024 10:36:58</publishTime>
+ </File>
+ <File Include="bin/Antlr3.Runtime.dll">
+ <publishTime>02/22/2013 16:43:40</publishTime>
+ </File>
+ <File Include="bin/Antlr3.Runtime.pdb">
+ <publishTime>02/22/2013 16:43:40</publishTime>
+ </File>
+ <File Include="bin/BLL.dll">
+ <publishTime>12/01/2025 11:29:56</publishTime>
+ </File>
+ <File Include="bin/BLL.pdb">
+ <publishTime>12/01/2025 11:29:56</publishTime>
+ </File>
+ <File Include="bin/BouncyCastle.Crypto.dll">
+ <publishTime>12/18/2020 05:32:28</publishTime>
+ </File>
+ <File Include="bin/DAL.dll">
+ <publishTime>12/01/2025 11:29:55</publishTime>
+ </File>
+ <File Include="bin/DAL.pdb">
+ <publishTime>12/01/2025 11:29:55</publishTime>
+ </File>
+ <File Include="bin/Dapper.dll">
+ <publishTime>07/22/2016 22:52:40</publishTime>
+ </File>
+ <File Include="bin/DBUtility.dll">
+ <publishTime>12/01/2025 11:29:53</publishTime>
+ </File>
+ <File Include="bin/DBUtility.pdb">
+ <publishTime>12/01/2025 11:29:53</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.Api.dll">
+ <publishTime>03/22/2022 13:17:26</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.Api.pdb">
+ <publishTime>03/19/2022 07:39:42</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.dll">
+ <publishTime>03/22/2022 13:17:20</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.pdb">
+ <publishTime>03/19/2022 07:39:48</publishTime>
+ </File>
+ <File Include="bin/grpc_csharp_ext.x64.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="bin/grpc_csharp_ext.x86.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="bin/ICSharpCode.SharpZipLib.dll">
+ <publishTime>05/09/2021 01:08:30</publishTime>
+ </File>
+ <File Include="bin/ICSharpCode.SharpZipLib.pdb">
+ <publishTime>05/09/2021 01:08:30</publishTime>
+ </File>
+ <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="bin/libgrpc_csharp_ext.x64.dylib">
+ <publishTime>03/19/2022 07:38:44</publishTime>
+ </File>
+ <File Include="bin/libgrpc_csharp_ext.x64.so">
+ <publishTime>03/19/2022 07:38:42</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
+ <publishTime>03/19/2015 01:02:50</publishTime>
+ </File>
+ <File Include="bin/Microsoft.CSharp.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Web.Infrastructure.dll">
+ <publishTime>07/25/2012 19:48:56</publishTime>
+ </File>
+ <File Include="bin/Model.dll">
+ <publishTime>12/01/2025 11:29:53</publishTime>
+ </File>
+ <File Include="bin/Model.pdb">
+ <publishTime>12/01/2025 11:29:53</publishTime>
+ </File>
+ <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="bin/Newtonsoft.Json.dll">
+ <publishTime>03/08/2023 15:09:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.dll">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OOXML.dll">
+ <publishTime>10/23/2021 09:07:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.OOXML.pdb">
+ <publishTime>10/23/2021 17:07:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXml4Net.dll">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXml4Net.pdb">
+ <publishTime>10/23/2021 17:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXmlFormats.dll">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXmlFormats.pdb">
+ <publishTime>10/23/2021 17:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.pdb">
+ <publishTime>10/23/2021 17:07:54</publishTime>
+ </File>
+ <File Include="bin/Pub_Class.dll">
+ <publishTime>12/01/2025 11:29:51</publishTime>
+ </File>
+ <File Include="bin/Pub_Class.pdb">
+ <publishTime>12/01/2025 11:29:51</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.dll">
+ <publishTime>12/01/2025 11:29:52</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.pdb">
+ <publishTime>12/01/2025 11:29:52</publishTime>
+ </File>
+ <File Include="bin/RestSharp.dll">
+ <publishTime>08/31/2012 06:22:50</publishTime>
+ </File>
+ <File Include="bin/SQLHelper.dll">
+ <publishTime>12/01/2025 11:29:52</publishTime>
+ </File>
+ <File Include="bin/SQLHelper.pdb">
+ <publishTime>12/01/2025 11:29:52</publishTime>
+ </File>
+ <File Include="bin/Swashbuckle.Core.dll">
+ <publishTime>02/16/2015 01:57:08</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.dll">
+ <publishTime>12/01/2025 11:29:51</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.pdb">
+ <publishTime>12/01/2025 11:29:51</publishTime>
+ </File>
+ <File Include="bin/System.Buffers.dll">
+ <publishTime>07/19/2017 18:01:28</publishTime>
+ </File>
+ <File Include="bin/System.ComponentModel.DataAnnotations.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Configuration.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Data.DataSetExtensions.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Data.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Drawing.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.EnterpriseServices.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
+ <publishTime>08/19/2014 18:03:34</publishTime>
+ </File>
+ <File Include="bin/System.Memory.dll">
+ <publishTime>04/18/2019 00:24:34</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Extensions.dll">
+ <publishTime>02/20/2015 04:10:46</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Formatting.dll">
+ <publishTime>11/28/2018 21:00:36</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Primitives.dll">
+ <publishTime>02/20/2015 04:10:46</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
+ <publishTime>09/19/2018 03:38:10</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.Serialization.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.ApplicationServices.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Cors.dll">
+ <publishTime>11/28/2018 20:58:44</publishTime>
+ </File>
+ <File Include="bin/System.Web.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.DynamicData.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Entity.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Extensions.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Helpers.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.Cors.dll">
+ <publishTime>11/28/2018 21:01:26</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.dll">
+ <publishTime>11/28/2018 21:01:00</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.WebHost.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="bin/System.Web.Mvc.dll">
+ <publishTime>01/28/2015 12:02:18</publishTime>
+ </File>
+ <File Include="bin/System.Web.Optimization.dll">
+ <publishTime>02/11/2014 23:26:04</publishTime>
+ </File>
+ <File Include="bin/System.Web.Razor.dll">
+ <publishTime>01/28/2015 12:02:32</publishTime>
+ </File>
+ <File Include="bin/System.Web.Services.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.Deployment.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.Razor.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Xml.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Xml.Linq.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/Tea.dll">
+ <publishTime>05/09/2023 10:43:40</publishTime>
+ </File>
+ <File Include="bin/TopSdk.dll">
+ <publishTime>12/01/2025 11:29:53</publishTime>
+ </File>
+ <File Include="bin/TopSdk.pdb">
+ <publishTime>12/01/2025 11:29:53</publishTime>
+ </File>
+ <File Include="bin/WebActivatorEx.dll">
+ <publishTime>11/24/2014 19:18:48</publishTime>
+ </File>
+ <File Include="bin/WebAPI.dll">
+ <publishTime>12/01/2025 11:30:00</publishTime>
+ </File>
+ <File Include="bin/WebAPI.pdb">
+ <publishTime>12/01/2025 11:30:00</publishTime>
+ </File>
+ <File Include="bin/WebAPI.XmlSerializers.dll">
+ <publishTime>12/01/2025 11:30:03</publishTime>
+ </File>
+ <File Include="bin/WebGrease.dll">
+ <publishTime>07/18/2013 01:03:52</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
+ <publishTime>11/29/2018 21:26:02</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
+ <publishTime>11/29/2018 21:26:30</publishTime>
+ </File>
+ <File Include="Config/kdapi.config">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Content/bootstrap.css">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Content/bootstrap.min.css">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Content/Site.css">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/BLL.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/DAL.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/DBUtility.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/Model.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/Newtonsoft.Json.Net35.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/Pub_Class.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/Pub_Control.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/SQLHelper.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.eot">
+ <publishTime>11/12/2025 10:43:48</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.svg">
+ <publishTime>11/12/2025 10:43:48</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.ttf">
+ <publishTime>11/12/2025 10:43:48</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.woff">
+ <publishTime>11/12/2025 10:43:48</publishTime>
+ </File>
+ <File Include="Global.asax">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="grpc_csharp_ext.x64.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="grpc_csharp_ext.x86.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="Index.html">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="libgrpc_csharp_ext.x64.dylib">
+ <publishTime>03/19/2022 07:38:44</publishTime>
+ </File>
+ <File Include="libgrpc_csharp_ext.x64.so">
+ <publishTime>03/19/2022 07:38:42</publishTime>
+ </File>
+ <File Include="libman.json">
+ <publishTime>11/12/2025 10:43:48</publishTime>
+ </File>
+ <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="packages.config">
+ <publishTime>11/12/2025 10:43:48</publishTime>
+ </File>
+ <File Include="Template/barCodeTemplateStorage.json">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/bootstrap.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/bootstrap.min.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.min.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.min.map">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.min.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/modernizr-2.6.2.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Shared/Error.cshtml">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Shared/_Layout.cshtml">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/web.config">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/_ViewStart.cshtml">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web.config">
+ <publishTime>12/01/2025 11:30:08</publishTime>
+ </File>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml
index 86e2fec..46e2048 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml
@@ -7,7 +7,7 @@
<DeleteExistingFiles>true</DeleteExistingFiles>
<ExcludeApp_Data>False</ExcludeApp_Data>
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
- <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+ <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
<PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</PublishUrl>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user
index a5e7253..930db18 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user
@@ -5,11 +5,11 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2025-02-12T06:57:08.1380239Z;True|2025-02-12T14:47:58.0901509+08:00;True|2025-02-12T14:15:10.5288654+08:00;True|2025-02-12T14:12:22.5382196+08:00;True|2025-02-12T14:07:11.7831540+08:00;True|2024-11-29T13:29:48.1554947+08:00;</History>
+ <History>True|2025-12-03T09:12:24.4237446Z;True|2025-12-03T16:54:15.1801517+08:00;False|2025-12-03T16:53:42.7976484+08:00;True|2025-12-03T12:26:32.8151086+08:00;True|2025-12-03T10:22:12.3177261+08:00;False|2025-12-03T10:21:38.7919750+08:00;True|2025-12-03T10:18:00.9077028+08:00;True|2025-12-03T10:02:30.4022692+08:00;False|2025-12-03T09:58:15.6880929+08:00;True|2025-12-02T20:20:19.5577161+08:00;True|2025-12-02T19:59:44.5694165+08:00;True|2025-12-02T18:53:53.4696294+08:00;True|2025-12-02T12:31:02.0786003+08:00;False|2025-12-02T12:30:35.5116200+08:00;True|2025-12-02T09:16:07.2877709+08:00;True|2025-02-12T14:57:08.1380239+08:00;True|2025-02-12T14:47:58.0901509+08:00;True|2025-02-12T14:15:10.5288654+08:00;True|2025-02-12T14:12:22.5382196+08:00;True|2025-02-12T14:07:11.7831540+08:00;True|2024-11-29T13:29:48.1554947+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</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>02/12/2025 14:04:56</publishTime>
+ <publishTime>12/02/2025 12:30:53</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>02/12/2025 14:04:56</publishTime>
+ <publishTime>12/02/2025 12:30:53</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>02/12/2025 14:04:53</publishTime>
+ <publishTime>12/02/2025 12:30:50</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>02/12/2025 14:04:53</publishTime>
+ <publishTime>12/02/2025 12:30:50</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>02/12/2025 14:04:51</publishTime>
+ <publishTime>12/02/2025 09:14:57</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>02/12/2025 14:04:51</publishTime>
+ <publishTime>12/02/2025 09:14:57</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>02/08/2023 09:47:46</publishTime>
+ <publishTime>05/23/2025 10:00:25</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>02/12/2025 14:04:51</publishTime>
+ <publishTime>12/02/2025 12:30:47</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>02/12/2025 14:04:51</publishTime>
+ <publishTime>12/02/2025 12:30:47</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</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>02/12/2025 14:04:49</publishTime>
+ <publishTime>12/02/2025 09:14:46</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>02/12/2025 14:04:49</publishTime>
+ <publishTime>12/02/2025 09:14:46</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>02/12/2025 14:04:50</publishTime>
+ <publishTime>12/02/2025 09:14:50</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>02/12/2025 14:04:50</publishTime>
+ <publishTime>12/02/2025 09:14:50</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>02/12/2025 14:04:50</publishTime>
+ <publishTime>12/02/2025 09:14:51</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>02/12/2025 14:04:50</publishTime>
+ <publishTime>12/02/2025 09:14:51</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>02/12/2025 14:04:48</publishTime>
+ <publishTime>12/02/2025 09:06:48</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>02/12/2025 14:04:48</publishTime>
+ <publishTime>12/02/2025 09:06:48</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>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 12:02:18</publishTime>
@@ -285,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>02/12/2025 14:04:50</publishTime>
+ <publishTime>12/02/2025 09:07:14</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>02/12/2025 14:04:50</publishTime>
+ <publishTime>12/02/2025 09:07:14</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>02/12/2025 14:57:02</publishTime>
+ <publishTime>12/03/2025 17:12:23</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>02/12/2025 14:57:02</publishTime>
+ <publishTime>12/03/2025 17:12:23</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>02/12/2025 14:57:06</publishTime>
@@ -312,58 +312,58 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>08/15/2022 15:46:13</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>02/08/2023 09:47:46</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</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>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -381,118 +381,124 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="libman.json">
- <publishTime>07/18/2023 17:26:29</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="packages.config">
- <publishTime>09/19/2024 08:47:56</publishTime>
+ <publishTime>10/13/2025 14:50:13</publishTime>
+ </File>
+ <File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
+ <publishTime>11/25/2025 17:22:05</publishTime>
+ </File>
+ <File Include="Template/barCodeTemplateStorage.json">
+ <publishTime>09/05/2025 16:16:48</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>03/31/2023 09:57:09</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web.config">
- <publishTime>02/12/2025 14:07:07</publishTime>
+ <publishTime>12/02/2025 09:16:00</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/YsjPath.pubxml b/WebAPI/Properties/PublishProfiles/YsjPath.pubxml
new file mode 100644
index 0000000..6ac6bff
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/YsjPath.pubxml
@@ -0,0 +1,17 @@
+锘�<?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>True</DeleteExistingFiles>
+ <ExcludeApp_Data>False</ExcludeApp_Data>
+ <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+ <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
+ <LastUsedPlatform>x86</LastUsedPlatform>
+ <PublishProvider>FileSystem</PublishProvider>
+ <PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</PublishUrl>
+ <WebPublishMethod>FileSystem</WebPublishMethod>
+ <SiteUrlToLaunchAfterPublish />
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/YsjPath.pubxml.user b/WebAPI/Properties/PublishProfiles/YsjPath.pubxml.user
new file mode 100644
index 0000000..e4d0401
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/YsjPath.pubxml.user
@@ -0,0 +1,498 @@
+锘�<?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>
+ <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
+ <History>True|2025-12-01T11:22:21.9416380Z;False|2025-12-01T19:22:14.0582794+08:00;True|2025-12-01T17:38:22.0847469+08:00;</History>
+ </PropertyGroup>
+ <ItemGroup>
+ <File Include="apiapp.json">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.EndpointUtil.dll">
+ <publishTime>04/07/2020 08:33:48</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
+ <publishTime>04/25/2023 09:49:04</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.GatewaySpi.dll">
+ <publishTime>07/31/2024 12:50:30</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.OpenApiClient.dll">
+ <publishTime>08/06/2024 10:07:52</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.OpenApiUtil.dll">
+ <publishTime>11/22/2022 03:24:18</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
+ <publishTime>08/08/2024 11:43:22</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.TeaUtil.dll">
+ <publishTime>07/15/2024 12:25:56</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.TeaXML.dll">
+ <publishTime>08/03/2022 13:46:08</publishTime>
+ </File>
+ <File Include="bin/Aliyun.Credentials.dll">
+ <publishTime>07/24/2024 02:36:58</publishTime>
+ </File>
+ <File Include="bin/Antlr3.Runtime.dll">
+ <publishTime>02/22/2013 08:43:40</publishTime>
+ </File>
+ <File Include="bin/Antlr3.Runtime.pdb">
+ <publishTime>02/22/2013 08:43:40</publishTime>
+ </File>
+ <File Include="bin/BLL.dll">
+ <publishTime>12/01/2025 19:21:09</publishTime>
+ </File>
+ <File Include="bin/BLL.pdb">
+ <publishTime>12/01/2025 19:21:09</publishTime>
+ </File>
+ <File Include="bin/BouncyCastle.Crypto.dll">
+ <publishTime>12/17/2020 21:32:28</publishTime>
+ </File>
+ <File Include="bin/DAL.dll">
+ <publishTime>12/01/2025 19:21:08</publishTime>
+ </File>
+ <File Include="bin/DAL.pdb">
+ <publishTime>12/01/2025 19:21:08</publishTime>
+ </File>
+ <File Include="bin/Dapper.dll">
+ <publishTime>07/22/2016 14:52:40</publishTime>
+ </File>
+ <File Include="bin/DBUtility.dll">
+ <publishTime>12/01/2025 19:21:06</publishTime>
+ </File>
+ <File Include="bin/DBUtility.pdb">
+ <publishTime>12/01/2025 19:21:06</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.Api.dll">
+ <publishTime>03/22/2022 05:17:26</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.Api.pdb">
+ <publishTime>03/18/2022 23:39:42</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.dll">
+ <publishTime>03/22/2022 05:17:20</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.pdb">
+ <publishTime>03/18/2022 23:39:48</publishTime>
+ </File>
+ <File Include="bin/grpc_csharp_ext.x64.dll">
+ <publishTime>03/22/2022 05:17:22</publishTime>
+ </File>
+ <File Include="bin/grpc_csharp_ext.x86.dll">
+ <publishTime>03/22/2022 05:17:22</publishTime>
+ </File>
+ <File Include="bin/ICSharpCode.SharpZipLib.dll">
+ <publishTime>05/08/2021 17:08:30</publishTime>
+ </File>
+ <File Include="bin/ICSharpCode.SharpZipLib.pdb">
+ <publishTime>05/08/2021 17:08:30</publishTime>
+ </File>
+ <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
+ <publishTime>02/08/2023 09:18:13</publishTime>
+ </File>
+ <File Include="bin/libgrpc_csharp_ext.x64.dylib">
+ <publishTime>03/18/2022 23:38:44</publishTime>
+ </File>
+ <File Include="bin/libgrpc_csharp_ext.x64.so">
+ <publishTime>03/18/2022 23:38:42</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
+ <publishTime>03/18/2015 17:02:50</publishTime>
+ </File>
+ <File Include="bin/Microsoft.CSharp.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Web.Infrastructure.dll">
+ <publishTime>07/25/2012 11:48:56</publishTime>
+ </File>
+ <File Include="bin/Model.dll">
+ <publishTime>12/01/2025 19:21:06</publishTime>
+ </File>
+ <File Include="bin/Model.pdb">
+ <publishTime>12/01/2025 19:21:06</publishTime>
+ </File>
+ <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
+ <publishTime>09/05/2022 17:03:10</publishTime>
+ </File>
+ <File Include="bin/Newtonsoft.Json.dll">
+ <publishTime>03/08/2023 07:09:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.dll">
+ <publishTime>10/23/2021 01:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OOXML.dll">
+ <publishTime>10/23/2021 01:07:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.OOXML.pdb">
+ <publishTime>10/23/2021 09:07:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXml4Net.dll">
+ <publishTime>10/23/2021 01:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXml4Net.pdb">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXmlFormats.dll">
+ <publishTime>10/23/2021 01:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXmlFormats.pdb">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.pdb">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/Pub_Class.dll">
+ <publishTime>12/01/2025 19:21:05</publishTime>
+ </File>
+ <File Include="bin/Pub_Class.pdb">
+ <publishTime>12/01/2025 19:21:05</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.dll">
+ <publishTime>12/01/2025 19:21:05</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.pdb">
+ <publishTime>12/01/2025 19:21:05</publishTime>
+ </File>
+ <File Include="bin/RestSharp.dll">
+ <publishTime>08/30/2012 22:22:50</publishTime>
+ </File>
+ <File Include="bin/SQLHelper.dll">
+ <publishTime>12/01/2025 19:21:05</publishTime>
+ </File>
+ <File Include="bin/SQLHelper.pdb">
+ <publishTime>12/01/2025 19:21:05</publishTime>
+ </File>
+ <File Include="bin/Swashbuckle.Core.dll">
+ <publishTime>02/15/2015 17:57:08</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.dll">
+ <publishTime>12/01/2025 19:21:03</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.pdb">
+ <publishTime>12/01/2025 19:21:03</publishTime>
+ </File>
+ <File Include="bin/System.Buffers.dll">
+ <publishTime>07/19/2017 10:01:28</publishTime>
+ </File>
+ <File Include="bin/System.ComponentModel.DataAnnotations.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Configuration.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Data.DataSetExtensions.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Data.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Drawing.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.EnterpriseServices.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
+ <publishTime>08/19/2014 10:03:34</publishTime>
+ </File>
+ <File Include="bin/System.Memory.dll">
+ <publishTime>04/17/2019 16:24:34</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Extensions.dll">
+ <publishTime>02/19/2015 20:10:46</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Formatting.dll">
+ <publishTime>11/28/2018 13:00:36</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Primitives.dll">
+ <publishTime>02/19/2015 20:10:46</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
+ <publishTime>09/18/2018 19:38:10</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.Serialization.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.ApplicationServices.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Cors.dll">
+ <publishTime>11/28/2018 12:58:44</publishTime>
+ </File>
+ <File Include="bin/System.Web.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.DynamicData.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Entity.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Extensions.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Helpers.dll">
+ <publishTime>01/28/2015 04:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.Cors.dll">
+ <publishTime>11/28/2018 13:01:26</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.dll">
+ <publishTime>11/28/2018 13:01:00</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.WebHost.dll">
+ <publishTime>09/05/2022 17:03:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Mvc.dll">
+ <publishTime>01/28/2015 04:02:18</publishTime>
+ </File>
+ <File Include="bin/System.Web.Optimization.dll">
+ <publishTime>02/11/2014 15:26:04</publishTime>
+ </File>
+ <File Include="bin/System.Web.Razor.dll">
+ <publishTime>01/28/2015 04:02:32</publishTime>
+ </File>
+ <File Include="bin/System.Web.Services.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.Deployment.dll">
+ <publishTime>01/28/2015 04:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.dll">
+ <publishTime>01/28/2015 04:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.Razor.dll">
+ <publishTime>01/28/2015 04:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Xml.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Xml.Linq.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/Tea.dll">
+ <publishTime>05/09/2023 02:43:40</publishTime>
+ </File>
+ <File Include="bin/TopSdk.dll">
+ <publishTime>12/01/2025 19:21:06</publishTime>
+ </File>
+ <File Include="bin/TopSdk.pdb">
+ <publishTime>12/01/2025 19:21:06</publishTime>
+ </File>
+ <File Include="bin/WebActivatorEx.dll">
+ <publishTime>11/24/2014 11:18:48</publishTime>
+ </File>
+ <File Include="bin/WebAPI.dll">
+ <publishTime>12/01/2025 19:21:14</publishTime>
+ </File>
+ <File Include="bin/WebAPI.pdb">
+ <publishTime>12/01/2025 19:21:14</publishTime>
+ </File>
+ <File Include="bin/WebGrease.dll">
+ <publishTime>07/17/2013 17:03:52</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
+ <publishTime>11/29/2018 13:26:02</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
+ <publishTime>11/29/2018 13:26:30</publishTime>
+ </File>
+ <File Include="Config/kdapi.config">
+ <publishTime>11/27/2023 09:14:13</publishTime>
+ </File>
+ <File Include="Content/bootstrap.css">
+ <publishTime>09/05/2022 17:02:53</publishTime>
+ </File>
+ <File Include="Content/bootstrap.min.css">
+ <publishTime>09/05/2022 17:02:53</publishTime>
+ </File>
+ <File Include="Content/Site.css">
+ <publishTime>09/05/2022 17:02:53</publishTime>
+ </File>
+ <File Include="DLL/BLL.dll">
+ <publishTime>09/05/2022 17:03:02</publishTime>
+ </File>
+ <File Include="DLL/DAL.dll">
+ <publishTime>09/05/2022 17:03:06</publishTime>
+ </File>
+ <File Include="DLL/DBUtility.dll">
+ <publishTime>09/05/2022 17:03:07</publishTime>
+ </File>
+ <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
+ <publishTime>02/08/2023 09:18:13</publishTime>
+ </File>
+ <File Include="DLL/Model.dll">
+ <publishTime>09/05/2022 17:03:07</publishTime>
+ </File>
+ <File Include="DLL/Newtonsoft.Json.Net35.dll">
+ <publishTime>09/05/2022 17:03:07</publishTime>
+ </File>
+ <File Include="DLL/Pub_Class.dll">
+ <publishTime>09/05/2022 17:03:07</publishTime>
+ </File>
+ <File Include="DLL/Pub_Control.dll">
+ <publishTime>09/05/2022 17:03:08</publishTime>
+ </File>
+ <File Include="DLL/SQLHelper.dll">
+ <publishTime>09/05/2022 17:03:08</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.eot">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.svg">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.ttf">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.woff">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Global.asax">
+ <publishTime>01/10/2023 17:20:14</publishTime>
+ </File>
+ <File Include="grpc_csharp_ext.x64.dll">
+ <publishTime>03/22/2022 05:17:22</publishTime>
+ </File>
+ <File Include="grpc_csharp_ext.x86.dll">
+ <publishTime>03/22/2022 05:17:22</publishTime>
+ </File>
+ <File Include="Index.html">
+ <publishTime>09/05/2022 17:03:09</publishTime>
+ </File>
+ <File Include="libgrpc_csharp_ext.x64.dylib">
+ <publishTime>03/18/2022 23:38:44</publishTime>
+ </File>
+ <File Include="libgrpc_csharp_ext.x64.so">
+ <publishTime>03/18/2022 23:38:42</publishTime>
+ </File>
+ <File Include="libman.json">
+ <publishTime>07/24/2023 08:56:46</publishTime>
+ </File>
+ <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
+ <publishTime>09/05/2022 17:03:09</publishTime>
+ </File>
+ <File Include="packages.config">
+ <publishTime>09/18/2024 18:59:21</publishTime>
+ </File>
+ <File Include="Template/barCodeTemplateStorage.json">
+ <publishTime>09/13/2025 17:30:20</publishTime>
+ </File>
+ <File Include="Views/Scripts/bootstrap.js">
+ <publishTime>09/05/2022 17:03:10</publishTime>
+ </File>
+ <File Include="Views/Scripts/bootstrap.min.js">
+ <publishTime>09/05/2022 17:03:10</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.js">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.min.js">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.min.map">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.js">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.min.js">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Views/Scripts/modernizr-2.6.2.js">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Views/Shared/Error.cshtml">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Views/Shared/_Layout.cshtml">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Views/web.config">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Views/_ViewStart.cshtml">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
+ <publishTime>01/24/2024 11:35:25</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
+ <publishTime>01/24/2024 11:35:25</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
+ <publishTime>01/24/2024 11:35:25</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
+ <publishTime>01/24/2024 11:35:25</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
+ <publishTime>01/24/2024 11:35:25</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
+ <publishTime>01/24/2024 11:35:25</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
+ <publishTime>01/24/2024 11:35:25</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
+ <publishTime>01/24/2024 11:35:26</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
+ <publishTime>01/24/2024 11:35:26</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
+ <publishTime>01/24/2024 11:35:26</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
+ <publishTime>01/24/2024 11:35:25</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
+ <publishTime>01/24/2024 11:35:26</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
+ <publishTime>01/24/2024 11:35:26</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
+ <publishTime>01/24/2024 11:35:25</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
+ <publishTime>01/24/2024 11:35:26</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
+ <publishTime>01/24/2024 11:35:26</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
+ <publishTime>01/24/2024 11:35:26</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
+ <publishTime>01/24/2024 11:35:25</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
+ <publishTime>01/24/2024 11:35:26</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
+ <publishTime>01/24/2024 11:35:25</publishTime>
+ </File>
+ <File Include="Web.config">
+ <publishTime>12/01/2025 19:22:21</publishTime>
+ </File>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index b409f6d..7eda4bc 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -277,12 +277,14 @@
<Content Include="fonts\glyphicons-halflings-regular.svg" />
<Content Include="Global.asax" />
<Content Include="Index.html" />
+ <Content Include="Properties\PublishProfiles\JFAPI.pubxml.user" />
<Content Include="Views\Scripts\bootstrap.js" />
<Content Include="Views\Scripts\bootstrap.min.js" />
<Content Include="Config\kdapi.config" />
<Content Include="libman.json" />
<Content Include="Template\barCodeTemplateStorage.json" />
<None Include="Properties\PublishProfiles\FolderProfilewtt.pubxml" />
+ <None Include="Properties\PublishProfiles\JFAPI.pubxml" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -374,6 +376,7 @@
<Compile Include="Controllers\BaseSet\Gy_BarCodeBillController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ConkTypeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ColorClassController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_DriverController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ICBomBillController.cs" />
<Compile Include="Controllers\BaseSet\Gy_WorkDayController.cs" />
<Compile Include="Controllers\BaseSet\Gy_PackTypeController.cs" />
@@ -449,6 +452,8 @@
<Compile Include="Controllers\CJGL\Sc_OEEReportController.cs" />
<Compile Include="Controllers\CKGL\TMZD\Gy_BarCodeBillListController.cs" />
<Compile Include="Controllers\JHGL\Gy_SourceMouldBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldProdMoveBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldProdBackBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldProdOutBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldOutRequestBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldInRequestBillController.cs" />
@@ -628,6 +633,7 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardStatusController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardAddressController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardTypeController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CarTypeController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_COMMONCONTACTBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DiscountListController.cs" />
@@ -662,6 +668,7 @@
<Compile Include="Models\ClsWW_EntrustOrderBillMainSub.cs" />
<Compile Include="Models\ClsWW_PPBomBill.cs" />
<Compile Include="Models\ClsWW_EntrustOrderBillMain_1.cs" />
+ <Compile Include="Models\Driver.cs" />
<Compile Include="Models\GroupOrderBill.cs" />
<Compile Include="Models\ClsGy_PNLInfoSub.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ProcMulController.cs" />
@@ -971,6 +978,7 @@
<Compile Include="Models\鍩虹璧勬枡\Gy_Duty.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_TemporaryArea.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_StockPlace.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\Gy_CarType.cs" />
<Compile Include="Models\鍩虹璧勬枡\WorkDay.cs" />
<Compile Include="Models\鍩虹璧勬枡\PackType.cs" />
<Compile Include="Models\鍩虹璧勬枡\WorkStation.cs" />
@@ -1237,6 +1245,7 @@
<Folder Include="Views\Gy_COMMONCONTACTBill\" />
<Folder Include="Views\Gy_ConkType\" />
<Folder Include="Views\Gy_CustLocation\" />
+ <Folder Include="Views\Gy_Driver\" />
<Folder Include="Views\Gy_DutyBill\" />
<Folder Include="Views\Gy_EquipStatus\" />
<Folder Include="Views\Gy_EquipType\" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 116e391..9db2484 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -5,15 +5,17 @@
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
+<<<<<<< HEAD
<NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
+=======
+ <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile8.pubxml</NameOfLastUsedPublishProfile>
+>>>>>>> fccf02cb2cc7b88e649f8e66230e190dce41abc1
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
@@ -32,29 +34,5 @@
<ProjectView>ShowAllFiles</ProjectView>
<ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
- <ProjectExtensions>
- <VisualStudio>
- <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
- <WebProjectProperties>
- <StartPageUrl>
- </StartPageUrl>
- <StartAction>CurrentPage</StartAction>
- <AspNetDebugging>True</AspNetDebugging>
- <SilverlightDebugging>False</SilverlightDebugging>
- <NativeDebugging>False</NativeDebugging>
- <SQLDebugging>False</SQLDebugging>
- <ExternalProgram>
- </ExternalProgram>
- <StartExternalURL>
- </StartExternalURL>
- <StartCmdLineArguments>
- </StartCmdLineArguments>
- <StartWorkingDirectory>
- </StartWorkingDirectory>
- <EnableENC>True</EnableENC>
- <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
- </WebProjectProperties>
- </FlavorProperties>
- </VisualStudio>
- </ProjectExtensions>
+ <ProjectExtensions />
</Project>
\ No newline at end of file
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_DH.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_DH.cs"
index b29a399..86605d1 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_DH.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_DH.cs"
@@ -393,11 +393,11 @@
BillNew.omodel.HMaterIDD = "";
BillNew.omodel.HICMOInterID = HICMOInterID;
BillNew.omodel.HICMOEntryID = HICMOEntryID;
- BillNew.omodel.HPicNumVer = "";
- BillNew.omodel.HPicNumAssemble = "";
- BillNew.omodel.HMaterTexture = "";
- BillNew.omodel.HProductNum = "";
- BillNew.omodel.HVerNum = "";
+ BillNew.omodel.HPicNumVer = ds.Tables[0].Rows[0]["HPicNumVer"].ToString();
+ BillNew.omodel.HPicNumAssemble = ds.Tables[0].Rows[0]["HPicNumAssemble"].ToString();
+ BillNew.omodel.HMaterTexture = ds.Tables[0].Rows[0]["HMaterTexture"].ToString();
+ BillNew.omodel.HProductNum = ds.Tables[0].Rows[0]["HProductNum"].ToString();
+ BillNew.omodel.HVerNum = ds.Tables[0].Rows[0]["HVerNum"].ToString();
BillNew.omodel.HPRDORGID = DBUtility.ClsPub.HOrgID;
BillNew.omodel.HBLFlag = false;
BillNew.omodel.HCusNumber = "";
@@ -502,15 +502,15 @@
oBillSub.HWWOrderBillNo = "";
oBillSub.HReportQty = 0;
oBillSub.HBackProc = false;
- oBillSub.HSupID = 0;
- oBillSub.HSupFlag = false;
+ oBillSub.HSupID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[j]["HSupID"]);
+ oBillSub.HSupFlag = DBUtility.ClsPub.isBool(ds.Tables[0].Rows[j]["HSupFlag"]);
oBillSub.HOverRate = 0;
oBillSub.HMaxQty = 0;
- oBillSub.HTechnologyParameter = "";
+ oBillSub.HTechnologyParameter = ds.Tables[0].Rows[j]["HTechnologyParameter"].ToString();
oBillSub.HProcCheckNote = "";
- oBillSub.HPicNum = "";
- oBillSub.HMouldNo = "";
- oBillSub.HProcWorkNum = "";
+ oBillSub.HPicNum = ds.Tables[0].Rows[j]["HPicNum"].ToString();
+ oBillSub.HMouldNo = ds.Tables[0].Rows[j]["HMouldNo"].ToString();
+ oBillSub.HProcWorkNum = ds.Tables[0].Rows[j]["HProcWorkNum"].ToString();
oBillSub.HSeOrderInterID = 0;
oBillSub.HSeOrderEntryID = 0;
oBillSub.HSNCtrl = false;
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
index 6454633..ea5d956 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 18a4277..cb980dd 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/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
index 35e5324..054e86e 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.CoreCompileInputs.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.CoreCompileInputs.cache
deleted file mode 100644
index c12cb71..0000000
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-b7766d0cccdf2c98a5ed7c86257ed2f2c0c84c8a
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index 0d6e7ae..303846f 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,6 +1,49 @@
+<<<<<<< HEAD
+
+D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+=======
+
+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.AssemblyReference.cache
+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:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+D:\WMES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+D:\WMES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\WMES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+D:\WMES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+D:\WMES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+D:\WMES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+=======
+>>>>>>> 3758c91a8f9b3ca8409da3a8fa5330d52e237a0f
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+<<<<<<< HEAD
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+=======
+=======
+>>>>>>> 3758c91a8f9b3ca8409da3a8fa5330d52e237a0f
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..fb59284
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -0,0 +1,25 @@
+<<<<<<< HEAD
+=======
+D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
+D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
+D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
+D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
+=======
+>>>>>>> 72d1aaa4af401fe25e5f2f7ba07163d7fc8fe8e8
+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:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
+>>>>>>> 72d1aaa4af401fe25e5f2f7ba07163d7fc8fe8e8
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
new file mode 100644
index 0000000..ea5d956
--- /dev/null
+++ 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
new file mode 100644
index 0000000..cb980dd
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1