From d0191bf7ec69d670597a577d5f60857997bface3 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期二, 27 一月 2026 14:48:11 +0800
Subject: [PATCH] 1
---
DAL/bin/x86/Release/DAL.dll | 0
SQLHelper/obj/x86/Release/SQLHelper.dll | 0
WebAPI/WebAPI.csproj.user | 32 +
PayM/bin/x86/Debug/Pub_Control.pdb | 0
Model/obj/x86/Release/Model.csproj.AssemblyReference.cache | 0
BLL/bin/x86/Release/SQLHelper.pdb | 0
DBUtility/bin/x86/Release/DBUtility.pdb | 0
SQLHelper/obj/x86/Release/SQLHelper.pdb | 0
WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs | 4
WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs | 2
PayM/bin/x86/Debug/Pub_Class.pdb | 0
PayM/bin/x86/Debug/Pub_Control.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.pdb | 0
WebAPI/Service/GeTuiService.cs | 6
PayM/bin/x86/Debug/Pub_Class.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.dll | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.dll | 0
Model/bin/x86/Release/Pub_Control.dll | 0
SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache | 0
Model/obj/x86/Release/Model.csproj.CoreCompileInputs.cache | 2
SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt | 11
Model/bin/x86/Release/Pub_Control.pdb | 0
WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user | 2
BLL/bin/x86/Release/Pub_Control.pdb | 0
BLL/bin/x86/Release/SQLHelper.dll | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb | 0
WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs | 89 ++
DAL/车间管理/ClsSc_EmployeeSignInNoteBill.cs | 5
Model/bin/x86/Release/SQLHelper.pdb | 0
Model/bin/x86/Release/SQLHelper.dll | 0
WebAPI/WebAPI.csproj | 1
PayM/bin/x86/Debug/DBUtility.dll | 0
SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache | 0
Model/车间管理/ClsSc_EmployeeSignInNoteBill.cs | 5
BLL/bin/x86/Release/Model.dll | 0
Model/bin/x86/Release/Model.dll | 0
PayM/bin/x86/Debug/DAL.dll | 0
Pub_Class/bin/x86/Release/Pub_Class.pdb | 0
WebAPI/Controllers/条码管理/WEBSController.cs | 51 +
PayM/bin/x86/Debug/DBUtility.pdb | 0
Model/bin/x86/Release/Model.pdb | 0
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache | 0
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 17
WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs | 2
WebAPI/Web.config | 6
DAL/bin/x86/Release/Pub_Class.pdb | 0
Pub_Class/bin/x86/Release/Pub_Class.dll | 0
DAL/bin/x86/Release/Pub_Class.dll | 0
WebAPI/Controllers/品质管理/首件检验单/QC_FirstPieceCheckBillController.cs | 4
WebAPI/Controllers/物流管理/运单费用结算单/Pay_WayBillPaymentBillController.cs | 6
BLL/bin/x86/Release/Model.pdb | 0
BLL/bin/x86/Release/Pub_Control.dll | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
BLL/bin/x86/Release/DAL.dll | 0
SQLHelper/bin/x86/Release/Pub_Class.pdb | 0
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 63 ++
SQLHelper/bin/x86/Release/Pub_Class.dll | 0
BLL/bin/x86/Release/TopSdk.dll | 0
PayM/bin/x86/Debug/DAL.pdb | 0
WebAPI/Controllers/基础资料/基础资料/Gy_CostAverageTypeController.cs | 887 +++++++++++++++++++++++++++++++
DBUtility/bin/x86/Release/DBUtility.dll | 0
BLL/bin/x86/Release/DAL.pdb | 0
BLL/bin/x86/Release/TopSdk.pdb | 0
WebAPI/Controllers/CJGL/Cj_CheckBarcodeController.cs | 10
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs | 4
DAL/基础资料/公用基础资料/ClsGy_CostAverageType_View.cs | 2
WebAPI/Controllers/品质管理/工序检验单/QC_ProcessCheckBillController.cs | 56 ++
PayM/bin/x86/Debug/SQLHelper.dll | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 8
BLL/bin/x86/Release/BLL.pdb | 0
Pub_Control/bin/x86/Release/Pub_Control.dll | 0
DAL/bin/x86/Release/DBUtility.dll | 0
WebAPI/Controllers/品质管理/巡检单/QC_PatrolProcCheckOtherBillController.cs | 58 ++
WebAPI/Controllers/QC_ManagementController.cs | 2
BLL/bin/x86/Release/BLL.dll | 0
WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs | 44 +
Model/bin/x86/Release/Pub_Class.pdb | 0
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user | 53 +
Pub_Control/bin/x86/Release/Pub_Control.pdb | 0
WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs | 6
DAL/bin/x86/Release/Model.dll | 0
BLL/bin/x86/Release/Pub_Class.pdb | 0
PayM/bin/x86/Debug/SQLHelper.pdb | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
PayM/bin/x86/Debug/Model.pdb | 0
PayM/bin/x86/Debug/BLL.dll | 0
DBUtility/bin/x86/Release/Pub_Class.pdb | 0
DBUtility/bin/x86/Release/Pub_Class.dll | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
WebAPI/Controllers/WebAPIController.cs | 49 +
BLL/bin/x86/Release/Pub_Class.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache | 0
BLL/bin/x86/Release/DBUtility.dll | 0
DAL/bin/x86/Release/Model.pdb | 0
PayM/bin/x86/Debug/BLL.pdb | 0
WebAPI/Models/Gy_Mould.cs | 2
Model/obj/x86/Release/Model.dll | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 3
Model/bin/x86/Release/Pub_Class.dll | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
BLL/bin/x86/Release/DBUtility.pdb | 0
DAL/bin/x86/Release/DBUtility.pdb | 0
WebAPI/Properties/PublishProfiles/WTTFolder.pubxml.user | 45
Model/obj/x86/Release/Model.pdb | 0
DAL/bin/x86/Release/SQLHelper.dll | 0
Model/bin/x86/Release/DBUtility.dll | 0
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 9
DBUtility/bin/x86/Release/Pub_Control.pdb | 0
DBUtility/bin/x86/Release/SQLHelper.pdb | 0
WebAPI/Controllers/LMESController.cs | 2
SQLHelper/bin/x86/Release/SQLHelper.pdb | 0
DAL/bin/x86/Release/Pub_Control.pdb | 0
Model/bin/x86/Release/DBUtility.pdb | 0
WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs | 2
DBUtility/bin/x86/Release/Pub_Control.dll | 0
DBUtility/bin/x86/Release/SQLHelper.dll | 0
DAL/bin/x86/Release/Pub_Control.dll | 0
Model/基础资料/基础资料/ClsGy_CostAverageType_Model.cs | 2
PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll | 0
DAL/bin/x86/Release/SQLHelper.pdb | 0
PayM/bin/x86/Debug/Model.dll | 0
DAL/基础资料/其他基础资料/ClsGy_QCCheckProjectMain.cs | 1
PayM/bin/x86/Debug/Interop.gregn6Lib.dll | 0
DAL/质检管理/ClsQC_PatrolProcCheckOtherBill.cs | 4
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 1
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt | 1
Pub_Control/bin/x86/Release/Pub_Class.dll | 0
/dev/null | 1
WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user | 44
PayM/bin/x86/Debug/PayM.dll | 0
PayM/bin/x86/Debug/PayM.pdb | 0
WebAPI/Controllers/Sc_ProcessMangementController.cs | 20
Pub_Control/bin/x86/Release/Pub_Class.pdb | 0
SQLHelper/bin/x86/Release/SQLHelper.dll | 0
DAL/基础资料/公用基础资料/ClsGy_CostAverageType_Ctl.cs | 56 +
DAL/bin/x86/Release/DAL.pdb | 0
136 files changed, 1,523 insertions(+), 157 deletions(-)
diff --git a/BLL/bin/x86/Release/BLL.dll b/BLL/bin/x86/Release/BLL.dll
index 87f9cda..5eb5b07 100644
--- a/BLL/bin/x86/Release/BLL.dll
+++ b/BLL/bin/x86/Release/BLL.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/BLL.pdb b/BLL/bin/x86/Release/BLL.pdb
index 726e73e..8c088ff 100644
--- a/BLL/bin/x86/Release/BLL.pdb
+++ b/BLL/bin/x86/Release/BLL.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/DAL.dll b/BLL/bin/x86/Release/DAL.dll
index ff2ebec..428d5a6 100644
--- a/BLL/bin/x86/Release/DAL.dll
+++ b/BLL/bin/x86/Release/DAL.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/DAL.pdb b/BLL/bin/x86/Release/DAL.pdb
index ea334b4..7085190 100644
--- a/BLL/bin/x86/Release/DAL.pdb
+++ b/BLL/bin/x86/Release/DAL.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/DBUtility.dll b/BLL/bin/x86/Release/DBUtility.dll
index f26bf8c..ed2b2a2 100644
--- a/BLL/bin/x86/Release/DBUtility.dll
+++ b/BLL/bin/x86/Release/DBUtility.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/DBUtility.pdb b/BLL/bin/x86/Release/DBUtility.pdb
index c3892c5..27ef9e8 100644
--- a/BLL/bin/x86/Release/DBUtility.pdb
+++ b/BLL/bin/x86/Release/DBUtility.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/Model.dll b/BLL/bin/x86/Release/Model.dll
index b6ff3e2..bf851f2 100644
--- a/BLL/bin/x86/Release/Model.dll
+++ b/BLL/bin/x86/Release/Model.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/Model.pdb b/BLL/bin/x86/Release/Model.pdb
index a48ef89..ec97201 100644
--- a/BLL/bin/x86/Release/Model.pdb
+++ b/BLL/bin/x86/Release/Model.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/Pub_Class.dll b/BLL/bin/x86/Release/Pub_Class.dll
index 224df93..5654547 100644
--- a/BLL/bin/x86/Release/Pub_Class.dll
+++ b/BLL/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/Pub_Class.pdb b/BLL/bin/x86/Release/Pub_Class.pdb
index 8f0f1a0..de84267 100644
--- a/BLL/bin/x86/Release/Pub_Class.pdb
+++ b/BLL/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/Pub_Control.dll b/BLL/bin/x86/Release/Pub_Control.dll
index 8e36837..2960926 100644
--- a/BLL/bin/x86/Release/Pub_Control.dll
+++ b/BLL/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/Pub_Control.pdb b/BLL/bin/x86/Release/Pub_Control.pdb
index b587c2e..32b6a51 100644
--- a/BLL/bin/x86/Release/Pub_Control.pdb
+++ b/BLL/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/SQLHelper.dll b/BLL/bin/x86/Release/SQLHelper.dll
index 04d1f58..921e1f9 100644
--- a/BLL/bin/x86/Release/SQLHelper.dll
+++ b/BLL/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/SQLHelper.pdb b/BLL/bin/x86/Release/SQLHelper.pdb
index 20e1a45..0a05fa0 100644
--- a/BLL/bin/x86/Release/SQLHelper.pdb
+++ b/BLL/bin/x86/Release/SQLHelper.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/TopSdk.dll b/BLL/bin/x86/Release/TopSdk.dll
index 118189b..0166748 100644
--- a/BLL/bin/x86/Release/TopSdk.dll
+++ b/BLL/bin/x86/Release/TopSdk.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/TopSdk.pdb b/BLL/bin/x86/Release/TopSdk.pdb
index 52e2ce5..fb27801 100644
--- a/BLL/bin/x86/Release/TopSdk.pdb
+++ b/BLL/bin/x86/Release/TopSdk.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/DAL.dll b/DAL/bin/x86/Release/DAL.dll
index ff2ebec..428d5a6 100644
--- a/DAL/bin/x86/Release/DAL.dll
+++ b/DAL/bin/x86/Release/DAL.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/DAL.pdb b/DAL/bin/x86/Release/DAL.pdb
index ea334b4..7085190 100644
--- a/DAL/bin/x86/Release/DAL.pdb
+++ b/DAL/bin/x86/Release/DAL.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/DBUtility.dll b/DAL/bin/x86/Release/DBUtility.dll
index f26bf8c..ed2b2a2 100644
--- a/DAL/bin/x86/Release/DBUtility.dll
+++ b/DAL/bin/x86/Release/DBUtility.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/DBUtility.pdb b/DAL/bin/x86/Release/DBUtility.pdb
index c3892c5..27ef9e8 100644
--- a/DAL/bin/x86/Release/DBUtility.pdb
+++ b/DAL/bin/x86/Release/DBUtility.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/Model.dll b/DAL/bin/x86/Release/Model.dll
index b6ff3e2..bf851f2 100644
--- a/DAL/bin/x86/Release/Model.dll
+++ b/DAL/bin/x86/Release/Model.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/Model.pdb b/DAL/bin/x86/Release/Model.pdb
index a48ef89..ec97201 100644
--- a/DAL/bin/x86/Release/Model.pdb
+++ b/DAL/bin/x86/Release/Model.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/Pub_Class.dll b/DAL/bin/x86/Release/Pub_Class.dll
index 224df93..5654547 100644
--- a/DAL/bin/x86/Release/Pub_Class.dll
+++ b/DAL/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/Pub_Class.pdb b/DAL/bin/x86/Release/Pub_Class.pdb
index 8f0f1a0..de84267 100644
--- a/DAL/bin/x86/Release/Pub_Class.pdb
+++ b/DAL/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/Pub_Control.dll b/DAL/bin/x86/Release/Pub_Control.dll
index 8e36837..2960926 100644
--- a/DAL/bin/x86/Release/Pub_Control.dll
+++ b/DAL/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/Pub_Control.pdb b/DAL/bin/x86/Release/Pub_Control.pdb
index b587c2e..32b6a51 100644
--- a/DAL/bin/x86/Release/Pub_Control.pdb
+++ b/DAL/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/SQLHelper.dll b/DAL/bin/x86/Release/SQLHelper.dll
index 04d1f58..921e1f9 100644
--- a/DAL/bin/x86/Release/SQLHelper.dll
+++ b/DAL/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/SQLHelper.pdb b/DAL/bin/x86/Release/SQLHelper.pdb
index 20e1a45..0a05fa0 100644
--- a/DAL/bin/x86/Release/SQLHelper.pdb
+++ b/DAL/bin/x86/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_CostAverageType_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_CostAverageType_Ctl.cs"
index f14d3b0..8272f99 100644
--- "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_CostAverageType_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_CostAverageType_Ctl.cs"
@@ -12,19 +12,25 @@
public string HOldNumber;
public Model.ClsGy_CostAverageType_Model oModel = new Model.ClsGy_CostAverageType_Model();
//鏂板
- public override bool AddNew()
+ public override bool AddNew(ref string sReturn)
{
try
{
oCn.BeginTran();
- oCn.RunProc("Insert into " + MvarItemKey + " " +
- " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HAverageRemark) " +
- " 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.HAverageRemark + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.RunProc($@"
+ INSERT INTO {MvarItemKey} (HNumber, HName, HShortNumber, HParentID, HLevel, HEndFlag,
+ HStopflag, HRemark, HHelpCode, HUseFlag, HMakeTime, HMakeEmp, HUSEORGID,
+ HCREATEORGID, HAverageRemark)
+ VALUES ('{oModel.HNumber}', '{oModel.HName}', '{oModel.HShortNumber}',
+ '{oModel.HParentID}', '{oModel.HLevel}', '{oModel.HEndFlag}',
+ '{oModel.HStopflag}', '{oModel.HRemark}', '{oModel.HHelpCode}',
+ '{oModel.HUseFlag}', getdate(), '{oModel.HMakeEmp}',
+ '{oModel.HUSEORGID}', '{oModel.HCREATEORGID}', '{oModel.HAverageRemark}'
+ )
+ ", ref sReturn);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref sReturn);
oCn.Commit();
return true;
}
@@ -36,26 +42,34 @@
}
//淇敼
- public override bool ModifyByID(Int64 sItemID)
+ public override bool ModifyByID(Int64 sItemID, ref string sReturn)
{
try
{
oCn.BeginTran();
- oCn.RunProc("Update " + MvarItemKey + " set " +
- " HNumber='" + oModel.HNumber + "'" +
- ",HName='" + oModel.HName + "'" +
- ",HShortNumber='" + oModel.HShortNumber + "'" +
- ",HHelpCode='" + oModel.HHelpCode + "'" +
- ",HLevel=" + oModel.HLevel.ToString() +
- ",HParentID=" + oModel.HParentID.ToString() +
- ",HEndflag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) +
- ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
- ",HAverageRemark='" + oModel.HAverageRemark + "'" +
- ",HRemark= '" + oModel.HRemark + "' Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.RunProc($@"
+ UPDATE {MvarItemKey} SET
+ HNumber='{oModel.HNumber}',
+ HName='{oModel.HName}',
+ HShortNumber='{oModel.HShortNumber}',
+ HParentID='{oModel.HParentID}',
+ HLevel='{oModel.HLevel}',
+ HEndFlag='{oModel.HEndFlag}',
+ HStopflag='{oModel.HStopflag}',
+ HRemark='{oModel.HRemark}',
+ HHelpCode='{oModel.HHelpCode}',
+ HUseFlag='{oModel.HUseFlag}',
+ HModifyEmp='{oModel.HModifyEmp}',
+ HModifyTime=getdate(),
+ HUSEORGID='{oModel.HUSEORGID}',
+ HCREATEORGID='{oModel.HCREATEORGID}',
+ HAverageRemark='{oModel.HAverageRemark}'
+ WHERE HItemID='{oModel.HItemID}'
+ ", ref sReturn);
//淇敼瀛愰」鐩唬鐮�
- oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", 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.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref sReturn);
//
oCn.Commit();
return true;
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_CostAverageType_View.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_CostAverageType_View.cs"
index c85af2c..fde6d2b 100644
--- "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_CostAverageType_View.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_CostAverageType_View.cs"
@@ -82,7 +82,7 @@
omodel.HRemark = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
omodel.HHelpCode = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HHelpCode"]);
omodel.HAverageRemark = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HAverageRemark"]);
- omodel.HMakeTime = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HMakeTime"]);
+ omodel.HMakeTime = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMakeTime"]);
//
return true;
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 3d8045e..8daa300 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"
@@ -93,6 +93,7 @@
omodel.HInterID = lngBillKey;
foreach (Model.ClsGy_QCCheckProjectSub oSub in DetailColl)
{
+
oCn.RunProc("Insert into Gy_QCCheckProjectSub " +
" (HInterID,HBillNo_bak,HEntryID,HCloseMan" +
",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
diff --git "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckOtherBill.cs" "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckOtherBill.cs"
index d94be1c..1c35893 100644
--- "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckOtherBill.cs"
+++ "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckOtherBill.cs"
@@ -169,14 +169,14 @@
",HSourceID,HICMOInterID,HICMOBillNo,HICMOQty,HProcExchInterID,HProcExchEntryID" +
",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp,HLastResult" +
",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HICMOEntryID,HQCSchemeID,HShiftsID,HErrTreatment,HBatchNo" +
- ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo,HProcID" +
+ ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo,HProcID, HCheckQty" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
"," + omodel.HSourceID.ToString() + "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HICMOQty.ToString() + "," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() +
",'" + omodel.HProcExchBillNo + "'," + omodel.HProcExchQty.ToString() + "," + omodel.HMaterID.ToString() + "," + omodel.HFirstCheckEmp.ToString() + ", " + DBUtility.ClsPub.BoolToString(omodel.HLastResult) +
"," + omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'," + omodel.HICMOEntryID + "," + omodel.HQCSchemeID + "," + omodel.HShiftsID + ",'" + omodel.HErrTreatment + "','" + omodel.HBatchNo + "'" +
- "," + omodel.HTakeSampleCheckBillID + ",'" + omodel.HTakeSampleCheckBillNo + "','" + omodel.HProcID + "'" +
+ "," + omodel.HTakeSampleCheckBillID + ",'" + omodel.HTakeSampleCheckBillNo + "','" + omodel.HProcID + "'," + omodel.HCheckQty +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsQC_PatrolProcCheckOtherBillSub oSub in DetailColl)
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_EmployeeSignInNoteBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_EmployeeSignInNoteBill.cs"
index b57f7da..026a219 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_EmployeeSignInNoteBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_EmployeeSignInNoteBill.cs"
@@ -79,6 +79,7 @@
",HSignInReason ='" + omodel.HSignInReason.ToString()+"'"+
",HSignRemark ='" + omodel.HSignRemark.ToString()+"'"+
",HEmpID ='" + omodel.HEmpID.ToString()+ "'" +
+ ",HMouldRelQty ='" + omodel.HMouldRelQty.ToString() + "'" +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -155,7 +156,7 @@
",HYear,HPeriod,HRemark,HMaker,HMakeDate," +
"HMainSourceBillType,HMainSourceBillNo,HMainSourceInterID,HMainSourceEntryID," +
"HEquipID,HMouldID,HSourceID,HProcID,HGroupID,HShiftsID,HSignInReason,HSignRemark," +
- "HDeptID,HEmpID,HOrgID) " +
+ "HDeptID,HEmpID,HMouldRelQty,HOrgID) " +
"values('" + (this.BillType ?? "") + "','" + (this.HBillSubType ?? "") + "'," +
"'" + (omodel.HBillNo ?? "") + "','" + (omodel.HDate.ToString() ?? "") + "'" +
"," + (omodel.HYear.ToString() ?? "0") + "," + (omodel.HPeriod.ToString() ?? "0") +
@@ -166,7 +167,7 @@
(omodel.HSourceID.ToString() ?? "0") + "," + (omodel.HProcID.ToString() ?? "0") + "," +
(omodel.HGroupID.ToString() ?? "0") + "," + (omodel.HShiftsID.ToString() ?? "0") + ",'" +
(omodel.HSignInReason?.ToString() ?? "0") + "','" + (omodel.HSignRemark?.ToString() ?? "") + "'," +
- (omodel.HDeptID.ToString() ?? "0") + "," + (omodel.HEmpID.ToString() ?? "0") + "," + (omodel.HOrgID.ToString() ?? "0") + ")");
+ (omodel.HDeptID.ToString() ?? "0") + "," + (omodel.HEmpID.ToString() ?? "0") + "," + (omodel.HMouldRelQty.ToString() ?? "0") + "," + (omodel.HOrgID.ToString() ?? "0") + ")");
//涓昏〃
//鎻掑叆瀛愯〃
diff --git a/DBUtility/bin/x86/Release/DBUtility.dll b/DBUtility/bin/x86/Release/DBUtility.dll
index f26bf8c..ed2b2a2 100644
--- a/DBUtility/bin/x86/Release/DBUtility.dll
+++ b/DBUtility/bin/x86/Release/DBUtility.dll
Binary files differ
diff --git a/DBUtility/bin/x86/Release/DBUtility.pdb b/DBUtility/bin/x86/Release/DBUtility.pdb
index c3892c5..27ef9e8 100644
--- a/DBUtility/bin/x86/Release/DBUtility.pdb
+++ b/DBUtility/bin/x86/Release/DBUtility.pdb
Binary files differ
diff --git a/DBUtility/bin/x86/Release/Pub_Class.dll b/DBUtility/bin/x86/Release/Pub_Class.dll
index 224df93..5654547 100644
--- a/DBUtility/bin/x86/Release/Pub_Class.dll
+++ b/DBUtility/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/DBUtility/bin/x86/Release/Pub_Class.pdb b/DBUtility/bin/x86/Release/Pub_Class.pdb
index 8f0f1a0..de84267 100644
--- a/DBUtility/bin/x86/Release/Pub_Class.pdb
+++ b/DBUtility/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/DBUtility/bin/x86/Release/Pub_Control.dll b/DBUtility/bin/x86/Release/Pub_Control.dll
index 8e36837..2960926 100644
--- a/DBUtility/bin/x86/Release/Pub_Control.dll
+++ b/DBUtility/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/DBUtility/bin/x86/Release/Pub_Control.pdb b/DBUtility/bin/x86/Release/Pub_Control.pdb
index b587c2e..32b6a51 100644
--- a/DBUtility/bin/x86/Release/Pub_Control.pdb
+++ b/DBUtility/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/DBUtility/bin/x86/Release/SQLHelper.dll b/DBUtility/bin/x86/Release/SQLHelper.dll
index 04d1f58..921e1f9 100644
--- a/DBUtility/bin/x86/Release/SQLHelper.dll
+++ b/DBUtility/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/DBUtility/bin/x86/Release/SQLHelper.pdb b/DBUtility/bin/x86/Release/SQLHelper.pdb
index 20e1a45..0a05fa0 100644
--- a/DBUtility/bin/x86/Release/SQLHelper.pdb
+++ b/DBUtility/bin/x86/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
index ad275e8..c092895 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
Binary files differ
diff --git a/Model/bin/x86/Release/DBUtility.dll b/Model/bin/x86/Release/DBUtility.dll
index f26bf8c..ed2b2a2 100644
--- a/Model/bin/x86/Release/DBUtility.dll
+++ b/Model/bin/x86/Release/DBUtility.dll
Binary files differ
diff --git a/Model/bin/x86/Release/DBUtility.pdb b/Model/bin/x86/Release/DBUtility.pdb
index c3892c5..27ef9e8 100644
--- a/Model/bin/x86/Release/DBUtility.pdb
+++ b/Model/bin/x86/Release/DBUtility.pdb
Binary files differ
diff --git a/Model/bin/x86/Release/Model.dll b/Model/bin/x86/Release/Model.dll
index b6ff3e2..bf851f2 100644
--- a/Model/bin/x86/Release/Model.dll
+++ b/Model/bin/x86/Release/Model.dll
Binary files differ
diff --git a/Model/bin/x86/Release/Model.pdb b/Model/bin/x86/Release/Model.pdb
index a48ef89..ec97201 100644
--- a/Model/bin/x86/Release/Model.pdb
+++ b/Model/bin/x86/Release/Model.pdb
Binary files differ
diff --git a/Model/bin/x86/Release/Pub_Class.dll b/Model/bin/x86/Release/Pub_Class.dll
index 224df93..5654547 100644
--- a/Model/bin/x86/Release/Pub_Class.dll
+++ b/Model/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/Model/bin/x86/Release/Pub_Class.pdb b/Model/bin/x86/Release/Pub_Class.pdb
index 8f0f1a0..de84267 100644
--- a/Model/bin/x86/Release/Pub_Class.pdb
+++ b/Model/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/Model/bin/x86/Release/Pub_Control.dll b/Model/bin/x86/Release/Pub_Control.dll
index 8e36837..2960926 100644
--- a/Model/bin/x86/Release/Pub_Control.dll
+++ b/Model/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/Model/bin/x86/Release/Pub_Control.pdb b/Model/bin/x86/Release/Pub_Control.pdb
index b587c2e..32b6a51 100644
--- a/Model/bin/x86/Release/Pub_Control.pdb
+++ b/Model/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/Model/bin/x86/Release/SQLHelper.dll b/Model/bin/x86/Release/SQLHelper.dll
index 04d1f58..921e1f9 100644
--- a/Model/bin/x86/Release/SQLHelper.dll
+++ b/Model/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/Model/bin/x86/Release/SQLHelper.pdb b/Model/bin/x86/Release/SQLHelper.pdb
index 20e1a45..0a05fa0 100644
--- a/Model/bin/x86/Release/SQLHelper.pdb
+++ b/Model/bin/x86/Release/SQLHelper.pdb
Binary files differ
diff --git a/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache b/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
index 70d746f..49c9494 100644
--- a/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
+++ b/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/obj/x86/Release/Model.csproj.CoreCompileInputs.cache b/Model/obj/x86/Release/Model.csproj.CoreCompileInputs.cache
index 625f511..5b6e1ab 100644
--- a/Model/obj/x86/Release/Model.csproj.CoreCompileInputs.cache
+++ b/Model/obj/x86/Release/Model.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-b79b3c0c4971d4b381c2412fc062953b25704479
+d0c44618c2b8dbcb19468e7481c83bfc987c140a
diff --git a/Model/obj/x86/Release/Model.dll b/Model/obj/x86/Release/Model.dll
index b6ff3e2..bf851f2 100644
--- a/Model/obj/x86/Release/Model.dll
+++ b/Model/obj/x86/Release/Model.dll
Binary files differ
diff --git a/Model/obj/x86/Release/Model.pdb b/Model/obj/x86/Release/Model.pdb
index a48ef89..ec97201 100644
--- a/Model/obj/x86/Release/Model.pdb
+++ b/Model/obj/x86/Release/Model.pdb
Binary files differ
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_CostAverageType_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_CostAverageType_Model.cs"
index 5c94007..caf0f0a 100644
--- "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_CostAverageType_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_CostAverageType_Model.cs"
@@ -6,8 +6,6 @@
{
public class ClsGy_CostAverageType_Model : DBUtility.ClsGy_Base_Model
{
- //
- public DateTime HMakeTime; //建立时间
public string HAverageRemark; //分配类型计算
}
}
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_EmployeeSignInNoteBill.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_EmployeeSignInNoteBill.cs"
index 92b5f5e..e7012ac 100644
--- "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_EmployeeSignInNoteBill.cs"
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_EmployeeSignInNoteBill.cs"
@@ -18,10 +18,7 @@
public Int64 HShiftsID;
public string HSignInReason;
public string HSignRemark;
-
-
-
-
+ public Int64 HMouldRelQty;
}
}
diff --git a/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll b/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll
index be11ca7..875f0aa 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 86940c7..a8ae098 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 224c219..3b81397 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 ae72c90..46736ce 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 4d72f34..975a021 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 cacc03f..bb985db 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 65b6308..6161ab8 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 23597f8..772cf43 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 93484ef..7f621b7 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 eed4ec7..c3d5766 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 60207f1..e663e00 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 8e1d111..cbeec1c 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 51c1cd4..0311ab6 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 f209bb9..9038c7b 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 855f2e8..9df557f 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 388caf1..052bb8f 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 bee06d9..10a084a 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 966a52a..4336d01 100644
--- a/PayM/bin/x86/Debug/SQLHelper.pdb
+++ b/PayM/bin/x86/Debug/SQLHelper.pdb
Binary files differ
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index c01467a..f2ff7df 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -1853,6 +1853,7 @@
{
omodel.Kf_EntrustOutBackBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+
//===========生产组托单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_PackUnionBill_SourceBillTypeCtl")
diff --git a/Pub_Class/bin/x86/Release/Pub_Class.dll b/Pub_Class/bin/x86/Release/Pub_Class.dll
index 224df93..5654547 100644
--- a/Pub_Class/bin/x86/Release/Pub_Class.dll
+++ b/Pub_Class/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Class/bin/x86/Release/Pub_Class.pdb b/Pub_Class/bin/x86/Release/Pub_Class.pdb
index 8f0f1a0..de84267 100644
--- a/Pub_Class/bin/x86/Release/Pub_Class.pdb
+++ b/Pub_Class/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Control/bin/x86/Release/Pub_Class.dll b/Pub_Control/bin/x86/Release/Pub_Class.dll
index 224df93..5654547 100644
--- a/Pub_Control/bin/x86/Release/Pub_Class.dll
+++ b/Pub_Control/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Control/bin/x86/Release/Pub_Class.pdb b/Pub_Control/bin/x86/Release/Pub_Class.pdb
index 8f0f1a0..de84267 100644
--- a/Pub_Control/bin/x86/Release/Pub_Class.pdb
+++ b/Pub_Control/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Control/bin/x86/Release/Pub_Control.dll b/Pub_Control/bin/x86/Release/Pub_Control.dll
index 8e36837..2960926 100644
--- a/Pub_Control/bin/x86/Release/Pub_Control.dll
+++ b/Pub_Control/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/Pub_Control/bin/x86/Release/Pub_Control.pdb b/Pub_Control/bin/x86/Release/Pub_Control.pdb
index b587c2e..32b6a51 100644
--- a/Pub_Control/bin/x86/Release/Pub_Control.pdb
+++ b/Pub_Control/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/SQLHelper/bin/x86/Release/Pub_Class.dll b/SQLHelper/bin/x86/Release/Pub_Class.dll
index 224df93..5654547 100644
--- a/SQLHelper/bin/x86/Release/Pub_Class.dll
+++ b/SQLHelper/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/SQLHelper/bin/x86/Release/Pub_Class.pdb b/SQLHelper/bin/x86/Release/Pub_Class.pdb
index 8f0f1a0..de84267 100644
--- a/SQLHelper/bin/x86/Release/Pub_Class.pdb
+++ b/SQLHelper/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/SQLHelper/bin/x86/Release/SQLHelper.dll b/SQLHelper/bin/x86/Release/SQLHelper.dll
index 04d1f58..921e1f9 100644
--- a/SQLHelper/bin/x86/Release/SQLHelper.dll
+++ b/SQLHelper/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/bin/x86/Release/SQLHelper.pdb b/SQLHelper/bin/x86/Release/SQLHelper.pdb
index 20e1a45..0a05fa0 100644
--- a/SQLHelper/bin/x86/Release/SQLHelper.pdb
+++ b/SQLHelper/bin/x86/Release/SQLHelper.pdb
Binary files differ
diff --git a/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache
index dd83cd4..394676d 100644
--- a/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache
+++ b/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SQLHelper/obj/x86/Release/SQLHelper.dll b/SQLHelper/obj/x86/Release/SQLHelper.dll
index 04d1f58..921e1f9 100644
--- a/SQLHelper/obj/x86/Release/SQLHelper.dll
+++ b/SQLHelper/obj/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/obj/x86/Release/SQLHelper.pdb b/SQLHelper/obj/x86/Release/SQLHelper.pdb
index 20e1a45..0a05fa0 100644
--- a/SQLHelper/obj/x86/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/x86/Release/SQLHelper.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index 95b5978..7378e03 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,3 +1,10 @@
+<<<<<<< HEAD
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+=======
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
@@ -17,6 +24,7 @@
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
=======
+>>>>>>> d7c4b0ac44e3e0770e14d51059f9305135b5f26f
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
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.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
index f48159e..a634831 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,10 +1,11 @@
-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:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
+D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
+D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
+D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
+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
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index f5fa917..fd4a8bb 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -2708,6 +2708,7 @@
string HProductDesignSize = mainList[0].HProductDesignSize; // 浜у搧璁捐灏哄
string HGaugeDesignSize = mainList[0].HGaugeDesignSize; // 妫�鍏疯璁″昂瀵�
int HProductQTY = mainList[0].HProductQTY; // 浜у搧鏁伴噺
+ int HManagerID = mainList[0].HManagerID; // 璐熻矗浜�
//淇濆瓨鍓嶆帶鍒�=========================================
string HBillNote = "";
@@ -2745,7 +2746,7 @@
",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID,HBarCode,HMadeSupID" +
",HMouldClass,HNowWHID,HNowSPID,HInitLife,HMouldUseStatus,HCREATEORGID,HUSEORGID " +
",HMouldLength,HMouldWidth,HMouldHeight,HMouldFoldHeight,HTransPackFlag,HSendPackFlag," +
- "HUserID,HBrand,HCalibrationType,HLocation,HCalibrationDate,HCalibrationCycle,HProductDesignSize,HGaugeDesignSize,HProductQTY ) " +
+ "HUserID,HBrand,HCalibrationType,HLocation,HCalibrationDate,HCalibrationCycle,HProductDesignSize,HGaugeDesignSize,HProductQTY,HManagerID) " +
" values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
@@ -2758,7 +2759,7 @@
",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'," + HMadeSupID +
",'" + HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + "','" + HMouldUseStatus + "'," + HCREATEORGID + "," + HUSEORGID +
"," + HMouldLength + "," + HMouldWidth + "," + HMouldHeight + "," + HMouldFoldHeight + "," + Convert.ToString(HTransPackFlag ? 1 : 0) + "," + Convert.ToString(HSendPackFlag ? 1 : 0) + "," +
- "'" + HUserID + "','" + HBrand + "','" + HCalibrationType + "','" + HLocation + "','" + HCalibrationDate + "','" + HCalibrationCycle + "','" + HProductDesignSize + "','" + HGaugeDesignSize + "','" + HProductQTY + "') ");
+ "'" + HUserID + "','" + HBrand + "','" + HCalibrationType + "','" + HLocation + "','" + HCalibrationDate + "','" + HCalibrationCycle + "','" + HProductDesignSize + "','" + HGaugeDesignSize + "','" + HProductQTY + "','" + HManagerID + "') ");
//瀛愯〃
oCN.RunProc("Insert into Gy_MouldFileSub " +
@@ -2922,6 +2923,7 @@
string HProductDesignSize = mainList[0].HProductDesignSize; // 浜у搧璁捐灏哄
string HGaugeDesignSize = mainList[0].HGaugeDesignSize; // 妫�鍏疯璁″昂瀵�
int HProductQTY = mainList[0].HProductQTY; // 浜у搧鏁伴噺
+ int HManagerID = mainList[0].HManagerID; // 璐熻矗浜�
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
@@ -3019,6 +3021,7 @@
"',HProductDesignSize='" + HProductDesignSize +
"',HGaugeDesignSize='" + HGaugeDesignSize +
"',HProductQTY='" + HProductQTY +
+ "',HManagerID='" + HManagerID +
"' where HInterID=" + HInterID.ToString());
oCN.RunProc("delete from Gy_MouldFileSub_SubMater where HInterID='" + HInterID + "'");
@@ -4024,6 +4027,8 @@
DataSet ds = new DataSet();
ds = oCN.RunProcReturn("select * from Gy_MouldFileMain where HInterID=" + HInterID, "Gy_MouldFileMain");
DataRow dr = ds.Tables[0].Rows[0];
+ dr["HPrintQty"] = 0;
+
string Num = dr["HBarCode"].ToString();
string Num1 = Num.Substring(0, (Num.Length) - 5);
oCN.BeginTran();
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index 0eaf023..313ea3f 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -3596,7 +3596,70 @@
}
#endregion
+ #region 閲囪喘璁㈠崟缂栬緫鍥炴樉
+ [Route("Cg_POOrderBill/QueryListEdit")]
+ [HttpGet]
+ public object QueryListEdit(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillList", 3, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //if (!DBUtility.ClsPub.Security_Log("Sc_EmployeeSignInNoteBillMain_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_Cg_POOrderBillEdit order by 鍗曟嵁鍙� desc", "锘縣_v_Cg_POOrderBillEdit");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Cg_POOrderBillEdit where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
+ ds = oCN.RunProcReturn(sql, "锘縣_v_Cg_POOrderBillEdit");
+ }
+
+
+ //娣诲姞鍒楀悕
+ 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 ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
diff --git a/WebAPI/Controllers/CJGL/Cj_CheckBarcodeController.cs b/WebAPI/Controllers/CJGL/Cj_CheckBarcodeController.cs
index 1bf08df..37b8e55 100644
--- a/WebAPI/Controllers/CJGL/Cj_CheckBarcodeController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_CheckBarcodeController.cs
@@ -22,11 +22,11 @@
#region 涓夌爜鍚堜竴锛屽垽鏂壂鎻忕墿鏂欐潯鐮佺粦瀹氫俊鎭槸鍚︿竴鑷�
[Route("CheckBarcodeController/Get_BarCode_BarcodeCheck")]
[HttpGet]
- public object CheckBarcode(string HBarCode_Pallet, string HBarCode_Destination, string HBarCode_MiddleBox, string HBarCode_SN, int HBarCodeType,int HInterID, string HBillNo,string HMaker)
+ public object CheckBarcode(string HBarCode_Pallet, string HBarCode_Destination, string HBarCode_MiddleBox, string HBarCode_SN, int HBarCodeType,int HInterID, string HBillNo,string HMaker,string HBillType)
{
try
{
- ds = oCn.RunProcReturn("exec h_p_Cj_CheckBarcodeBing '" + HBarCode_Pallet + "','" + HBarCode_Destination + "','" + HBarCode_MiddleBox + "','" + HBarCode_SN + "','" + HBarCodeType + "'," + HInterID + ",'" + HBillNo + "','" + HMaker + "'", "h_p_Cj_CheckBarcodeBing");
+ ds = oCn.RunProcReturn("exec h_p_Cj_CheckBarcodeBing '" + HBarCode_Pallet + "','" + HBarCode_Destination + "','" + HBarCode_MiddleBox + "','" + HBarCode_SN + "','" + HBarCodeType + "'," + HInterID + ",'" + HBillNo + "','" + HMaker + "','" + HBillType + "'", "h_p_Cj_CheckBarcodeBing");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -68,12 +68,12 @@
[Route("CheckBarcodeController/Save_BarCode_BarcodeCheck")]
[HttpGet]
- public object Save_BarCode_BarcodeCheck(Int64 HInterID, string HBillNo)
+ public object Save_BarCode_BarcodeCheck(Int64 HInterID, string HBillNo,string HBillType)
{
try
{
oCn.BeginTran();
- DataSet ds = oCn.RunProcReturn("exec h_p_WMS_BarCodeBingCheckBill_Insert " + HInterID.ToString() + ",'" + HBillNo + "'", "h_p_WMS_BarCodeBingCheckBill_Insert");
+ DataSet ds = oCn.RunProcReturn("exec h_p_WMS_BarCodeBingCheckBill_Insert " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "'", "h_p_WMS_BarCodeBingCheckBill_Insert");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
@@ -93,7 +93,7 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.Message = ds.Tables[0].Rows[0]["HBackRemark"].ToString(); //澶辫触锛�
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index eb6ae13..e4d1de3 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -734,6 +734,8 @@
{
if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
{
+ oCN.RunProc("update Sc_ProcessExchangeBillMain set HMakeDate = GETDATE(),HMaker='"+ user + "' where HInterID = " + HInterID );
+
//鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�
oCN.RunProc("exec h_p_OA_WorkLinkBill_Create " + HInterID + "," + 3772);
}
diff --git a/WebAPI/Controllers/QC_ManagementController.cs b/WebAPI/Controllers/QC_ManagementController.cs
index 21207d6..e5ecba2 100644
--- a/WebAPI/Controllers/QC_ManagementController.cs
+++ b/WebAPI/Controllers/QC_ManagementController.cs
@@ -2132,7 +2132,7 @@
UserName = oItem.HMaker;
oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HDate=oItem.HDate.ToString()==""? DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")) : oItem.HDate;
oItem.HBillType = "7506";
oItem.HBillSubType = "7506";
oItem.HBillStatus = 0;
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
index 7ae87df..37de902 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
@@ -80,8 +80,8 @@
#endregion
- #region 涓嬫帹鏍规嵁璁惧id鏌ヨ鍥炴樉
- [Route("Gy_EquipFileMain/get锘縎b_EquipList")]
+ #region 涓嬫帹鏍规嵁璁惧id鏌y_EquipFileMain/GetResumeList璇㈠洖鏄�
+ [Route("Gy_EquipFileMain/getSb_EquipList")]
[HttpGet]
public object getSb_EquipBeginBillList(int HInterID, string user)
{
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs
index 7ac462f..a35de88 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs
@@ -514,6 +514,50 @@
}
#endregion
+ #region 鏍规嵁璁惧ID鏌ユ壘璁惧妗ｆ淇℃伅PDA 鏌ヨ鏉＄爜妗ｆ鍒楄〃
+ [Route("Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_ListByHEquipID")]
+ [HttpGet]
+ public object txtHBarCode_KeyDown_ListByHEquipID(string HEquipID)
+ {
+ try
+ {
+ if (HEquipID == null || HEquipID.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璁惧鍐呯爜涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_EquipFileMainList where hmainid= " + HEquipID , "h_v_Gy_EquipFileMainList");
+ //鍐欏叆淇℃伅
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ 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 鏍规嵁璁惧鏉＄爜鏌ユ壘璁惧妗ｆ淇℃伅PDA 鏌ヨ鏉＄爜妗ｆ鍒楄〃
[Route("Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_List")]
[HttpGet]
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs
index 4509ba1..5bb9568 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs
@@ -209,13 +209,13 @@
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
",HEquipID,HExplanation,HInnerBillNo,HRepairID,HEmpID" +
",HManagerID,HDeptID,HRepairContent,HRepairPlanBeginDate,HRepairPlanEndDate" +
- ",HPlanTimes,HCycleUnit" +
+ ",HPlanTimes,HCycleUnit,HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID" +
") " +
" values('" + BillType + "','" + BillType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
", " + omodel.HEquipID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + omodel.HRepairID.ToString() + "," + omodel.HEmpID.ToString() +
"," + omodel.HManagerID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HRepairContent + "','" + omodel.HRepairPlanBeginDate + "','" + omodel.HRepairPlanEndDate + "'" +
- "," + omodel.HPlanTimes.ToString() + ",'" + omodel.HCycleUnit + "'" +
+ "," + omodel.HPlanTimes.ToString() + ",'" + omodel.HCycleUnit + "','" + omodel.HMainSourceBillType + "','" + omodel.HMainSourceInterID + "','" + omodel.HMainSourceEntryID + "'" +
") ");
//涓昏〃
oCN.RunProc("Insert Into Sb_EquipRepairSendWorkBillMain" +
@@ -226,7 +226,7 @@
",HPlanTimes,HCycleUnit" +
") " +
" values('" + BillType + "','" + BillType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
- ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
+ ", Year(getdate()),Month(getdate()),'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
", " + omodel.HEquipID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + omodel.HRepairID.ToString() + "," + omodel.HEmpID.ToString() +
"," + omodel.HManagerID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HRepairContent + "','" + omodel.HRepairPlanBeginDate + "','" + omodel.HRepairPlanEndDate + "'" +
"," + omodel.HPlanTimes.ToString() + ",'" + omodel.HCycleUnit + "'" +
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index 9631de6..1eba259 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -8232,14 +8232,29 @@
{
try
{
+ List<object> columnNameList = new List<object>();
- string sql = "select * from OA_WorkLinkBillSub where HInterID = '" + HInterID + "'order by HDate desc";
+ string sql = $@"select HSendMan 鍥炲浜�, HDescription 鍥炲鍐呭, HDate 鍥炲鏃堕棿,
+ case HSendStatus
+ when 1 then '鏅��'
+ when 10 then '楠岃瘉閫氳繃'
+ when 9 then '缁撴'
+ end as 绫诲瀷
+ ,* from OA_WorkLinkBillSub where HInterID = '" + HInterID + "'order by HDate desc";
ds = oCN.RunProcReturn(sql, "OA_WorkLinkBillSub");
+
+ 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)
diff --git a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
index 811b127..e3b912c 100644
--- a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
@@ -1633,7 +1633,7 @@
objJsonResult.data = 1;
return objJsonResult;
}
-
+ LogService.Write("婧愬崟绫诲瀷: " + oItem.HMainSourceBillType);
//oItem.HMaker = "";
UserName = oItem.HMaker; //鍒跺崟浜�
oItem.HBillType = "3910";
diff --git a/WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs b/WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs
index 3a94470..c54f76f 100644
--- a/WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs
+++ b/WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs
@@ -79,7 +79,6 @@
}
#endregion
-
#region 鏍规嵁婧愬崟浼犵墿鏂欏垪琛�
[Route("WLYayBillController/GetMesByOrginBill_1")]
[HttpGet]
@@ -350,17 +349,19 @@
#endregion
#region app鎵爜妯″潡
- [Route("Sc_EmployeeSignInNoteBillController/APP_Edit_json")]
+ //鑾峰彇璁惧淇℃伅
+ [Route("Sc_EmployeeSignInNoteBillController/txtHBarCode_KeyDown")]
[HttpGet]
- public object APP_Edit_json(int HInterID, string HBarCode)
+ public object txtHBarCode_KeyDown(string HBarCode)
{
- DataSet ds = oCN.RunProcReturn("exec h_p_getMESByEquipmentCode_app '" + HBarCode+"'", "h_p_getMESByEquipmentCode_app");
+ DataSet ds = oCN.RunProcReturn("select * from h_v_Gy_EquipFileBill_KeyDown_PDA where 鏉″舰鐮�= '" + HBarCode+"'", "h_v_Gy_EquipFileBill_KeyDown_PDA");
+
if (ds != null || ds.Tables.Count > 0)
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鎴愬姛";
- objJsonResult.data = ds.Tables;
+ objJsonResult.Message = "鏌ヨ鎴愬姛";
+ objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -368,6 +369,82 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
+ objJsonResult.Message = "璁惧妗ｆ鏈壘鍒版潯鐮佸搴旂殑璁惧淇℃伅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //鑾峰彇妯″叿淇℃伅
+ [Route("Sc_EmployeeSignInNoteBillController/Get_HMouldList")]
+ [HttpGet]
+ public object Get_HMouldList(int HInterID,string UserNmae)
+ {
+ DataSet ds = oCN.RunProcReturn("exec h_p_SB_HEquipHMould_Query '" + HInterID + "'", "h_p_SB_HEquipHMould_Query");
+
+ if (ds != null || ds.Tables.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏌ヨ鎴愬姛";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠璁惧鏃犳ā鍏蜂俊鎭紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //鑾峰彇宸ュ崟淇℃伅
+ [Route("Sc_EmployeeSignInNoteBillController/Get_HIcmoList")]
+ [HttpGet]
+ public object Get_HIcmoList(int HInterID, string UserNmae)
+ {
+ DataSet ds = oCN.RunProcReturn("exec h_p_Sc_ICMOBillStatus_Tmp_QD '" + HInterID + "'", "h_p_Sc_ICMOBillStatus_Tmp_QD");
+
+ if (ds != null || ds.Tables.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏌ヨ鎴愬姛";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠璁惧鏃犳ā鍏蜂俊鎭紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ [Route("Sc_EmployeeSignInNoteBillController/Get_equipmentMes")]
+ [HttpGet]
+ public object Get_MouldMes(int HInterID, string HBarCode)
+ {
+
+
+ DataSet dss = oCN.RunProcReturn("select HInterID from Gy_EquipFileBillMain where HBarCode='"+ HBarCode + "'", "Gy_EquipFileBillMain");
+ DataSet ds = oCN.RunProcReturn("exec h_p_SB_HEquipHMould_Query '" + dss.Tables[0].Rows[0]["HInterID"] + "'", "h_p_SB_HEquipHMould_Query");
+ if (ds != null || ds.Tables.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
objJsonResult.data = null;
return objJsonResult;
diff --git a/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs b/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
index 6f85bb9..c907c0b 100644
--- a/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
@@ -242,7 +242,7 @@
",HSupID,HRepairType,HNewModel,HNewDesignLife,HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID,HBillStatus" +
") " +
" values('" + BillType + "','" + BillType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
- "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
+ ",YEAR(GETDATE()),month(GETDATE()),'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
"," + omodel.HEquipID.ToString() + "," + omodel.HRepairID.ToString() + ",'" + omodel.HRepairBeginDate + "','" + omodel.HRepairEndDate + "','" + omodel.HRepairContent + "'" +
",'" + omodel.HCycleUnit + "'," + omodel.HPlanTimes.ToString() + "," + omodel.HTimes.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() +
"," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + omodel.HMouldID.ToString() +
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 27e876b..e07ff59 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -1709,8 +1709,8 @@
}
LogService.Write("WMS_CampanyName: ", oSystemParameter.omodel.WMS_CampanyName);
- //if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "閿﹂殕"))
- //{
+ if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "閿﹂殕"))
+ {
string sql = @"select a.FID,a.FNUMBER Employee,d.FNUMBER Dept from Gy_Employee e
join JL20250716203240..T_HR_EMPINFO a on e.HNumber = a.FNUMBER
join JL20250716203240..T_BD_STAFFTEMP c on c.FID = a.FID
@@ -1727,7 +1727,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- //}
+ }
@@ -1738,10 +1738,10 @@
model.Add("FInspectOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //璐ㄦ缁勭粐
model.Add("FSourceOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //鏉ユ簮缁勭粐
//model.Add("FInspectDepId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Dept"].ToString() }); //璐ㄦ閮ㄩ棬
- //if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "閿﹂殕"))
- //{
+ if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "閿﹂殕"))
+ {
model.Add("FInspectorId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Employee"].ToString() }); //璐ㄦ鍛�
- //}
+ }
model.Add("FISSYNCED", "false");// 鏄惁宸插悓姝�
model.Add("F_PGKJ_Date", DateTime.Now.ToString("yyyy-MM-dd"));// 鎶ユ鏃ユ湡
model.Add("FBillNo", HBillNo);
@@ -1782,12 +1782,12 @@
FentityModel2.Add("FBasePolicyQty", HRightQty.ToString() == "0" ? HBadQty.ToString() : HRightQty.ToString()); //鍩烘湰鍗曚綅鏁伴噺
FentityModel2.Add("FUsePolicy", HUseResult.ToString()); //浣跨敤鍐崇瓥
FentityModel2.Add("FIsCheck", false); //鏄惁鎶芥
- //FentityModel2.Add("FIsDefectProcess", false); //涓嶈壇澶勭悊
+ FentityModel2.Add("FIsDefectProcess", false); //涓嶈壇澶勭悊
// 閿﹂殕鍚敤涓嶈壇澶勭悊
- //if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "閿﹂殕"))
- //{
+ if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "閿﹂殕"))
+ {
FentityModel2.Add("FIsDefectProcess", true); //涓嶈壇澶勭悊
- //}
+ }
FentityModel2.Add("FCanSale", false); //鍙攢鍞�
FentityModel2.Add("FIsMRBReview", false); //MRP璇勫
FentityModel2.Add("FIsReturn", true); //鍒ら��
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index e83bff7..9f5f033 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -1150,7 +1150,52 @@
}
}
+ /// <summary>
+ /// 鑾峰彇浠撳簱鍒楄〃 --娣诲姞妯″叿浠撳簱鏉′欢 鐢ㄤ簬鍙煡璇㈡ā鍏蜂粨搴�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetWarehouseList_Json_MJ")]
+ [HttpGet]
+ public object GetWarehouseList_Json_MJ(string Warehouse, Int64 HOrgID)
+ {
+ sWhere = " Where HStopFlag=0 and HEndFlag=1 and HWarehouseType='妯″叿浠撳簱' and HUSEORGID =" + HOrgID + "";
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+ if (Warehouse != "")
+ {
+ sWhere = sWhere + " and ( HNumber like '%" + Warehouse + "%' or HName like '%" + Warehouse + "%' or HUSEORGID like '%" + Warehouse + "%' ) ";
+ }
+ try
+ {
+ WebS.WebService1 oWeb = new WebS.WebService1();
+ ds = oWeb.GetWarehouseList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
/// <summary>
/// 鑾峰彇浠撲綅鍒楄〃
@@ -1492,11 +1537,11 @@
{
if (Employee != "")
{
- sWhere = " Where HStopFlag=0 and HWHID=" + HGroupID.ToString() + " and ( HNumber like '%" + Employee + "%' or HName like '%" + Employee + "%' ) ";
+ sWhere = " Where HStopFlag=0 and HGroupID=" + HGroupID.ToString() + " and ( HNumber like '%" + Employee + "%' or HName like '%" + Employee + "%' ) ";
}
else
{
- sWhere = " Where HStopFlag=0 and HWHID=" + HGroupID.ToString();
+ sWhere = " Where HStopFlag=0 and HGroupID=" + HGroupID.ToString();
}
}
try
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\241\346\243\200\345\215\225/QC_PatrolProcCheckOtherBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\241\346\243\200\345\215\225/QC_PatrolProcCheckOtherBillController.cs"
index 6208a16..e7eb49a 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\241\346\243\200\345\215\225/QC_PatrolProcCheckOtherBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\241\346\243\200\345\215\225/QC_PatrolProcCheckOtherBillController.cs"
@@ -244,6 +244,7 @@
BillNew.omodel.HBatchNo = ClsPub.isStrNull(mainList[0].HBatchNo);
BillNew.omodel.HTakeSampleCheckBillID = ClsPub.isLong(mainList[0].HTakeSampleCheckBillID);
BillNew.omodel.HTakeSampleCheckBillNo = ClsPub.isStrNull(mainList[0].HTakeSampleCheckBillNo);
+ BillNew.omodel.HCheckQty = ClsPub.isLong(mainList[0].HCheckQty);
List<Model.ClsQC_PatrolProcCheckOtherBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_PatrolProcCheckOtherBillSub>>(msg3);
BillNew.DetailColl = new List<Model.ClsQC_PatrolProcCheckOtherBillSub>();
for (int i = 0; i < subList.ToArray().Length; i++)
@@ -1326,6 +1327,63 @@
}
#endregion
+ #region 宸℃鍗曟牴鎹簮鍗曠被鍨嬭幏鍙栦俊鎭�-婧愬崟涓哄彇鏍峰崟
+ [Route("QC_PatrolProcCheckBill/get_TakeSampleCheckBill")]
+ [HttpGet]
+ public object get_TakeSampleCheckBill(string HInterID, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sReturn = "";
+ string sql = "";
+ if (oSystemParameter.ShowBill(ref sReturn))
+ {
+ switch (oSystemParameter.omodel.QC_ProcessCheckBill_QCSchemeSource)
+ {
+ case "宸ュ簭":
+ sql = "exec h_p_QC_PatrolProc_GetTakeSampleCheckBillList " + "'宸ュ簭','" + HInterID + "'";
+ break;
+ case "鐗╂枡":
+ sql = "exec h_p_QC_PatrolProc_GetTakeSampleCheckBillList " + "'鐗╂枡','" + HInterID + "'";
+ break;
+ case "宸ヨ壓璺嚎":
+ sql = "exec h_p_QC_PatrolProc_GetTakeSampleCheckBillList " + "'宸ヨ壓璺嚎','" + HInterID + "'";
+ break;
+ }
+
+ }
+
+ ds = oCN.RunProcReturn(sql, "h_p_QC_PatrolProc_GetTakeSampleCheckBillList");
+
+ //娣诲姞鍒楀悕
+ 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 = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
#region PDA宸℃璁板綍鍗� 鏌ヨ鍒楄〃
[Route("QC_PatrolProcCheckOtherBill/QC_PatrolProcCheckOtherBillList_PDA")]
[HttpGet]
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
index dfc0236..4cb5ed0 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
@@ -242,6 +242,62 @@
}
#endregion
+ #region 宸ュ簭妫�楠屽崟鏍规嵁婧愬崟绫诲瀷鑾峰彇淇℃伅-婧愬崟涓哄彇鏍峰崟
+ [Route("QC_ProcessCheckBill/get_TakeSampleCheckBill")]
+ [HttpGet]
+ public object get_TakeSampleCheckBill(string HInterID, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sReturn = "";
+ string sql = "";
+ if (oSystemParameter.ShowBill(ref sReturn))
+ {
+ switch (oSystemParameter.omodel.QC_ProcessCheckBill_QCSchemeSource)
+ {
+ case "宸ュ簭":
+ sql = "exec h_p_QC_Process_GetTakeSampleCheckBillList " + "'宸ュ簭','" + HInterID + "'";
+ break;
+ case "鐗╂枡":
+ sql = "exec h_p_QC_Process_GetTakeSampleCheckBillList " + "'鐗╂枡','" + HInterID + "'";
+ break;
+ case "宸ヨ壓璺嚎":
+ sql = "exec h_p_QC_Process_GetTakeSampleCheckBillList " + "'宸ヨ壓璺嚎','" + HInterID + "'";
+ break;
+ }
+
+ }
+
+ ds = oCN.RunProcReturn(sql, "h_p_QC_Process_GetTakeSampleCheckBillList");
+
+ //娣诲姞鍒楀悕
+ 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 = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 宸ュ簭妫�楠屽崟 瀹℃牳 鍙嶅鏍� 鍏抽棴 鍙嶅叧闂� 浣滃簾 鍙嶄綔搴�
/// <summary>
/// 宸ュ簭妫�楠屽崟 瀹℃牳銆佸弽瀹℃牳
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
index d2f4023..987795d 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
@@ -698,7 +698,7 @@
}
}
- oCN.RunProc("update QC_FirstPieceCheckBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate() where HInterID=" + HInterID);
+ oCN.RunProc("update QC_FirstPieceCheckBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate(),HBillStatus=2 where HInterID=" + HInterID);
//瀹℃牳鍚庢帶鍒�
DataSet EndDs = oCN.RunProcReturn("Exec h_p_QC_FirstPieceCheckBill_AfterCheckCtrl " + HInterID.ToString() + ",'"+ ds.Tables[0].Rows[0]["HBillNo"].ToString() + "','" + CurUserName + "'", "h_p_QC_FirstPieceCheckBill_AfterCheckCtrl");
@@ -752,7 +752,7 @@
}
}
- oCN.RunProc("update QC_FirstPieceCheckBillMain set HChecker='',HCheckDate=null where HInterID=" + HInterID);
+ oCN.RunProc("update QC_FirstPieceCheckBillMain set HChecker='',HCheckDate=null,HBillStatus=1 where HInterID=" + HInterID);
//鍙嶅鏍稿悗鎺у埗
DataSet EndDs = oCN.RunProcReturn("Exec h_p_QC_FirstPieceCheckBill_AfterUnCheckCtrl " + HInterID.ToString() + ",'" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + "','" + CurUserName + "'", " h_p_QC_FirstPieceCheckBill_AfterUnCheckCtrl");
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_CostAverageTypeController.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_CostAverageTypeController.cs"
new file mode 100644
index 0000000..43b3270
--- /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_CostAverageTypeController.cs"
@@ -0,0 +1,887 @@
+锘縰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.IO;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+using WebAPI.Service;
+namespace WebAPI.Controllers.鍩虹璧勬枡.鍩虹璧勬枡
+{
+ public class Gy_CostAverageTypeController : ApiController
+ {
+ 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_CostAverageType/list")]
+ [HttpGet]
+ public object list(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_CostAverageType_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_CostAverageTypeList where 1=1 order by hitemid ", "h_v_Gy_CostAverageTypeList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_CostAverageTypeList where 1=1 ";
+ string sql = sql1 + sWhere + " order by hitemid";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_CostAverageTypeList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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 = null;
+ //return objJsonResult;
+ //}
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #region 鎴愭湰鍒嗛厤绫诲瀷鍒楄〃-鍒嗛〉
+ [Route("Gy_CostAverageType/list_byPage")]
+ [HttpGet]
+ public object GetCarList_byPage(string sWhere, string user, int page, int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_CostAverageType_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("exec h_p_Gy_CostAverageTypeList " + page + "," + size + "," + "''", "h_p_Gy_CostAverageTypeList");
+ }
+ else
+ {
+ sWhere = sWhere.Replace("'", "''");
+
+ ds = oCN.RunProcReturn("exec h_p_Gy_CostAverageTypeList " + page + "," + size + ",'" + sWhere + "'", "h_p_Gy_CostAverageTypeList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ 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="msg"></param>
+ /// <returns></returns>
+ [Route("Gy_CostAverageType/SaveGy_CostAverageType")]
+ [HttpPost]
+ public object SaveGy_CostAverageType([FromBody] JObject msg)
+ {
+ DataSet ds;
+ var _value = msg["msg"].ToString();
+ string msg3 = _value.ToString();
+ string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string msg2 = sArray[1].ToString();
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_CostAverageType_Edit", 1, false, msg2))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ Int64 HItemID = 0;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ListModels oListModels = new ListModels();
+ try
+ {
+ DAL.ClsGy_CostAverageType_Ctl oBill = new DAL.ClsGy_CostAverageType_Ctl();
+ List<Model.ClsGy_CostAverageType_Model> lsmain = new List<Model.ClsGy_CostAverageType_Model>();
+ msg1 = msg1.Replace("\\", "");
+ msg1 = msg1.Replace("\n", ""); //\n
+ msg1 = "[" + msg1.ToString() + "]";
+ lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_CostAverageType_Model>>(msg1);
+ foreach (Model.ClsGy_CostAverageType_Model oItem in lsmain)
+ {
+ if (oItem.HNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹垚鏈垎閰嶄唬鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (oItem.HName.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹垚鏈垎閰嶇被鍨嬪悕绉颁笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+
+ ds = oCN.RunProcReturn("select * from Gy_CostAverageType where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_CostAverageType");
+
+ //鏂板鏃跺垽鏂�
+ if (oItem.HItemID == 0)
+ {
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹垚鏈垎閰嶄唬鐮侀噸澶嶏紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ string sParent;
+ sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ if (sParent.Trim() == "")
+ {
+ oBill.oModel.HParentID = 0;
+ }
+ else
+ {
+ if (oBill.HavParentCode(sParent.Trim(), HItemID))
+ {
+ oBill.oModel.HParentID = oBill.oModel.HItemID;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ else//缂栬緫鏃跺垽鏂�
+ {
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_CostAverageType where HItemID=" + oItem.HItemID, "Gy_CostAverageType");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ string sParent;
+ sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ if (sParent.Trim() == "")
+ {
+ oBill.oModel.HParentID = 0;
+ }
+ else
+ {
+ if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID))
+ {
+ oBill.oModel.HParentID = oBill.oModel.HItemID;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ //寰楀埌鐭唬鐮�
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oItem.HShortNumber = sShortNumber;//鐭唬鐮�
+ oItem.HEndFlag = true;//鏈骇鏍囧織
+ oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇
+ oItem.HMakeEmp = msg2;//鍒涘缓浜�
+ oBill.oModel = oItem;
+ }
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.oModel.HItemID == 0)
+ {
+
+ bResult = oBill.AddNew(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ oBill.oModel.HModifyEmp = msg2;
+ bResult = oBill.ModifyByID(oBill.oModel.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ 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
+
+ #region 鎴愭湰鍒嗛厤绫诲瀷瀹℃牳銆佸弽瀹℃牳
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Gy_CostAverageType/AuditGy_CostAverageType")]
+ [HttpGet]
+ public object AuditGy_CostAverageType(int HInterID, int IsAudit, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_CostAverageType_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_CostAverageType where HItemID=" + HInterID, "Gy_CostAverageType");
+ 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) //瀹℃牳鍒ゆ柇
+ {
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_CostAverageType_BeforeCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_CostAverageType_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;
+ }
+ //==================================================================================
+
+
+ oCN.RunProc("update Gy_CostAverageType set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID);
+
+
+ //瀹℃牳鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Gy_CostAverageType_AfterCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_CostAverageType_AfterCheckCtrl");
+ 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;
+ }
+ //==================================================================================
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ //鍙嶅鏍稿墠鎺у埗=========================================
+ string sql1 = "exec h_p_Gy_CostAverageType_BeforeUnCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_CostAverageType_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;
+ }
+ //==================================================================================
+
+
+
+ oCN.RunProc("update Gy_CostAverageType set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID);
+
+
+ //鍙嶅鏍稿悗鎺у埗=========================================
+ string sql2 = "exec h_p_Gy_CostAverageType_AfterUnCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_CostAverageType_AfterCheckCtrl");
+ 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;
+ }
+ //==================================================================================
+
+ 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_CostAverageType/StopGy_CostAverageType")]
+ [HttpGet]
+ public object StopGy_CostAverageType(int HInterID, int IsStop, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_CostAverageType_Stop", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_CostAverageType where HItemID=" + HInterID, "Gy_CostAverageType");
+ 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) //绂佺敤鍒ゆ柇
+ {
+
+ //绂佺敤鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_CostAverageType_BeforeStopCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_CostAverageType_BeforeStopCtrl");
+ 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;
+ }
+ //==================================================================================
+
+ oCN.RunProc("update Gy_CostAverageType set HStopEmp='" + CurUserName + "',HStopTime=getdate(),HStopflag=1 where HItemID=" + HInterID);
+
+ //绂佺敤鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Gy_CostAverageType_AfterStopCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_CostAverageType_AfterStopCtrl");
+ 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;
+ }
+ //==================================================================================
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+ {
+ //鍙嶇鐢ㄥ墠鎺у埗=========================================
+ string sql1 = "exec h_p_Gy_CostAverageType_BeforeUnStopCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_CostAverageType_BeforeUnStopCtrl");
+ 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;
+ }
+ //==================================================================================
+
+
+ oCN.RunProc("update Gy_CostAverageType set HStopEmp='',HStopTime=null,HStopflag=0 where HItemID=" + HInterID);
+
+
+ //鍙嶇鐢ㄥ悗鎺у埗=========================================
+ string sql2 = "exec h_p_Gy_CostAverageType_AfterUnStopCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_CostAverageType_AfterUnStopCtrl");
+ 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;
+ }
+ //==================================================================================
+
+ 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_CostAverageType/GetGy_CostAverageTypeDetail")]
+ [HttpGet]
+ public object GetGy_CostAverageTypeDetail(int HID)
+ {
+
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ string sql1 = $@"select * from h_v_Gy_CostAverageTypeList_Edit where HItemID = {HID}";
+ ds = oCN.RunProcReturn(sql1, "h_v_Gy_CostAverageTypeList");
+ //娣诲姞鍒楀悕
+ 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
+
+ #region 鍒犻櫎
+ [Route("Gy_CostAverageType/DeltetGy_CostAverageType")]
+ [HttpGet]
+ public object DeltetGy_CostAverageType(string HItemID, string user)
+ {
+ DataSet ds;
+ try
+ {
+ //鍒犻櫎鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_CostAverageType_Drop", 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();//寮�濮嬩簨鍔�
+ string HNumber = "";
+ string HName = "";
+ ds = oCN.RunProcReturn("select * from Gy_CostAverageType where HItemID=" + HItemID, "Gy_CostAverageType");
+ 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"] != null && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸茬粡瀹℃牳涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ else
+ {
+ HNumber = ds.Tables[0].Rows[0]["HNumber"].ToString();
+ HName = ds.Tables[0].Rows[0]["HName"].ToString();
+ }
+
+
+ var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
+ if (HStopflag)
+ {
+ oCN.RollBack();//鍥炴粴浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("delete from Gy_CostAverageType where HItemID=" + HItemID);
+
+
+
+ //鍐欏叆鏃ュ織
+ string Operation = "鍒犻櫎"; //鎿嶄綔
+ string ComputerName = System.Net.Dns.GetHostName(); //璁惧鍚嶇О
+ string WorkList = Operation + "鎴愭湰鍒嗛厤绫诲瀷锛屾垚鏈垎閰嶇被鍨嬩唬鐮侊細" + HNumber + "锛涙垚鏈垎閰嶇被鍨嬪悕绉帮細" + HName; //鎿嶄綔璇︽儏
+ string MvarReportTitle = "鎴愭湰鍒嗛厤绫诲瀷鍒楄〃"; //鎿嶄綔妯″潡
+ string SystemName = "LMES-" + MvarReportTitle + "妯″潡"; //鎿嶄綔妯″潡
+ string IPAddress = "";
+ //string IPAddress = Dns.GetHostEntry(Dns.GetHostName()).AddressList[0].ToString(); //IP鍦板潃
+ //string IPAddress = System.Web.HttpContext.Current.Request.UserHostAddress;
+
+ oCN.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
+ "(getdate(),'" + user + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','" + IPAddress + "','" + Operation + "')"
+ );
+
+
+ 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;
+ }
+ }
+ #endregion
+
+
+
+ }
+}
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index c1b4508..ed05dcf 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -13834,15 +13834,22 @@
if(Mode == 1)
{
//鎵爜妯″紡闇�瑕佽В鏋愭潯鐮佽幏鍙朒InterID鍜孒EntryID
+ LogService.Write($@"
+ exec h_p_CheckBillBarCode_AnalysisBarcode
+ @HBillType={HBillType},
+ @HSourceBillType={HSourceBillType},
+ @HBarCode='{HBarCode}',
+ @user = '{user}'
+ ");
ds = oCn.RunProcReturn($@"
exec h_p_CheckBillBarCode_AnalysisBarcode
@HBillType={HBillType},
@HSourceBillType={HSourceBillType},
- @HBarCode={HBarCode},
+ @HBarCode='{HBarCode}',
@user = '{user}'
", "h_p_CheckBillBarCode_AnalysisBarcode");
- if (ds.Tables[0].Rows.Count == 0)
+ if (ds is null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -13982,5 +13989,45 @@
}
}
#endregion
+
+ #region [鍙栨牱鍗昡 鑾峰彇鏈笅鎺ㄦ垚妫�楠屽崟鐨勫彇鏍峰崟鍒楄〃
+ [Route("WEBSController/AwaitCheckSampleBillList")]
+ [HttpGet]
+ public Object AwaitCheckSampleBillList(string user)
+ {
+ List<object> columnNameList = new List<object>();
+ try
+ {
+ ds = oCn.RunProcReturn($@"
+ exec h_p_AwaitCheckSampleBillList @user={user}
+ ", "h_p_CheckBillBarCode_CheckItem");
+
+ //娣诲姞鍒楀悕
+ 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 = "success锛�";
+ objJsonResult.data = ds.Tables;
+ objJsonResult.list = columnNameList;
+
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鍗曟嵁鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
diff --git "a/WebAPI/Controllers/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\345\215\225\350\264\271\347\224\250\347\273\223\347\256\227\345\215\225/Pay_WayBillPaymentBillController.cs" "b/WebAPI/Controllers/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\345\215\225\350\264\271\347\224\250\347\273\223\347\256\227\345\215\225/Pay_WayBillPaymentBillController.cs"
index 6031ceb..bc2881e 100644
--- "a/WebAPI/Controllers/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\345\215\225\350\264\271\347\224\250\347\273\223\347\256\227\345\215\225/Pay_WayBillPaymentBillController.cs"
+++ "b/WebAPI/Controllers/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\345\215\225\350\264\271\347\224\250\347\273\223\347\256\227\345\215\225/Pay_WayBillPaymentBillController.cs"
@@ -97,8 +97,8 @@
string msg3 = sArray[1].ToString(); //瀛愯〃
string refSav = sArray[2].ToString();//鎿嶄綔鏂瑰紡鏁版嵁绫诲瀷 1娣诲姞 3淇敼 2 澶嶅埗
string msg4 = sArray[3].ToString();//鐢ㄦ埛鍚�
- string msg5 = sArray[4].ToString();
- if (msg5 != null || msg5 != "")
+ string msg5 = sArray[5].ToString();
+ if (msg5 != null && msg5 != ""&& msg5 != "undefined")
{
msg5 = msg5.Substring(1);
@@ -232,7 +232,7 @@
{
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- if (msg5 != "")
+ if (msg5 != null && msg5 != "" && msg5 != "undefined")
{
oCN.RunProc("update WL_YayBillMain set HDate_Accounting=getdate() , HSurer_Accounting='" + msg4 +"'" +" where HInterID in (" + msg5 + ")");
}
diff --git a/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs b/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs
index a130ae3..04b14aa 100644
--- a/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs
+++ b/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs
@@ -127,8 +127,8 @@
"," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCNote1 + "','" + oSub.HQCNote2 + "','" + oSub.HQCNote3 + "','" + oSub.HQCNote4 + "'" +
",'" + oSub.HQCNote5 + "','" + oSub.HQCNote6 + "','" + oSub.HQCNote7 + "','" + oSub.HQCNote8 + "','" + oSub.HQCNote9 + "','" + oSub.HQCNote10 + "','" + oSub.HQCNote1_SN + "','" + oSub.HQCNote2_SN + "','" + oSub.HQCNote3_SN + "','" + oSub.HQCNote4_SN + "','" + oSub.HQCNote5_SN + "','" + oSub.HQCNote6_SN + "','" + oSub.HQCNote7_SN + "','" + oSub.HQCNote8_SN + "','" + oSub.HQCNote9_SN + "','" + oSub.HQCNote10_SN + "'" +
- "," + oSub.HTargetVal + "," + oSub.HInspectMethodID + "," + oSub.HDownLimit + "," + oSub.HUpLimit + ",'" + oSub.HAnalysisMethod + "'" +
- "," + oSub.HTargetVal2 + "," + oSub.HTargetVal3 + "," + oSub.HTargetVal4 + "," + oSub.HTargetVal5 + "," + oSub.HTargetVal6 +
+ ",'" + oSub.HTargetVal + "'," + oSub.HInspectMethodID + ",'" + oSub.HDownLimit + "','" + oSub.HUpLimit + "','" + oSub.HAnalysisMethod + "'" +
+ ",'" + oSub.HTargetVal2 + "','" + oSub.HTargetVal3 + "','" + oSub.HTargetVal4 + "','" + oSub.HTargetVal5 + "','" + oSub.HTargetVal6 +"'"+
") ");
}
diff --git a/WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs b/WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs
index bd1cce7..b550f8c 100644
--- a/WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs
+++ b/WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs
@@ -258,7 +258,7 @@
//
//=========================淇濆瓨鍚庢帶鍒�
- DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sb_EquipRepairWorkBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Sb_EquipRepairWorkBill_AfterSaveCtrl");
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sb_EquipRepairWorkBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + $"',{omodel.HMainSourceBillType}", "h_p_Sb_EquipRepairWorkBill_AfterSaveCtrl");
if (ds2 == null)
{
sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
diff --git a/WebAPI/Models/Gy_Mould.cs b/WebAPI/Models/Gy_Mould.cs
index 2897b2e..69d89a4 100644
--- a/WebAPI/Models/Gy_Mould.cs
+++ b/WebAPI/Models/Gy_Mould.cs
@@ -90,6 +90,6 @@
public string HProductDesignSize { get; set; } // 浜у搧璁捐灏哄
public string HGaugeDesignSize { get; set; } // 妫�鍏疯璁″昂瀵�
public int HProductQTY { get; set; } // 浜у搧鏁伴噺
-
+ public int HManagerID { get; set; } // 璐熻矗浜�
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user
index 210b24d..66eb13c 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\gz\缃戠珯鍙戝竷\MES-WEB-API</_PublishTargetUrl>
- <History>True|2025-12-29T08:07:54.9198175Z;True|2025-12-29T16:03:22.7326283+08:00;True|2025-12-29T14:48:43.2998704+08:00;True|2025-12-29T13:15:31.9190907+08:00;False|2025-12-29T13:14:50.6997009+08:00;False|2025-12-29T13:14:43.3747902+08:00;True|2025-12-29T11:23:10.8799366+08:00;True|2025-12-29T10:28:51.7449005+08:00;True|2025-12-29T10:16:49.3899978+08:00;True|2025-12-29T10:12:43.7936956+08:00;True|2025-12-29T10:11:56.0271637+08:00;True|2025-12-29T08:50:47.5622375+08:00;False|2025-12-29T08:50:28.9083964+08:00;True|2025-12-26T17:03:30.4685598+08:00;True|2025-12-26T15:03:24.1797813+08:00;True|2025-12-26T14:44:52.6944631+08:00;True|2025-12-26T14:39:46.7764533+08:00;True|2025-12-26T14:36:47.1612784+08:00;True|2025-12-26T14:32:05.2128659+08:00;True|2025-12-26T14:29:20.7607039+08:00;True|2025-12-26T08:47:33.3798643+08:00;True|2025-12-26T08:20:29.5411144+08:00;True|2025-12-26T08:16:26.6662581+08:00;False|2025-12-26T08:16:07.5700329+08:00;True|2025-12-25T17:07:24.9496892+08:00;True|2025-12-25T17:04:00.1314291+08:00;True|2025-12-25T16:53:07.6258358+08:00;True|2025-12-25T16:47:09.1816088+08:00;True|2025-12-25T11:23:19.3812293+08:00;True|2025-12-25T11:15:13.7273857+08:00;</History>
+ <History>False|2026-01-13T01:46:00.8946389Z;True|2025-12-29T16:07:54.9198175+08:00;True|2025-12-29T16:03:22.7326283+08:00;True|2025-12-29T14:48:43.2998704+08:00;True|2025-12-29T13:15:31.9190907+08:00;False|2025-12-29T13:14:50.6997009+08:00;False|2025-12-29T13:14:43.3747902+08:00;True|2025-12-29T11:23:10.8799366+08:00;True|2025-12-29T10:28:51.7449005+08:00;True|2025-12-29T10:16:49.3899978+08:00;True|2025-12-29T10:12:43.7936956+08:00;True|2025-12-29T10:11:56.0271637+08:00;True|2025-12-29T08:50:47.5622375+08:00;False|2025-12-29T08:50:28.9083964+08:00;True|2025-12-26T17:03:30.4685598+08:00;True|2025-12-26T15:03:24.1797813+08:00;True|2025-12-26T14:44:52.6944631+08:00;True|2025-12-26T14:39:46.7764533+08:00;True|2025-12-26T14:36:47.1612784+08:00;True|2025-12-26T14:32:05.2128659+08:00;True|2025-12-26T14:29:20.7607039+08:00;True|2025-12-26T08:47:33.3798643+08:00;True|2025-12-26T08:20:29.5411144+08:00;True|2025-12-26T08:16:26.6662581+08:00;False|2025-12-26T08:16:07.5700329+08:00;True|2025-12-25T17:07:24.9496892+08:00;True|2025-12-25T17:04:00.1314291+08:00;True|2025-12-25T16:53:07.6258358+08:00;True|2025-12-25T16:47:09.1816088+08:00;True|2025-12-25T11:23:19.3812293+08:00;True|2025-12-25T11:15:13.7273857+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
index a77e421..debdbdf 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2026-01-19T09:23:36.9963060Z;True|2026-01-19T17:18:41.7602029+08:00;True|2026-01-19T17:05:35.1663057+08:00;True|2026-01-19T16:49:48.9497194+08:00;True|2026-01-19T12:35:09.4063486+08:00;False|2026-01-19T12:33:25.3260660+08:00;True|2026-01-17T20:21:42.3497625+08:00;True|2026-01-17T20:17:40.8631870+08:00;True|2026-01-17T20:13:16.6618986+08:00;False|2026-01-17T20:10:39.7099356+08:00;False|2026-01-17T20:10:01.5198461+08:00;False|2026-01-17T20:09:07.5632818+08:00;True|2026-01-17T20:06:07.7085249+08:00;True|2026-01-17T17:50:38.6295526+08:00;False|2026-01-17T17:48:59.9531552+08:00;True|2026-01-16T16:22:22.3525933+08:00;True|2026-01-16T14:14:39.4187185+08:00;False|2026-01-16T14:10:47.6350779+08:00;True|2026-01-15T17:33:04.8867687+08:00;True|2026-01-15T17:13:07.4827420+08:00;False|2026-01-15T17:11:32.8298249+08:00;True|2026-01-15T16:34:04.8984638+08:00;True|2026-01-15T14:12:39.3677563+08:00;False|2026-01-15T14:10:25.0842475+08:00;True|2026-01-14T19:47:01.2486856+08:00;False|2026-01-14T19:46:15.5380497+08:00;True|2026-01-14T15:49:22.6528911+08:00;True|2026-01-14T10:24:06.5942562+08:00;False|2026-01-14T10:22:32.4884475+08:00;False|2026-01-12T09:27:01.9297704+08:00;True|2026-01-11T14:27:58.9407325+08:00;False|2026-01-11T14:26:47.1324504+08:00;True|2026-01-11T13:54:38.7697615+08:00;True|2026-01-11T12:39:56.1396008+08:00;False|2026-01-11T12:37:59.5059421+08:00;True|2026-01-09T15:34:00.7959753+08:00;False|2026-01-09T15:32:33.3223847+08:00;True|2026-01-09T10:27:04.4418230+08:00;False|2026-01-09T10:24:55.6104648+08:00;True|2026-01-08T18:05:09.8950096+08:00;False|2026-01-08T18:03:49.6828377+08:00;True|2026-01-08T15:53:31.8458993+08:00;True|2026-01-08T15:43:35.4452984+08:00;True|2026-01-08T15:16:09.2797564+08:00;True|2026-01-08T15:09:12.1761272+08:00;False|2026-01-08T15:08:31.8053125+08:00;True|2026-01-08T12:28:32.3839432+08:00;False|2026-01-08T12:28:06.4930402+08:00;False|2026-01-06T13:05:41.4537127+08:00;True|2026-01-04T11:27:03.6003486+08:00;True|2026-01-04T11:16:09.0856233+08:00;True|2026-01-04T11:09:33.9721372+08:00;True|2026-01-04T10:59:57.5111892+08:00;False|2026-01-04T10:57:57.5312203+08:00;True|2025-12-30T14:23:14.0889784+08:00;True|2025-12-29T09:12:05.7081903+08:00;False|2025-12-29T09:11:27.9082848+08:00;True|2025-07-01T16:53:57.8492332+08:00;True|2025-07-01T16:14:28.8419744+08:00;True|2025-07-01T15:15:43.3121091+08:00;True|2025-07-01T14:48:00.3454856+08:00;True|2025-07-01T09:17:46.2541717+08:00;False|2025-07-01T09:17:07.0648196+08:00;True|2025-06-23T14:30:28.6691264+08:00;False|2025-06-23T14:27:45.6002040+08:00;True|2025-06-23T11:02:08.3020700+08:00;True|2025-06-23T10:47:44.4654541+08:00;True|2025-06-23T09:46:24.9049910+08:00;False|2025-06-23T09:45:40.5195919+08:00;True|2025-06-20T14:33:10.9210583+08:00;True|2025-06-20T13:22:54.5321865+08:00;False|2025-06-20T13:21:30.8643897+08:00;True|2025-06-20T08:36:32.6695266+08:00;False|2025-06-20T08:35:57.8274069+08:00;True|2025-06-19T08:14:35.0623669+08:00;False|2025-06-19T08:12:57.2451557+08:00;True|2025-06-18T16:56:03.4555368+08:00;True|2025-06-18T16:42:43.2441845+08:00;False|2025-06-18T16:42:02.6907205+08:00;True|2025-06-16T16:13:03.2956026+08:00;False|2025-06-16T16:12:23.8438917+08:00;True|2025-06-16T15:21:32.7370852+08:00;True|2025-06-16T15:08:57.7166003+08:00;True|2025-06-16T14:02:18.4224630+08:00;True|2025-06-16T11:00:03.6375429+08:00;False|2025-06-16T10:59:26.0956296+08:00;True|2025-06-09T16:45:52.0865612+08:00;True|2025-06-09T16:38:47.2182194+08:00;True|2025-06-09T16:17:50.9170601+08:00;False|2025-06-09T16:17:43.0333396+08:00;True|2025-06-09T15:25:17.0429161+08:00;True|2025-06-09T15:00:15.0058791+08:00;True|2025-06-09T14:50:02.1370115+08:00;True|2025-06-09T14:38:10.9037045+08:00;True|2025-06-09T14:34:53.2826267+08:00;True|2025-06-09T14:07:24.5341951+08:00;True|2025-06-09T13:39:17.5042542+08:00;True|2025-06-09T09:30:31.8197114+08:00;True|2025-01-10T13:10:47.2046185+08:00;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History>
+ <History>True|2026-01-27T04:19:58.2090999Z;True|2026-01-27T12:18:40.9255150+08:00;True|2026-01-27T12:10:45.0784359+08:00;True|2026-01-27T11:45:58.2218602+08:00;True|2026-01-27T08:54:11.2473398+08:00;False|2026-01-27T08:50:52.3900508+08:00;True|2026-01-25T16:51:10.8469862+08:00;True|2026-01-25T16:15:55.3063785+08:00;False|2026-01-25T16:13:47.1609576+08:00;False|2026-01-25T16:10:27.3797138+08:00;True|2026-01-22T19:26:11.1120981+08:00;False|2026-01-22T19:21:59.7591077+08:00;True|2026-01-21T20:10:38.2264542+08:00;True|2026-01-21T20:05:52.6769930+08:00;False|2026-01-21T20:04:52.2864808+08:00;True|2026-01-20T10:09:22.6558754+08:00;True|2026-01-20T09:43:16.9535139+08:00;False|2026-01-20T09:40:14.5080297+08:00;True|2026-01-19T17:23:36.9963060+08:00;True|2026-01-19T17:18:41.7602029+08:00;True|2026-01-19T17:05:35.1663057+08:00;True|2026-01-19T16:49:48.9497194+08:00;True|2026-01-19T12:35:09.4063486+08:00;False|2026-01-19T12:33:25.3260660+08:00;True|2026-01-17T20:21:42.3497625+08:00;True|2026-01-17T20:17:40.8631870+08:00;True|2026-01-17T20:13:16.6618986+08:00;False|2026-01-17T20:10:39.7099356+08:00;False|2026-01-17T20:10:01.5198461+08:00;False|2026-01-17T20:09:07.5632818+08:00;True|2026-01-17T20:06:07.7085249+08:00;True|2026-01-17T17:50:38.6295526+08:00;False|2026-01-17T17:48:59.9531552+08:00;True|2026-01-16T16:22:22.3525933+08:00;True|2026-01-16T14:14:39.4187185+08:00;False|2026-01-16T14:10:47.6350779+08:00;True|2026-01-15T17:33:04.8867687+08:00;True|2026-01-15T17:13:07.4827420+08:00;False|2026-01-15T17:11:32.8298249+08:00;True|2026-01-15T16:34:04.8984638+08:00;True|2026-01-15T14:12:39.3677563+08:00;False|2026-01-15T14:10:25.0842475+08:00;True|2026-01-14T19:47:01.2486856+08:00;False|2026-01-14T19:46:15.5380497+08:00;True|2026-01-14T15:49:22.6528911+08:00;True|2026-01-14T10:24:06.5942562+08:00;False|2026-01-14T10:22:32.4884475+08:00;False|2026-01-12T09:27:01.9297704+08:00;True|2026-01-11T14:27:58.9407325+08:00;False|2026-01-11T14:26:47.1324504+08:00;True|2026-01-11T13:54:38.7697615+08:00;True|2026-01-11T12:39:56.1396008+08:00;False|2026-01-11T12:37:59.5059421+08:00;True|2026-01-09T15:34:00.7959753+08:00;False|2026-01-09T15:32:33.3223847+08:00;True|2026-01-09T10:27:04.4418230+08:00;False|2026-01-09T10:24:55.6104648+08:00;True|2026-01-08T18:05:09.8950096+08:00;False|2026-01-08T18:03:49.6828377+08:00;True|2026-01-08T15:53:31.8458993+08:00;True|2026-01-08T15:43:35.4452984+08:00;True|2026-01-08T15:16:09.2797564+08:00;True|2026-01-08T15:09:12.1761272+08:00;False|2026-01-08T15:08:31.8053125+08:00;True|2026-01-08T12:28:32.3839432+08:00;False|2026-01-08T12:28:06.4930402+08:00;False|2026-01-06T13:05:41.4537127+08:00;True|2026-01-04T11:27:03.6003486+08:00;True|2026-01-04T11:16:09.0856233+08:00;True|2026-01-04T11:09:33.9721372+08:00;True|2026-01-04T10:59:57.5111892+08:00;False|2026-01-04T10:57:57.5312203+08:00;True|2025-12-30T14:23:14.0889784+08:00;True|2025-12-29T09:12:05.7081903+08:00;False|2025-12-29T09:11:27.9082848+08:00;True|2025-07-01T16:53:57.8492332+08:00;True|2025-07-01T16:14:28.8419744+08:00;True|2025-07-01T15:15:43.3121091+08:00;True|2025-07-01T14:48:00.3454856+08:00;True|2025-07-01T09:17:46.2541717+08:00;False|2025-07-01T09:17:07.0648196+08:00;True|2025-06-23T14:30:28.6691264+08:00;False|2025-06-23T14:27:45.6002040+08:00;True|2025-06-23T11:02:08.3020700+08:00;True|2025-06-23T10:47:44.4654541+08:00;True|2025-06-23T09:46:24.9049910+08:00;False|2025-06-23T09:45:40.5195919+08:00;True|2025-06-20T14:33:10.9210583+08:00;True|2025-06-20T13:22:54.5321865+08:00;False|2025-06-20T13:21:30.8643897+08:00;True|2025-06-20T08:36:32.6695266+08:00;False|2025-06-20T08:35:57.8274069+08:00;True|2025-06-19T08:14:35.0623669+08:00;False|2025-06-19T08:12:57.2451557+08:00;True|2025-06-18T16:56:03.4555368+08:00;True|2025-06-18T16:42:43.2441845+08:00;False|2025-06-18T16:42:02.6907205+08:00;True|2025-06-16T16:13:03.2956026+08:00;False|2025-06-16T16:12:23.8438917+08:00;True|2025-06-16T15:21:32.7370852+08:00;True|2025-06-16T15:08:57.7166003+08:00;True|2025-06-16T14:02:18.4224630+08:00;True|2025-06-16T11:00:03.6375429+08:00;False|2025-06-16T10:59:26.0956296+08:00;True|2025-06-09T16:45:52.0865612+08:00;True|2025-06-09T16:38:47.2182194+08:00;True|2025-06-09T16:17:50.9170601+08:00;False|2025-06-09T16:17:43.0333396+08:00;True|2025-06-09T15:25:17.0429161+08:00;True|2025-06-09T15:00:15.0058791+08:00;True|2025-06-09T14:50:02.1370115+08:00;True|2025-06-09T14:38:10.9037045+08:00;True|2025-06-09T14:34:53.2826267+08:00;True|2025-06-09T14:07:24.5341951+08:00;True|2025-06-09T13:39:17.5042542+08:00;True|2025-06-09T09:30:31.8197114+08:00;True|2025-01-10T13:10:47.2046185+08:00;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -45,31 +45,40 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>01/19/2026 17:18:35</publishTime>
+ <publishTime>01/27/2026 12:10:08</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>01/19/2026 17:18:35</publishTime>
+ <publishTime>01/27/2026 12:10:08</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>01/19/2026 17:18:27</publishTime>
+ <publishTime>01/27/2026 12:10:02</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>01/19/2026 17:18:27</publishTime>
+ <publishTime>01/27/2026 12:10:02</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>01/19/2026 17:18:22</publishTime>
+ <publishTime>01/27/2026 08:51:58</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>01/19/2026 17:18:22</publishTime>
+ <publishTime>01/27/2026 08:51:58</publishTime>
</File>
<File Include="bin/Fleck.dll">
<publishTime>04/22/2021 11:48:12</publishTime>
+ </File>
+ <File Include="bin/GetuiServerApiSDK.dll">
+ <publishTime>01/19/2026 18:29:10</publishTime>
+ </File>
+ <File Include="bin/GetuiServerApiSDK.dll.config">
+ <publishTime>01/19/2026 18:29:10</publishTime>
+ </File>
+ <File Include="bin/Google.ProtocolBuffers.dll">
+ <publishTime>01/19/2026 18:29:10</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -114,10 +123,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>01/19/2026 17:18:24</publishTime>
+ <publishTime>01/27/2026 11:43:15</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>01/19/2026 17:18:24</publishTime>
+ <publishTime>01/27/2026 11:43:15</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>05/23/2025 10:00:25</publishTime>
@@ -150,34 +159,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>01/19/2026 17:18:19</publishTime>
+ <publishTime>01/27/2026 08:51:47</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>01/19/2026 17:18:19</publishTime>
+ <publishTime>01/27/2026 08:51:47</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>01/19/2026 17:18:20</publishTime>
+ <publishTime>01/27/2026 08:51:52</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>01/19/2026 17:18:20</publishTime>
+ <publishTime>01/27/2026 08:51:52</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>01/19/2026 17:18:20</publishTime>
+ <publishTime>01/27/2026 08:51:54</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>01/19/2026 17:18:20</publishTime>
+ <publishTime>01/27/2026 08:51:54</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>01/19/2026 17:10:15</publishTime>
+ <publishTime>01/22/2026 19:32:24</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>01/19/2026 17:10:15</publishTime>
+ <publishTime>01/22/2026 19:32:24</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -288,19 +297,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>01/19/2026 17:10:40</publishTime>
+ <publishTime>01/22/2026 19:32:24</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>01/19/2026 17:10:40</publishTime>
+ <publishTime>01/22/2026 19:32:24</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>01/19/2026 17:23:35</publishTime>
+ <publishTime>01/27/2026 12:19:52</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>01/19/2026 17:23:35</publishTime>
+ <publishTime>01/27/2026 12:19:52</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>07/01/2025 16:53:56</publishTime>
@@ -507,7 +516,7 @@
<publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web.config">
- <publishTime>01/16/2026 14:14:33</publishTime>
+ <publishTime>01/27/2026 08:54:05</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user
index 28e9e3f..cbf5173 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2026-01-20T02:28:19.5250951Z;True|2026-01-20T10:27:41.5947282+08:00;True|2026-01-20T10:23:10.6474490+08:00;True|2026-01-20T10:07:24.8412652+08:00;True|2026-01-20T09:53:19.8583529+08:00;True|2026-01-20T08:21:20.5302494+08:00;False|2026-01-20T08:20:24.6093320+08:00;True|2026-01-19T15:58:34.1439056+08:00;True|2026-01-19T15:56:47.6488483+08:00;True|2026-01-19T15:12:36.9286562+08:00;True|2026-01-19T14:55:17.2807312+08:00;True|2026-01-19T14:47:03.8892836+08:00;True|2026-01-19T14:36:15.0507410+08:00;True|2026-01-19T14:26:05.5060287+08:00;True|2026-01-19T13:50:54.8654304+08:00;True|2026-01-19T13:37:47.2294303+08:00;True|2026-01-19T13:20:13.3781676+08:00;True|2026-01-19T13:07:18.8111360+08:00;True|2026-01-19T13:01:15.1432453+08:00;True|2026-01-19T11:54:26.6582081+08:00;True|2026-01-19T11:23:28.6100843+08:00;True|2026-01-19T08:41:23.8724527+08:00;True|2026-01-19T08:34:06.3247836+08:00;True|2026-01-19T07:48:11.5052413+08:00;False|2026-01-19T07:47:21.4586297+08:00;True|2026-01-18T14:27:24.9640228+08:00;True|2026-01-18T13:21:44.9690334+08:00;False|2026-01-18T13:20:08.6314025+08:00;False|2026-01-16T16:53:24.3290896+08:00;True|2026-01-16T09:03:14.4122067+08:00;True|2026-01-16T08:44:23.0342932+08:00;False|2026-01-16T08:43:34.3488415+08:00;True|2026-01-15T16:27:10.8480719+08:00;False|2026-01-15T16:26:06.6002625+08:00;True|2026-01-15T13:04:43.0602637+08:00;</History>
+ <History>True|2026-01-26T01:37:16.8828589Z;False|2026-01-26T09:36:35.9597492+08:00;True|2026-01-25T15:20:11.0096169+08:00;True|2026-01-25T14:52:25.7167654+08:00;True|2026-01-25T14:28:16.6779637+08:00;False|2026-01-25T14:27:32.6753765+08:00;True|2026-01-23T16:17:17.9227805+08:00;True|2026-01-23T14:37:25.7929932+08:00;True|2026-01-23T14:32:25.7611106+08:00;False|2026-01-23T14:31:28.4811198+08:00;True|2026-01-22T09:55:07.0908298+08:00;True|2026-01-22T09:38:49.9102490+08:00;False|2026-01-22T09:37:53.0384929+08:00;True|2026-01-21T16:50:27.5625267+08:00;True|2026-01-21T10:50:18.7634322+08:00;True|2026-01-21T10:47:56.7913811+08:00;True|2026-01-21T10:41:46.5883817+08:00;True|2026-01-21T09:29:22.5824101+08:00;False|2026-01-21T09:28:13.4362586+08:00;True|2026-01-20T14:26:36.7806712+08:00;True|2026-01-20T13:13:01.3064754+08:00;False|2026-01-20T13:12:08.1800841+08:00;True|2026-01-20T10:28:19.5250951+08:00;True|2026-01-20T10:27:41.5947282+08:00;True|2026-01-20T10:23:10.6474490+08:00;True|2026-01-20T10:07:24.8412652+08:00;True|2026-01-20T09:53:19.8583529+08:00;True|2026-01-20T08:21:20.5302494+08:00;False|2026-01-20T08:20:24.6093320+08:00;True|2026-01-19T15:58:34.1439056+08:00;True|2026-01-19T15:56:47.6488483+08:00;True|2026-01-19T15:12:36.9286562+08:00;True|2026-01-19T14:55:17.2807312+08:00;True|2026-01-19T14:47:03.8892836+08:00;True|2026-01-19T14:36:15.0507410+08:00;True|2026-01-19T14:26:05.5060287+08:00;True|2026-01-19T13:50:54.8654304+08:00;True|2026-01-19T13:37:47.2294303+08:00;True|2026-01-19T13:20:13.3781676+08:00;True|2026-01-19T13:07:18.8111360+08:00;True|2026-01-19T13:01:15.1432453+08:00;True|2026-01-19T11:54:26.6582081+08:00;True|2026-01-19T11:23:28.6100843+08:00;True|2026-01-19T08:41:23.8724527+08:00;True|2026-01-19T08:34:06.3247836+08:00;True|2026-01-19T07:48:11.5052413+08:00;False|2026-01-19T07:47:21.4586297+08:00;True|2026-01-18T14:27:24.9640228+08:00;True|2026-01-18T13:21:44.9690334+08:00;False|2026-01-18T13:20:08.6314025+08:00;False|2026-01-16T16:53:24.3290896+08:00;True|2026-01-16T09:03:14.4122067+08:00;True|2026-01-16T08:44:23.0342932+08:00;False|2026-01-16T08:43:34.3488415+08:00;True|2026-01-15T16:27:10.8480719+08:00;False|2026-01-15T16:26:06.6002625+08:00;True|2026-01-15T13:04:43.0602637+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>01/20/2026 10:27:11</publishTime>
+ <publishTime>01/26/2026 09:36:51</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>01/20/2026 10:27:11</publishTime>
+ <publishTime>01/26/2026 09:36:51</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>01/20/2026 10:27:09</publishTime>
+ <publishTime>01/26/2026 09:36:49</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>01/20/2026 10:27:09</publishTime>
+ <publishTime>01/26/2026 09:36:49</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>01/20/2026 10:27:02</publishTime>
+ <publishTime>01/26/2026 09:36:44</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>01/20/2026 10:27:02</publishTime>
+ <publishTime>01/26/2026 09:36:44</publishTime>
</File>
<File Include="bin/Fleck.dll">
<publishTime>04/22/2021 11:48:12</publishTime>
@@ -123,10 +123,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>01/20/2026 10:27:04</publishTime>
+ <publishTime>01/26/2026 09:36:45</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>01/20/2026 10:27:04</publishTime>
+ <publishTime>01/26/2026 09:36:45</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/21/2025 11:46:16</publishTime>
@@ -159,34 +159,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>01/20/2026 10:26:59</publishTime>
+ <publishTime>01/26/2026 09:36:42</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>01/20/2026 10:26:59</publishTime>
+ <publishTime>01/26/2026 09:36:42</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>01/20/2026 10:27:00</publishTime>
+ <publishTime>01/26/2026 09:36:43</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>01/20/2026 10:27:00</publishTime>
+ <publishTime>01/26/2026 09:36:43</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>01/20/2026 10:27:01</publishTime>
+ <publishTime>01/26/2026 09:36:43</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>01/20/2026 10:27:01</publishTime>
+ <publishTime>01/26/2026 09:36:43</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>01/20/2026 10:26:02</publishTime>
+ <publishTime>01/26/2026 09:35:13</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>01/20/2026 10:26:02</publishTime>
+ <publishTime>01/26/2026 09:35:13</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -297,22 +297,22 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>01/20/2026 10:26:09</publishTime>
+ <publishTime>01/26/2026 09:35:19</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>01/20/2026 10:26:09</publishTime>
+ <publishTime>01/26/2026 09:35:19</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>01/20/2026 10:28:10</publishTime>
+ <publishTime>01/26/2026 09:37:00</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>01/20/2026 10:28:10</publishTime>
+ <publishTime>01/26/2026 09:37:00</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>01/20/2026 10:28:17</publishTime>
+ <publishTime>01/26/2026 09:37:14</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
diff --git a/WebAPI/Properties/PublishProfiles/WTTFolder.pubxml.user b/WebAPI/Properties/PublishProfiles/WTTFolder.pubxml.user
index 09eb061..f7b4cfe 100644
--- a/WebAPI/Properties/PublishProfiles/WTTFolder.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/WTTFolder.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\API</_PublishTargetUrl>
- <History>True|2026-01-21T05:46:11.7257946Z;True|2026-01-20T09:22:33.7255529+08:00;False|2026-01-20T08:33:10.2890987+08:00;True|2026-01-19T13:53:48.2079321+08:00;False|2026-01-19T13:53:24.9464993+08:00;True|2026-01-16T15:23:46.2649561+08:00;True|2026-01-16T09:00:43.1528772+08:00;</History>
+ <History>True|2026-01-23T08:43:00.5233443Z;True|2026-01-23T15:52:34.0578166+08:00;True|2026-01-23T15:18:26.9929522+08:00;True|2026-01-23T14:54:41.7989523+08:00;True|2026-01-23T14:20:36.5052445+08:00;False|2026-01-23T13:57:17.0723425+08:00;True|2026-01-23T08:08:55.5799949+08:00;False|2026-01-23T08:08:18.0965301+08:00;True|2026-01-21T13:46:11.7257946+08:00;True|2026-01-20T09:22:33.7255529+08:00;False|2026-01-20T08:33:10.2890987+08:00;True|2026-01-19T13:53:48.2079321+08:00;False|2026-01-19T13:53:24.9464993+08:00;True|2026-01-16T15:23:46.2649561+08:00;True|2026-01-16T09:00:43.1528772+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -45,31 +45,40 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>01/21/2026 13:45:59</publishTime>
+ <publishTime>01/23/2026 15:18:20</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>01/21/2026 13:45:59</publishTime>
+ <publishTime>01/23/2026 15:18:20</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>01/21/2026 13:45:54</publishTime>
+ <publishTime>01/23/2026 15:18:17</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>01/21/2026 13:45:54</publishTime>
+ <publishTime>01/23/2026 15:18:17</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>01/21/2026 13:45:49</publishTime>
+ <publishTime>01/23/2026 08:08:34</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>01/21/2026 13:45:49</publishTime>
+ <publishTime>01/23/2026 08:08:34</publishTime>
</File>
<File Include="bin/Fleck.dll">
<publishTime>04/22/2021 11:48:12</publishTime>
+ </File>
+ <File Include="bin/GetuiServerApiSDK.dll">
+ <publishTime>01/21/2026 17:26:16</publishTime>
+ </File>
+ <File Include="bin/GetuiServerApiSDK.dll.config">
+ <publishTime>01/21/2026 17:26:16</publishTime>
+ </File>
+ <File Include="bin/Google.ProtocolBuffers.dll">
+ <publishTime>01/21/2026 17:26:16</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -114,10 +123,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>01/21/2026 13:45:52</publishTime>
+ <publishTime>01/23/2026 13:57:29</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>01/21/2026 13:45:52</publishTime>
+ <publishTime>01/23/2026 13:57:29</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>08/18/2025 16:11:18</publishTime>
@@ -150,25 +159,25 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>01/21/2026 13:45:44</publishTime>
+ <publishTime>01/23/2026 08:08:32</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>01/21/2026 13:45:44</publishTime>
+ <publishTime>01/23/2026 08:08:32</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>01/21/2026 13:45:47</publishTime>
+ <publishTime>01/23/2026 08:08:33</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>01/21/2026 13:45:47</publishTime>
+ <publishTime>01/23/2026 08:08:33</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>01/21/2026 13:45:47</publishTime>
+ <publishTime>01/23/2026 08:08:33</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>01/21/2026 13:45:47</publishTime>
+ <publishTime>01/23/2026 08:08:33</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
@@ -297,10 +306,10 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>01/21/2026 13:46:08</publishTime>
+ <publishTime>01/23/2026 16:42:59</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>01/21/2026 13:46:08</publishTime>
+ <publishTime>01/23/2026 16:42:59</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -504,7 +513,7 @@
<publishTime>10/27/2025 08:51:29</publishTime>
</File>
<File Include="Web.config">
- <publishTime>01/20/2026 09:22:31</publishTime>
+ <publishTime>01/23/2026 08:08:47</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Service/GeTuiService.cs b/WebAPI/Service/GeTuiService.cs
index 9261a6c..164895e 100644
--- a/WebAPI/Service/GeTuiService.cs
+++ b/WebAPI/Service/GeTuiService.cs
@@ -46,7 +46,7 @@
{
string title = ds.Tables[0].Rows[0]["涓婚"].ToString();
string content = ds.Tables[0].Rows[0]["鍐呭"].ToString();
- template = GetNotificationTemplate(title, content, "/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillList", "0");
+ template = GetNotificationTemplate(title, content, "/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery", "0"); // 璺宠浆鍒板伐浣滆仈绯诲崟鏌ヨ椤甸潰
// 骞挎挱
if(ds.Tables[0].Rows[0]["鍙戦�佺被鍨�"].ToString() == "鍏叡")
@@ -156,8 +156,8 @@
template.IsClearable = true;
var customData = new Dictionary<string, string>
{
- {"pagePath", pagePath}, // 绀轰緥锛�"/pages/detail/detail"
- {"itemId", HItemID} // 绀轰緥锛�"123456"
+ {"pagePath", pagePath},
+ {"itemId", HItemID}
};
template.TransmissionContent = JsonConvert.SerializeObject(customData); // 搴忓垪鍖栦负 JSON 瀛楃涓�
template.TransmissionType = 1; // 1=鐐瑰嚮閫氱煡鍚庤Е鍙戝鎴风鍥炶皟锛堥�忎紶鍐呭缁欏鎴风锛�
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 77b36e8..61b7897 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -40,7 +40,7 @@
<!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--鏂帿灏�-->
<!--<add key="surl" value="http://192.168.0.113/WEBS-WMS/Webservice1.asmx" />涓夊崌鏈湴閰嶇疆-->
<!--<add key="surl" value="http://36.134.2.30:200/WEBS-WMS/WebService1.asmx" />--> <!--閲戝竻-->
- <add key="sUrl" value="http://localhost:8082/webs/webservice1.asmx" />
+ <add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx" />
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
@@ -120,13 +120,13 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://localhost:8082/webs/webservice1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
+ <endpoint address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
</client>
</system.serviceModel>
<applicationSettings>
<WebAPI.Properties.Settings>
<setting name="WebAPI_WebS_WebService1" serializeAs="String">
- <value>http://localhost:8082/webs/webservice1.asmx</value>
+ <value>http://47.96.97.237/WEBS-WMS/WebService1.asmx</value>
</setting>
</WebAPI.Properties.Settings>
</applicationSettings>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 7500da4..e92fd51 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -669,6 +669,7 @@
<Compile Include="Controllers\鍗庤繙datamapping\Gy_BarCodeBill_Set_TempController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_AssistantDataEntryController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_BilloriginController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CostAverageTypeController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CarController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardChangeTypeController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardStatusController.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 1eee095..f4a1b93 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
@@ -9,8 +9,32 @@
<IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
<IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
<UseGlobalApplicationHostFile />
- <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile6.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile>
+ <ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
- <ProjectExtensions />
+ <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>
</Project>
\ No newline at end of file
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index be8f38a..bd394c8 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
index 66595d4..246c15c 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
index 118189b..0166748 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 52e2ce5..fb27801 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.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index d936871..9469919 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -9,6 +9,8 @@
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
+<<<<<<< HEAD
+=======
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
@@ -30,3 +32,4 @@
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
>>>>>>> dbb4487be15ef158326d46bb81b6284987e35a2c
+>>>>>>> d7c4b0ac44e3e0770e14d51059f9305135b5f26f
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index be8f38a..bd394c8 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
index 66595d4..246c15c 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..d77c332
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 0312216..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-eb64bc61f5da8fdd8ad56e04c391e3a377d8ca59
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
index c6ae541..45fbfdc 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -5,6 +5,7 @@
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
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.AssemblyReference.cache
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
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
index 118189b..0166748 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
index 52e2ce5..fb27801 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1