From 773e65fc78cd6300aaa706efdcb5756db9ad59a4 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 03 三月 2025 08:53:43 +0800
Subject: [PATCH] 1
---
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 20
WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user | 164 +-
WebAPI/Controllers/品质管理/基础资料/Gy_BaseInformationController.cs | 132 +
Model/计划管理/ClsGy_SourceMouldBillSub.cs | 14
SyntacticSugar/bin/Release/SyntacticSugar.dll | 0
WebAPI/Controllers/CGGL/Kf_POStockInBackBillController.cs | 4
WebAPI/WebAPI.csproj.user | 14
Model/obj/x86/Release/Model.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/生产管理/质量汇报单/Sc_QualityReportBillController.cs | 6
WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user | 166 +-
DAL/计划管理/ClsGy_SourceMouldBillMain.cs | 271 +++
SyntacticSugar/bin/Release/SyntacticSugar.pdb | 0
DAL/生产管理/设备管理/ClsSB_EquipICMOTechParamBill.cs | 8
Model/生产管理/ClsSc_ShiftsBeginInfoBillMain.cs | 1
WebAPI/Controllers/SCGL/Sc_ICBomBillController.cs | 327 ++++
Pub_Class/bin/Release/SyntacticSugar.pdb | 0
Model/基础资料/其他基础资料/ClsGy_WorkShiftMain.cs | 1
Model/生产管理/设备管理/ClsSB_EquipICMOTechParamBillSub.cs | 1
WebAPI/Controllers/CGGL/Cg_PayableBillController.cs | 2
DAL/基础资料/其他基础资料/ClsGy_WorkShift_Ctl.cs | 3
WebAPI/Controllers/BLL/Xt_UserController.cs | 6
SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt | 9
Pub_Class/bin/Release/SyntacticSugar.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml | 16
WebAPI/Controllers/WebAPIController.cs | 12
WebAPI/Models/Gy_User.cs | 2
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache | 0
Model/计划管理/ClsGy_ICBomBillMain.cs | 1
WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user | 6
DAL/计划管理/ClsGy_ICBomBill.cs | 11
WebAPI/Controllers/JHGL/Gy_SourceMouldBillController.cs | 648 ++++++++
WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs | 254 +++
WebAPI.sln | 16
WebAPI/ListModels.cs | 24
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 78 +
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | 104 +
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 15
DAL/DAL.csproj | 1
WebAPI/DLL/ClsSb_EquipDotCheckRuleBill.cs | 5
WebAPI/WebAPI.csproj | 1
Model/计划管理/ClsGy_MaterialTechParamBillSub.cs | 1
DAL/生产管理/ClsSc_QualityReportBill.cs | 2
Model/计划管理/ClsGy_SourceMouldBillMain.cs | 17
WebAPI/Web References/WebS/WebService1.wsdl | 510 +++---
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 44
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | 65
WebAPI/Controllers/条码管理/WEBSController.cs | 212 ++
PayM/obj/Release/PayM.csproj.ResolveComReference.cache | 0
Model/Model.csproj | 2
WebAPI/Controllers/LMESController.cs | 2
DAL/生产管理/ClsSc_ShiftsBeginInfoBill.cs | 5
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache | 0
DAL/计划管理/ClsGy_MaterialTechParamBillMain.cs | 6
Model/生产管理/ClsSc_PPBomBillMain.cs | 1
WebAPI/Models/ClsSb_EquipDotCheckRuleBillMain.cs | 1
WebAPI/Web References/WebS/Reference.cs | 1152 +++++++-------
DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache | 0
WebAPI/DLL/ClsSb_EquipMaintainRuleBill.cs | 5
DAL/基础资料/其他基础资料/ClsGy_QCCheckProjectMain.cs | 5
Model/生产管理/ClsSc_QualityReportBillSub.cs | 1
WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user | 46
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt | 9
Model/基础资料/其他基础资料/ClsGy_QCCheckProjectMain.cs | 1
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/CGGL/Cg_POInStockBackBillController.cs | 4
WebAPI/Models/ClsSb_EquipMaintainRuleBillMain.cs | 1
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs | 23
68 files changed, 3,358 insertions(+), 1,100 deletions(-)
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 4e12ba0..652edd6 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -97,6 +97,7 @@
<Compile Include="鐢熶骇绠＄悊\鎺掍骇瑙ｉ攣鐢宠鍗昞ClsJIT_UnLockRequestBill.cs" />
<Compile Include="鐢熶骇绠＄悊\鎺掍骇閿佸畾鐢宠鍗昞ClsJIT_LockRequestBill.cs" />
<Compile Include="绯荤粺鍏敤\ClsXt_DefineBillMainSet.cs" />
+ <Compile Include="璁″垝绠＄悊\ClsGy_SourceMouldBillMain.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_EnvironmentTestDotCheckBillMain.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_MonthTarGetBill.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipRepairSignBill.cs" />
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 271a850..b8ed03b 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"
@@ -68,6 +68,7 @@
",HProcID=" + omodel.HProcID.ToString() +
",HDeptID=" + omodel.HDeptID.ToString() +
",HSampleSchemeID=" + omodel.HSampleSchemeID.ToString() +
+ ",HSourceID=" + omodel.HSourceID.ToString() +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -143,13 +144,13 @@
"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HRemark" +
",HMaterID,HName,HMaterNumber,HMaterTypeID,HUnitID" +
- ",HUnitNumber,HStandard,HProcID,HDeptID,HSampleSchemeID" +
+ ",HUnitNumber,HStandard,HProcID,HDeptID,HSampleSchemeID,HSourceID" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'"+
"," + omodel.HMaterID.ToString() + ",'" + omodel.HName + "','" + omodel.HMaterNumber + "'," + omodel.HMaterTypeID.ToString() + "," + omodel.HUnitID.ToString() +
",'" + omodel.HUnitNumber + "', " + Convert.ToString(omodel.HStandard ? 1 : 0) + "," + omodel.HProcID.ToString() + "," + omodel.HDeptID.ToString() +
- "," + omodel.HSampleSchemeID + ") ");
+ "," + omodel.HSampleSchemeID + ",'" + omodel.HSourceID + "') ");
//鎻掑叆瀛愯〃
foreach (Model.ClsGy_QCCheckProjectSub oSub in DetailColl)
{
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_WorkShift_Ctl.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_WorkShift_Ctl.cs"
index d5616fb..a09099c 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_WorkShift_Ctl.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_WorkShift_Ctl.cs"
@@ -89,6 +89,7 @@
",HWorkTimes=" + omodel.HWorkTimes.ToString() +
",HStopflag='" + DBUtility.ClsPub.BoolToString(omodel.HStopflag) + "'" +
",HRemark='" + omodel.HRemark + "'" +
+ ",HPlanShutdownTimes='" + omodel.HPlanShutdownTimes + "'" +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -128,9 +129,11 @@
oCn.RunProc("Insert Into Gy_WorkShift " +
"(HInterID,HNumber,HName,HNote" +
",HDeptID,HWorkCenterID,HWorkTimes,HStopflag,HRemark" +
+ ",HPlanShutdownTimes" +
") " +
" values(" + omodel.HInterID.ToString() + ",'" + omodel.HNumber + "','" + omodel.HName + "','" + omodel.HNote + "'" +
"," + omodel.HDeptID.ToString() + "," + omodel.HWorkCenterID.ToString() + "," + omodel.HWorkTimes.ToString() + "," + Convert.ToString(omodel.HStopflag ? 1 : 0) + ",'" + omodel.HRemark + "'" +
+ ","+ omodel.HPlanShutdownTimes.ToString() +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsGy_WorkShiftSub oSub in DetailColl)
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBill.cs"
index 5e7aa38..fd1373c 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBill.cs"
@@ -192,7 +192,7 @@
") " +
" values(" +
"'" + this.BillType + "'" +
- ",'" + this.HBillSubType + "'" +
+ ",'" + omodel.HBillSubType + "'" +
"," + omodel.HInterID + "" +
",'" + omodel.HBillNo + "'" +
",'" + omodel.HDate + "'" +
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ShiftsBeginInfoBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ShiftsBeginInfoBill.cs"
index 2fa0d02..dc95f8e 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ShiftsBeginInfoBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ShiftsBeginInfoBill.cs"
@@ -72,6 +72,7 @@
",HGroupID =" + omodel.HGroupID.ToString() +
",HGroupLeaderID =" + omodel.HGroupLeaderID.ToString() +
",HStdEmpQty =" + omodel.HStdEmpQty.ToString() +
+ ",HPlanShutdownTimes =" + omodel.HPlanShutdownTimes.ToString() +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
@@ -169,7 +170,7 @@
//涓昏〃
string mainSql = "insert into Sc_ShiftsBeginInfoBillMain" +
"(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HRemark,HMaker,HMakeDate" +
- ",HDeptID,HWorkCenterID,HShiftsID,HSourceID,HGroupID,HGroupLeaderID,HStdEmpQty) " +
+ ",HDeptID,HWorkCenterID,HShiftsID,HSourceID,HGroupID,HGroupLeaderID,HStdEmpQty,HPlanShutdownTimes) " +
"values(" +
"" + (omodel.HYear.ToString() != "0" ? omodel.HYear.ToString() : DateTime.Now.Year.ToString()) +
"," + omodel.HPeriod.ToString() +
@@ -188,7 +189,7 @@
"','" + omodel.HGroupID +
"','" + omodel.HGroupLeaderID +
"','" + omodel.HStdEmpQty +
-
+ "','" + omodel.HPlanShutdownTimes +
"')";
oCn.RunProc(mainSql);
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSB_EquipICMOTechParamBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSB_EquipICMOTechParamBill.cs"
index 604e2c9..648e987 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSB_EquipICMOTechParamBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSB_EquipICMOTechParamBill.cs"
@@ -136,11 +136,11 @@
oCn.RunProc("Insert into SB_EquipICMOTechParamBillSub " +
" (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HBillNo_bak" +
- ",HTechParamID,HTechParamUnitID,HVaule,HStd,HMax,HMin,HResult,HTechParamIDStd,HResultStd,HTechParamClassID,HSNO" +
+ ",HTechParamID,HTechParamUnitID,HVaule,HStd,HMax,HMin,HResult,HTechParamIDStd,HResultStd,HTechParamClassID,HSNO,HIsRequired" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "','" + omodel.HBillNo + "'" +
- "," + oSub.HTechParamID.ToString() + "," + oSub.HTechParamUnitID.ToString() + ",'" + oSub.HVaule + "','" + oSub.HStd + "','" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HResult + "','" + oSub.HTechParamIDStd + "','" + oSub.HResultStd + "','" + oSub.HTechParamClassID + "','" + oSub.HSNO + "'" +
+ "," + oSub.HTechParamID.ToString() + "," + oSub.HTechParamUnitID.ToString() + ",'" + oSub.HVaule + "','" + oSub.HStd + "','" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HResult + "','" + oSub.HTechParamIDStd + "','" + oSub.HResultStd + "','" + oSub.HTechParamClassID + "','" + oSub.HSNO + "','" + Convert.ToString(oSub.HIsRequired ? 1 : 0) + "'" +
") ");
}
//淇濆瓨鍚庢帶鍒�
@@ -200,11 +200,11 @@
oCn.RunProc("Insert into SB_EquipICMOTechParamBillSub " +
" (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HBillNo_bak" +
- ",HTechParamID,HTechParamUnitID,HVaule,HStd,HMax,HMin,HResult,HTechParamIDStd,HResultStd,HTechParamClassID,HSNO" +
+ ",HTechParamID,HTechParamUnitID,HVaule,HStd,HMax,HMin,HResult,HTechParamIDStd,HResultStd,HTechParamClassID,HSNO,HIsRequired" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "','" + omodel.HBillNo + "'" +
- "," + oSub.HTechParamID.ToString() + "," + oSub.HTechParamUnitID.ToString() + ",'" + oSub.HVaule + "','" + oSub.HStd + "','" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HResult + "','" + oSub.HTechParamIDStd + "','" + oSub.HResultStd + "','" + oSub.HTechParamClassID + "','" + oSub.HSNO + "'" +
+ "," + oSub.HTechParamID.ToString() + "," + oSub.HTechParamUnitID.ToString() + ",'" + oSub.HVaule + "','" + oSub.HStd + "','" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HResult + "','" + oSub.HTechParamIDStd + "','" + oSub.HResultStd + "','" + oSub.HTechParamClassID + "','" + oSub.HSNO + "','" + Convert.ToString(oSub.HIsRequired ? 1 : 0) + "'" +
") ");
}
//淇濆瓨鍚庢帶鍒�
diff --git "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_ICBomBill.cs" "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_ICBomBill.cs"
index 79c75ae..c027bbd 100644
--- "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_ICBomBill.cs"
+++ "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_ICBomBill.cs"
@@ -39,9 +39,9 @@
//鏇存柊涓昏〃
oCn.RunProc("UpDate Gy_ICBomBillMain set " +
" HBillNo='" + omodel.HBillNo + "'" +
- ",HDate='" + omodel.HDate + "'" +
- ",HYear='" + omodel.HYear.ToString() + "'" +
- ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ //",HDate='" + omodel.HDate + "'" +
+ //",HYear='" + omodel.HYear.ToString() + "'" +
+ //",HPeriod='" + omodel.HPeriod.ToString() + "'" +
",HRemark='" + omodel.HRemark + "'" +
",HUpDater='" + omodel.HUpDater + "'" +
",HUpDateDate='" + omodel.HUpDateDate + "'" +
@@ -56,6 +56,7 @@
",HProdRate=" + omodel.HProdRate.ToString() +
",HQty=" + omodel.HQty.ToString() +
",HJump='" + omodel.HJump + "'" +
+ ",HBomType='" + omodel.HBomType + "'" +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -104,12 +105,12 @@
"(HBillType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate,HMaterTypeID,HStatus" +
",HMaterID,HParentID,HVersion,HPicNo,HPropertyID" +
- ",HUnitID,HQty,HProdRate,HJump" +
+ ",HUnitID,HQty,HProdRate,HJump,HBomType" +
") " +
" values('" + this.BillType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate(),'" + omodel.HMaterTypeID.ToString() + "','" + omodel.HStatus +
"','" + omodel.HMaterID.ToString() + "'," + omodel.HParentID.ToString() + ",'" + omodel.HVersion + "','" + omodel.HPicNo + "'," +omodel.HPropertyID.ToString() +
- ","+omodel.HUnitID.ToString()+","+omodel.HQty.ToString()+","+omodel.HProdRate.ToString()+",'"+omodel.HJump +"'"+
+ ","+omodel.HUnitID.ToString()+","+omodel.HQty.ToString()+","+omodel.HProdRate.ToString()+",'"+omodel.HJump +"','"+omodel.HBomType + "'"+
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsGy_ICBomBillSub oSub in DetailColl)
diff --git "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_MaterialTechParamBillMain.cs" "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_MaterialTechParamBillMain.cs"
index b85de2d..581e38a 100644
--- "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_MaterialTechParamBillMain.cs"
+++ "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_MaterialTechParamBillMain.cs"
@@ -70,7 +70,7 @@
{
string subSql = "insert into Gy_MaterialTechParamBillSub" +
"(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
- ",HTechParamID,HTechParamUnitID,HStd,HMax,HMin,HDataForm,HDataUnit,HDataTimes,HTechParamClassID,HSNO,HStdNextTimes,HTechParamIDStd) " +
+ ",HTechParamID,HTechParamUnitID,HStd,HMax,HMin,HDataForm,HDataUnit,HDataTimes,HTechParamClassID,HSNO,HStdNextTimes,HTechParamIDStd,HIsRequired) " +
" values(" +
"" + omodel.HInterID.ToString() +
"," + oSub.HEntryID.ToString() +
@@ -90,6 +90,7 @@
"','" + oSub.HSNO +
"','" + oSub.HStdNextTimes +
"','" + oSub.HTechParamIDStd +
+ "','" + Convert.ToString(oSub.HIsRequired ? 1 : 0) +
"')";
oCn.RunProc(subSql);
}
@@ -163,7 +164,7 @@
{
string subSql = "insert into Gy_MaterialTechParamBillSub" +
"(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
- ",HTechParamID,HTechParamUnitID,HStd,HMax,HMin,HDataForm,HDataUnit,HDataTimes,HTechParamClassID,HSNO,HStdNextTimes,HTechParamIDStd) " +
+ ",HTechParamID,HTechParamUnitID,HStd,HMax,HMin,HDataForm,HDataUnit,HDataTimes,HTechParamClassID,HSNO,HStdNextTimes,HTechParamIDStd,HIsRequired) " +
" values(" +
"" + omodel.HInterID.ToString() +
"," + oSub.HEntryID.ToString() +
@@ -183,6 +184,7 @@
"','" + oSub.HSNO +
"','" + oSub.HStdNextTimes +
"','" + oSub.HTechParamIDStd +
+ "','" + Convert.ToString(oSub.HIsRequired ? 1 : 0)+
"')";
oCn.RunProc(subSql);
}
diff --git "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_SourceMouldBillMain.cs" "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_SourceMouldBillMain.cs"
new file mode 100644
index 0000000..5514547
--- /dev/null
+++ "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_SourceMouldBillMain.cs"
@@ -0,0 +1,271 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsGy_SourceMouldBillMain : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsGy_SourceMouldBillMain omodel = new Model.ClsGy_SourceMouldBillMain();
+ public List<Model.ClsGy_SourceMouldBillSub> DetailColl = new List<Model.ClsGy_SourceMouldBillSub>();
+
+ public ClsGy_SourceMouldBillMain()
+ {
+ base.MvarItemKeySub = "Gy_SourceMouldBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "Gy_SourceMouldBillMain";
+ base.MvarReportTitle = "浜х嚎鍣ㄥ叿娓呭崟";
+ base.BillType = "4617";
+ base.HBillSubType = "4617";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+ #region 鏃犲弬鏋勯�犲嚱鏁�
+ ~ClsGy_SourceMouldBillMain()
+ {
+ DetailColl = null;
+ }
+ #endregion
+ #endregion
+
+ //#region 淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ string mainSql = "update Gy_SourceMouldBillMain set " +
+ " HBillNo = '" + omodel.HBillNo +
+ "', HDate = '" + omodel.HDate +
+ "', HRemark = '" + omodel.HRemark +
+ "', HUpDater = '" + omodel.HUpDater +
+ "', HUpDateDate = getdate()" +
+ //===============================================================
+
+ ", HDeptID = '" + omodel.HDeptID +
+ "', HEmpID = '" + omodel.HEmpID +
+ "', HSourceID = '" + omodel.HSourceID +
+ "', HWorkCenterID = '" + omodel.HWorkCenterID +
+ "', HEquipID = '" + omodel.HEquipID +
+ "', HOrgID = '" + omodel.HOrgID +
+ "', HProcID = " + omodel.HProcID +
+ " where HInterID = " + omodel.HInterID;
+
+ oCn.RunProc(mainSql);
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Model.ClsGy_SourceMouldBillSub oSub in DetailColl)
+ {
+ string subSql = "insert into Gy_SourceMouldBillSub" +
+ "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HMouldID,HQty,HMouldQty,HRate) " +
+ " values(" +
+ "" + omodel.HInterID.ToString() +
+ "," + oSub.HEntryID.ToString() +
+ "," + oSub.HSourceInterID +
+ "," + oSub.HSourceEntryID +
+ ",'" + oSub.HSourceBillNo +
+ "','" + oSub.HSourceBillType +
+ "','" + oSub.HMouldID +
+ "'," + oSub.HQty +
+ "," + oSub.HMouldQty +
+ ",'" + oSub.HRate +
+ "')";
+ oCn.RunProc(subSql);
+ }
+
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //#endregion
+
+ #region 鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ DataSet ds;
+
+
+ oCn.BeginTran();
+
+ //妫�鏌ヤ富琛ㄥ唴鐮佹槸鍚﹂噸澶嶏紝鑻ラ噸澶嶅垯閲嶆柊鐢熸垚骞剁户缁鏌ワ紝鐩村埌涓嶅啀閲嶅
+ while (true)
+ {
+ ds = oCn.RunProcReturn("select * from Gy_SourceMouldBillMain where HInterID = " + omodel.HInterID, "Gy_SourceMouldBillMain");
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ break;
+ }
+ }
+
+ //鎻掑叆涓昏〃
+ string mainSql = "insert into Gy_SourceMouldBillMain" +
+ "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HRemark,HMaker,HMakeDate" +
+ ",HDeptID,HEmpID,HSourceID,HWorkCenterID,HEquipID,HOrgID,HProcID) " +
+ "values(" +
+ "" + omodel.HYear.ToString() +
+ "," + omodel.HPeriod.ToString() +
+ ",'" + this.BillType +
+ "','" + this.HBillSubType +
+ "'," + omodel.HInterID +
+ ",'" + omodel.HDate +
+ "','" + omodel.HBillNo +
+ "','" + omodel.HRemark +
+ "','" + omodel.HMaker +
+ "',getdate()" +
+ "," + omodel.HDeptID +
+ "," + omodel.HEmpID +
+ ",'" + omodel.HSourceID +
+ "','" + omodel.HWorkCenterID +
+ "','" + omodel.HEquipID +
+ "','" + omodel.HOrgID +
+ "'," + omodel.HProcID +
+ ")";
+
+ oCn.RunProc(mainSql);
+
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsGy_SourceMouldBillSub oSub in DetailColl)
+ {
+ string subSql = "insert into Gy_SourceMouldBillSub" +
+ "" +
+ "" +
+ "" +
+ "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HMouldID,HQty,HMouldQty,HRate) " +
+ " values(" +
+ "" + omodel.HInterID.ToString() +
+ "," + oSub.HEntryID.ToString() +
+ "," + oSub.HSourceInterID +
+ "," + oSub.HSourceEntryID +
+ ",'" + oSub.HSourceBillNo +
+ "','" + oSub.HSourceBillType +
+ "','" + oSub.HMouldID +
+ "'," + oSub.HQty +
+ "," + oSub.HMouldQty +
+ ",'" + oSub.HRate +
+ "')";
+ oCn.RunProc(subSql);
+ }
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ #endregion
+
+ #region 鏄剧ず鍗曟嵁
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds;
+ Ds = oCn.RunProcReturn("select * from Gy_SourceMouldBillMain Where HInterID = " + lngBillKey.ToString(), "Gy_SourceMouldBillMain");
+ if (Ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+
+ //鍥哄畾璧嬪��===========================================
+ omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+ omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+ omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+ omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
+ omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
+ omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
+ omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+ omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
+ omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
+ omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
+ omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
+ omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
+ omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
+ omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
+ omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
+ omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
+ omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+ omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+ omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
+ omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+ omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+ omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
+ omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+ omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+ //========================================================
+
+ omodel.HOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOrgID"]);
+
+
+ //
+
+ //寰幆
+ DataSet DsSub;
+ DsSub = oCn.RunProcReturn("select * from Gy_SourceMouldBillSub where HInterID = " + lngBillKey.ToString() + "order by HEntryID", "Gy_SourceMouldBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsGy_SourceMouldBillSub oSub = new Model.ClsGy_SourceMouldBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
+ oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ //===================================================
+
+
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+ #endregion
+
+ }
+
+}
diff --git a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
index 749f75b..0e5831b 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
index 28ba0b1..abd5f74 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
Binary files differ
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 18f5a36..69d70da 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -159,6 +159,8 @@
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainPlanBillSub_Plan.cs" />
<Compile Include="绯荤粺鍏敤\ClsXt_DefineBillMainSetSub.cs" />
<Compile Include="绯荤粺鍏敤\ClsXt_DefineBillMainSetMain.cs" />
+ <Compile Include="璁″垝绠＄悊\ClsGy_SourceMouldBillMain.cs" />
+ <Compile Include="璁″垝绠＄悊\ClsGy_SourceMouldBillSub.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_EnvironmentTestDotCheckBillMain.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_EnvironmentTestDotCheckBillSub.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_MonthTarGetBillMain.cs" />
diff --git a/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache b/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
index 119813e..0b9fb6e 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/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectMain.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectMain.cs"
index e3757a5..450abbd 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectMain.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectMain.cs"
@@ -17,5 +17,6 @@
public Int64 HProcID;
public Int64 HDeptID;
public Int64 HSampleSchemeID;
+ public Int64 HSourceID;
}
}
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_WorkShiftMain.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_WorkShiftMain.cs"
index 517b317..516531f 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_WorkShiftMain.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_WorkShiftMain.cs"
@@ -10,5 +10,6 @@
public long HDeptID;// int --部门
public double HWorkTimes;// money --工作时间
public int HWorkCenterID;//工作中心
+ public decimal HPlanShutdownTimes; //计划停工时长
}
}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_PPBomBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_PPBomBillMain.cs"
index a89bf0e..c79a7e4 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_PPBomBillMain.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_PPBomBillMain.cs"
@@ -46,6 +46,7 @@
public Int64 HSeOrderEntrySEQ; //閿�鍞鍗曡鍙�
public Int64 HICMOEntrySEQ; //鐢熶骇璁㈠崟琛屽彿
public string HREQSRC; //闇�姹傛潵婧�
+ public string HICMOBillNo; //闇�姹傛潵婧�
public Int64 HICMOEntryID;
public Int64 HPRDORGID;
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBillSub.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBillSub.cs"
index 74e9d1c..bbaa9cd 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBillSub.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBillSub.cs"
@@ -31,5 +31,6 @@
public int HBadProcID;//班组
public int HNowProcID;//当前工序
public int HBadPhenomenaID;//不良现象
+ public int HBadTypeID;//不良类型
}
}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ShiftsBeginInfoBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ShiftsBeginInfoBillMain.cs"
index 8d07019..c8e44c2 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ShiftsBeginInfoBillMain.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ShiftsBeginInfoBillMain.cs"
@@ -14,6 +14,7 @@
public Int64 HGroupID; // int --生产班组（gy_Group）
public Int64 HGroupLeaderID; // int --班组长（gy_Employee）
public Int64 HStdEmpQty; // int 应到岗人数
+ public decimal HPlanShutdownTimes;
}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSB_EquipICMOTechParamBillSub.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSB_EquipICMOTechParamBillSub.cs"
index e2d0260..1bc3195 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSB_EquipICMOTechParamBillSub.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSB_EquipICMOTechParamBillSub.cs"
@@ -17,5 +17,6 @@
public string HResultStd; //varchar(200) //设备设定值
public Int64 HTechParamClassID; //工艺参数大类（Gy_TechnologyParameterClass）
public Int64 HSNO; //int //工艺次序
+ public bool HIsRequired; // bit 是否必录
}
}
diff --git "a/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_ICBomBillMain.cs" "b/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_ICBomBillMain.cs"
index 892b27b..a118f82 100644
--- "a/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_ICBomBillMain.cs"
+++ "b/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_ICBomBillMain.cs"
@@ -17,6 +17,7 @@
public double HQty; //数量
public Single HProdRate; //成品率
public string HJump; //跳层
+ public string HBomType;
}
diff --git "a/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_MaterialTechParamBillSub.cs" "b/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_MaterialTechParamBillSub.cs"
index 0e7b78e..86c58c7 100644
--- "a/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_MaterialTechParamBillSub.cs"
+++ "b/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_MaterialTechParamBillSub.cs"
@@ -13,6 +13,7 @@
public string HMax; //上限
public string HMin; //下限
public string HDataForm; //采集来源
+ public bool HIsRequired; //是否必录
public string HDataUnit; //采集时间单位
public int HDataTimes; //采集周期频率
public int HTechParamClassID; //工艺参数大类（Gy_TechnologyParameterClass）
diff --git "a/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_SourceMouldBillMain.cs" "b/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_SourceMouldBillMain.cs"
new file mode 100644
index 0000000..959d94e
--- /dev/null
+++ "b/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_SourceMouldBillMain.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+namespace Model
+{
+ public class ClsGy_SourceMouldBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HOrgID; //int 缁勭粐
+ public Int64 HDeptID; //int 閮ㄩ棬
+ public Int64 HEmpID; //int 璐熻矗浜�
+ public Int64 HSourceID; //int 浜х嚎
+ public Int64 HWorkCenterID; //int 宸ヤ綔涓績
+ public Int64 HEquipID; //int 璁惧ID
+
+ public Int64 HProcID; //宸ュ簭ID
+ }
+}
diff --git "a/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_SourceMouldBillSub.cs" "b/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_SourceMouldBillSub.cs"
new file mode 100644
index 0000000..d1f52d2
--- /dev/null
+++ "b/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_SourceMouldBillSub.cs"
@@ -0,0 +1,14 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_SourceMouldBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public Int64 HMouldID;
+ public Int64 HMouldQty;
+ public decimal HQty;
+ public decimal HRate;
+ }
+}
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache
index bbd8f8a..0e88a05 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache
Binary files differ
diff --git a/PayM/obj/Release/PayM.csproj.ResolveComReference.cache b/PayM/obj/Release/PayM.csproj.ResolveComReference.cache
index 74c4161..9b052d7 100644
--- a/PayM/obj/Release/PayM.csproj.ResolveComReference.cache
+++ b/PayM/obj/Release/PayM.csproj.ResolveComReference.cache
Binary files differ
diff --git a/Pub_Class/bin/Release/SyntacticSugar.dll b/Pub_Class/bin/Release/SyntacticSugar.dll
index 9a5be6e..609cfaf 100644
--- a/Pub_Class/bin/Release/SyntacticSugar.dll
+++ b/Pub_Class/bin/Release/SyntacticSugar.dll
Binary files differ
diff --git a/Pub_Class/bin/Release/SyntacticSugar.pdb b/Pub_Class/bin/Release/SyntacticSugar.pdb
index 310ad83..f3f20ec 100644
--- a/Pub_Class/bin/Release/SyntacticSugar.pdb
+++ b/Pub_Class/bin/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/bin/Release/SyntacticSugar.dll b/SyntacticSugar/bin/Release/SyntacticSugar.dll
index 9a5be6e..609cfaf 100644
--- a/SyntacticSugar/bin/Release/SyntacticSugar.dll
+++ b/SyntacticSugar/bin/Release/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Release/SyntacticSugar.pdb b/SyntacticSugar/bin/Release/SyntacticSugar.pdb
index 310ad83..f3f20ec 100644
--- a/SyntacticSugar/bin/Release/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..67f5af4
--- /dev/null
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index be80070..e3847dd 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -3,9 +3,29 @@
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+<<<<<<< HEAD
+=======
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+<<<<<<< HEAD
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+=======
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+<<<<<<< HEAD
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+=======
+>>>>>>> 8931bbf58bfe3565d1367977e3c74f98bac8d23c
+>>>>>>> 6c6942d4595c5a99903b4e9033c54af44de94b94
+>>>>>>> 7cce3c1dbda47d04067ab78a6eebcdbbca9ba246
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
index 243e34e..92664e7 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,6 +1,15 @@
+<<<<<<< HEAD
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
+=======
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
+>>>>>>> 7cce3c1dbda47d04067ab78a6eebcdbbca9ba246
diff --git a/WebAPI.sln b/WebAPI.sln
index 7fc0032..4759653 100644
--- a/WebAPI.sln
+++ b/WebAPI.sln
@@ -3,12 +3,6 @@
# Visual Studio Version 16
VisualStudioVersion = 16.0.30907.101
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebAPI", "WebAPI\WebAPI.csproj", "{5B60CE0C-963C-4DC2-91B3-0B471AAC5438}"
- ProjectSection(ProjectDependencies) = postProject
- {0844CD97-FFAB-445F-A473-1380387E9A12} = {0844CD97-FFAB-445F-A473-1380387E9A12}
- {59DA489D-C83F-4584-8F1E-0BE1DC9710D4} = {59DA489D-C83F-4584-8F1E-0BE1DC9710D4}
- EndProjectSection
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "APSM", "APSM\APSM.csproj", "{59DA489D-C83F-4584-8F1E-0BE1DC9710D4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BaseSet", "BaseSet\BaseSet.csproj", "{0844CD97-FFAB-445F-A473-1380387E9A12}"
@@ -56,6 +50,8 @@
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TopSdk", "sdk_dingding\TopSdk\TopSdk.csproj", "{9C11CAE5-5188-4E71-825B-68FC3135728A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SyntacticSugar", "SyntacticSugar\SyntacticSugar.csproj", "{AFD44036-A391-4A68-BD73-37BABFC1605E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebAPI", "WebAPI\WebAPI.csproj", "{5B60CE0C-963C-4DC2-91B3-0B471AAC5438}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -264,6 +260,14 @@
{AFD44036-A391-4A68-BD73-37BABFC1605E}.Release|Any CPU.Build.0 = Release|Any CPU
{AFD44036-A391-4A68-BD73-37BABFC1605E}.Release|x86.ActiveCfg = Release|Any CPU
{AFD44036-A391-4A68-BD73-37BABFC1605E}.Release|x86.Build.0 = Release|Any CPU
+ {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Debug|x86.ActiveCfg = Debug|x86
+ {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Debug|x86.Build.0 = Debug|x86
+ {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Release|x86.ActiveCfg = Release|x86
+ {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/WebAPI/Controllers/BLL/Xt_UserController.cs b/WebAPI/Controllers/BLL/Xt_UserController.cs
index 3ec6fa1..b0ecd17 100644
--- a/WebAPI/Controllers/BLL/Xt_UserController.cs
+++ b/WebAPI/Controllers/BLL/Xt_UserController.cs
@@ -238,14 +238,14 @@
",HWhID,HWHName,HSupID,HSupName " +
",HSCWHID,HSCWHName " +
",HCloudUserName,HCloudUserPsd,HUSEORGID,HProcID" +
- ",HGroupID,HSourceID,HCheckEmpID,HWorkCenterID,HICNumber,HDingDingUserID) " +
+ ",HGroupID,HSourceID,HCheckEmpID,HWorkCenterID,HICNumber,HDingDingUserID,HCusID) " +
"values ('" + lsmain[0].Czybm.ToString() + "','" + lsmain[0].Czymc.ToString() + "','" + ClsPub.StrToPsd(lsmain[0].Czmm.ToString()) + "','" + lsmain[0].Explain.ToString() + "','" + lsmain[0].HEmpID.ToString() + "',"+ lsmain[0].HK3UserID.ToString() + "" +
","+ lsmain[0].HKeeperID.ToString() + ",'"+ lsmain[0].HKeeper.ToString() + "',"+ lsmain[0].HSecManagerID.ToString() + ",'"+ lsmain[0].HSecManager.ToString() + "'" +
"," + lsmain[0].HSellManID.ToString() + ",'" + lsmain[0].HSellMan.ToString() + "'," + lsmain[0].HDeptID.ToString() + ",'" + lsmain[0].HDept.ToString() + "'" +
"," + lsmain[0].HWhID.ToString() + ",'" + lsmain[0].HWHName.ToString() + "'," + lsmain[0].HSupID.ToString() + ",'" + lsmain[0].HSupName.ToString() + "'" +
"," + lsmain[0].HSCWHID.ToString() + ",'" + lsmain[0].HSCWHName.ToString() + "'" +
",'" + lsmain[0].HCloudUserName.ToString() + "','" + lsmain[0].HCloudUserPsd.ToString() + "',"+ lsmain[0].HOrgID.ToString() + "," + lsmain[0].HProcID.ToString() + "" +
- ","+ lsmain[0].HGroupID.ToString() + ","+ lsmain[0].HSourceID.ToString() + "," + lsmain[0].HCheckEmpID.ToString() + "," + lsmain[0].HWorkCenterID.ToString() + ",'" + lsmain[0].HICNumber + "','" + lsmain[0].HDingDingUserID + "'" + ")");
+ ","+ lsmain[0].HGroupID.ToString() + ","+ lsmain[0].HSourceID.ToString() + "," + lsmain[0].HCheckEmpID.ToString() + "," + lsmain[0].HWorkCenterID.ToString() + ",'" + lsmain[0].HICNumber + "','" + lsmain[0].HDingDingUserID + "','" + lsmain[0].HCusID + "'" + ")");
//鏂板鍚庢煡璇� 纭繚鏁版嵁娣诲姞鎴愬姛
ds = oCN.RunProcReturn("Select * from Gy_Czygl where Czybm='" + lsmain[0].Czybm.ToString() + "'", "Gy_Czygl");
@@ -314,6 +314,7 @@
",HUSEORGID=" + lsmain[0].HOrgID.ToString() +
",HICNumber='" + lsmain[0].HICNumber + "'" +
",HDingDingUserID='" + lsmain[0].HDingDingUserID + "'" +
+ ",HCusID='" + lsmain[0].HCusID + "'" +
" where Czybm='" + lsmain[0].Czybm.ToString() + "'");
}
else
@@ -346,6 +347,7 @@
",HUSEORGID=" + lsmain[0].HOrgID.ToString() +
",HICNumber='" + lsmain[0].HICNumber + "'" +
",HDingDingUserID='" + lsmain[0].HDingDingUserID + "'" +
+ ",HCusID='" + lsmain[0].HCusID + "'" +
" where Czybm='" + lsmain[0].Czybm.ToString() + "'");
}
diff --git a/WebAPI/Controllers/CGGL/Cg_POInStockBackBillController.cs b/WebAPI/Controllers/CGGL/Cg_POInStockBackBillController.cs
index df78c81..1494a95 100644
--- a/WebAPI/Controllers/CGGL/Cg_POInStockBackBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POInStockBackBillController.cs
@@ -250,6 +250,8 @@
+ ",HAddress='" + HAddress + "' ,HInnerBillNo='" + HInnerBillNo + "' where HInterID=" + HInterID;
oCN.RunProc(sql);
+ //閫�鏂欓�氱煡鍗曞垹闄ゅ洖濉噰璐鍗曞叧鑱旀暟閲�
+ oCN.RunProc("exec h_p_Cg_UpDateRelation_POInStockBackToPOOrder_Del " + HInterID);
//鍒犻櫎瀛愯〃
oCN.RunProc("delete from Cg_POInStockBackBillSub where HInterID='" + HInterID + "'");
}
@@ -444,6 +446,8 @@
string sReturn = "";
oCN.BeginTran();
+ //閫�鏂欓�氱煡鍗曞垹闄ゅ洖濉噰璐鍗曞叧鑱旀暟閲�
+ oCN.RunProc("exec h_p_Cg_UpDateRelation_POInStockBackToPOOrder_Del " + HInterID);
oCN.RunProc("Delete From Cg_POInStockBackBillMain where HInterID = " + HInterID);
oCN.RunProc("Delete From Cg_POInStockBackBillSub where HInterID = " + HInterID);
oCN.Commit();
diff --git a/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs b/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
index eb29396..3981534 100644
--- a/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
@@ -471,7 +471,7 @@
//搴斾粯鍗� 鍒犻櫎 鎾ら攢 閲囪喘鍏ュ簱鍗� 鍏宠仈鏁伴噺
oCN.RunProc("exec h_p_Cg_UpDateRelation_POStockInToPayable_Del " + HInterID);
- //搴斾粯鍗� 鍒犻櫎 鎾ら攢 搴斾粯鍗� 鍏宠仈鏁伴噺
+ //搴斾粯鍗� 鍒犻櫎 鎾ら攢 閲囪喘璁㈠崟 鍏宠仈鏁伴噺
oCN.RunProc("exec h_p_Cg_UpDateRelation_POOrderToPayable_Del " + HInterID);
oCN.RunProc("delete from Cg_PayableBillMain where HInterID = " + HInterID);
diff --git a/WebAPI/Controllers/CGGL/Kf_POStockInBackBillController.cs b/WebAPI/Controllers/CGGL/Kf_POStockInBackBillController.cs
index 5a5df2f..6ea0851 100644
--- a/WebAPI/Controllers/CGGL/Kf_POStockInBackBillController.cs
+++ b/WebAPI/Controllers/CGGL/Kf_POStockInBackBillController.cs
@@ -238,6 +238,8 @@
+ ",HAddress='" + HAddress + "'where HInterID=" + HInterID;
oCN.RunProc(sql);
+ //閲囪喘閫�鏂欏垹闄ゅ洖濉��鏂欓�氱煡鍗曞叧鑱旀暟閲�
+ oCN.RunProc("exec h_p_Kf_UpDateRelation_POStockInBackToPOInStockBack_Del " + HInterID);
//鍒犻櫎瀛愯〃
oCN.RunProc("delete from Kf_ICStockBillSub where HInterID='" + HInterID + "'");
}
@@ -445,6 +447,8 @@
string sReturn = "";
oCN.BeginTran();
+ //閲囪喘閫�鏂欏垹闄ゅ洖濉��鏂欓�氱煡鍗曞叧鑱旀暟閲�
+ oCN.RunProc("exec h_p_Kf_UpDateRelation_POStockInBackToPOInStockBack_Del " + HInterID);
oCN.RunProc("Delete From Kf_ICStockBillMain where HInterID = " + HInterID);
oCN.RunProc("Delete From Kf_ICStockBillSub where HInterID = " + HInterID);
oCN.Commit();
diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
index 4d893d2..99408a2 100644
--- a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -183,14 +183,31 @@
if (ds.Tables[0].Rows.Count == 0)//鏂板
{
- //涓昏〃
- oCN.RunProc(@"Insert Into Sc_QualityReportBillMain
-(HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate
-,HYear,HPeriod,HRemark,HMaker,HMakeDate
-,HEmpID,HGroupID,HDeptID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo)
+ if (HResult== "寰憰鍝�")
+ {
+ //涓昏〃
+ oCN.RunProc(@"Insert Into Sc_QualityReportBillMain
+ (HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate
+ ,HYear,HPeriod,HRemark,HMaker,HMakeDate
+ ,HEmpID,HGroupID,HDeptID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo)
+ values('3717','3717-1',1," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
+ "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" +
+ ",'" + HEmpID + "'," + HGroupID + "," + HDeptID + "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "') ");
+ //閲嶆柊缁橦Result璧嬪��
+ HResult = "";
+ }
+ else
+ {
+ //涓昏〃
+ oCN.RunProc(@"Insert Into Sc_QualityReportBillMain
+ (HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate
+ ,HYear,HPeriod,HRemark,HMaker,HMakeDate
+ ,HEmpID,HGroupID,HDeptID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo)
values('3717','3717',1," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
- "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" +
- ",'" + HEmpID + "'," + HGroupID + "," + HDeptID + "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "') ");
+ "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" +
+ ",'" + HEmpID + "'," + HGroupID + "," + HDeptID + "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "') ");
+ }
+
}
@@ -290,8 +307,22 @@
oCN.RunProc("update Gy_BarCodeBill set HStatus='"+ HResult + "' where HBarCode='"+ oSub.HBarCode + "'");
//淇敼鍑虹珯鍗曠殑 涓嶈壇 鎶ュ簾鏁伴噺
- if (HResult == "涓嶈壇") {
- oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1 where HProcExchBillNo='" + oSub.HProcExchBillNo + "' and HProcID=" + oSub.HProcID + " and HInterID=" + linterid);
+ if (HResult == "涓嶈壇" && (oSub.HBadTypeID == 3 || oSub.HBadTypeID == 4 || oSub.HBadTypeID == 6))
+ {
+ //宸ュ簾
+ if (oSub.HBadTypeID == 3)
+ {
+ oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1,HWasterQty_Work+=1 where HProcExchBillNo='" + oSub.HProcExchBillNo + "' and HProcID=" + oSub.HProcID + " and HInterID=" + linterid);
+ }//鏂欏簾
+ else if (oSub.HBadTypeID == 4)
+ {
+ oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1,HWasterQty_Mater+=1 where HProcExchBillNo='" + oSub.HProcExchBillNo + "' and HProcID=" + oSub.HProcID + " and HInterID=" + linterid);
+ }//杩斿伐
+ else if (oSub.HBadTypeID == 6)
+ {
+ oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1,HBackWorkQty+=1 where HProcExchBillNo='" + oSub.HProcExchBillNo + "' and HProcID=" + oSub.HProcID + " and HInterID=" + linterid);
+ }
+
}
else if (HResult == "鎶ュ簾")
{
@@ -1657,8 +1688,20 @@
if (dataSet.Tables[0].Rows.Count > 0)
{
string HOutInterID = dataSet.Tables[0].Rows[0][0].ToString();
-
- oCN.RunProc("update Sc_StationOutBillMain set HBadCount-=1 where HInterID='" + HOutInterID + "'");
+ //鏂帿灏旂殑鎯呭喌 鍒� 宸ュ簾鏂欏簾 杩斿伐
+ //宸ュ簾
+ if (subLsit[0].HBadTypeID == 3)
+ {
+ oCN.RunProc("update Sc_StationOutBillMain set HBadCount-=1,HWasterQty_Work-=1 where HInterID='" + HOutInterID + "'");
+ }//鏂欏簾
+ else if (subLsit[0].HBadTypeID == 4)
+ {
+ oCN.RunProc("update Sc_StationOutBillMain set HBadCount-=1,HWasterQty_Mater-=1 where HInterID='" + HOutInterID + "'");
+ }//杩斿伐
+ else if (subLsit[0].HBadTypeID == 6)
+ {
+ oCN.RunProc("update Sc_StationOutBillMain set HBadCount-=1,HBackWorkQty-=1 where HInterID='" + HOutInterID + "'");
+ }
}
else
{
diff --git a/WebAPI/Controllers/JHGL/Gy_SourceMouldBillController.cs b/WebAPI/Controllers/JHGL/Gy_SourceMouldBillController.cs
new file mode 100644
index 0000000..4fd3b93
--- /dev/null
+++ b/WebAPI/Controllers/JHGL/Gy_SourceMouldBillController.cs
@@ -0,0 +1,648 @@
+锘縰sing DBUtility;
+using Model;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using System.Windows.Forms;
+using WebAPI.Models;
+
+
+namespace WebAPI.Controllers.JHGL
+{
+ public class Gy_SourceMouldBillController : ApiController
+ {
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ public DAL.ClsGy_SourceMouldBillMain BillNew1 = new DAL.ClsGy_SourceMouldBillMain(); //浜у搧鍣ㄥ叿娓呭崟瀵瑰簲鍗曟嵁绫�
+ public DAL.ClsGy_SourceMouldBillMain BillOld1 = new DAL.ClsGy_SourceMouldBillMain();
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+
+
+ #region 浜х嚎鍣ㄥ叿娓呭崟鍗曞垪琛�
+ [Route("Gy_SourceMouldBill/Gy_SourceMouldBillList")]
+ [HttpGet]
+ public object Gy_SourceMouldBillList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ヨ鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_SourceMouldBill_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_SourceMouldBillMainList order by 鍗曟嵁鍙� desc", "h_v_Gy_SourceMouldBillMainList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_SourceMouldBillMainList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_SourceMouldBillMainList");
+ }
+ //娣诲姞鍒楀悕
+ 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
+
+ #region 浜у搧鍣ㄥ叿娓呭崟缂栬緫鏃惰幏鍙栬〃浣撴暟鎹�
+ [Route("Gy_SourceMouldBill/Gy_SourceMouldBillEditList")]
+ [HttpGet]
+ public object Gy_SourceMouldBillEditList(string HInterID, string User)
+ {
+ try
+ {
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_SourceMouldBill_Edit", 1, false, User))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (HInterID == null || HInterID.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_Gy_SourceMouldBill_Edit where HInterID = " + HInterID, "h_v_Gy_SourceMouldBill_Edit");
+
+ if (ds != null && ds.Tables.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ヨ鍒版暟鎹紒";
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 浜у搧鍣ㄥ叿娓呭崟 淇濆瓨/缂栬緫
+ /// <summary>
+ /// 淇濆瓨妯″叿缁翠慨鍗�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Gy_SourceMouldBill/SaveGy_SourceMouldBillMain")]
+ [HttpPost]
+ public object SaveGy_SourceMouldBillMain([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString(); //瀛愯〃
+ string refSav = sArray[2].ToString();//鎿嶄綔鏂瑰紡鏁版嵁绫诲瀷 1娣诲姞 3淇敼 2 澶嶅埗
+ string user = sArray[3].ToString();//鐢ㄦ埛鍚�
+
+ string UserName = "";
+ string s = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ //淇濆瓨鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_SourceMouldBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsGy_SourceMouldBillMain oBill = new DAL.ClsGy_SourceMouldBillMain();
+ List<Model.ClsGy_SourceMouldBillMain> lsmain = new List<Model.ClsGy_SourceMouldBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_SourceMouldBillMain(msg2);
+ foreach (Model.ClsGy_SourceMouldBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew1.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld1.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (refSav == "Update")
+ {
+ if (BillOld1.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld1.omodel.HChecker != "" && BillOld1.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (BillOld1.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld1, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "4617";
+ oItem.HBillSubType = "4617";
+
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ // 琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ List<Model.ClsGy_SourceMouldBillSub> ls = new List<Model.ClsGy_SourceMouldBillSub>();
+ ls = oListModels.getObjectByJson_Gy_SourceMouldBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsGy_SourceMouldBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (refSav == "Add")
+ {
+
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else if (refSav == "Update")
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = false;
+ }
+ 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 浜х嚎鍣ㄥ叿娓呭崟璁板綍鍒犻櫎鍔熻兘
+ [Route("Gy_SourceMouldBill/DeleteGy_SourceMould")]
+ [HttpGet]
+ public object DeleteGy_SourceMould(string HInterID, string user)
+ {
+ try
+ {
+ //鍒犻櫎鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_SourceMouldBill_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (HInterID == null || HInterID.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ oCN.RunProc("delete from Gy_SourceMouldBillMain where HInterID = " + HInterID);
+ oCN.RunProc("delete from Gy_SourceMouldBillSub where HInterID = " + HInterID);
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 浜у搧鍣ㄥ叿娓呭崟鍒楄〃 瀹℃牳/鍙嶅鏍稿姛鑳�
+ [Route("Gy_SourceMouldBill/CheckGy_SourceMouldBillMain")]
+ [HttpGet]
+ public object CheckGy_SourceMouldBillMain(int HInterID, int IsAudit, string CurUserName)
+ {
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_SourceMouldBill_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //HInterID鏁版嵁鍒ゆ柇
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+ DAL.ClsGy_SourceMouldBillMain oBill = new DAL.ClsGy_SourceMouldBillMain(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣�
+ if (IsAudit == 0) //瀹℃牳鎻愪氦
+ {
+ oCN.BeginTran();
+
+ //璁板綍杩斿洖淇℃伅
+ string msg = "";
+
+
+
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_SourceMouldBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_SourceMouldBill_BeforeCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ //瀹℃牳鎻愪氦
+ if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Gy_SourceMouldBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛锛�" + msg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ oCN.RollBack();
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍告彁浜�
+ {
+
+ //鍙嶅鏍稿墠鎺у埗=========================================
+ string sql1 = "exec h_p_Gy_SourceMouldBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_SourceMouldBill_BeforeUnCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿墠鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //===========================================================
+
+ //鍙嶅鏍告彁浜bandonCheck
+ if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Gy_SourceMouldBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ 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_SourceMouldBill/CloseGy_SourceMouldBillMain")]
+ [HttpGet]
+ public object CloseGy_SourceMouldBillMain(string HInterID, int IsAudit, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊叧闂潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_SourceMouldBill_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ var ds = oCN.RunProcReturn("select * from Gy_SourceMouldBillMain where HInterID=" + HInterID, "Gy_SourceMouldBillMain");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsAudit == 0) //鍏抽棴鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅叧闂垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸弽鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsAudit == 0) //鍏抽棴鍒ゆ柇
+ {
+ oCN.RunProc("update Gy_SourceMouldBillMain set HCloseMan='" + user + "',HCloseDate=getdate() where HInterID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ oCN.RunProc("update Gy_SourceMouldBillMain set HCloseMan='',HCloseDate=null where HInterID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ 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/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 04b9bc9..7d0c01f 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -192,7 +192,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillList_Query where 1 = 1 " + sWhere + " order by 鍗曟嵁鍙� desc ", "h_v_Sc_ProcessExchangeBillList_Query");
+ ds = oCN.RunProcReturn("select top 1000 * from h_v_Sc_ProcessExchangeBillList_Query where 1 = 1 " + sWhere + " order by 鍗曟嵁鍙� desc ", "h_v_Sc_ProcessExchangeBillList_Query");
//娣诲姞鍒楀悕
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
index 8c4f92d..8bc50fb 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
@@ -33,6 +33,8 @@
{
try
{
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
if (!DBUtility.ClsPub.Security_Log("Gy_EquipFileBill_Query", 1, false, user))
{
objJsonResult.code = "0";
@@ -51,12 +53,19 @@
string sql = sql1 + sWhere + " order by hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_Gy_EquipFileMainList");
}
+ //娣诲姞鍒楀悕
+ 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)
@@ -187,7 +196,7 @@
{
try
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_EquipFileMainList where hmainid=" + HInterID, "h_v_Gy_EquipFileMainList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_EquipFileMain_Edit where hmainid=" + HInterID, "h_v_Gy_EquipFileMain_Edit");
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -350,7 +359,7 @@
string HMainSourceFlag = list[0].HMainSourceFlag; //varchar(10) //鏄惁涓荤敓浜ц澶�(鍚︼紝鏄�)
int HMainSourceID = list[0].HMainSourceID; //int //鎵�灞炰富鐢熶骇璁惧锛圙y_EquipFileBillMain锛�
string HMaker = msg5;
- string HMakeDate = DateTime.Now.Date.ToString();
+ //string HMakeDate = DateTime.Now.Date.ToString();
int HEquipDotCheckRuleInterID = list[0].HEquipDotCheckRuleInterID;
int HEquipMaintainRuleInterID = list[0].HEquipMaintainRuleInterID;
int HSourceID = list[0].HSourceID;
@@ -405,7 +414,7 @@
" Values("+ HInterID+",'" + hbillno + "','" + HEquipFileNumber + "','" + HEquipFileNo + "','" + HName + "','" + HModel + "','" + HModel2 + "'," + HMaterID + "," + HUnitID +
",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HUseEmpID + "," + HRepairEmpID + ",'" + HAddress +
"','" + HSetupDate + "','" + HStartupDate + "','" + HStatus + "'," + HEquipFileTypeID + ",'" + HProNum +
- "','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID + ",'3308','" + HDate + "','" + HYear + "','" + HMaker + "','" + HMakeDate + "','" + HEquipMaintainRuleInterID + "','" + HEquipDotCheckRuleInterID +"'" +
+ "','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID + ",'3308','" + HDate + "','" + HYear + "','" + HMaker + "',GETDATE(),'" + HEquipMaintainRuleInterID + "','" + HEquipDotCheckRuleInterID +"'" +
"," + HSourceID + ",'" + HMainSourceFlag + "','" + HMacAddress + "','" + HMainSourceID + "','" + HIPAddress + "','" + HLinkNETMode + "','" + HCollectMode + "','" + HCollectClass + "')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
objJsonResult = AddBillSub(msg3, msg4, HInterID, hbillno, 1);
@@ -510,7 +519,7 @@
string HCollectClass = list[0].HCollectClass; // varchar(50) //閲囬泦绫诲瀷
int HMainSourceID = list[0].HMainSourceID; //int //鎵�灞炰富鐢熶骇璁惧锛圙y_EquipFileBillMain锛�
string HUpDater = msg5;
- string HUpDateDate = DateTime.Now.Date.ToString();
+ //string HUpDateDate = DateTime.Now.Date.ToString();
int HEquipDotCheckRuleInterID = list[0].HEquipDotCheckRuleInterID;
int HEquipMaintainRuleInterID = list[0].HEquipMaintainRuleInterID;
int HSourceID = list[0].HSourceID;
@@ -564,8 +573,8 @@
",HLogo='" + HLogo + "'" +
",HSellSupID=" + HSellSupID +
",HMakeSupID= " + HMakeSupID +
- ",HUpDater= '" + HUpDater + "'" +
- ",HUpDateDate= '" + HUpDateDate + "'" +
+ ",HUpDater= '" + HUpDater + "'" +
+ ",HUpDateDate= GETDATE()" +
",HEquipDotCheckRuleInterID='" + HEquipDotCheckRuleInterID + "'" +
",HEquipMaintainRuleInterID='" + HEquipMaintainRuleInterID + "'" +
",HSourceID='" + HSourceID + "'" +
diff --git a/WebAPI/Controllers/SCGL/Sc_ICBomBillController.cs b/WebAPI/Controllers/SCGL/Sc_ICBomBillController.cs
index 1841ada..c026cb6 100644
--- a/WebAPI/Controllers/SCGL/Sc_ICBomBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_ICBomBillController.cs
@@ -1,4 +1,6 @@
-锘縰sing System;
+锘縰sing DAL;
+using Newtonsoft.Json.Linq;
+using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
@@ -41,12 +43,12 @@
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_ICBomBillList order by hmainid desc ", "h_v_Gy_ICBomBillList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_ICBomBillList order by 鏃ユ湡 desc,hmainid desc ", "h_v_Gy_ICBomBillList");
}
else
{
string sql1 = "select * from h_v_Gy_ICBomBillList where 1 = 1 ";
- string sql = sql1 + sWhere+ " order by hmainid desc ";
+ string sql = sql1 + sWhere+ " order by 鏃ユ湡 desc,hmainid desc ";
ds = oCN.RunProcReturn(sql, "h_v_Gy_ICBomBillList");
}
@@ -78,5 +80,324 @@
}
}
#endregion
+
+ #region 鐢熶骇鐗╂枡娓呭崟 缂栬緫鏌ヨ
+ /// <summary>
+ /// 鐢熶骇BOM/鐢熶骇鐗╂枡娓呭崟
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ [Route("Sc_ICBomBill/Editlist")]
+ [HttpGet]
+ public object Editlist(string sWhere)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_ICBomBillEditList where 1=1 "+ sWhere + " order by hmainid desc ", "h_v_Gy_ICBomBillEditList");
+
+
+ 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 鐢熶骇鐗╂枡娓呭崟 鏂板
+ /// <summary>
+ /// 鐢熶骇BOM/鐢熶骇鐗╂枡娓呭崟
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ [Route("sc_Gy_ICBomBill/sc_Gy_ICBomBillAdd")]
+ [HttpPost]
+ public object sc_Gy_ICBomBillAdd([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ try
+ {
+ string msg2 = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃鏁版嵁
+ int OperationType = int.Parse(sArray[2].ToString()); // 鏁版嵁绫诲瀷 1娣诲姞 3淇敼
+ string user = sArray[3].ToString();
+
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_ICBomBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsGy_ICBomBill oBill = new ClsGy_ICBomBill();
+ msg2 = "[" + msg2 + "]";
+ List<Model.ClsGy_ICBomBillMain> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ICBomBillMain>>(msg2);
+ foreach (Model.ClsGy_ICBomBillMain oItem in lsmain)
+ {
+ //oItem.HMaker = "";
+ oItem.HMaker = user; //鍒跺崟浜�
+ oItem.HBillType = "3302";
+ oItem.HBillSubType = "3302";
+ oItem.HBillStatus = 1;
+ oItem.HUpDater = user;
+ oItem.HUpDateDate = DateTime.Now.ToString();
+ DBUtility.ClsPub.CurUserName = user;
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+
+ List<Model.ClsGy_ICBomBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ICBomBillSub>>(msg3);
+ int i = 0;
+ foreach (Model.ClsGy_ICBomBillSub oItemSub in DetailColl)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+ oItemSub.HRemark2 = "";
+ oItemSub.HRemark3 = "";
+ oItemSub.HRemark4 = "";
+ oItemSub.HChildType = "";
+ oItemSub.HCloseMan = "";
+ oItemSub.HSourceBillNo = "";
+ oItemSub.HSourceBillType = "";
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+
+
+ bool bResult;
+ if (OperationType == 1)
+ {
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else if (OperationType == 3)
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔绫诲瀷鏃犳晥锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ 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 = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢熶骇鐗╂枡娓呭崟 鍒犻櫎
+ [Route("sc_Gy_ICBomBill/DeltetICBomBill")]
+ [HttpGet]
+ public object DeltetICBomBill(string HInterID,string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_ICBomBill_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬垹闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+ oCN.RunProc("Delete From Gy_ICBomBillMain where HInterID = " + HInterID);
+ oCN.RunProc("Delete From Gy_ICBomBillSub where HInterID = " + HInterID);
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢熶骇鐗╂枡娓呭崟 瀹℃牳鍙婂弽瀹℃牳
+ [Route("sc_Gy_ICBomBill/AuditBomBill")]
+ [HttpGet]
+ public object AuditBomBill(int HInterID, int IsAudit, string CurUserName)
+ {
+
+ try
+ {
+ //IsAudit=1 瀹℃牳锛� IsAudit=2 鍙嶅鏍�
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_ICBomBill_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲鏍告潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ if (lngBillKey == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+
+ ClsGy_ICBomBill oBill = new ClsGy_ICBomBill();
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (oBill.omodel.HCloseMan != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�,涓嶈兘杩涜瀹℃牳";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (oBill.omodel.HDeleteMan != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�,涓嶈兘杩涜瀹℃牳";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (IsAudit == 1)
+ {
+ if (oBill.omodel.HBillStatus == 2)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁宸插鏍革紝鏃犻渶鍐嶆瀹℃牳";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ string HCheckDate = DateTime.Now.Date.ToString();
+ oCN.BeginTran();
+ oCN.RunProc(" Update Gy_ICBomBillMain set HChecker='" + CurUserName + "',HCheckDate='" + HCheckDate + "',HBillStatus=2 Where HInterID=" + HInterID);
+
+ oCN.Commit();
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (oBill.omodel.HBillStatus == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁鏈鏍革紝鏃犻渶鍙嶅鏍�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ string HCheckDate = DateTime.Now.Date.ToString();
+ oCN.BeginTran();
+ oCN.RunProc(" Update Gy_ICBomBillMain set HChecker=' ',HCheckDate=null,HBillStatus=1 Where HInterID=" + HInterID);
+
+ oCN.Commit();
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔燂紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栧弽瀹℃牳澶辫触" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs b/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
index 6465722..5f3ddc6 100644
--- a/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
@@ -91,6 +91,50 @@
}
}
+ [Route("Sc_PPBomBill/Editlist")]
+ [HttpGet]
+ public object Editlist(string sWhere)
+ {
+ try
+ {
+ List<object> a = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_PPBomBillList order by hmainid desc ", "h_v_IF_PPBomBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_IF_PPBomBillList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by hmainid desc ";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_PPBomBillList");
+ }
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ a.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = a;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
#region 鐢熶骇鐢ㄦ枡娓呭崟鍒楄〃鍒嗛〉鍒楄〃
[Route("Sc_PPBomBill/page")]
@@ -304,6 +348,216 @@
}
#endregion
+ #region 鐢熶骇鐢ㄦ枡鍗� 淇濆瓨/缂栬緫鍔熻兘 鏂版柟娉�
+ [Route("Sc_PPBomBill/sc_PPBomBillAdd")]
+ [HttpPost]
+ public object sc_PPBomBillAdd([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+
+ try
+ {
+ string msg2 = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃鏁版嵁
+ int OperationType = int.Parse(sArray[2].ToString()); // 鏁版嵁绫诲瀷 1娣诲姞 3淇敼
+ string user = sArray[3].ToString();
+
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("QC_TestSampleCheckBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犵紪杈戞潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsSc_PPBomBillMain list = Newtonsoft.Json.JsonConvert.DeserializeObject<ClsSc_PPBomBillMain>(msg2);
+ string BillType = "3720";
+ string HBillSubType = "3720";
+ long HInterID = list.HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string HBillNo = list.HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ int HBillStatus = 1;
+ string HMaker = user;//鍒跺崟浜�
+ int HYear = DateTime.Now.Year;
+ double HPeriod = DateTime.Now.Month;
+ long HICMOInterID = list.HICMOInterID;//浠诲姟鍗旾D
+ long HICMOEntryID = list.HICMOEntryID;//浠诲姟鍗旾D
+ string HICMOBillNo = list.HICMOBillNo;//浠诲姟鍗旾D
+ long HMaterID = list.HMaterID;//浜у搧ID
+ long HUnitID = list.HUnitID;//璁￠噺鍗曚綅
+ long HPRDORGID = list.HPRDORGID;//缁勭粐ID
+ long HICMOEntrySEQ = list.HICMOEntrySEQ;
+ DateTime HDate = list.HDate;
+ double HQty = list.HQty;
+ long HDeptID = list.HDeptID;
+ string HRemark = list.HRemark;
+ string HChecker = "";
+ string HCheckDate = "";
+ string HSeOrderBillNo = "";
+ long HSeOrderInterID = 0;
+ long HSeOrderEntryID = 0;
+ long HENTRUSTORGID = 0;
+ long HPARENTOWNERID = 0;
+ long HPARENTOWNERTYPEID = 0;
+ long HERPInterID = 0;
+ long HSeOrderEntrySEQ = 0;
+ string HERPBillType = "";
+ string HREQSRC = "";
+
+ oCN.BeginTran();
+ if (OperationType== 1)
+ {
+ ds = oCN.RunProcReturn("select * from Sc_PPBomBillMain where HBillNo='" + HBillNo + "'", "Sc_PPBomBillMain");
+ if (ds.Tables[0].Rows.Count == 1)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //涓昏〃
+ oCN.RunProc(@"Insert Into Sc_PPBomBillMain
+ (HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillNo,HBillStatus,HICMOInterID
+ ,HICMOEntryID,HMaterID,HUnitID,HQty,HDeptID,HMaker,HMakeDate,HChecker,HCheckDate
+ ,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HPRDORGID,HENTRUSTORGID,HPARENTOWNERID
+ ,HPARENTOWNERTYPEID,HERPInterID,HERPBillType,HSeOrderEntrySEQ,HICMOEntrySEQ,HREQSRC,HRemark)
+ values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + BillType + "','" +
+ HBillSubType + "','" + HDate + "','" + HBillNo + "','" + HBillStatus + "'," + HICMOInterID +
+ "," + HICMOEntryID + ",'" + HMaterID + "'," + HUnitID + "," + HQty + "," + HDeptID +
+ ",'" + HMaker + "',getdate(),'" + HChecker + "','" + HCheckDate + "','" + HSeOrderBillNo + "'," + HSeOrderInterID + "," + HSeOrderEntryID + "," + HPRDORGID + "," + HENTRUSTORGID + "," + HPARENTOWNERID + "," +
+ HPARENTOWNERTYPEID + "," + HERPInterID + ",'" + HERPBillType + "'," + HSeOrderEntrySEQ + "," + HICMOEntrySEQ + ",'" + HREQSRC + "','"+ HRemark + "')");
+ }
+ else if (OperationType == 3 )
+ { //淇敼
+ oCN.RunProc("update Sc_PPBomBillMain set " +
+ "HRemark='" + HRemark + "', HChecker='" + HMaker + "', HCheckDate=getdate()" +
+ ",HDeptID=" + HDeptID + ",HICMOInterID=" + HICMOInterID + ",HICMOEntryID=" + HICMOEntryID + ",HMaterID=" + HMaterID + ",HUnitID=" + HUnitID + ",HICMOEntrySEQ=" + HICMOEntrySEQ + " ,HQty=" + HQty + " where HInterID=" + HInterID);
+
+ //鍒犻櫎瀛愯〃
+ oCN.RunProc("delete from Sc_PPBomBillSub where HInterID='" + HInterID + "'");
+ }
+ else
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔绫诲瀷鏃犳晥锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<ClsSc_PPBomBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSc_PPBomBillSub>>(msg3);
+ int i = 0;
+ foreach (ClsSc_PPBomBillSub oSub in DetailColl)
+ {
+ i++;
+ string HMaterNumber = oSub.HMaterNumber;
+ string HUnitNumber = oSub.HUnitNumber;
+ long HQtyMust = 0;
+ long HSourceInterID = oSub.HSourceInterID;
+ long HSourceEntryID = oSub.HSourceEntryID;
+ long HCHILDSUPPLYORGID = oSub.HCHILDSUPPLYORGID;
+ long HSUPPLYORGID = oSub.HSUPPLYORGID;
+ long HENTRUSTPICKORGID = oSub.HENTRUSTPICKORGID;
+ long HSRCTRANSORGID = oSub.HSRCTRANSORGID;
+ long HGROUPBYOWNERID = oSub.HGROUPBYOWNERID;
+ long HOWNERID = oSub.HOWNERID;
+ long HAuxPropID = oSub.HAuxPropID;
+ long HERPEntryID = oSub.HERPEntryID;
+ long HProcessID = oSub.HProcessID;
+ long HICMOENTRYSEQ = oSub.HICMOENTRYSEQ;
+ long HOPERID = oSub.HOPERID;
+ long HSEQ = i;
+ long HSTOCKSTATUSID = oSub.HSTOCKSTATUSID;
+ long HOPTQUEUE = oSub.HOPTQUEUE;
+ long HLOT = oSub.HLOT;
+ long HRESERVETYPE = oSub.HRESERVETYPE;
+ string HOWNERTYPEID = oSub.HOWNERTYPEID;
+ double HRelationQty = oSub.HRelationQty;
+ double HMoveStockQty = oSub.HMoveStockQty;
+ double HQtyScrap = oSub.HQtyScrap;
+ double HBackRelationQty = oSub.HBackRelationQty;
+ double HNumerator = oSub.HNumerator;
+ double HDenominator = oSub.HDenominator;
+ double HSelPickedQty = oSub.HSelPickedQty;
+ double HSELPRCDRETURNQTY = oSub.HSELPRCDRETURNQTY;
+ string HSourceBillNo = oSub.HSourceBillNo;
+ string HSourceBillType = oSub.HSourceBillType;
+ string HBatchNO = oSub.HBatchNO;
+ string HMTONo = oSub.HMTONo;
+ string HPROJECTNO = oSub.HPROJECTNO;
+
+ if (oSub.HQty <= 0 || oSub.HQty == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + i + "琛岋紝鏁伴噺涓嶈兘涓�0鎴栬�呭皬浜�0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (oSub.HMaterID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + i + "琛岋紝鐗╂枡涓嶈兘涓虹┖";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (oSub.HUnitID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + i + "琛岋紝璁￠噺鍗曚綅涓嶈兘涓虹┖";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ Int64 NewHEntryID = i;
+
+ oCN.RunProc($@"Insert into Sc_PPBomBillSub
+ (HInterID,HEntryID,HMaterID,HMaterNumber,HUnitID,HUnitNumber,HSPID,HQty,HQtyMust,HWHID,HRemark
+ ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HICMOInterID,HICMOEntryID,HICMOBillNo
+ ,HCHILDSUPPLYORGID,HSUPPLYORGID,HENTRUSTPICKORGID,HSRCTRANSORGID,HGROUPBYOWNERID,HOWNERID,HOWNERTYPEID
+ ,HRelationQty,HMoveStockQty,HAuxPropID,HBatchNO,HMTONo,HQtyScrap,HERPInterID,HERPEntryID
+ ,HBackRelationQty,HNumerator,HDenominator,HBASEUNITID,HProcessID,HICMOENTRYSEQ,HPROJECTNO
+ ,HOPERID,HSEQ,HSTOCKSTATUSID,HLOT,HOPTQUEUE,HRESERVETYPE,HSelPickedQty,HSELPRCDRETURNQTY)
+ values({HInterID},{NewHEntryID},{oSub.HMaterID},'{HMaterNumber}',{oSub.HUnitID},'{HUnitNumber}',{oSub.HSPID},{(oSub.HQty == null ? 0 : oSub.HQty)}
+ ,{HQtyMust},{oSub.HWHID},'{oSub.HRemark}',{HSourceInterID},{HSourceEntryID},'{HSourceBillNo}','{HSourceBillType}',{HICMOInterID},{HICMOEntryID},'{HICMOBillNo}',{HCHILDSUPPLYORGID},{HSUPPLYORGID},{HENTRUSTPICKORGID},{HSRCTRANSORGID},{HGROUPBYOWNERID},{HOWNERID},'{HOWNERTYPEID}',{HRelationQty},{HMoveStockQty},{HAuxPropID},'{HBatchNO}','{HMTONo}',{HQtyScrap},{HERPInterID},
+ {HERPEntryID},{HBackRelationQty},{HNumerator},{HDenominator},{oSub.HBASEUNITID},{HProcessID},{HICMOENTRYSEQ},'{HPROJECTNO}',{HOPERID},{HSEQ},{HSTOCKSTATUSID},{HLOT},{HOPTQUEUE},{HRESERVETYPE},{HSelPickedQty},{HSELPRCDRETURNQTY})");
+ }
+
+
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+
+ #endregion
+
#region 鐢熶骇鐢ㄦ枡鍗� 淇濆瓨/缂栬緫鍔熻兘
[Route("Sc_PPBomBill/PPBomBillEdit")]
[HttpPost]
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
index d88b974..756f653 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
@@ -3055,5 +3055,83 @@
}
#endregion
+ #region 閫氳繃鐗╂枡鍖归厤浜у搧鍣ㄥ叿娓呭崟
+ [Route("JIT_DayPlanPlatFormBill/GetMouldByMater")]
+ [HttpGet]
+ public object GetMouldByMater(string HMaterID,string HSourceID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("exec h_p_Gy_MaterialMouldByMater " + HMaterID + "," + HSourceID, "h_p_Gy_MaterialMouldByMater");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閫氳繃璧勬簮鍖归厤璧勬簮鍣ㄥ叿娓呭崟
+ [Route("JIT_DayPlanPlatFormBill/GetMouldBySource")]
+ [HttpGet]
+ public object GetMouldBySource(string HSourceID, string HMouldID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_SourceMouldBillMainList where HSourceID = " + HSourceID + " and HMouldID = " + HMouldID, "h_v_Gy_SourceMouldBillMainList");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鎺掍骇鍚庡皢鍣ㄥ叿鍗犵敤鏃堕棿鍐欏叆鏁版嵁搴�
+ [Route("JIT_DayPlanPlatFormBill/AddMouldOccupancyTime")]
+ [HttpGet]
+ public object AddMouldOccupancyTime(string HMouldID, string HSourceID, string HICMOInterID, string HICMOEntryID, string HMouldPCTime)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("exec h_p_JIT_AddMouldOccupancyTime " + HMouldID + "," + HSourceID + "," + HICMOInterID + "," + HICMOEntryID + ",'" + HMouldPCTime + "'", "h_p_JIT_AddMouldOccupancyTime");
+
+ 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
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 4653e62..98bd60c 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -37,7 +37,7 @@
string fileip = System.Configuration.ConfigurationManager.AppSettings["FileIP"];
/// <summary>
- /// 閫佽揣鍗曡〃澶翠俊鎭�
+ /// 鑾峰彇鍗曟嵁鍙蜂笌鍗曟嵁鍐呯爜
/// </summary>
/// <param name="sMsg"></param>
/// <returns></returns>
@@ -16866,12 +16866,16 @@
/// <returns></returns>
[Route("Web/GetCheckItemID")]
[HttpGet]
- public object GetCheckItemID(string HName,string HProName)
+ public object GetCheckItemID(string HName,string HProName,string HSourceID)
{
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_QCCheckProjectList_Main where 鐗╂枡鍚嶇О='"+HName+ "' and 宸ュ簭鍚嶇О='" + HProName + "' order by 鏃ユ湡 desc ", "h_v_Gy_QCCheckProjectList_Main");
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_QCCheckProjectList_Main where 鐗╂枡鍚嶇О='"+HName+ "' and 宸ュ簭鍚嶇О='" + HProName + "' and HSourceID='" + HSourceID + "' order by 鏃ユ湡 desc ", "h_v_Gy_QCCheckProjectList_Main");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_QCCheckProjectList_Main where 鐗╂枡鍚嶇О='" + HName + "' and 宸ュ簭鍚嶇О='" + HProName + "' order by 鏃ユ湡 desc ", "h_v_Gy_QCCheckProjectList_Main");
+ }
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objjson.code = "0";
@@ -18029,7 +18033,7 @@
if ((ds.Tables[0] == null || ds.Tables[0].Rows.Count == 0))
{
sql = "Select * from Gy_Menu_1 where HType = '" + HType + "' Order by HPosition,len(HitemID),HitemID ";
- ds = oCn.RunProcReturn(sql, "Gy_Menu");
+ ds = oCn.RunProcReturn(sql, "Gy_Menu_1");
}
}
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BaseInformationController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BaseInformationController.cs"
index 7b1c65c..44f86ad 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BaseInformationController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BaseInformationController.cs"
@@ -757,7 +757,137 @@
return objJsonResult;
}
}
- #endregion
+ #endregion
+
+ #region SPC涓績绾垮垪琛� 鏌ヨ
+ [Route("QC_SpcCenterlineList/List")]
+ [HttpGet]
+ public object List(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_QC_SpcCenterlineList order by HInterID desc", "锘縣_v_QC_SpcCenterlineList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_QC_SpcCenterlineList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by HInterID desc";
+ ds = oCN.RunProcReturn(sql, "锘縣_v_QC_SpcCenterlineList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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 SPC涓績绾垮垪琛� 寮傚父鏁版嵁 鏇存柊
+ [Route("QC_SpcCenterlineList/UpdateData")]
+ [HttpGet]
+ public object UpdateData(string HInterID, string HBeginDate, string HEndDate, string user)
+ {
+ try
+ {
+ LogService.Write("杈撳叆鍊�:" + "exec h_p_QC_SPC_EightJudge_Abnormal " + HInterID + ",'" + HBeginDate + "','" + HEndDate + "'");
+ ds = oCN.RunProcReturn("exec h_p_QC_SPC_EightJudge_Abnormal "+ HInterID + ",'"+ HBeginDate + "','"+ HEndDate + "'", "锘縣_p_QC_SPC_EightJudge_Abnormal");
+ LogService.Write("杈撳叆鍊�:" + ds.Tables[0].Rows.Count);
+ if (int.Parse(ds.Tables[0].Rows[0]["绫诲瀷"].ToString()) <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString();
+ 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 SPC涓績绾垮垪琛� 寮傚父鏁版嵁 鏂板
+ [Route("QC_SpcCenterlineList/QC_SpcCenterlineAdd")]
+ [HttpGet]
+ public object UpdateData(string HInterID, string AvgData, string HControlUpperLimit_X, string HControlLowerLimit_X, string user)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select * from QC_SpcCenterline where HInterID="+ HInterID, "锘縌C_SpcCenterline");
+
+ if (ds.Tables[0].Rows.Count==0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message ="鏌ユ棤鏁版嵁!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var HMaterID = int.Parse( ds.Tables[0].Rows[0]["HMaterID"].ToString());
+ var HQCCheckItemID = int.Parse(ds.Tables[0].Rows[0]["HQCCheckItemID"].ToString());
+ var HMouldNum = ds.Tables[0].Rows[0]["HMouldNum"].ToString();
+
+ oCN.RunProc("update QC_SpcCenterline set HStart=0 where HMaterID=" + HMaterID + " and HQCCheckItemID=" + HQCCheckItemID + " and HMouldNum='" + HMouldNum + "'");
+ oCN.RunProc("insert into QC_SpcCenterline(HMaterID,HQCCheckItemID,HMouldNum,HCenterline_X,HControlUpperLimit_X,HControlLowerLimit_X,HMaker, HMakeDate, HStart)" +
+ "values(" + HMaterID + "," + HQCCheckItemID + "," + HMouldNum + "," + AvgData + "," + HControlUpperLimit_X + "," + HControlLowerLimit_X + "," + user + ",getdate(),1) ");
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鎴愬姛锛�";
+ objJsonResult.data = null;
+ objJsonResult.list = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
index f0eb048..05aa878 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
@@ -1918,8 +1918,11 @@
string HProcName = dic["HProcName"].ToString();//宸ュ簭鍚嶇О
string HReceiveMan = dic["HReceiveMan"].ToString();//鎿嶄綔鍛�
string HEquipNumber = dic["HEquipNumber"].ToString();//璁惧缂栫爜
+ string HMaterName = dic["HMaterName"].ToString();//鐗╂枡鍚嶇О
+ string HBachNO_BCP = dic["HBachNO_BCP"].ToString();//鍗婃垚鍝佹壒娆�
+ string HBachNO_CP = dic["HBachNO_CP"].ToString();//鎴愬搧鎵规
- ds = oCN.RunProcReturn("exec h_p_QC_QualityDailyReprot '" + HBeginDate + "','" + HEndDate + "','" + HBatchNo + "','" + HBatchNo1 + "','" + HProject + "','" + HBatchWork + "','" + HDivisionName + "','" + HProcName + "','" + HReceiveMan + "','" + HEquipNumber + "'", "h_p_QC_QualityDailyReprot");
+ ds = oCN.RunProcReturn("exec h_p_QC_QualityDailyReprot '" + HBeginDate + "','" + HEndDate + "','" + HBatchNo + "','" + HBatchNo1 + "','" + HProject + "','" + HBatchWork + "','" + HDivisionName + "','" + HProcName + "','" + HReceiveMan + "','" + HEquipNumber + "','" + HMaterName + "','" + HBachNO_BCP + "','" + HBachNO_CP + "'", "h_p_QC_QualityDailyReprot");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -2098,5 +2101,104 @@
}
}
#endregion
+
+ #region 璐ㄩ噺妯″潡 鎬ц兘妫�娴嬫姤琛� 鏌ヨ
+
+ [Route("QC_CustomerAppealReport/getQC_TechParamReport")]
+ [HttpGet]
+ public object getQC_TechParamReport(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HBeginDate = dic["HBeginDate"].ToString();
+ string HEndDate = dic["HEndDate"].ToString();
+ string HProject = dic["HProject"].ToString();//椤圭洰鍙�
+ string HProcId = dic["HProcId"].ToString(); //宸ュ簭
+ string Frequency = dic["Frequency"].ToString();//棰戞
+
+
+ ds = oCN.RunProcReturn("exec h_p_TechParamReportList '" + Frequency + "','" + HProject + "','" + HProcId + "','" + HBeginDate + "','" + HEndDate + "'", "h_p_TechParamReportList");
+
+
+ //娣诲姞鍒楀悕
+ 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("QC_CustomerAppealReport/getQC_BackWorkReport")]
+ [HttpGet]
+ public object getQC_BackWorkReport(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HBeginDate = dic["HBeginDate"].ToString();
+ string HEndDate = dic["HEndDate"].ToString();
+ string HProject = dic["HProject"].ToString();//椤圭洰鍙�
+ string HBatchWork = dic["HBatchWork"].ToString();//鏄惁閲忎骇
+ string HDivisionName = dic["HDivisionName"].ToString();//浜嬩笟閮�
+ string HMaterName = dic["HMaterName"].ToString();//鐗╂枡鍚嶇О
+ string HProcName = dic["HProcName"].ToString();//宸ュ簭鍚嶇О
+ string HBadReasonID = dic["HBadReasonID"].ToString();//涓嶈壇鍘熷洜
+
+
+ ds = oCN.RunProcReturn("exec h_p_QC_BackWorkReport '" + HBeginDate + "','" + HEndDate + "','" + HProject + "','" + HDivisionName + "','" + HBatchWork + "','" + HMaterName + "','" + HProcName + "','" + HBadReasonID + "'", "h_p_QC_BackWorkReport");
+
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
}
}
diff --git "a/WebAPI/Controllers/\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 b422d37..90fb3c9 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"
@@ -3871,6 +3871,92 @@
#endregion
+ #region 閿�鍞��璐� 涓婁紶鐢熷崟
+
+ #region 閿�鍞��璐� 鏂板妯″紡
+
+ /// <summary>
+ /// 閿�鍞��璐ф柊澧炰笂浼�
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/set_SaveSellOutBackBill_Json")]
+ [HttpPost]
+ public object set_SaveSellOutBackBill_Json([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ try
+ {
+ List<Model.ClsKf_ICStockBillMain> lsmain = new List<Model.ClsKf_ICStockBillMain>();
+ ListModels oListModels = new ListModels();
+ lsmain = oListModels.getICStockBillMainByJson(msg1);
+ WebS.ClsKf_ICStockBillMain websLsmain = new WebS.ClsKf_ICStockBillMain();
+ string sSourceType = lsmain[0].HMainSourceBillType;
+ websLsmain.HInterID = lsmain[0].HInterID;
+ websLsmain.HBillNo = lsmain[0].HBillNo;
+ websLsmain.HBillType = lsmain[0].HBillType;
+ websLsmain.HDate = lsmain[0].HDate;
+ websLsmain.HDeptID = lsmain[0].HDeptID;
+ websLsmain.HWHID = lsmain[0].HWHID;
+ websLsmain.HSCWHID = lsmain[0].HSCWHID;
+ websLsmain.HSupID = lsmain[0].HSupID;
+ websLsmain.HKeeperID = lsmain[0].HKeeperID;
+ websLsmain.HSecManagerID = lsmain[0].HSecManagerID;
+ websLsmain.HEmpID = lsmain[0].HEmpID;
+ websLsmain.HManagerID = lsmain[0].HManagerID;
+ websLsmain.HRemark = lsmain[0].HRemark;
+ websLsmain.HExplanation = lsmain[0].HExplanation;
+ websLsmain.HInnerBillNo = lsmain[0].HInnerBillNo;
+ websLsmain.HRedBlueFlag = lsmain[0].HRedBlueFlag;
+ websLsmain.HBillSubType = lsmain[0].HBillSubType;
+ if (lsmain[0].HMainSourceBillType == "1403")
+ {
+ websLsmain.HMainSourceBillType = "閫�璐ч�氱煡鍗�";
+ }
+ else if (lsmain[0].HMainSourceBillType == "1401")
+ {
+ websLsmain.HMainSourceBillType = "閿�鍞鍗�";
+ }
+ else
+ {
+ websLsmain.HMainSourceBillType = "鎵嬪伐褰曞叆";
+ }
+ websLsmain.HMaker = lsmain[0].HMaker;
+ websLsmain.HBillerID = lsmain[0].HBillerID;
+ websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
+ websLsmain.HOWNERID = lsmain[0].HSTOCKORGID;
+
+ if (oWebs.set_SaveSellOutBackBill_New(websLsmain, sSourceType, ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閿�鍞��璐у崟涓婁紶澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #endregion
+
#region 鐢熶骇缁勬墭鍗� 涓婁紶鐢熷崟
/// <summary>
@@ -4690,6 +4776,48 @@
try
{
WebSoBar = oWebs.get_SourceBarCode_MateOutBack(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
+ if (WebSoBar == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = WebSoBar;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿婧愬崟鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 閿�鍞��璐� 鎵弿婧愬崟鏉＄爜
+
+ /// <summary>
+ /// 閿�鍞��璐� 鎵弿婧愬崟鏉＄爜
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/Get_SourceBarCode_SellOutBack_Json")]
+ [HttpGet]
+ public object Get_SourceBarCode_SellOutBack_Json(Int64 HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, Int64 HStockOrgID)
+ {
+ try
+ {
+ WebSoBar = oWebs.get_SourceBarCode_SellOutBack(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
if (WebSoBar == null)
{
objJsonResult.code = "0";
@@ -10360,7 +10488,7 @@
HSourceBillNo_TB = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HSourceBillNo"]);
HSourceInterID = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[0]["HSourceInterID"]);
//鏍规嵁鍏ュ簱鐢宠鍗曞崟鍙峰垽鏂崟鎹俊鎭槸鍚﹀凡缁忓悓姝ュ埌閲戣澏
- sql = string.Format(@"select FID,FBILLNO from {0}..TFKO_t_Cust100009 with(nolock) where FBILLNO = '" + HSourceBillNo_TB + "'", HDataBaseName);
+ sql = string.Format(@"select FID,FBILLNO,FDOCUMENTSTATUS from {0}..TFKO_t_Cust100009 with(nolock) where FBILLNO = '" + HSourceBillNo_TB + "'", HDataBaseName);
ds = oCn.RunProcReturn(sql, "TFKO_t_Cust100009");
//鍏ュ簱鐢宠鍗曟病鏈夊悓姝ュ埌閲戣澏鍒欒繘琛屽悓姝�
@@ -10506,10 +10634,7 @@
LogService.Write("鍙戠敓寮傚父锛屽叆搴撶敵璇峰崟鍚屾鑾峰彇鐧诲綍璐﹀彿瀵嗙爜澶辫触锛侊細" + sBarCode + "," + HSourceBillNo_TB + "," + HSourceInterID);
return "鍙戠敓寮傚父锛屽叆搴撶敵璇峰崟鍚屾鑾峰彇鐧诲綍璐﹀彿瀵嗙爜澶辫触锛�";
}
- LogService.Write("鍏朵粬鍏ュ簱,鍗冲皢鐧诲綍閲戣澏");
var loginRet = InvokeHelper.Login();
- LogService.Write("鍏朵粬鍏ュ簱,鐧诲綍閲戣澏缁撴灉1锛�" + loginRet);
- LogService.Write("鍏朵粬鍏ュ簱,鐧诲綍閲戣澏缁撴灉2锛�" + JObject.Parse(loginRet)["LoginResultType"].Value<int>());
var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
if (isSuccess == 0)
@@ -10563,11 +10688,88 @@
}
//鏇存柊鏉＄爜婧愬崟id淇℃伅
- sql = string.Format($@"update a set HSourceInterID = isnull(b.FID,0),HSourceEntryID = isnull(c.FEntryID,0) from Gy_BarCodeBill a left join AIS20220609121235..TFKO_t_Cust100009 b on a.HSourceBillNo = b.FBillNo left join AIS20220609121235..TFKO_t_Cust_Entry100065 c on b.FID = C.FID and a.HBarcodeNo = c.FSEQ where HSourceBillNo = '{HSourceBillNo_TB}'");
+ sql = string.Format($@"update a set HSourceInterID = isnull(b.FID,0),HSourceEntryID = isnull(c.FEntryID,0) from Gy_BarCodeBill a with(nolock) left join AIS20220609121235..TFKO_t_Cust100009 b with(nolock) on a.HSourceBillNo = b.FBillNo left join AIS20220609121235..TFKO_t_Cust_Entry100065 c with(nolock) on b.FID = C.FID and a.HBarcodeNo = c.FSEQ where HSourceBillNo = '{HSourceBillNo_TB}'");
//鎵ц鏇存柊璇彞
oCn.RunProc(sql);
}
+ //鍒ゆ柇鐢熶骇鍏ュ簱鐢宠鍗曟槸鍚︽槸瀹℃牳鐘舵�侊紝鑻ユ湭瀹℃牳鍒欐墽琛屾彁浜ゅ鏍告柟娉�
+ else
+ {
+ //--Z 鏆傚瓨锛孉 鍒涘缓锛孊 瀹℃牳涓紝C 宸插鏍革紝D 閲嶆柊瀹℃牳
+
+ //鑾峰彇鍏ュ簱鐢宠鍗曞崟鎹彿
+ string HBillNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["FBILLNO"]);
+ //鍖呰绾跨敓鎴愮殑鐢熶骇鍏ュ簱鐢宠鍗曞弬涓庤嚜鍔ㄥ鏍�
+ if (HBillNo.Substring(0,2) == "RK" )
+ {
+ //鑾峰彇鍏ュ簱鐢宠鍗曞崟鎹姸鎬�
+ string HBillStatus = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["FDOCUMENTSTATUS"]);
+ //鑾峰彇鍏ュ簱鐢宠鍗旾D
+ var json = new
+ {
+ Ids = ds.Tables[0].Rows[0]["FID"].ToString(),
+ };
+ LogService.Write("鎻愪氦瀹℃牳ID锛�" + DBUtility.ClsPub.isInt(ds.Tables[0].Rows[0]["FID"]));
+
+ //浠庨厤缃枃浠惰幏鍙� CLOUD缃戝潃銆佽处濂椾俊鎭�佺櫥褰曠敤鎴枫�佺櫥褰曞瘑鐮�
+ if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
+ {
+ LogService.Write("鍙戠敓寮傚父锛屽叆搴撶敵璇峰崟鍚屾鑾峰彇鐧诲綍璐﹀彿瀵嗙爜澶辫触锛侊細" + sBarCode + "," + HSourceBillNo_TB + "," + HSourceInterID);
+ return "鍙戠敓寮傚父锛屽叆搴撶敵璇峰崟鍚屾鑾峰彇鐧诲綍璐﹀彿瀵嗙爜澶辫触锛�";
+ }
+
+ //鐧诲綍閲戣澏
+ var loginRet = InvokeHelper.Login();
+ //鍒ゆ柇鏄惁鐧诲綍鎴愬姛
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ if (isSuccess == 0)
+ {
+ LogService.Write("鍏朵粬鍏ュ簱,鐧诲綍閲戣澏澶辫触锛�" + sBarCode + "," + HSourceBillNo_TB + "," + HSourceInterID);
+ return "鍙戠敓寮傚父锛岀櫥褰曢噾铦跺け璐ワ紒";
+ }
+
+ //鎻愪氦瀹℃牳
+ string result1 = string.Empty;
+ string result2 = string.Empty;
+ //鍒涘缓锛岄噸鏂板鏍哥姸鎬佽皟鐢ㄦ彁浜わ紝瀹℃牳鎸夐挳
+ if (HBillStatus == "A" || HBillStatus == "D")
+ {
+ LogService.Write("鐢熶骇鍏ュ簱鐢宠鍗曞彿锛�" + HBillNo + ",閲嶆柊杩涜鎻愪氦瀹℃牳");
+ result1 = InvokeHelper.Submit("k18d2ab4f14034c569576ec8e0835a80c", JsonConvert.SerializeObject(json));//鎻愪氦
+ result2 = InvokeHelper.Audit("k18d2ab4f14034c569576ec8e0835a80c", JsonConvert.SerializeObject(json));//瀹℃牳
+
+ if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ LogService.Write("鍏ュ簱鐢宠鍗曞崟鍙�:" + ",鎻愪氦澶辫触" + result1);
+ return "鍙戠敓寮傚父锛屽叆搴撶敵璇峰崟鍗曞彿:" + ",鎻愪氦澶辫触" + result1;
+ }
+
+ if (JObject.Parse(result2)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ LogService.Write("鍏ュ簱鐢宠鍗曞崟鍙�:" + ",瀹℃牳澶辫触" + result2);
+ return "鍙戠敓寮傚父锛屽叆搴撶敵璇峰崟鍗曞彿:" + ",瀹℃牳澶辫触" + result2;
+ }
+ }
+ //瀹℃牳涓姸鎬佽皟鐢ㄥ鏍告寜閽�
+ else if (HBillStatus == "B")
+ {
+ LogService.Write("鐢熶骇鍏ュ簱鐢宠鍗曞彿锛�" + HBillNo + ",閲嶆柊杩涜瀹℃牳");
+ result2 = InvokeHelper.Audit("k18d2ab4f14034c569576ec8e0835a80c", JsonConvert.SerializeObject(json));//瀹℃牳
+ if (JObject.Parse(result2)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ LogService.Write("鍏ュ簱鐢宠鍗曞崟鍙�:" + ",瀹℃牳澶辫触" + result2);
+ return "鍙戠敓寮傚父锛屽叆搴撶敵璇峰崟鍗曞彿:" + ",瀹℃牳澶辫触" + result2;
+ }
+ }
+
+ //鏇存柊鏉＄爜婧愬崟id淇℃伅
+ sql = string.Format($@"update a set HSourceInterID = isnull(b.FID,0),HSourceEntryID = isnull(c.FEntryID,0) from Gy_BarCodeBill a with(nolock) left join AIS20220609121235..TFKO_t_Cust100009 b with(nolock) on a.HSourceBillNo = b.FBillNo left join AIS20220609121235..TFKO_t_Cust_Entry100065 c with(nolock) on b.FID = C.FID and a.HBarcodeNo = c.FSEQ where HSourceBillNo = '{HSourceBillNo_TB}'");
+ //鎵ц鏇存柊璇彞
+ oCn.RunProc(sql);
+ }
+
+ }
}
HReturnResult = sBarCode;
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
index 168e56a..4b7b638 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
@@ -640,7 +640,7 @@
#region 鎻愪氦淇濆瓨锛屽瓨涓诲瓙琛ㄥ強鏄庣粏琛�
[Route("Sc_QualityReportBill/set_SaveBill")]
[HttpGet]
- public object set_SaveBill(long HInterID,string HBillNo, string HChecker)
+ public object set_SaveBill(long HInterID,string HBillNo, string HChecker,string HBillSubType)
{
try
{
@@ -672,11 +672,11 @@
ds = oCN.RunProcReturn(sql, "Sc_QualityReportBillSub");
if (ds.Tables[0].Rows.Count>0)
{
- oCN.RunProc("exec h_p_save_Sc_QualityReportBillSum " + HInterID + "");
+ oCN.RunProc("exec h_p_save_Sc_QualityReportBillSum '" + HInterID + "','" + HBillSubType +"'");
}
else
{
- oCN.RunProc("exec h_p_save_Sc_QualityReportBill " + HInterID + "");
+ oCN.RunProc("exec h_p_save_Sc_QualityReportBill '" + HInterID + "','" + HBillSubType + "'");
}
//鍒ゆ柇鏄惁鍏佽淇濆瓨锛屼笉鍏佽鍒欏洖婊�
diff --git a/WebAPI/DLL/ClsSb_EquipDotCheckRuleBill.cs b/WebAPI/DLL/ClsSb_EquipDotCheckRuleBill.cs
index 7d74108..5069766 100644
--- a/WebAPI/DLL/ClsSb_EquipDotCheckRuleBill.cs
+++ b/WebAPI/DLL/ClsSb_EquipDotCheckRuleBill.cs
@@ -43,6 +43,7 @@
",HCheckCycle='" + omodel.HCheckCycle + "'" +
",HExplanation='" + omodel.HExplanation + "'" +
",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ ",HStandard='" + Convert.ToString(omodel.HStandard ? 1 : 0) + "'" +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -90,11 +91,11 @@
oCn.RunProc("Insert Into Sb_EquipDotCheckRuleBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HRemark" +
- ",HBeginDate,HEndDate,HCycleUnit,HCheckCycle,HExplanation,HInnerBillNo" +
+ ",HBeginDate,HEndDate,HCycleUnit,HCheckCycle,HExplanation,HInnerBillNo,HStandard" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'," +
- "'" + omodel.HBeginDate + "','" + omodel.HEndDate + "','" + omodel.HCycleUnit+ "','" + omodel.HCheckCycle + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'" +
+ "'" + omodel.HBeginDate + "','" + omodel.HEndDate + "','" + omodel.HCycleUnit+ "','" + omodel.HCheckCycle + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "','" + Convert.ToString(omodel.HStandard ? 1 : 0) + "'" +
") ");
//鎻掑叆瀛愯〃
foreach (Models.ClsSb_EquipDotCheckRuleBillSub oSub in DetailColl_Mater)
diff --git a/WebAPI/DLL/ClsSb_EquipMaintainRuleBill.cs b/WebAPI/DLL/ClsSb_EquipMaintainRuleBill.cs
index 13a6745..132944d 100644
--- a/WebAPI/DLL/ClsSb_EquipMaintainRuleBill.cs
+++ b/WebAPI/DLL/ClsSb_EquipMaintainRuleBill.cs
@@ -58,6 +58,7 @@
",HMaintainLevID=" + omodel.HMaintainLevID +
",HSafeDays=" + omodel.HSafeDays +
",HErrWarDays=" + omodel.HErrWarDays +
+ ",HStandard=" + Convert.ToString(omodel.HStandard ? 1 : 0) +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -123,11 +124,11 @@
oCn.RunProc("Insert Into Sb_EquipMaintainRuleBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HRemark" +
- ",HCheckCycle,HCycleUnit,HExplanation,HInnerBillNo,HMaintainLevID,HSafeDays,HErrWarDays" +
+ ",HCheckCycle,HCycleUnit,HExplanation,HInnerBillNo,HMaintainLevID,HSafeDays,HErrWarDays,HStandard" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark +
- "',"+ omodel.HCheckCycle.ToString() + ",'" + omodel.HCycleUnit + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + omodel.HMaintainLevID + "," + omodel.HSafeDays +", " + omodel.HErrWarDays +
+ "',"+ omodel.HCheckCycle.ToString() + ",'" + omodel.HCycleUnit + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + omodel.HMaintainLevID + "," + omodel.HSafeDays + "," + omodel.HErrWarDays + ", " + Convert.ToString(omodel.HStandard ? 1 : 0) +
") ");
//鎻掑叆淇濆吇椤瑰瓙琛�
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 87001b8..f263833 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -1637,6 +1637,30 @@
}
/// <summary>
+ /// 澶勭悊鏂板浜х嚎鍣ㄥ叿娓呭崟琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_SourceMouldBillMain> getObjectByJson_Gy_SourceMouldBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_SourceMouldBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_SourceMouldBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板浜х嚎鍣ㄥ叿娓呭崟瀛愯〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_SourceMouldBillSub> getObjectByJson_Gy_SourceMouldBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_SourceMouldBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_SourceMouldBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
/// 澶勭悊鏂板浜у搧宸ヨ壓鍙傛暟娓呭崟琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
diff --git a/WebAPI/Models/ClsSb_EquipDotCheckRuleBillMain.cs b/WebAPI/Models/ClsSb_EquipDotCheckRuleBillMain.cs
index 1c9fe42..b346972 100644
--- a/WebAPI/Models/ClsSb_EquipDotCheckRuleBillMain.cs
+++ b/WebAPI/Models/ClsSb_EquipDotCheckRuleBillMain.cs
@@ -13,5 +13,6 @@
public int HCheckCycle;// int --鐐规鍛ㄦ湡
public string HExplanation;// varchar(500) --鎽樿
public string HInnerBillNo;// varchar(50) --鍐呴儴鍗曟嵁鍙�
+ public bool HStandard;//榛樿瑙勭▼
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsSb_EquipMaintainRuleBillMain.cs b/WebAPI/Models/ClsSb_EquipMaintainRuleBillMain.cs
index 9b70bf6..399a6f9 100644
--- a/WebAPI/Models/ClsSb_EquipMaintainRuleBillMain.cs
+++ b/WebAPI/Models/ClsSb_EquipMaintainRuleBillMain.cs
@@ -16,5 +16,6 @@
public Int64 HSafeDays;//淇濆吇瀹夊叏澶╂暟
public Int64 HErrWarDays;//淇濆吇棰勮澶╂暟
+ public bool HStandard;//榛樿瑙勭▼
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/Gy_User.cs b/WebAPI/Models/Gy_User.cs
index 3849a48..057a92c 100644
--- a/WebAPI/Models/Gy_User.cs
+++ b/WebAPI/Models/Gy_User.cs
@@ -39,5 +39,7 @@
public string HICNumber;
public string HDingDingUserID;
+
+ public int HCusID;
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
index 97ebf4b..64be831 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -4,12 +4,12 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2025-02-20T08:36:10.9641214Z;True|2025-02-20T16:21:03.0003766+08:00;True|2025-02-20T15:08:51.6413196+08:00;True|2025-02-20T13:39:30.8516200+08:00;True|2025-02-20T13:16:40.9877944+08:00;False|2025-02-20T13:15:53.7798440+08:00;True|2025-02-19T16:25:08.9854342+08:00;True|2025-02-19T15:36:48.5332520+08:00;False|2025-02-19T15:35:38.9033857+08:00;True|2025-02-12T16:16:08.9819207+08:00;True|2025-02-10T10:08:35.4361091+08:00;False|2025-02-10T10:07:39.0458286+08:00;True|2025-01-18T09:42:50.3629397+08:00;False|2025-01-18T09:39:16.1773412+08:00;True|2025-01-17T11:15:39.4147082+08:00;False|2025-01-17T11:15:09.0033498+08:00;True|2025-01-14T10:20:31.1504093+08:00;False|2025-01-14T10:19:59.1429931+08:00;True|2025-01-10T16:29:54.8671377+08:00;False|2025-01-10T16:29:05.0650370+08:00;True|2025-01-04T14:30:56.5041884+08:00;True|2025-01-04T14:26:52.7448761+08:00;True|2025-01-04T14:23:27.9956967+08:00;True|2025-01-04T14:12:46.2410106+08:00;True|2025-01-04T14:09:33.1727375+08:00;True|2025-01-04T14:07:16.3373347+08:00;False|2025-01-04T14:06:33.4982458+08:00;True|2024-12-31T13:36:55.7394582+08:00;False|2024-12-31T13:35:58.6205647+08:00;True|2024-12-28T15:59:32.1394796+08:00;True|2024-12-28T13:48:20.4283118+08:00;True|2024-12-28T13:43:39.8159616+08:00;True|2024-12-28T13:23:58.4183285+08:00;True|2024-12-28T13:19:13.0583263+08:00;True|2024-12-28T13:12:03.2648502+08:00;True|2024-12-28T13:04:22.6803754+08:00;False|2024-12-28T13:03:56.5993252+08:00;True|2024-12-28T10:50:06.1597154+08:00;True|2024-12-28T10:27:58.7075320+08:00;False|2024-12-28T10:27:09.9450571+08:00;True|2024-12-24T10:52:25.3403292+08:00;False|2024-12-24T10:51:41.8017370+08:00;True|2024-12-23T15:45:21.7729300+08:00;True|2024-12-23T15:31:38.8549407+08:00;True|2024-12-23T15:20:26.2361671+08:00;True|2024-12-23T13:40:03.2774116+08:00;False|2024-12-23T13:39:39.8510770+08:00;True|2024-12-23T13:11:15.3232454+08:00;True|2024-12-23T13:05:43.3057458+08:00;True|2024-12-16T10:57:23.0694936+08:00;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
+ <History>True|2025-02-12T06:05:06.1068587Z;False|2025-02-12T14:03:43.3961038+08:00;True|2025-01-18T09:42:50.3629397+08:00;True|2025-01-18T09:39:16.1773412+08:00;True|2025-01-17T11:15:39.4147082+08:00;False|2025-01-17T11:15:09.0033498+08:00;True|2025-01-14T10:20:31.1504093+08:00;False|2025-01-14T10:19:59.1429931+08:00;True|2025-01-10T16:29:54.8671377+08:00;False|2025-01-10T16:29:05.0650370+08:00;True|2025-01-04T14:30:56.5041884+08:00;True|2025-01-04T14:26:52.7448761+08:00;True|2025-01-04T14:23:27.9956967+08:00;True|2025-01-04T14:12:46.2410106+08:00;True|2025-01-04T14:09:33.1727375+08:00;True|2025-01-04T14:07:16.3373347+08:00;False|2025-01-04T14:06:33.4982458+08:00;True|2024-12-31T13:36:55.7394582+08:00;False|2024-12-31T13:35:58.6205647+08:00;True|2024-12-28T15:59:32.1394796+08:00;True|2024-12-28T13:48:20.4283118+08:00;True|2024-12-28T13:43:39.8159616+08:00;True|2024-12-28T13:23:58.4183285+08:00;True|2024-12-28T13:19:13.0583263+08:00;True|2024-12-28T13:12:03.2648502+08:00;True|2024-12-28T13:04:22.6803754+08:00;False|2024-12-28T13:03:56.5993252+08:00;True|2024-12-28T10:50:06.1597154+08:00;True|2024-12-28T10:27:58.7075320+08:00;False|2024-12-28T10:27:09.9450571+08:00;True|2024-12-24T10:52:25.3403292+08:00;False|2024-12-24T10:51:41.8017370+08:00;True|2024-12-23T15:45:21.7729300+08:00;True|2024-12-23T15:31:38.8549407+08:00;True|2024-12-23T15:20:26.2361671+08:00;True|2024-12-23T13:40:03.2774116+08:00;False|2024-12-23T13:39:39.8510770+08:00;True|2024-12-23T13:11:15.3232454+08:00;True|2024-12-23T13:05:43.3057458+08:00;True|2024-12-16T10:57:23.0694936+08:00;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="bin/AlibabaCloud.EndpointUtil.dll">
<publishTime>04/07/2020 16:33:48</publishTime>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>02/20/2025 16:35:32</publishTime>
+ <publishTime>02/12/2025 14:04:56</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>02/20/2025 16:35:32</publishTime>
+ <publishTime>02/12/2025 14:04:56</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>02/20/2025 16:35:29</publishTime>
+ <publishTime>02/12/2025 14:04:53</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>02/20/2025 16:35:29</publishTime>
+ <publishTime>02/12/2025 14:04:53</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>02/10/2025 10:07:51</publishTime>
+ <publishTime>02/12/2025 14:04:51</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>02/10/2025 10:07:51</publishTime>
+ <publishTime>02/12/2025 14:04:51</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -93,7 +93,7 @@
<publishTime>05/09/2021 01:08:30</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>02/08/2023 09:47:46</publishTime>
</File>
<File Include="bin/libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -111,13 +111,13 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>02/20/2025 16:20:19</publishTime>
+ <publishTime>02/12/2025 14:04:51</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>02/20/2025 16:20:19</publishTime>
+ <publishTime>02/12/2025 14:04:51</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>03/08/2023 15:09:56</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>02/10/2025 10:07:50</publishTime>
+ <publishTime>02/12/2025 14:04:49</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>02/10/2025 10:07:50</publishTime>
+ <publishTime>02/12/2025 14:04:49</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>02/10/2025 10:07:51</publishTime>
+ <publishTime>02/12/2025 14:04:50</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>02/10/2025 10:07:51</publishTime>
+ <publishTime>02/12/2025 14:04:50</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>02/10/2025 10:07:51</publishTime>
+ <publishTime>02/12/2025 14:04:50</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>02/10/2025 10:07:51</publishTime>
+ <publishTime>02/12/2025 14:04:50</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>02/10/2025 10:07:48</publishTime>
+ <publishTime>02/12/2025 14:04:48</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>02/10/2025 10:07:48</publishTime>
+ <publishTime>02/12/2025 14:04:48</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -252,7 +252,7 @@
<publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 12:02:18</publishTime>
@@ -285,22 +285,22 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>02/10/2025 10:07:52</publishTime>
+ <publishTime>02/12/2025 14:04:50</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>02/10/2025 10:07:52</publishTime>
+ <publishTime>02/12/2025 14:04:50</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>02/20/2025 16:36:02</publishTime>
+ <publishTime>02/12/2025 14:05:00</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>02/20/2025 16:36:02</publishTime>
+ <publishTime>02/12/2025 14:05:00</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>02/20/2025 16:36:07</publishTime>
+ <publishTime>02/12/2025 14:05:04</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -312,58 +312,58 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>04/06/2023 15:57:01</publishTime>
+ <publishTime>08/15/2022 15:46:13</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>04/06/2023 15:57:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>04/06/2023 15:57:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>04/06/2023 15:57:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>02/08/2023 09:47:46</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
<publishTime>03/22/2022 13:17:22</publishTime>
@@ -372,7 +372,7 @@
<publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -381,121 +381,121 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="libman.json">
- <publishTime>07/12/2023 08:14:21</publishTime>
+ <publishTime>07/18/2023 17:26:29</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="packages.config">
- <publishTime>09/19/2024 10:10:46</publishTime>
+ <publishTime>09/19/2024 08:47:56</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:09</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
<publishTime>05/06/2024 13:47:57</publishTime>
</File>
<File Include="Web.config">
- <publishTime>01/10/2025 16:29:53</publishTime>
+ <publishTime>02/12/2025 14:05:05</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml
new file mode 100644
index 0000000..518156f
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml
@@ -0,0 +1,16 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <DeleteExistingFiles>False</DeleteExistingFiles>
+ <ExcludeApp_Data>False</ExcludeApp_Data>
+ <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+ <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+ <LastUsedPlatform>Any CPU</LastUsedPlatform>
+ <PublishProvider>FileSystem</PublishProvider>
+ <PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\LAYAPI</PublishUrl>
+ <WebPublishMethod>FileSystem</WebPublishMethod>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user
new file mode 100644
index 0000000..a32fee2
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user
@@ -0,0 +1,6 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user
index d081fb5..a5e7253 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile8.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|2024-11-29T05:29:48.1554947Z;</History>
+ <History>True|2025-02-12T06:57:08.1380239Z;True|2025-02-12T14:47:58.0901509+08:00;True|2025-02-12T14:15:10.5288654+08:00;True|2025-02-12T14:12:22.5382196+08:00;True|2025-02-12T14:07:11.7831540+08:00;True|2024-11-29T13:29:48.1554947+08:00;</History>
</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>11/29/2024 13:29:25</publishTime>
+ <publishTime>02/12/2025 14:04:56</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>11/29/2024 13:29:25</publishTime>
+ <publishTime>02/12/2025 14:04:56</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>11/29/2024 13:29:24</publishTime>
+ <publishTime>02/12/2025 14:04:53</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>11/29/2024 13:29:24</publishTime>
+ <publishTime>02/12/2025 14:04:53</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>11/29/2024 13:29:21</publishTime>
+ <publishTime>02/12/2025 14:04:51</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>11/29/2024 13:29:21</publishTime>
+ <publishTime>02/12/2025 14:04:51</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>11/29/2024 13:29:22</publishTime>
+ <publishTime>02/12/2025 14:04:51</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>11/29/2024 13:29:22</publishTime>
+ <publishTime>02/12/2025 14:04:51</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>03/15/2022 10:06:42</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>11/29/2024 13:29:19</publishTime>
+ <publishTime>02/12/2025 14:04:49</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>11/29/2024 13:29:19</publishTime>
+ <publishTime>02/12/2025 14:04:49</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>11/29/2024 13:29:20</publishTime>
+ <publishTime>02/12/2025 14:04:50</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>11/29/2024 13:29:20</publishTime>
+ <publishTime>02/12/2025 14:04:50</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>11/29/2024 13:29:20</publishTime>
+ <publishTime>02/12/2025 14:04:50</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>11/29/2024 13:29:20</publishTime>
+ <publishTime>02/12/2025 14:04:50</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>11/29/2024 13:29:17</publishTime>
+ <publishTime>02/12/2025 14:04:48</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>11/29/2024 13:29:17</publishTime>
+ <publishTime>02/12/2025 14:04:48</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,22 +285,22 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>11/29/2024 13:29:20</publishTime>
+ <publishTime>02/12/2025 14:04:50</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>11/29/2024 13:29:20</publishTime>
+ <publishTime>02/12/2025 14:04:50</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>11/29/2024 13:29:42</publishTime>
+ <publishTime>02/12/2025 14:57:02</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>11/29/2024 13:29:42</publishTime>
+ <publishTime>02/12/2025 14:57:02</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>11/29/2024 13:29:46</publishTime>
+ <publishTime>02/12/2025 14:57:06</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -492,7 +492,7 @@
<publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web.config">
- <publishTime>11/29/2024 13:29:46</publishTime>
+ <publishTime>02/12/2025 14:07:07</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index f84dc35..56ccf3f 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2025-02-11T02:10:05.6068846Z;True|2025-02-11T09:45:52.5312134+08:00;False|2025-02-11T09:42:54.6560039+08:00;False|2025-02-11T09:42:44.7260867+08:00;True|2025-02-10T15:18:16.8537767+08:00;True|2025-02-10T15:11:21.0436532+08:00;True|2025-02-10T13:51:35.4452640+08:00;True|2025-02-10T13:22:03.2907876+08:00;True|2025-02-10T11:04:24.1824725+08:00;True|2025-02-10T10:28:28.1308553+08:00;False|2025-02-10T10:25:56.3141700+08:00;True|2025-02-10T10:20:23.8683188+08:00;False|2025-02-10T10:20:11.3293731+08:00;True|2025-01-10T16:40:52.1666611+08:00;False|2025-01-10T16:40:46.4916510+08:00;True|2025-01-07T14:28:51.8669083+08:00;True|2025-01-07T13:07:29.9052541+08:00;True|2025-01-07T12:56:00.2870613+08:00;True|2025-01-07T12:43:45.7885867+08:00;True|2025-01-07T11:09:19.5063011+08:00;True|2025-01-07T11:00:06.9697471+08:00;True|2025-01-07T09:56:02.2879532+08:00;True|2025-01-07T09:45:19.5462835+08:00;True|2025-01-07T09:42:50.9089289+08:00;False|2025-01-07T09:42:40.4271324+08:00;True|2025-01-04T15:46:13.8527906+08:00;True|2025-01-04T15:39:45.2037219+08:00;False|2025-01-04T15:39:22.4930686+08:00;True|2025-01-04T13:31:08.6975632+08:00;True|2025-01-04T13:29:16.6440831+08:00;True|2025-01-04T13:13:10.1452466+08:00;True|2025-01-03T14:15:46.7252901+08:00;True|2025-01-03T10:09:32.6319841+08:00;False|2025-01-03T10:09:25.9409250+08:00;True|2024-12-31T15:30:13.0841451+08:00;True|2024-12-31T15:20:44.4779893+08:00;False|2024-12-31T15:20:38.3464087+08:00;True|2024-12-30T19:31:50.5186513+08:00;True|2024-12-30T19:26:51.9369903+08:00;True|2024-12-30T19:03:43.0165721+08:00;True|2024-12-30T17:03:44.6035503+08:00;True|2024-12-30T16:59:37.4694911+08:00;True|2024-12-30T15:14:16.7657186+08:00;False|2024-12-30T15:14:09.9136437+08:00;True|2024-12-28T14:22:43.5822832+08:00;True|2024-12-28T14:10:54.9885289+08:00;True|2024-12-28T13:56:42.0405943+08:00;True|2024-12-28T13:18:42.1604585+08:00;True|2024-12-28T10:48:49.0559287+08:00;False|2024-12-28T10:48:41.8813560+08:00;True|2024-12-27T16:41:50.4368711+08:00;True|2024-12-27T14:31:25.7129706+08:00;True|2024-12-27T11:24:16.6524093+08:00;False|2024-12-27T11:23:25.9617516+08:00;True|2024-12-18T08:34:56.1537647+08:00;True|2024-12-17T13:56:47.7915112+08:00;True|2024-12-17T11:13:27.2665832+08:00;True|2024-12-16T16:01:15.5110052+08:00;True|2024-12-16T15:53:18.1111331+08:00;True|2024-12-16T15:13:43.9719840+08:00;True|2024-12-16T15:08:49.2287341+08:00;True|2024-12-16T14:59:21.3003410+08:00;True|2024-12-16T10:16:34.6636364+08:00;True|2024-12-16T10:12:38.1827164+08:00;False|2024-12-16T10:12:16.1621752+08:00;True|2024-12-13T15:44:29.9921182+08:00;False|2024-12-13T15:43:36.1775569+08:00;True|2024-12-11T09:06:23.2065068+08:00;True|2024-12-11T09:02:10.9767948+08:00;True|2024-12-11T08:26:16.2292105+08:00;True|2024-12-10T16:17:47.2702447+08:00;True|2024-12-10T14:47:18.4352590+08:00;True|2024-12-10T14:10:37.0165625+08:00;True|2024-12-10T13:59:25.4712057+08:00;True|2024-12-10T13:46:02.3070111+08:00;True|2024-12-10T13:39:19.2434918+08:00;True|2024-12-10T10:42:47.3763447+08:00;True|2024-12-10T10:28:20.0524748+08:00;True|2024-12-09T11:01:35.7691980+08:00;True|2024-12-09T09:20:22.9742701+08:00;True|2024-12-09T08:47:26.0470083+08:00;True|2024-12-06T13:13:33.9776030+08:00;True|2024-12-05T14:33:41.1542437+08:00;True|2024-12-05T14:21:02.3120095+08:00;True|2024-12-05T14:13:09.2733831+08:00;True|2024-12-05T13:27:25.9831554+08:00;True|2024-12-05T13:23:25.4183580+08:00;True|2024-12-05T11:27:26.9609695+08:00;True|2024-12-05T09:20:29.4596887+08:00;True|2024-12-05T08:47:57.2553570+08:00;True|2024-12-05T08:41:06.4860297+08:00;True|2024-12-05T08:32:16.9785572+08:00;True|2024-12-04T15:54:19.4995372+08:00;True|2024-12-04T11:10:12.2273624+08:00;True|2024-12-04T10:21:44.8769236+08:00;False|2024-12-04T10:20:59.8206595+08:00;True|2024-12-04T09:52:03.8506923+08:00;True|2024-12-03T15:09:48.8710712+08:00;False|2024-12-03T15:08:46.8904626+08:00;True|2024-11-28T10:42:45.3823067+08:00;True|2024-11-28T09:58:38.0983021+08:00;True|2024-11-27T16:16:28.4276838+08:00;True|2024-11-27T16:09:08.0834912+08:00;True|2024-11-27T14:32:21.1684294+08:00;True|2024-11-27T13:24:51.2115157+08:00;True|2024-11-27T13:16:51.5888615+08:00;True|2024-11-26T10:47:18.1958719+08:00;False|2024-11-26T10:46:22.2016963+08:00;False|2024-11-25T10:22:55.3420353+08:00;True|2024-11-20T09:08:48.6293480+08:00;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;True|2024-11-18T15:19:07.4691728+08:00;True|2024-11-18T14:57:25.8637252+08:00;True|2024-11-18T14:52:10.6158576+08:00;True|2024-11-18T14:46:03.5051743+08:00;True|2024-11-18T13:42:14.5146469+08:00;True|2024-11-18T13:27:53.4498275+08:00;True|2024-11-18T11:26:05.8168670+08:00;True|2024-11-18T11:04:00.4711300+08:00;True|2024-11-18T10:54:15.6267907+08:00;True|2024-11-18T10:45:29.5275370+08:00;True|2024-11-15T16:58:39.1926238+08:00;True|2024-11-15T16:45:12.0168760+08:00;True|2024-11-15T16:37:11.8513587+08:00;True|2024-11-15T16:31:13.0430714+08:00;True|2024-11-15T16:27:45.3575015+08:00;False|2024-11-15T16:26:49.5306586+08:00;True|2024-11-15T16:16:54.0542122+08:00;True|2024-11-15T15:51:41.6920560+08:00;False|2024-11-15T15:50:37.8798414+08:00;True|2024-11-06T14:13:46.3129972+08:00;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
+ <History>True|2025-02-26T06:27:14.6049136Z;False|2025-02-26T14:27:02.9843524+08:00;True|2025-02-25T15:20:23.1640745+08:00;True|2025-02-25T14:48:55.2842125+08:00;False|2025-02-25T14:48:42.2715748+08:00;True|2025-02-11T10:10:05.6068846+08:00;True|2025-02-11T09:45:52.5312134+08:00;False|2025-02-11T09:42:54.6560039+08:00;False|2025-02-11T09:42:44.7260867+08:00;True|2025-02-10T15:18:16.8537767+08:00;True|2025-02-10T15:11:21.0436532+08:00;True|2025-02-10T13:51:35.4452640+08:00;True|2025-02-10T13:22:03.2907876+08:00;True|2025-02-10T11:04:24.1824725+08:00;True|2025-02-10T10:28:28.1308553+08:00;False|2025-02-10T10:25:56.3141700+08:00;True|2025-02-10T10:20:23.8683188+08:00;False|2025-02-10T10:20:11.3293731+08:00;True|2025-01-10T16:40:52.1666611+08:00;False|2025-01-10T16:40:46.4916510+08:00;True|2025-01-07T14:28:51.8669083+08:00;True|2025-01-07T13:07:29.9052541+08:00;True|2025-01-07T12:56:00.2870613+08:00;True|2025-01-07T12:43:45.7885867+08:00;True|2025-01-07T11:09:19.5063011+08:00;True|2025-01-07T11:00:06.9697471+08:00;True|2025-01-07T09:56:02.2879532+08:00;True|2025-01-07T09:45:19.5462835+08:00;True|2025-01-07T09:42:50.9089289+08:00;False|2025-01-07T09:42:40.4271324+08:00;True|2025-01-04T15:46:13.8527906+08:00;True|2025-01-04T15:39:45.2037219+08:00;False|2025-01-04T15:39:22.4930686+08:00;True|2025-01-04T13:31:08.6975632+08:00;True|2025-01-04T13:29:16.6440831+08:00;True|2025-01-04T13:13:10.1452466+08:00;True|2025-01-03T14:15:46.7252901+08:00;True|2025-01-03T10:09:32.6319841+08:00;False|2025-01-03T10:09:25.9409250+08:00;True|2024-12-31T15:30:13.0841451+08:00;True|2024-12-31T15:20:44.4779893+08:00;False|2024-12-31T15:20:38.3464087+08:00;True|2024-12-30T19:31:50.5186513+08:00;True|2024-12-30T19:26:51.9369903+08:00;True|2024-12-30T19:03:43.0165721+08:00;True|2024-12-30T17:03:44.6035503+08:00;True|2024-12-30T16:59:37.4694911+08:00;True|2024-12-30T15:14:16.7657186+08:00;False|2024-12-30T15:14:09.9136437+08:00;True|2024-12-28T14:22:43.5822832+08:00;True|2024-12-28T14:10:54.9885289+08:00;True|2024-12-28T13:56:42.0405943+08:00;True|2024-12-28T13:18:42.1604585+08:00;True|2024-12-28T10:48:49.0559287+08:00;False|2024-12-28T10:48:41.8813560+08:00;True|2024-12-27T16:41:50.4368711+08:00;True|2024-12-27T14:31:25.7129706+08:00;True|2024-12-27T11:24:16.6524093+08:00;False|2024-12-27T11:23:25.9617516+08:00;True|2024-12-18T08:34:56.1537647+08:00;True|2024-12-17T13:56:47.7915112+08:00;True|2024-12-17T11:13:27.2665832+08:00;True|2024-12-16T16:01:15.5110052+08:00;True|2024-12-16T15:53:18.1111331+08:00;True|2024-12-16T15:13:43.9719840+08:00;True|2024-12-16T15:08:49.2287341+08:00;True|2024-12-16T14:59:21.3003410+08:00;True|2024-12-16T10:16:34.6636364+08:00;True|2024-12-16T10:12:38.1827164+08:00;False|2024-12-16T10:12:16.1621752+08:00;True|2024-12-13T15:44:29.9921182+08:00;False|2024-12-13T15:43:36.1775569+08:00;True|2024-12-11T09:06:23.2065068+08:00;True|2024-12-11T09:02:10.9767948+08:00;True|2024-12-11T08:26:16.2292105+08:00;True|2024-12-10T16:17:47.2702447+08:00;True|2024-12-10T14:47:18.4352590+08:00;True|2024-12-10T14:10:37.0165625+08:00;True|2024-12-10T13:59:25.4712057+08:00;True|2024-12-10T13:46:02.3070111+08:00;True|2024-12-10T13:39:19.2434918+08:00;True|2024-12-10T10:42:47.3763447+08:00;True|2024-12-10T10:28:20.0524748+08:00;True|2024-12-09T11:01:35.7691980+08:00;True|2024-12-09T09:20:22.9742701+08:00;True|2024-12-09T08:47:26.0470083+08:00;True|2024-12-06T13:13:33.9776030+08:00;True|2024-12-05T14:33:41.1542437+08:00;True|2024-12-05T14:21:02.3120095+08:00;True|2024-12-05T14:13:09.2733831+08:00;True|2024-12-05T13:27:25.9831554+08:00;True|2024-12-05T13:23:25.4183580+08:00;True|2024-12-05T11:27:26.9609695+08:00;True|2024-12-05T09:20:29.4596887+08:00;True|2024-12-05T08:47:57.2553570+08:00;True|2024-12-05T08:41:06.4860297+08:00;True|2024-12-05T08:32:16.9785572+08:00;True|2024-12-04T15:54:19.4995372+08:00;True|2024-12-04T11:10:12.2273624+08:00;True|2024-12-04T10:21:44.8769236+08:00;False|2024-12-04T10:20:59.8206595+08:00;True|2024-12-04T09:52:03.8506923+08:00;True|2024-12-03T15:09:48.8710712+08:00;False|2024-12-03T15:08:46.8904626+08:00;True|2024-11-28T10:42:45.3823067+08:00;True|2024-11-28T09:58:38.0983021+08:00;True|2024-11-27T16:16:28.4276838+08:00;True|2024-11-27T16:09:08.0834912+08:00;True|2024-11-27T14:32:21.1684294+08:00;True|2024-11-27T13:24:51.2115157+08:00;True|2024-11-27T13:16:51.5888615+08:00;True|2024-11-26T10:47:18.1958719+08:00;False|2024-11-26T10:46:22.2016963+08:00;False|2024-11-25T10:22:55.3420353+08:00;True|2024-11-20T09:08:48.6293480+08:00;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;True|2024-11-18T15:19:07.4691728+08:00;True|2024-11-18T14:57:25.8637252+08:00;True|2024-11-18T14:52:10.6158576+08:00;True|2024-11-18T14:46:03.5051743+08:00;True|2024-11-18T13:42:14.5146469+08:00;True|2024-11-18T13:27:53.4498275+08:00;True|2024-11-18T11:26:05.8168670+08:00;True|2024-11-18T11:04:00.4711300+08:00;True|2024-11-18T10:54:15.6267907+08:00;True|2024-11-18T10:45:29.5275370+08:00;True|2024-11-15T16:58:39.1926238+08:00;True|2024-11-15T16:45:12.0168760+08:00;True|2024-11-15T16:37:11.8513587+08:00;True|2024-11-15T16:31:13.0430714+08:00;True|2024-11-15T16:27:45.3575015+08:00;False|2024-11-15T16:26:49.5306586+08:00;True|2024-11-15T16:16:54.0542122+08:00;True|2024-11-15T15:51:41.6920560+08:00;False|2024-11-15T15:50:37.8798414+08:00;True|2024-11-06T14:13:46.3129972+08:00;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
<_PublishTargetUrl>G:\issWeb\缃戠珯鍙戝竷\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>02/11/2025 10:08:56</publishTime>
+ <publishTime>02/26/2025 14:26:38</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>02/11/2025 10:08:56</publishTime>
+ <publishTime>02/26/2025 14:26:38</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>02/11/2025 10:08:53</publishTime>
+ <publishTime>02/26/2025 14:26:35</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>02/11/2025 10:08:53</publishTime>
+ <publishTime>02/26/2025 14:26:35</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>02/11/2025 10:08:47</publishTime>
+ <publishTime>02/26/2025 14:26:30</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>02/11/2025 10:08:47</publishTime>
+ <publishTime>02/26/2025 14:26:30</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>02/11/2025 10:08:48</publishTime>
+ <publishTime>02/26/2025 14:26:31</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>02/11/2025 10:08:48</publishTime>
+ <publishTime>02/26/2025 14:26:31</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>02/11/2025 10:08:45</publishTime>
+ <publishTime>02/26/2025 14:26:27</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>02/11/2025 10:08:45</publishTime>
+ <publishTime>02/26/2025 14:26:27</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>02/11/2025 10:08:47</publishTime>
+ <publishTime>02/26/2025 14:26:29</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>02/11/2025 10:08:47</publishTime>
+ <publishTime>02/26/2025 14:26:29</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>02/11/2025 10:08:47</publishTime>
+ <publishTime>02/26/2025 14:26:29</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>02/11/2025 10:08:47</publishTime>
+ <publishTime>02/26/2025 14:26:29</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>02/11/2025 10:08:43</publishTime>
+ <publishTime>02/26/2025 10:31:43</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>02/11/2025 10:08:43</publishTime>
+ <publishTime>02/26/2025 10:31:43</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>02/11/2025 10:08:48</publishTime>
+ <publishTime>02/26/2025 14:26:31</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>02/11/2025 10:08:48</publishTime>
+ <publishTime>02/26/2025 14:26:31</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>02/11/2025 10:09:29</publishTime>
+ <publishTime>02/26/2025 14:27:12</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>02/11/2025 10:09:29</publishTime>
+ <publishTime>02/26/2025 14:27:12</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>08/16/2024 16:55:28</publishTime>
@@ -495,7 +495,7 @@
<publishTime>04/29/2024 08:30:03</publishTime>
</File>
<File Include="Web.config">
- <publishTime>02/11/2025 10:10:04</publishTime>
+ <publishTime>02/26/2025 14:27:13</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
index 7f95890..21586b1 100644
--- a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
@@ -5,11 +5,11 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2025-01-17T01:00:26.6966310Z;False|2025-01-17T08:59:59.9527727+08:00;True|2025-01-16T11:06:57.1014257+08:00;True|2025-01-16T10:27:57.2742426+08:00;False|2025-01-16T10:27:27.5197746+08:00;True|2025-01-15T11:05:17.5523582+08:00;True|2025-01-15T09:37:34.6118980+08:00;False|2025-01-15T09:36:27.7987949+08:00;True|2025-01-14T12:52:06.2234405+08:00;True|2025-01-14T12:50:08.8487446+08:00;False|2025-01-14T12:49:45.2743330+08:00;True|2025-01-14T10:31:18.6477403+08:00;False|2025-01-14T10:29:30.1534049+08:00;True|2025-01-13T15:27:00.4497527+08:00;True|2025-01-13T15:01:33.6142160+08:00;True|2025-01-13T10:29:49.4772980+08:00;True|2025-01-13T10:11:15.7993265+08:00;True|2025-01-13T10:08:58.9378828+08:00;False|2025-01-13T10:08:44.9869073+08:00;True|2025-01-13T10:02:17.5175561+08:00;False|2025-01-13T10:02:00.9991870+08:00;True|2025-01-08T17:50:21.7468469+08:00;True|2025-01-08T16:38:48.8592252+08:00;True|2025-01-08T10:44:42.9161086+08:00;False|2025-01-08T10:44:09.4840640+08:00;True|2025-01-08T10:34:31.5982265+08:00;False|2025-01-08T10:33:57.3576390+08:00;True|2025-01-03T17:19:09.1765100+08:00;True|2025-01-03T17:10:41.8794009+08:00;True|2025-01-03T17:10:11.4245485+08:00;True|2025-01-03T15:54:22.3387906+08:00;True|2025-01-03T15:41:44.9897120+08:00;False|2025-01-03T15:40:42.1357112+08:00;False|2025-01-03T15:39:09.0564197+08:00;True|2025-01-03T14:58:31.5701467+08:00;True|2025-01-03T14:29:13.4456304+08:00;False|2025-01-03T14:27:18.9925263+08:00;True|2025-01-02T16:08:24.1819376+08:00;True|2025-01-02T16:07:01.1636705+08:00;True|2025-01-02T16:03:02.6520904+08:00;True|2025-01-02T10:03:56.0551738+08:00;False|2025-01-02T10:03:34.8632732+08:00;True|2024-12-31T15:27:01.3180960+08:00;True|2024-12-31T11:17:12.2977529+08:00;True|2024-12-31T10:48:14.7205535+08:00;True|2024-12-31T10:18:45.6669875+08:00;False|2024-12-31T10:18:21.6706557+08:00;True|2024-12-30T09:32:44.3898729+08:00;True|2024-12-30T09:31:24.5771941+08:00;False|2024-12-30T09:30:52.4031391+08:00;True|2024-12-27T16:12:20.2836752+08:00;False|2024-12-27T16:11:04.6614343+08:00;True|2024-12-27T15:07:23.0750147+08:00;True|2024-12-27T15:04:52.7876532+08:00;True|2024-12-27T14:37:54.3154829+08:00;False|2024-12-27T14:37:26.9546174+08:00;True|2024-12-26T16:33:56.0452167+08:00;True|2024-12-26T16:29:21.4115458+08:00;True|2024-12-26T16:29:02.0242815+08:00;True|2024-12-26T15:17:24.7390981+08:00;False|2024-12-26T15:13:26.8863189+08:00;True|2024-12-26T15:06:35.4541902+08:00;True|2024-12-26T11:35:42.2760106+08:00;False|2024-12-26T11:35:08.9255789+08:00;True|2024-12-26T10:10:29.7487991+08:00;True|2024-12-26T09:27:40.2637311+08:00;False|2024-12-26T09:25:52.1339136+08:00;True|2024-12-24T15:11:48.9968778+08:00;True|2024-12-24T15:06:55.0283993+08:00;True|2024-12-24T14:36:29.6466740+08:00;True|2024-12-24T10:28:42.7489880+08:00;False|2024-12-24T10:28:08.6809715+08:00;True|2024-12-24T10:06:05.9449103+08:00;False|2024-12-24T10:05:32.8409161+08:00;True|2024-12-23T14:56:40.3416256+08:00;True|2024-12-23T14:50:50.2677378+08:00;True|2024-12-23T14:48:27.8169391+08:00;True|2024-12-23T14:45:25.5341474+08:00;True|2024-12-23T14:42:23.7825087+08:00;True|2024-12-23T14:35:53.8876449+08:00;True|2024-12-23T14:14:00.4257926+08:00;True|2024-12-23T11:10:54.5874876+08:00;True|2024-12-23T11:08:44.0250304+08:00;False|2024-12-23T11:08:18.5757850+08:00;True|2024-12-20T12:51:29.2354841+08:00;True|2024-12-20T12:46:13.7636932+08:00;False|2024-12-20T12:44:21.1473486+08:00;False|2024-12-20T12:44:06.5427106+08:00;True|2024-12-20T12:29:33.9971940+08:00;False|2024-12-20T12:29:01.0285205+08:00;True|2024-12-19T15:49:19.9906264+08:00;True|2024-12-19T14:55:54.3323405+08:00;True|2024-12-19T14:17:50.5086161+08:00;True|2024-12-19T14:08:16.0919011+08:00;True|2024-12-19T14:02:50.3092759+08:00;True|2024-12-19T13:54:41.2332165+08:00;False|2024-12-19T13:54:07.6973483+08:00;True|2024-12-19T09:34:54.5332110+08:00;True|2024-12-19T08:49:05.5690428+08:00;False|2024-12-19T08:48:51.0618113+08:00;True|2024-12-18T15:45:34.7174246+08:00;False|2024-12-18T15:45:10.3226822+08:00;True|2024-12-18T15:32:03.5983267+08:00;True|2024-12-18T15:31:20.1219502+08:00;True|2024-12-18T11:57:09.1595607+08:00;True|2024-12-18T11:13:37.4765697+08:00;True|2024-12-18T10:07:54.1294714+08:00;True|2024-12-18T10:04:16.0967342+08:00;False|2024-12-18T10:04:04.1561560+08:00;True|2024-12-16T17:07:07.3386872+08:00;True|2024-12-16T16:34:59.1101964+08:00;True|2024-12-16T16:19:07.9287470+08:00;False|2024-12-16T16:18:46.4617432+08:00;True|2024-12-13T18:06:11.0778539+08:00;True|2024-12-13T16:53:52.2283177+08:00;True|2024-12-13T16:23:15.9531944+08:00;True|2024-12-13T13:58:03.7464045+08:00;True|2024-12-13T10:40:33.9285602+08:00;True|2024-12-13T10:38:03.8494063+08:00;False|2024-12-13T10:37:52.4251132+08:00;True|2024-12-13T10:31:07.4994631+08:00;False|2024-12-13T10:30:40.8021885+08:00;True|2024-12-12T10:01:42.4944750+08:00;False|2024-12-12T10:01:15.7147977+08:00;True|2024-12-11T17:21:58.0453583+08:00;True|2024-12-11T10:59:15.3836831+08:00;True|2024-12-11T09:49:19.4060272+08:00;False|2024-12-11T09:48:51.7603525+08:00;True|2024-12-11T08:58:41.4567855+08:00;False|2024-12-11T08:58:09.2160433+08:00;True|2024-12-10T17:25:49.3068154+08:00;True|2024-12-10T17:21:30.0155027+08:00;True|2024-12-10T17:16:56.7587487+08:00;False|2024-12-10T17:16:34.7816611+08:00;True|2024-12-10T16:55:40.3777585+08:00;False|2024-12-10T16:55:13.2621448+08:00;False|2024-12-09T13:59:27.6362265+08:00;True|2024-12-06T16:55:30.6422980+08:00;True|2024-12-06T15:08:49.5834939+08:00;True|2024-12-06T14:31:56.0968616+08:00;False|2024-12-06T14:31:44.2264009+08:00;True|2024-12-06T13:59:52.8150929+08:00;False|2024-12-06T13:48:22.6073939+08:00;True|2024-12-05T17:33:27.9247467+08:00;True|2024-12-05T17:30:23.1740838+08:00;False|2024-12-05T17:30:03.9977311+08:00;True|2024-12-04T15:18:41.4963816+08:00;True|2024-12-04T15:16:45.1121101+08:00;True|2024-12-04T15:14:33.5954776+08:00;True|2024-12-04T15:12:27.2913137+08:00;True|2024-12-04T14:10:19.6190673+08:00;False|2024-12-04T14:10:02.0319713+08:00;True|2024-12-03T16:08:46.6721098+08:00;True|2024-12-03T15:16:04.1754554+08:00;True|2024-12-03T15:13:25.4927626+08:00;True|2024-12-03T14:55:09.4413291+08:00;True|2024-12-03T14:43:11.8243897+08:00;True|2024-12-03T14:29:16.1511932+08:00;True|2024-12-03T14:24:07.9561838+08:00;False|2024-12-03T14:23:55.1293602+08:00;True|2024-12-02T16:31:22.0404862+08:00;False|2024-12-02T16:28:53.1721961+08:00;True|2024-12-02T15:41:24.9462025+08:00;True|2024-12-02T14:12:12.9356193+08:00;False|2024-12-02T14:11:35.7159488+08:00;True|2024-12-02T10:59:31.5582757+08:00;True|2024-11-29T12:08:55.4868083+08:00;False|2024-11-29T12:08:37.0353185+08:00;True|2024-11-28T10:47:27.2071355+08:00;False|2024-11-28T10:47:13.6670955+08:00;True|2024-11-27T15:21:57.6747082+08:00;False|2024-11-27T15:20:07.2403056+08:00;True|2024-11-27T15:13:36.1461091+08:00;True|2024-11-27T14:34:35.5908753+08:00;False|2024-11-27T14:33:30.7118923+08:00;True|2024-11-26T15:16:44.1854927+08:00;True|2024-11-26T15:14:33.4021067+08:00;False|2024-11-26T15:14:07.9955135+08:00;True|2024-11-26T14:48:35.6408418+08:00;True|2024-11-26T14:45:00.7251556+08:00;True|2024-11-26T14:04:58.4232988+08:00;False|2024-11-26T14:04:28.1286675+08:00;True|2024-11-25T13:45:07.6935933+08:00;True|2024-11-25T13:43:59.0788650+08:00;False|2024-11-25T13:43:44.2225194+08:00;True|2024-11-25T08:54:05.5144014+08:00;False|2024-11-25T08:53:49.2284063+08:00;False|2024-11-22T09:53:13.7879664+08:00;True|2024-11-21T13:48:31.7056264+08:00;True|2024-11-21T13:46:55.0891551+08:00;True|2024-11-21T13:44:05.5221110+08:00;True|2024-11-21T13:43:39.1385899+08:00;False|2024-11-21T13:43:19.9351488+08:00;True|2024-11-20T11:33:52.0324053+08:00;True|2024-11-20T11:20:58.4917889+08:00;True|2024-11-20T11:03:46.9552623+08:00;True|2024-11-20T10:45:10.9517109+08:00;False|2024-11-20T10:44:58.3221116+08:00;False|2024-11-19T15:39:27.3889104+08:00;True|2024-11-19T14:42:32.0854561+08:00;True|2024-11-19T14:19:19.6198070+08:00;True|2024-11-19T14:13:08.2003750+08:00;False|2024-11-19T14:12:15.5442850+08:00;True|2024-11-18T13:05:41.0455534+08:00;True|2024-11-18T11:05:30.2819404+08:00;True|2024-11-18T10:51:07.1852818+08:00;False|2024-11-18T10:50:21.5098527+08:00;True|2024-11-18T10:15:38.5429366+08:00;True|2024-11-18T10:00:51.0847524+08:00;True|2024-11-18T09:34:52.1772715+08:00;True|2024-11-18T09:27:23.6013754+08:00;False|2024-11-18T09:26:00.9323551+08:00;True|2024-11-15T11:20:51.7576376+08:00;True|2024-11-15T11:11:17.5580168+08:00;True|2024-11-15T11:03:58.4142996+08:00;True|2024-11-15T10:44:50.5207827+08:00;True|2024-11-15T10:10:05.5550418+08:00;True|2024-11-15T09:49:30.6631382+08:00;False|2024-11-15T09:47:05.3973379+08:00;True|2024-11-14T18:31:54.8247681+08:00;True|2024-11-14T17:14:56.3660185+08:00;True|2024-11-14T16:49:44.7526912+08:00;True|2024-11-14T16:49:09.3427608+08:00;True|2024-11-14T15:59:00.2572264+08:00;True|2024-11-14T11:21:03.5110818+08:00;True|2024-11-14T10:51:10.7864658+08:00;False|2024-11-14T10:50:55.5384248+08:00;True|2024-11-14T10:29:13.6760158+08:00;False|2024-11-14T10:28:09.8622863+08:00;True|2024-11-13T17:48:46.4827219+08:00;True|2024-11-13T17:45:13.0659280+08:00;True|2024-11-13T16:01:55.2278671+08:00;False|2024-11-13T16:01:03.0040446+08:00;True|2024-11-12T17:24:06.3763535+08:00;True|2024-11-12T17:21:51.8459552+08:00;True|2024-11-12T17:11:57.9239909+08:00;True|2024-11-12T17:09:04.4322824+08:00;True|2024-11-12T17:07:12.1839548+08:00;True|2024-11-12T17:04:27.4579152+08:00;True|2024-11-12T17:03:59.6843282+08:00;True|2024-11-12T16:40:44.0714862+08:00;True|2024-11-12T16:36:27.7792764+08:00;True|2024-11-12T16:32:36.5262040+08:00;False|2024-11-12T16:32:23.9550194+08:00;True|2024-11-12T10:58:16.1987697+08:00;False|2024-11-12T10:58:04.8469631+08:00;True|2024-11-11T13:40:53.2582255+08:00;True|2024-11-11T13:37:45.0401833+08:00;True|2024-11-11T12:35:13.2429166+08:00;True|2024-11-11T11:27:29.0530688+08:00;False|2024-11-11T11:27:12.2765506+08:00;True|2024-11-08T15:52:17.1278870+08:00;False|2024-11-08T15:52:04.4379380+08:00;True|2024-11-07T18:27:41.8163960+08:00;False|2024-11-07T18:27:30.6037983+08:00;True|2024-11-06T15:55:27.6450488+08:00;True|2024-11-06T15:54:13.5957004+08:00;True|2024-11-06T15:25:33.3862531+08:00;True|2024-11-06T13:33:57.8502278+08:00;False|2024-11-06T13:33:39.2337086+08:00;True|2024-11-06T11:33:12.6755239+08:00;True|2024-11-05T18:34:17.7048247+08:00;True|2024-11-05T18:30:08.5724471+08:00;True|2024-11-05T18:24:35.5372980+08:00;True|2024-11-05T18:06:29.7644779+08:00;True|2024-11-05T17:53:50.9554703+08:00;True|2024-11-05T17:50:05.6376900+08:00;True|2024-11-05T11:13:46.2906508+08:00;True|2024-11-05T10:35:55.5423834+08:00;False|2024-11-05T10:35:20.4104039+08:00;True|2024-11-01T10:22:05.7636122+08:00;False|2024-11-01T10:21:33.2954398+08:00;True|2024-10-31T20:03:37.9075888+08:00;True|2024-10-31T18:35:31.6618415+08:00;True|2024-10-31T18:34:56.2479021+08:00;True|2024-10-31T09:43:29.0841188+08:00;False|2024-10-31T09:43:04.8780818+08:00;True|2024-10-30T18:42:11.0523067+08:00;True|2024-10-30T18:07:05.5603627+08:00;True|2024-10-30T18:03:15.3516621+08:00;True|2024-10-30T17:58:14.3276504+08:00;False|2024-10-30T17:57:44.5353118+08:00;True|2024-10-30T17:47:41.2889491+08:00;True|2024-10-30T17:19:36.6172721+08:00;True|2024-10-30T17:10:00.4399703+08:00;False|2024-10-30T17:08:57.6500450+08:00;True|2024-10-29T16:58:15.6006676+08:00;True|2024-10-29T16:51:56.8406649+08:00;True|2024-10-29T16:05:48.4297695+08:00;True|2024-10-29T15:12:15.1522377+08:00;True|2024-10-29T15:10:51.8431754+08:00;True|2024-10-29T11:21:01.5660940+08:00;False|2024-10-29T11:20:33.3958980+08:00;True|2024-10-28T17:51:26.7156861+08:00;False|2024-10-28T17:50:41.4388196+08:00;True|2024-10-28T13:34:14.8764262+08:00;True|2024-10-28T12:44:27.2083620+08:00;False|2024-10-28T12:43:57.5942717+08:00;True|2024-10-25T11:49:47.9817458+08:00;True|2024-10-25T11:49:34.4754546+08:00;True|2024-10-25T09:59:35.6471379+08:00;True|2024-10-25T09:47:46.8035540+08:00;True|2024-10-25T09:25:57.7872618+08:00;False|2024-10-25T09:25:30.0950732+08:00;True|2024-10-24T20:39:06.1992535+08:00;False|2024-10-24T20:38:33.1009731+08:00;True|2024-10-24T11:17:46.9974483+08:00;False|2024-10-24T11:17:17.0925356+08:00;True|2024-10-23T19:16:25.5189930+08:00;True|2024-10-23T17:10:44.4267777+08:00;False|2024-10-23T17:10:10.2947971+08:00;True|2024-10-23T14:13:22.6901287+08:00;False|2024-10-23T14:12:24.3997100+08:00;True|2024-10-22T16:25:12.9514711+08:00;False|2024-10-22T16:24:42.9025167+08:00;True|2024-10-22T10:22:33.9932601+08:00;False|2024-10-22T10:22:05.3030308+08:00;True|2024-10-21T17:53:29.9552741+08:00;True|2024-10-21T16:37:31.4159544+08:00;True|2024-10-21T16:35:43.6207036+08:00;True|2024-10-21T16:00:05.5040651+08:00;False|2024-10-21T15:59:35.9279259+08:00;True|2024-10-21T12:06:42.5768961+08:00;False|2024-10-21T12:06:16.6344662+08:00;True|2024-10-18T10:44:02.6495536+08:00;True|2024-10-18T09:55:47.9769914+08:00;True|2024-10-18T09:47:46.6365831+08:00;True|2024-10-18T09:46:40.4036657+08:00;True|2024-10-18T09:44:25.4598960+08:00;True|2024-10-18T09:30:07.6972377+08:00;False|2024-10-18T09:28:18.9251743+08:00;True|2024-10-17T12:13:34.8639685+08:00;True|2024-10-17T12:02:26.5251711+08:00;False|2024-10-17T12:01:31.3822430+08:00;True|2024-10-17T11:49:09.2395208+08:00;False|2024-10-17T11:48:38.0189241+08:00;True|2024-10-16T19:35:29.2047484+08:00;False|2024-10-16T19:32:43.0637947+08:00;True|2024-10-16T11:27:13.1263407+08:00;False|2024-10-16T11:25:49.8688677+08:00;True|2024-10-15T18:26:50.9948482+08:00;False|2024-10-15T18:26:23.6998750+08:00;True|2024-08-26T14:17:37.8502046+08:00;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+08:00;</History>
+ <History>False|2025-02-27T11:55:43.0462466Z;True|2025-02-24T16:03:00.5507258+08:00;False|2025-02-24T16:00:00.9104160+08:00;True|2025-02-19T16:55:31.8966125+08:00;True|2025-02-19T14:51:19.5866770+08:00;False|2025-02-19T14:49:16.2857645+08:00;True|2025-02-19T14:11:03.8109482+08:00;False|2025-02-19T14:08:17.7243950+08:00;True|2025-02-19T11:16:48.1875981+08:00;False|2025-02-19T11:14:24.0571589+08:00;True|2025-02-19T10:17:34.3257301+08:00;False|2025-02-19T10:14:49.0730325+08:00;True|2025-02-18T09:38:54.9616937+08:00;True|2025-02-18T09:16:03.1196071+08:00;False|2025-02-18T09:13:52.5022130+08:00;True|2025-02-17T17:28:38.1103164+08:00;True|2025-02-17T17:06:19.1494960+08:00;True|2025-02-17T16:58:21.8893871+08:00;False|2025-02-17T16:56:34.0012780+08:00;True|2025-02-17T15:56:45.9560949+08:00;False|2025-02-17T15:29:32.9323141+08:00;False|2025-02-17T15:27:54.6615301+08:00;False|2025-02-17T15:25:42.7179137+08:00;True|2025-02-12T10:48:39.4029671+08:00;True|2025-02-12T10:45:09.8138793+08:00;False|2025-02-12T10:43:37.5751112+08:00;False|2025-02-12T10:43:24.8201898+08:00;False|2025-02-12T10:42:58.2736984+08:00;False|2025-02-12T10:42:46.1482594+08:00;False|2025-02-12T10:42:01.5427330+08:00;False|2025-02-12T10:41:48.3761346+08:00;False|2025-02-12T10:41:29.3367142+08:00;True|2025-02-11T15:41:34.0746843+08:00;True|2025-02-11T15:39:37.3374891+08:00;False|2025-02-11T15:39:27.0449176+08:00;False|2025-02-11T15:08:35.2970100+08:00;True|2025-02-11T14:59:59.6539416+08:00;True|2025-02-11T14:56:20.5954601+08:00;False|2025-02-11T14:55:35.6700921+08:00;True|2025-02-10T09:39:38.7399451+08:00;False|2025-02-10T09:39:10.1358642+08:00;True|2025-02-08T16:00:23.1136903+08:00;False|2025-02-08T15:59:50.0414065+08:00;True|2025-01-17T10:17:41.6850215+08:00;False|2025-01-17T10:16:20.3202054+08:00;True|2025-01-17T09:00:26.6966310+08:00;False|2025-01-17T08:59:59.9527727+08:00;True|2025-01-16T11:06:57.1014257+08:00;True|2025-01-16T10:27:57.2742426+08:00;False|2025-01-16T10:27:27.5197746+08:00;True|2025-01-15T11:05:17.5523582+08:00;True|2025-01-15T09:37:34.6118980+08:00;False|2025-01-15T09:36:27.7987949+08:00;True|2025-01-14T12:52:06.2234405+08:00;True|2025-01-14T12:50:08.8487446+08:00;False|2025-01-14T12:49:45.2743330+08:00;True|2025-01-14T10:31:18.6477403+08:00;False|2025-01-14T10:29:30.1534049+08:00;True|2025-01-13T15:27:00.4497527+08:00;True|2025-01-13T15:01:33.6142160+08:00;True|2025-01-13T10:29:49.4772980+08:00;True|2025-01-13T10:11:15.7993265+08:00;True|2025-01-13T10:08:58.9378828+08:00;False|2025-01-13T10:08:44.9869073+08:00;True|2025-01-13T10:02:17.5175561+08:00;False|2025-01-13T10:02:00.9991870+08:00;True|2025-01-08T17:50:21.7468469+08:00;True|2025-01-08T16:38:48.8592252+08:00;True|2025-01-08T10:44:42.9161086+08:00;False|2025-01-08T10:44:09.4840640+08:00;True|2025-01-08T10:34:31.5982265+08:00;False|2025-01-08T10:33:57.3576390+08:00;True|2025-01-03T17:19:09.1765100+08:00;True|2025-01-03T17:10:41.8794009+08:00;True|2025-01-03T17:10:11.4245485+08:00;True|2025-01-03T15:54:22.3387906+08:00;True|2025-01-03T15:41:44.9897120+08:00;False|2025-01-03T15:40:42.1357112+08:00;False|2025-01-03T15:39:09.0564197+08:00;True|2025-01-03T14:58:31.5701467+08:00;True|2025-01-03T14:29:13.4456304+08:00;False|2025-01-03T14:27:18.9925263+08:00;True|2025-01-02T16:08:24.1819376+08:00;True|2025-01-02T16:07:01.1636705+08:00;True|2025-01-02T16:03:02.6520904+08:00;True|2025-01-02T10:03:56.0551738+08:00;False|2025-01-02T10:03:34.8632732+08:00;True|2024-12-31T15:27:01.3180960+08:00;True|2024-12-31T11:17:12.2977529+08:00;True|2024-12-31T10:48:14.7205535+08:00;True|2024-12-31T10:18:45.6669875+08:00;False|2024-12-31T10:18:21.6706557+08:00;True|2024-12-30T09:32:44.3898729+08:00;True|2024-12-30T09:31:24.5771941+08:00;False|2024-12-30T09:30:52.4031391+08:00;True|2024-12-27T16:12:20.2836752+08:00;False|2024-12-27T16:11:04.6614343+08:00;True|2024-12-27T15:07:23.0750147+08:00;True|2024-12-27T15:04:52.7876532+08:00;True|2024-12-27T14:37:54.3154829+08:00;False|2024-12-27T14:37:26.9546174+08:00;True|2024-12-26T16:33:56.0452167+08:00;True|2024-12-26T16:29:21.4115458+08:00;True|2024-12-26T16:29:02.0242815+08:00;True|2024-12-26T15:17:24.7390981+08:00;False|2024-12-26T15:13:26.8863189+08:00;True|2024-12-26T15:06:35.4541902+08:00;True|2024-12-26T11:35:42.2760106+08:00;False|2024-12-26T11:35:08.9255789+08:00;True|2024-12-26T10:10:29.7487991+08:00;True|2024-12-26T09:27:40.2637311+08:00;False|2024-12-26T09:25:52.1339136+08:00;True|2024-12-24T15:11:48.9968778+08:00;True|2024-12-24T15:06:55.0283993+08:00;True|2024-12-24T14:36:29.6466740+08:00;True|2024-12-24T10:28:42.7489880+08:00;False|2024-12-24T10:28:08.6809715+08:00;True|2024-12-24T10:06:05.9449103+08:00;False|2024-12-24T10:05:32.8409161+08:00;True|2024-12-23T14:56:40.3416256+08:00;True|2024-12-23T14:50:50.2677378+08:00;True|2024-12-23T14:48:27.8169391+08:00;True|2024-12-23T14:45:25.5341474+08:00;True|2024-12-23T14:42:23.7825087+08:00;True|2024-12-23T14:35:53.8876449+08:00;True|2024-12-23T14:14:00.4257926+08:00;True|2024-12-23T11:10:54.5874876+08:00;True|2024-12-23T11:08:44.0250304+08:00;False|2024-12-23T11:08:18.5757850+08:00;True|2024-12-20T12:51:29.2354841+08:00;True|2024-12-20T12:46:13.7636932+08:00;False|2024-12-20T12:44:21.1473486+08:00;False|2024-12-20T12:44:06.5427106+08:00;True|2024-12-20T12:29:33.9971940+08:00;False|2024-12-20T12:29:01.0285205+08:00;True|2024-12-19T15:49:19.9906264+08:00;True|2024-12-19T14:55:54.3323405+08:00;True|2024-12-19T14:17:50.5086161+08:00;True|2024-12-19T14:08:16.0919011+08:00;True|2024-12-19T14:02:50.3092759+08:00;True|2024-12-19T13:54:41.2332165+08:00;False|2024-12-19T13:54:07.6973483+08:00;True|2024-12-19T09:34:54.5332110+08:00;True|2024-12-19T08:49:05.5690428+08:00;False|2024-12-19T08:48:51.0618113+08:00;True|2024-12-18T15:45:34.7174246+08:00;False|2024-12-18T15:45:10.3226822+08:00;True|2024-12-18T15:32:03.5983267+08:00;True|2024-12-18T15:31:20.1219502+08:00;True|2024-12-18T11:57:09.1595607+08:00;True|2024-12-18T11:13:37.4765697+08:00;True|2024-12-18T10:07:54.1294714+08:00;True|2024-12-18T10:04:16.0967342+08:00;False|2024-12-18T10:04:04.1561560+08:00;True|2024-12-16T17:07:07.3386872+08:00;True|2024-12-16T16:34:59.1101964+08:00;True|2024-12-16T16:19:07.9287470+08:00;False|2024-12-16T16:18:46.4617432+08:00;True|2024-12-13T18:06:11.0778539+08:00;True|2024-12-13T16:53:52.2283177+08:00;True|2024-12-13T16:23:15.9531944+08:00;True|2024-12-13T13:58:03.7464045+08:00;True|2024-12-13T10:40:33.9285602+08:00;True|2024-12-13T10:38:03.8494063+08:00;False|2024-12-13T10:37:52.4251132+08:00;True|2024-12-13T10:31:07.4994631+08:00;False|2024-12-13T10:30:40.8021885+08:00;True|2024-12-12T10:01:42.4944750+08:00;False|2024-12-12T10:01:15.7147977+08:00;True|2024-12-11T17:21:58.0453583+08:00;True|2024-12-11T10:59:15.3836831+08:00;True|2024-12-11T09:49:19.4060272+08:00;False|2024-12-11T09:48:51.7603525+08:00;True|2024-12-11T08:58:41.4567855+08:00;False|2024-12-11T08:58:09.2160433+08:00;True|2024-12-10T17:25:49.3068154+08:00;True|2024-12-10T17:21:30.0155027+08:00;True|2024-12-10T17:16:56.7587487+08:00;False|2024-12-10T17:16:34.7816611+08:00;True|2024-12-10T16:55:40.3777585+08:00;False|2024-12-10T16:55:13.2621448+08:00;False|2024-12-09T13:59:27.6362265+08:00;True|2024-12-06T16:55:30.6422980+08:00;True|2024-12-06T15:08:49.5834939+08:00;True|2024-12-06T14:31:56.0968616+08:00;False|2024-12-06T14:31:44.2264009+08:00;True|2024-12-06T13:59:52.8150929+08:00;False|2024-12-06T13:48:22.6073939+08:00;True|2024-12-05T17:33:27.9247467+08:00;True|2024-12-05T17:30:23.1740838+08:00;False|2024-12-05T17:30:03.9977311+08:00;True|2024-12-04T15:18:41.4963816+08:00;True|2024-12-04T15:16:45.1121101+08:00;True|2024-12-04T15:14:33.5954776+08:00;True|2024-12-04T15:12:27.2913137+08:00;True|2024-12-04T14:10:19.6190673+08:00;False|2024-12-04T14:10:02.0319713+08:00;True|2024-12-03T16:08:46.6721098+08:00;True|2024-12-03T15:16:04.1754554+08:00;True|2024-12-03T15:13:25.4927626+08:00;True|2024-12-03T14:55:09.4413291+08:00;True|2024-12-03T14:43:11.8243897+08:00;True|2024-12-03T14:29:16.1511932+08:00;True|2024-12-03T14:24:07.9561838+08:00;False|2024-12-03T14:23:55.1293602+08:00;True|2024-12-02T16:31:22.0404862+08:00;False|2024-12-02T16:28:53.1721961+08:00;True|2024-12-02T15:41:24.9462025+08:00;True|2024-12-02T14:12:12.9356193+08:00;False|2024-12-02T14:11:35.7159488+08:00;True|2024-12-02T10:59:31.5582757+08:00;True|2024-11-29T12:08:55.4868083+08:00;False|2024-11-29T12:08:37.0353185+08:00;True|2024-11-28T10:47:27.2071355+08:00;False|2024-11-28T10:47:13.6670955+08:00;True|2024-11-27T15:21:57.6747082+08:00;False|2024-11-27T15:20:07.2403056+08:00;True|2024-11-27T15:13:36.1461091+08:00;True|2024-11-27T14:34:35.5908753+08:00;False|2024-11-27T14:33:30.7118923+08:00;True|2024-11-26T15:16:44.1854927+08:00;True|2024-11-26T15:14:33.4021067+08:00;False|2024-11-26T15:14:07.9955135+08:00;True|2024-11-26T14:48:35.6408418+08:00;True|2024-11-26T14:45:00.7251556+08:00;True|2024-11-26T14:04:58.4232988+08:00;False|2024-11-26T14:04:28.1286675+08:00;True|2024-11-25T13:45:07.6935933+08:00;True|2024-11-25T13:43:59.0788650+08:00;False|2024-11-25T13:43:44.2225194+08:00;True|2024-11-25T08:54:05.5144014+08:00;False|2024-11-25T08:53:49.2284063+08:00;False|2024-11-22T09:53:13.7879664+08:00;True|2024-11-21T13:48:31.7056264+08:00;True|2024-11-21T13:46:55.0891551+08:00;True|2024-11-21T13:44:05.5221110+08:00;True|2024-11-21T13:43:39.1385899+08:00;False|2024-11-21T13:43:19.9351488+08:00;True|2024-11-20T11:33:52.0324053+08:00;True|2024-11-20T11:20:58.4917889+08:00;True|2024-11-20T11:03:46.9552623+08:00;True|2024-11-20T10:45:10.9517109+08:00;False|2024-11-20T10:44:58.3221116+08:00;False|2024-11-19T15:39:27.3889104+08:00;True|2024-11-19T14:42:32.0854561+08:00;True|2024-11-19T14:19:19.6198070+08:00;True|2024-11-19T14:13:08.2003750+08:00;False|2024-11-19T14:12:15.5442850+08:00;True|2024-11-18T13:05:41.0455534+08:00;True|2024-11-18T11:05:30.2819404+08:00;True|2024-11-18T10:51:07.1852818+08:00;False|2024-11-18T10:50:21.5098527+08:00;True|2024-11-18T10:15:38.5429366+08:00;True|2024-11-18T10:00:51.0847524+08:00;True|2024-11-18T09:34:52.1772715+08:00;True|2024-11-18T09:27:23.6013754+08:00;False|2024-11-18T09:26:00.9323551+08:00;True|2024-11-15T11:20:51.7576376+08:00;True|2024-11-15T11:11:17.5580168+08:00;True|2024-11-15T11:03:58.4142996+08:00;True|2024-11-15T10:44:50.5207827+08:00;True|2024-11-15T10:10:05.5550418+08:00;True|2024-11-15T09:49:30.6631382+08:00;False|2024-11-15T09:47:05.3973379+08:00;True|2024-11-14T18:31:54.8247681+08:00;True|2024-11-14T17:14:56.3660185+08:00;True|2024-11-14T16:49:44.7526912+08:00;True|2024-11-14T16:49:09.3427608+08:00;True|2024-11-14T15:59:00.2572264+08:00;True|2024-11-14T11:21:03.5110818+08:00;True|2024-11-14T10:51:10.7864658+08:00;False|2024-11-14T10:50:55.5384248+08:00;True|2024-11-14T10:29:13.6760158+08:00;False|2024-11-14T10:28:09.8622863+08:00;True|2024-11-13T17:48:46.4827219+08:00;True|2024-11-13T17:45:13.0659280+08:00;True|2024-11-13T16:01:55.2278671+08:00;False|2024-11-13T16:01:03.0040446+08:00;True|2024-11-12T17:24:06.3763535+08:00;True|2024-11-12T17:21:51.8459552+08:00;True|2024-11-12T17:11:57.9239909+08:00;True|2024-11-12T17:09:04.4322824+08:00;True|2024-11-12T17:07:12.1839548+08:00;True|2024-11-12T17:04:27.4579152+08:00;True|2024-11-12T17:03:59.6843282+08:00;True|2024-11-12T16:40:44.0714862+08:00;True|2024-11-12T16:36:27.7792764+08:00;True|2024-11-12T16:32:36.5262040+08:00;False|2024-11-12T16:32:23.9550194+08:00;True|2024-11-12T10:58:16.1987697+08:00;False|2024-11-12T10:58:04.8469631+08:00;True|2024-11-11T13:40:53.2582255+08:00;True|2024-11-11T13:37:45.0401833+08:00;True|2024-11-11T12:35:13.2429166+08:00;True|2024-11-11T11:27:29.0530688+08:00;False|2024-11-11T11:27:12.2765506+08:00;True|2024-11-08T15:52:17.1278870+08:00;False|2024-11-08T15:52:04.4379380+08:00;True|2024-11-07T18:27:41.8163960+08:00;False|2024-11-07T18:27:30.6037983+08:00;True|2024-11-06T15:55:27.6450488+08:00;True|2024-11-06T15:54:13.5957004+08:00;True|2024-11-06T15:25:33.3862531+08:00;True|2024-11-06T13:33:57.8502278+08:00;False|2024-11-06T13:33:39.2337086+08:00;True|2024-11-06T11:33:12.6755239+08:00;True|2024-11-05T18:34:17.7048247+08:00;True|2024-11-05T18:30:08.5724471+08:00;True|2024-11-05T18:24:35.5372980+08:00;True|2024-11-05T18:06:29.7644779+08:00;True|2024-11-05T17:53:50.9554703+08:00;True|2024-11-05T17:50:05.6376900+08:00;True|2024-11-05T11:13:46.2906508+08:00;True|2024-11-05T10:35:55.5423834+08:00;False|2024-11-05T10:35:20.4104039+08:00;True|2024-11-01T10:22:05.7636122+08:00;False|2024-11-01T10:21:33.2954398+08:00;True|2024-10-31T20:03:37.9075888+08:00;True|2024-10-31T18:35:31.6618415+08:00;True|2024-10-31T18:34:56.2479021+08:00;True|2024-10-31T09:43:29.0841188+08:00;False|2024-10-31T09:43:04.8780818+08:00;True|2024-10-30T18:42:11.0523067+08:00;True|2024-10-30T18:07:05.5603627+08:00;True|2024-10-30T18:03:15.3516621+08:00;True|2024-10-30T17:58:14.3276504+08:00;False|2024-10-30T17:57:44.5353118+08:00;True|2024-10-30T17:47:41.2889491+08:00;True|2024-10-30T17:19:36.6172721+08:00;True|2024-10-30T17:10:00.4399703+08:00;False|2024-10-30T17:08:57.6500450+08:00;True|2024-10-29T16:58:15.6006676+08:00;True|2024-10-29T16:51:56.8406649+08:00;True|2024-10-29T16:05:48.4297695+08:00;True|2024-10-29T15:12:15.1522377+08:00;True|2024-10-29T15:10:51.8431754+08:00;True|2024-10-29T11:21:01.5660940+08:00;False|2024-10-29T11:20:33.3958980+08:00;True|2024-10-28T17:51:26.7156861+08:00;False|2024-10-28T17:50:41.4388196+08:00;True|2024-10-28T13:34:14.8764262+08:00;True|2024-10-28T12:44:27.2083620+08:00;False|2024-10-28T12:43:57.5942717+08:00;True|2024-10-25T11:49:47.9817458+08:00;True|2024-10-25T11:49:34.4754546+08:00;True|2024-10-25T09:59:35.6471379+08:00;True|2024-10-25T09:47:46.8035540+08:00;True|2024-10-25T09:25:57.7872618+08:00;False|2024-10-25T09:25:30.0950732+08:00;True|2024-10-24T20:39:06.1992535+08:00;False|2024-10-24T20:38:33.1009731+08:00;True|2024-10-24T11:17:46.9974483+08:00;False|2024-10-24T11:17:17.0925356+08:00;True|2024-10-23T19:16:25.5189930+08:00;True|2024-10-23T17:10:44.4267777+08:00;False|2024-10-23T17:10:10.2947971+08:00;True|2024-10-23T14:13:22.6901287+08:00;False|2024-10-23T14:12:24.3997100+08:00;True|2024-10-22T16:25:12.9514711+08:00;False|2024-10-22T16:24:42.9025167+08:00;True|2024-10-22T10:22:33.9932601+08:00;False|2024-10-22T10:22:05.3030308+08:00;True|2024-10-21T17:53:29.9552741+08:00;True|2024-10-21T16:37:31.4159544+08:00;True|2024-10-21T16:35:43.6207036+08:00;True|2024-10-21T16:00:05.5040651+08:00;False|2024-10-21T15:59:35.9279259+08:00;True|2024-10-21T12:06:42.5768961+08:00;False|2024-10-21T12:06:16.6344662+08:00;True|2024-10-18T10:44:02.6495536+08:00;True|2024-10-18T09:55:47.9769914+08:00;True|2024-10-18T09:47:46.6365831+08:00;True|2024-10-18T09:46:40.4036657+08:00;True|2024-10-18T09:44:25.4598960+08:00;True|2024-10-18T09:30:07.6972377+08:00;False|2024-10-18T09:28:18.9251743+08:00;True|2024-10-17T12:13:34.8639685+08:00;True|2024-10-17T12:02:26.5251711+08:00;False|2024-10-17T12:01:31.3822430+08:00;True|2024-10-17T11:49:09.2395208+08:00;False|2024-10-17T11:48:38.0189241+08:00;True|2024-10-16T19:35:29.2047484+08:00;False|2024-10-16T19:32:43.0637947+08:00;True|2024-10-16T11:27:13.1263407+08:00;False|2024-10-16T11:25:49.8688677+08:00;True|2024-10-15T18:26:50.9948482+08:00;False|2024-10-15T18:26:23.6998750+08:00;True|2024-08-26T14:17:37.8502046+08:00;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="bin/AlibabaCloud.EndpointUtil.dll">
<publishTime>04/07/2020 16:33:48</publishTime>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>01/17/2025 09:00:11</publishTime>
+ <publishTime>02/27/2025 19:58:31</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>01/17/2025 09:00:11</publishTime>
+ <publishTime>02/27/2025 19:58:31</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>01/17/2025 09:00:10</publishTime>
+ <publishTime>02/27/2025 19:57:53</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>01/17/2025 09:00:10</publishTime>
+ <publishTime>02/27/2025 19:57:53</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>01/17/2025 09:00:07</publishTime>
+ <publishTime>02/27/2025 19:57:17</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>01/17/2025 09:00:07</publishTime>
+ <publishTime>02/27/2025 19:57:17</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -93,7 +93,7 @@
<publishTime>05/09/2021 01:08:30</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="bin/libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -111,13 +111,13 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>01/17/2025 09:00:07</publishTime>
+ <publishTime>02/27/2025 19:57:29</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>01/17/2025 09:00:07</publishTime>
+ <publishTime>02/27/2025 19:57:29</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>03/08/2023 15:09:56</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>01/17/2025 09:00:05</publishTime>
+ <publishTime>02/27/2025 19:56:38</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>01/17/2025 09:00:05</publishTime>
+ <publishTime>02/27/2025 19:56:38</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>01/17/2025 09:00:06</publishTime>
+ <publishTime>02/27/2025 19:56:59</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>01/17/2025 09:00:06</publishTime>
+ <publishTime>02/27/2025 19:56:59</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>01/17/2025 09:00:06</publishTime>
+ <publishTime>02/27/2025 19:57:03</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>01/17/2025 09:00:06</publishTime>
+ <publishTime>02/27/2025 19:57:03</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>01/17/2025 08:56:51</publishTime>
+ <publishTime>02/27/2025 19:51:55</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>01/17/2025 08:56:51</publishTime>
+ <publishTime>02/27/2025 19:51:55</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -252,7 +252,7 @@
<publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 12:02:18</publishTime>
@@ -285,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>01/17/2025 08:56:53</publishTime>
+ <publishTime>02/27/2025 19:52:07</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>01/17/2025 08:56:53</publishTime>
+ <publishTime>02/27/2025 19:52:07</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>01/17/2025 08:57:23</publishTime>
+ <publishTime>02/27/2025 19:59:27</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>01/17/2025 08:57:23</publishTime>
+ <publishTime>02/27/2025 19:59:27</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -309,58 +309,58 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:06</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:06</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:06</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:06</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
<publishTime>03/22/2022 13:17:22</publishTime>
@@ -369,7 +369,7 @@
<publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -378,121 +378,121 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="libman.json">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:06</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="packages.config">
- <publishTime>09/19/2024 09:05:04</publishTime>
+ <publishTime>02/12/2025 09:59:06</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>02/12/2025 09:59:05</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web.config">
- <publishTime>12/30/2024 09:31:22</publishTime>
+ <publishTime>02/17/2025 15:27:54</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/Reference.cs b/WebAPI/Web References/WebS/Reference.cs
index 9d1a960..f4be136 100644
--- a/WebAPI/Web References/WebS/Reference.cs
+++ b/WebAPI/Web References/WebS/Reference.cs
@@ -34,7 +34,11 @@
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsXt_BaseBillMain))]
public partial class WebService1 : System.Web.Services.Protocols.SoapHttpClientProtocol {
+ private System.Threading.SendOrPostCallback get_SourceBarCode_POStockInBackOperationCompleted;
+
private System.Threading.SendOrPostCallback get_SourceBarCode_MateOutBackOperationCompleted;
+
+ private System.Threading.SendOrPostCallback get_SourceBarCode_SellOutBackOperationCompleted;
private System.Threading.SendOrPostCallback get_BarCodeOperationCompleted;
@@ -197,6 +201,8 @@
private System.Threading.SendOrPostCallback DeleteMouldOperationCompleted;
private System.Threading.SendOrPostCallback set_SavePonderationBillMain_Temp_BarCode_MouldOperationCompleted;
+
+ private System.Threading.SendOrPostCallback get_ORGANIZATIONS_UserByOrgRelationOperationCompleted;
private System.Threading.SendOrPostCallback get_ORGANIZATIONSIDByNameOperationCompleted;
@@ -364,7 +370,7 @@
private System.Threading.SendOrPostCallback get_SourceBarCode_MoveStockStepInOperationCompleted;
- private System.Threading.SendOrPostCallback get_SourceBarCode_POStockInBackOperationCompleted;
+ private System.Threading.SendOrPostCallback set_CheckEntrustInBillOperationCompleted;
private System.Threading.SendOrPostCallback set_AuditEntrustInBillOperationCompleted;
@@ -496,7 +502,7 @@
private System.Threading.SendOrPostCallback get_ORGANIZATIONSOperationCompleted;
- private System.Threading.SendOrPostCallback get_ORGANIZATIONS_UserByOrgRelationOperationCompleted;
+ private System.Threading.SendOrPostCallback set_SaveEntrustOutBill_NewOperationCompleted;
private System.Threading.SendOrPostCallback set_SaveEntrustOutBill_CLD_NewOperationCompleted;
@@ -592,7 +598,7 @@
private System.Threading.SendOrPostCallback set_CheckAddEntrustInBillOperationCompleted;
- private System.Threading.SendOrPostCallback set_CheckEntrustInBillOperationCompleted;
+ private System.Threading.SendOrPostCallback set_SaveMoveStockStepOutBill_CLD_NewOperationCompleted;
private System.Threading.SendOrPostCallback set_SaveMoveStockStepInBill_NewOperationCompleted;
@@ -691,8 +697,6 @@
private System.Threading.SendOrPostCallback set_AuditEntrustOutBillOperationCompleted;
private System.Threading.SendOrPostCallback GetKf_EntrustOutBill_K3_SourceOperationCompleted;
-
- private System.Threading.SendOrPostCallback set_SaveEntrustOutBill_NewOperationCompleted;
private System.Threading.SendOrPostCallback set_ClearPonderationBillMain_Temp_ChangGuiOperationCompleted;
@@ -824,11 +828,7 @@
private System.Threading.SendOrPostCallback set_SaveMoveStockBill_BillCheckOperationCompleted;
- private System.Threading.SendOrPostCallback set_SaveMoveStockBill_CLD_BillCheckOperationCompleted;
-
private System.Threading.SendOrPostCallback set_SaveMoveStockStepOutBill_NewOperationCompleted;
-
- private System.Threading.SendOrPostCallback set_SaveMoveStockStepOutBill_CLD_NewOperationCompleted;
private System.Threading.SendOrPostCallback GetSc_ICMOBillListOperationCompleted;
@@ -1209,7 +1209,13 @@
}
/// <remarks/>
+ public event get_SourceBarCode_POStockInBackCompletedEventHandler get_SourceBarCode_POStockInBackCompleted;
+
+ /// <remarks/>
public event get_SourceBarCode_MateOutBackCompletedEventHandler get_SourceBarCode_MateOutBackCompleted;
+
+ /// <remarks/>
+ public event get_SourceBarCode_SellOutBackCompletedEventHandler get_SourceBarCode_SellOutBackCompleted;
/// <remarks/>
public event get_BarCodeCompletedEventHandler get_BarCodeCompleted;
@@ -1453,6 +1459,9 @@
/// <remarks/>
public event set_SavePonderationBillMain_Temp_BarCode_MouldCompletedEventHandler set_SavePonderationBillMain_Temp_BarCode_MouldCompleted;
+
+ /// <remarks/>
+ public event get_ORGANIZATIONS_UserByOrgRelationCompletedEventHandler get_ORGANIZATIONS_UserByOrgRelationCompleted;
/// <remarks/>
public event get_ORGANIZATIONSIDByNameCompletedEventHandler get_ORGANIZATIONSIDByNameCompleted;
@@ -1704,7 +1713,7 @@
public event get_SourceBarCode_MoveStockStepInCompletedEventHandler get_SourceBarCode_MoveStockStepInCompleted;
/// <remarks/>
- public event get_SourceBarCode_POStockInBackCompletedEventHandler get_SourceBarCode_POStockInBackCompleted;
+ public event set_CheckEntrustInBillCompletedEventHandler set_CheckEntrustInBillCompleted;
/// <remarks/>
public event set_AuditEntrustInBillCompletedEventHandler set_AuditEntrustInBillCompleted;
@@ -1902,7 +1911,7 @@
public event get_ORGANIZATIONSCompletedEventHandler get_ORGANIZATIONSCompleted;
/// <remarks/>
- public event get_ORGANIZATIONS_UserByOrgRelationCompletedEventHandler get_ORGANIZATIONS_UserByOrgRelationCompleted;
+ public event set_SaveEntrustOutBill_NewCompletedEventHandler set_SaveEntrustOutBill_NewCompleted;
/// <remarks/>
public event set_SaveEntrustOutBill_CLD_NewCompletedEventHandler set_SaveEntrustOutBill_CLD_NewCompleted;
@@ -2046,7 +2055,7 @@
public event set_CheckAddEntrustInBillCompletedEventHandler set_CheckAddEntrustInBillCompleted;
/// <remarks/>
- public event set_CheckEntrustInBillCompletedEventHandler set_CheckEntrustInBillCompleted;
+ public event set_SaveMoveStockStepOutBill_CLD_NewCompletedEventHandler set_SaveMoveStockStepOutBill_CLD_NewCompleted;
/// <remarks/>
public event set_SaveMoveStockStepInBill_NewCompletedEventHandler set_SaveMoveStockStepInBill_NewCompleted;
@@ -2194,9 +2203,6 @@
/// <remarks/>
public event GetKf_EntrustOutBill_K3_SourceCompletedEventHandler GetKf_EntrustOutBill_K3_SourceCompleted;
-
- /// <remarks/>
- public event set_SaveEntrustOutBill_NewCompletedEventHandler set_SaveEntrustOutBill_NewCompleted;
/// <remarks/>
public event set_ClearPonderationBillMain_Temp_ChangGuiCompletedEventHandler set_ClearPonderationBillMain_Temp_ChangGuiCompleted;
@@ -2394,13 +2400,7 @@
public event set_SaveMoveStockBill_BillCheckCompletedEventHandler set_SaveMoveStockBill_BillCheckCompleted;
/// <remarks/>
- public event set_SaveMoveStockBill_CLD_BillCheckCompletedEventHandler set_SaveMoveStockBill_CLD_BillCheckCompleted;
-
- /// <remarks/>
public event set_SaveMoveStockStepOutBill_NewCompletedEventHandler set_SaveMoveStockStepOutBill_NewCompleted;
-
- /// <remarks/>
- public event set_SaveMoveStockStepOutBill_CLD_NewCompletedEventHandler set_SaveMoveStockStepOutBill_CLD_NewCompleted;
/// <remarks/>
public event GetSc_ICMOBillListCompletedEventHandler GetSc_ICMOBillListCompleted;
@@ -2913,6 +2913,50 @@
public event GetSc_ICMOBackBillListCompletedEventHandler GetSc_ICMOBackBillListCompleted;
/// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_SourceBarCode_POStockInBack", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public ClsKf_ICStockBill_WMS get_SourceBarCode_POStockInBack(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HStockOrgID, ref string sErrMsg) {
+ object[] results = this.Invoke("get_SourceBarCode_POStockInBack", new object[] {
+ HInterID,
+ HBillNo,
+ HBillType,
+ HSourceBillNo,
+ HSourceBillType,
+ HMaker,
+ HStockOrgID,
+ sErrMsg});
+ sErrMsg = ((string)(results[1]));
+ return ((ClsKf_ICStockBill_WMS)(results[0]));
+ }
+
+ /// <remarks/>
+ public void get_SourceBarCode_POStockInBackAsync(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HStockOrgID, string sErrMsg) {
+ this.get_SourceBarCode_POStockInBackAsync(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HStockOrgID, sErrMsg, null);
+ }
+
+ /// <remarks/>
+ public void get_SourceBarCode_POStockInBackAsync(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HStockOrgID, string sErrMsg, object userState) {
+ if ((this.get_SourceBarCode_POStockInBackOperationCompleted == null)) {
+ this.get_SourceBarCode_POStockInBackOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_SourceBarCode_POStockInBackOperationCompleted);
+ }
+ this.InvokeAsync("get_SourceBarCode_POStockInBack", new object[] {
+ HInterID,
+ HBillNo,
+ HBillType,
+ HSourceBillNo,
+ HSourceBillType,
+ HMaker,
+ HStockOrgID,
+ sErrMsg}, this.get_SourceBarCode_POStockInBackOperationCompleted, userState);
+ }
+
+ private void Onget_SourceBarCode_POStockInBackOperationCompleted(object arg) {
+ if ((this.get_SourceBarCode_POStockInBackCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.get_SourceBarCode_POStockInBackCompleted(this, new get_SourceBarCode_POStockInBackCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_SourceBarCode_MateOutBack", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
public ClsKf_ICStockBill_WMS get_SourceBarCode_MateOutBack(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HStockOrgID, ref string sErrMsg) {
object[] results = this.Invoke("get_SourceBarCode_MateOutBack", new object[] {
@@ -2953,6 +2997,50 @@
if ((this.get_SourceBarCode_MateOutBackCompleted != null)) {
System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
this.get_SourceBarCode_MateOutBackCompleted(this, new get_SourceBarCode_MateOutBackCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_SourceBarCode_SellOutBack", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public ClsKf_ICStockBill_WMS get_SourceBarCode_SellOutBack(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HStockOrgID, ref string sErrMsg) {
+ object[] results = this.Invoke("get_SourceBarCode_SellOutBack", new object[] {
+ HInterID,
+ HBillNo,
+ HBillType,
+ HSourceBillNo,
+ HSourceBillType,
+ HMaker,
+ HStockOrgID,
+ sErrMsg});
+ sErrMsg = ((string)(results[1]));
+ return ((ClsKf_ICStockBill_WMS)(results[0]));
+ }
+
+ /// <remarks/>
+ public void get_SourceBarCode_SellOutBackAsync(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HStockOrgID, string sErrMsg) {
+ this.get_SourceBarCode_SellOutBackAsync(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HStockOrgID, sErrMsg, null);
+ }
+
+ /// <remarks/>
+ public void get_SourceBarCode_SellOutBackAsync(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HStockOrgID, string sErrMsg, object userState) {
+ if ((this.get_SourceBarCode_SellOutBackOperationCompleted == null)) {
+ this.get_SourceBarCode_SellOutBackOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_SourceBarCode_SellOutBackOperationCompleted);
+ }
+ this.InvokeAsync("get_SourceBarCode_SellOutBack", new object[] {
+ HInterID,
+ HBillNo,
+ HBillType,
+ HSourceBillNo,
+ HSourceBillType,
+ HMaker,
+ HStockOrgID,
+ sErrMsg}, this.get_SourceBarCode_SellOutBackOperationCompleted, userState);
+ }
+
+ private void Onget_SourceBarCode_SellOutBackOperationCompleted(object arg) {
+ if ((this.get_SourceBarCode_SellOutBackCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.get_SourceBarCode_SellOutBackCompleted(this, new get_SourceBarCode_SellOutBackCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
@@ -6837,6 +6925,37 @@
if ((this.set_SavePonderationBillMain_Temp_BarCode_MouldCompleted != null)) {
System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
this.set_SavePonderationBillMain_Temp_BarCode_MouldCompleted(this, new set_SavePonderationBillMain_Temp_BarCode_MouldCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_ORGANIZATIONS_UserByOrgRelation", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public System.Data.DataSet get_ORGANIZATIONS_UserByOrgRelation(string HUserNumber, string HOrgName) {
+ object[] results = this.Invoke("get_ORGANIZATIONS_UserByOrgRelation", new object[] {
+ HUserNumber,
+ HOrgName});
+ return ((System.Data.DataSet)(results[0]));
+ }
+
+ /// <remarks/>
+ public void get_ORGANIZATIONS_UserByOrgRelationAsync(string HUserNumber, string HOrgName) {
+ this.get_ORGANIZATIONS_UserByOrgRelationAsync(HUserNumber, HOrgName, null);
+ }
+
+ /// <remarks/>
+ public void get_ORGANIZATIONS_UserByOrgRelationAsync(string HUserNumber, string HOrgName, object userState) {
+ if ((this.get_ORGANIZATIONS_UserByOrgRelationOperationCompleted == null)) {
+ this.get_ORGANIZATIONS_UserByOrgRelationOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_ORGANIZATIONS_UserByOrgRelationOperationCompleted);
+ }
+ this.InvokeAsync("get_ORGANIZATIONS_UserByOrgRelation", new object[] {
+ HUserNumber,
+ HOrgName}, this.get_ORGANIZATIONS_UserByOrgRelationOperationCompleted, userState);
+ }
+
+ private void Onget_ORGANIZATIONS_UserByOrgRelationOperationCompleted(object arg) {
+ if ((this.get_ORGANIZATIONS_UserByOrgRelationCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.get_ORGANIZATIONS_UserByOrgRelationCompleted(this, new get_ORGANIZATIONS_UserByOrgRelationCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
@@ -11001,46 +11120,34 @@
}
/// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_SourceBarCode_POStockInBack", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public ClsKf_ICStockBill_WMS get_SourceBarCode_POStockInBack(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HStockOrgID, ref string sErrMsg) {
- object[] results = this.Invoke("get_SourceBarCode_POStockInBack", new object[] {
- HInterID,
- HBillNo,
- HBillType,
- HSourceBillNo,
- HSourceBillType,
- HMaker,
- HStockOrgID,
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_CheckEntrustInBill", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public bool set_CheckEntrustInBill(ClsKf_EntrustInBillMain_K3 oMain, ref string sErrMsg) {
+ object[] results = this.Invoke("set_CheckEntrustInBill", new object[] {
+ oMain,
sErrMsg});
sErrMsg = ((string)(results[1]));
- return ((ClsKf_ICStockBill_WMS)(results[0]));
+ return ((bool)(results[0]));
}
/// <remarks/>
- public void get_SourceBarCode_POStockInBackAsync(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HStockOrgID, string sErrMsg) {
- this.get_SourceBarCode_POStockInBackAsync(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HStockOrgID, sErrMsg, null);
+ public void set_CheckEntrustInBillAsync(ClsKf_EntrustInBillMain_K3 oMain, string sErrMsg) {
+ this.set_CheckEntrustInBillAsync(oMain, sErrMsg, null);
}
/// <remarks/>
- public void get_SourceBarCode_POStockInBackAsync(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HStockOrgID, string sErrMsg, object userState) {
- if ((this.get_SourceBarCode_POStockInBackOperationCompleted == null)) {
- this.get_SourceBarCode_POStockInBackOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_SourceBarCode_POStockInBackOperationCompleted);
+ public void set_CheckEntrustInBillAsync(ClsKf_EntrustInBillMain_K3 oMain, string sErrMsg, object userState) {
+ if ((this.set_CheckEntrustInBillOperationCompleted == null)) {
+ this.set_CheckEntrustInBillOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_CheckEntrustInBillOperationCompleted);
}
- this.InvokeAsync("get_SourceBarCode_POStockInBack", new object[] {
- HInterID,
- HBillNo,
- HBillType,
- HSourceBillNo,
- HSourceBillType,
- HMaker,
- HStockOrgID,
- sErrMsg}, this.get_SourceBarCode_POStockInBackOperationCompleted, userState);
+ this.InvokeAsync("set_CheckEntrustInBill", new object[] {
+ oMain,
+ sErrMsg}, this.set_CheckEntrustInBillOperationCompleted, userState);
}
- private void Onget_SourceBarCode_POStockInBackOperationCompleted(object arg) {
- if ((this.get_SourceBarCode_POStockInBackCompleted != null)) {
+ private void Onset_CheckEntrustInBillOperationCompleted(object arg) {
+ if ((this.set_CheckEntrustInBillCompleted != null)) {
System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.get_SourceBarCode_POStockInBackCompleted(this, new get_SourceBarCode_POStockInBackCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ this.set_CheckEntrustInBillCompleted(this, new set_CheckEntrustInBillCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
@@ -13274,33 +13381,36 @@
}
/// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_ORGANIZATIONS_UserByOrgRelation", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public System.Data.DataSet get_ORGANIZATIONS_UserByOrgRelation(string HUserNumber, string HOrgName) {
- object[] results = this.Invoke("get_ORGANIZATIONS_UserByOrgRelation", new object[] {
- HUserNumber,
- HOrgName});
- return ((System.Data.DataSet)(results[0]));
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveEntrustOutBill_New", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public bool set_SaveEntrustOutBill_New(ClsKf_EntrustOutBillMain oMain, string sHSourceType, ref string sErrMsg) {
+ object[] results = this.Invoke("set_SaveEntrustOutBill_New", new object[] {
+ oMain,
+ sHSourceType,
+ sErrMsg});
+ sErrMsg = ((string)(results[1]));
+ return ((bool)(results[0]));
}
/// <remarks/>
- public void get_ORGANIZATIONS_UserByOrgRelationAsync(string HUserNumber, string HOrgName) {
- this.get_ORGANIZATIONS_UserByOrgRelationAsync(HUserNumber, HOrgName, null);
+ public void set_SaveEntrustOutBill_NewAsync(ClsKf_EntrustOutBillMain oMain, string sHSourceType, string sErrMsg) {
+ this.set_SaveEntrustOutBill_NewAsync(oMain, sHSourceType, sErrMsg, null);
}
/// <remarks/>
- public void get_ORGANIZATIONS_UserByOrgRelationAsync(string HUserNumber, string HOrgName, object userState) {
- if ((this.get_ORGANIZATIONS_UserByOrgRelationOperationCompleted == null)) {
- this.get_ORGANIZATIONS_UserByOrgRelationOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_ORGANIZATIONS_UserByOrgRelationOperationCompleted);
+ public void set_SaveEntrustOutBill_NewAsync(ClsKf_EntrustOutBillMain oMain, string sHSourceType, string sErrMsg, object userState) {
+ if ((this.set_SaveEntrustOutBill_NewOperationCompleted == null)) {
+ this.set_SaveEntrustOutBill_NewOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveEntrustOutBill_NewOperationCompleted);
}
- this.InvokeAsync("get_ORGANIZATIONS_UserByOrgRelation", new object[] {
- HUserNumber,
- HOrgName}, this.get_ORGANIZATIONS_UserByOrgRelationOperationCompleted, userState);
+ this.InvokeAsync("set_SaveEntrustOutBill_New", new object[] {
+ oMain,
+ sHSourceType,
+ sErrMsg}, this.set_SaveEntrustOutBill_NewOperationCompleted, userState);
}
- private void Onget_ORGANIZATIONS_UserByOrgRelationOperationCompleted(object arg) {
- if ((this.get_ORGANIZATIONS_UserByOrgRelationCompleted != null)) {
+ private void Onset_SaveEntrustOutBill_NewOperationCompleted(object arg) {
+ if ((this.set_SaveEntrustOutBill_NewCompleted != null)) {
System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.get_ORGANIZATIONS_UserByOrgRelationCompleted(this, new get_ORGANIZATIONS_UserByOrgRelationCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ this.set_SaveEntrustOutBill_NewCompleted(this, new set_SaveEntrustOutBill_NewCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
@@ -14900,34 +15010,38 @@
}
/// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_CheckEntrustInBill", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public bool set_CheckEntrustInBill(ClsKf_EntrustInBillMain_K3 oMain, ref string sErrMsg) {
- object[] results = this.Invoke("set_CheckEntrustInBill", new object[] {
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveMoveStockStepOutBill_CLD_New", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public bool set_SaveMoveStockStepOutBill_CLD_New(ClsKf_MoveStockStepOutBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg) {
+ object[] results = this.Invoke("set_SaveMoveStockStepOutBill_CLD_New", new object[] {
oMain,
+ sHSourceType,
+ oSystemParameterMain,
sErrMsg});
sErrMsg = ((string)(results[1]));
return ((bool)(results[0]));
}
/// <remarks/>
- public void set_CheckEntrustInBillAsync(ClsKf_EntrustInBillMain_K3 oMain, string sErrMsg) {
- this.set_CheckEntrustInBillAsync(oMain, sErrMsg, null);
+ public void set_SaveMoveStockStepOutBill_CLD_NewAsync(ClsKf_MoveStockStepOutBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, string sErrMsg) {
+ this.set_SaveMoveStockStepOutBill_CLD_NewAsync(oMain, sHSourceType, oSystemParameterMain, sErrMsg, null);
}
/// <remarks/>
- public void set_CheckEntrustInBillAsync(ClsKf_EntrustInBillMain_K3 oMain, string sErrMsg, object userState) {
- if ((this.set_CheckEntrustInBillOperationCompleted == null)) {
- this.set_CheckEntrustInBillOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_CheckEntrustInBillOperationCompleted);
+ public void set_SaveMoveStockStepOutBill_CLD_NewAsync(ClsKf_MoveStockStepOutBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, string sErrMsg, object userState) {
+ if ((this.set_SaveMoveStockStepOutBill_CLD_NewOperationCompleted == null)) {
+ this.set_SaveMoveStockStepOutBill_CLD_NewOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveMoveStockStepOutBill_CLD_NewOperationCompleted);
}
- this.InvokeAsync("set_CheckEntrustInBill", new object[] {
+ this.InvokeAsync("set_SaveMoveStockStepOutBill_CLD_New", new object[] {
oMain,
- sErrMsg}, this.set_CheckEntrustInBillOperationCompleted, userState);
+ sHSourceType,
+ oSystemParameterMain,
+ sErrMsg}, this.set_SaveMoveStockStepOutBill_CLD_NewOperationCompleted, userState);
}
- private void Onset_CheckEntrustInBillOperationCompleted(object arg) {
- if ((this.set_CheckEntrustInBillCompleted != null)) {
+ private void Onset_SaveMoveStockStepOutBill_CLD_NewOperationCompleted(object arg) {
+ if ((this.set_SaveMoveStockStepOutBill_CLD_NewCompleted != null)) {
System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.set_CheckEntrustInBillCompleted(this, new set_CheckEntrustInBillCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ this.set_SaveMoveStockStepOutBill_CLD_NewCompleted(this, new set_SaveMoveStockStepOutBill_CLD_NewCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
@@ -16581,40 +16695,6 @@
if ((this.GetKf_EntrustOutBill_K3_SourceCompleted != null)) {
System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
this.GetKf_EntrustOutBill_K3_SourceCompleted(this, new GetKf_EntrustOutBill_K3_SourceCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
- }
- }
-
- /// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveEntrustOutBill_New", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public bool set_SaveEntrustOutBill_New(ClsKf_EntrustOutBillMain oMain, string sHSourceType, ref string sErrMsg) {
- object[] results = this.Invoke("set_SaveEntrustOutBill_New", new object[] {
- oMain,
- sHSourceType,
- sErrMsg});
- sErrMsg = ((string)(results[1]));
- return ((bool)(results[0]));
- }
-
- /// <remarks/>
- public void set_SaveEntrustOutBill_NewAsync(ClsKf_EntrustOutBillMain oMain, string sHSourceType, string sErrMsg) {
- this.set_SaveEntrustOutBill_NewAsync(oMain, sHSourceType, sErrMsg, null);
- }
-
- /// <remarks/>
- public void set_SaveEntrustOutBill_NewAsync(ClsKf_EntrustOutBillMain oMain, string sHSourceType, string sErrMsg, object userState) {
- if ((this.set_SaveEntrustOutBill_NewOperationCompleted == null)) {
- this.set_SaveEntrustOutBill_NewOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveEntrustOutBill_NewOperationCompleted);
- }
- this.InvokeAsync("set_SaveEntrustOutBill_New", new object[] {
- oMain,
- sHSourceType,
- sErrMsg}, this.set_SaveEntrustOutBill_NewOperationCompleted, userState);
- }
-
- private void Onset_SaveEntrustOutBill_NewOperationCompleted(object arg) {
- if ((this.set_SaveEntrustOutBill_NewCompleted != null)) {
- System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.set_SaveEntrustOutBill_NewCompleted(this, new set_SaveEntrustOutBill_NewCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
@@ -19163,38 +19243,6 @@
}
/// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveMoveStockBill_CLD_BillCheck", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public bool set_SaveMoveStockBill_CLD_BillCheck(ClsKf_MoveStockBillMain oMain, ref string sErrMsg) {
- object[] results = this.Invoke("set_SaveMoveStockBill_CLD_BillCheck", new object[] {
- oMain,
- sErrMsg});
- sErrMsg = ((string)(results[1]));
- return ((bool)(results[0]));
- }
-
- /// <remarks/>
- public void set_SaveMoveStockBill_CLD_BillCheckAsync(ClsKf_MoveStockBillMain oMain, string sErrMsg) {
- this.set_SaveMoveStockBill_CLD_BillCheckAsync(oMain, sErrMsg, null);
- }
-
- /// <remarks/>
- public void set_SaveMoveStockBill_CLD_BillCheckAsync(ClsKf_MoveStockBillMain oMain, string sErrMsg, object userState) {
- if ((this.set_SaveMoveStockBill_CLD_BillCheckOperationCompleted == null)) {
- this.set_SaveMoveStockBill_CLD_BillCheckOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveMoveStockBill_CLD_BillCheckOperationCompleted);
- }
- this.InvokeAsync("set_SaveMoveStockBill_CLD_BillCheck", new object[] {
- oMain,
- sErrMsg}, this.set_SaveMoveStockBill_CLD_BillCheckOperationCompleted, userState);
- }
-
- private void Onset_SaveMoveStockBill_CLD_BillCheckOperationCompleted(object arg) {
- if ((this.set_SaveMoveStockBill_CLD_BillCheckCompleted != null)) {
- System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.set_SaveMoveStockBill_CLD_BillCheckCompleted(this, new set_SaveMoveStockBill_CLD_BillCheckCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
- }
- }
-
- /// <remarks/>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveMoveStockStepOutBill_New", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
public bool set_SaveMoveStockStepOutBill_New(ClsKf_MoveStockStepOutBillMain oMain, string sHSourceType, ref string sErrMsg) {
object[] results = this.Invoke("set_SaveMoveStockStepOutBill_New", new object[] {
@@ -19225,42 +19273,6 @@
if ((this.set_SaveMoveStockStepOutBill_NewCompleted != null)) {
System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
this.set_SaveMoveStockStepOutBill_NewCompleted(this, new set_SaveMoveStockStepOutBill_NewCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
- }
- }
-
- /// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveMoveStockStepOutBill_CLD_New", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public bool set_SaveMoveStockStepOutBill_CLD_New(ClsKf_MoveStockStepOutBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg) {
- object[] results = this.Invoke("set_SaveMoveStockStepOutBill_CLD_New", new object[] {
- oMain,
- sHSourceType,
- oSystemParameterMain,
- sErrMsg});
- sErrMsg = ((string)(results[1]));
- return ((bool)(results[0]));
- }
-
- /// <remarks/>
- public void set_SaveMoveStockStepOutBill_CLD_NewAsync(ClsKf_MoveStockStepOutBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, string sErrMsg) {
- this.set_SaveMoveStockStepOutBill_CLD_NewAsync(oMain, sHSourceType, oSystemParameterMain, sErrMsg, null);
- }
-
- /// <remarks/>
- public void set_SaveMoveStockStepOutBill_CLD_NewAsync(ClsKf_MoveStockStepOutBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, string sErrMsg, object userState) {
- if ((this.set_SaveMoveStockStepOutBill_CLD_NewOperationCompleted == null)) {
- this.set_SaveMoveStockStepOutBill_CLD_NewOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveMoveStockStepOutBill_CLD_NewOperationCompleted);
- }
- this.InvokeAsync("set_SaveMoveStockStepOutBill_CLD_New", new object[] {
- oMain,
- sHSourceType,
- oSystemParameterMain,
- sErrMsg}, this.set_SaveMoveStockStepOutBill_CLD_NewOperationCompleted, userState);
- }
-
- private void Onset_SaveMoveStockStepOutBill_CLD_NewOperationCompleted(object arg) {
- if ((this.set_SaveMoveStockStepOutBill_CLD_NewCompleted != null)) {
- System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.set_SaveMoveStockStepOutBill_CLD_NewCompleted(this, new set_SaveMoveStockStepOutBill_CLD_NewCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
@@ -36546,7 +36558,6 @@
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_PackUnionBillMain))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_PackDoubleBillMain))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_PackSplitBillMain))]
- [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_MoveStockStepOutBillMain))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_MoveStockBillMain))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_QualityReportBillMain))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_ICMOReportBillMain))]
@@ -36560,6 +36571,7 @@
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_StationInBillMain))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_SellOutBillMain))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_MoveStockStepInBillMain))]
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_MoveStockStepOutBillMain))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_ProductInBillMain_K3))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_AGVRequestBillMain))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_ProductInBillMain_CLD))]
@@ -37397,279 +37409,6 @@
}
set {
this.hUnitIDField = value;
- }
- }
- }
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
- [System.SerializableAttribute()]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
- public partial class ClsKf_MoveStockStepOutBillMain : ClsXt_BaseBillMain {
-
- private long hSupIDField;
-
- private long hWHIDField;
-
- private long hSCWHIDField;
-
- private long hEmpIDField;
-
- private long hManagerIDField;
-
- private long hSecManagerIDField;
-
- private long hKeeperIDField;
-
- private long hDeptIDField;
-
- private string hExplanationField;
-
- private string hInnerBillNoField;
-
- private bool hRedBlueFlagField;
-
- private string hAddressField;
-
- private string hLinkManField;
-
- private string hLinkPhoneField;
-
- private long hConveyTypeIDField;
-
- private long hConveyCompIDField;
-
- private double hConveyMoneyField;
-
- private string hStockStyleField;
-
- private long hStockInOrgIDField;
-
- private long hStockOutOrgIDField;
-
- private long hSTOCKORGIDField;
-
- private long hOWNERIDField;
-
- /// <remarks/>
- public long HSupID {
- get {
- return this.hSupIDField;
- }
- set {
- this.hSupIDField = value;
- }
- }
-
- /// <remarks/>
- public long HWHID {
- get {
- return this.hWHIDField;
- }
- set {
- this.hWHIDField = value;
- }
- }
-
- /// <remarks/>
- public long HSCWHID {
- get {
- return this.hSCWHIDField;
- }
- set {
- this.hSCWHIDField = value;
- }
- }
-
- /// <remarks/>
- public long HEmpID {
- get {
- return this.hEmpIDField;
- }
- set {
- this.hEmpIDField = value;
- }
- }
-
- /// <remarks/>
- public long HManagerID {
- get {
- return this.hManagerIDField;
- }
- set {
- this.hManagerIDField = value;
- }
- }
-
- /// <remarks/>
- public long HSecManagerID {
- get {
- return this.hSecManagerIDField;
- }
- set {
- this.hSecManagerIDField = value;
- }
- }
-
- /// <remarks/>
- public long HKeeperID {
- get {
- return this.hKeeperIDField;
- }
- set {
- this.hKeeperIDField = value;
- }
- }
-
- /// <remarks/>
- public long HDeptID {
- get {
- return this.hDeptIDField;
- }
- set {
- this.hDeptIDField = value;
- }
- }
-
- /// <remarks/>
- public string HExplanation {
- get {
- return this.hExplanationField;
- }
- set {
- this.hExplanationField = value;
- }
- }
-
- /// <remarks/>
- public string HInnerBillNo {
- get {
- return this.hInnerBillNoField;
- }
- set {
- this.hInnerBillNoField = value;
- }
- }
-
- /// <remarks/>
- public bool HRedBlueFlag {
- get {
- return this.hRedBlueFlagField;
- }
- set {
- this.hRedBlueFlagField = value;
- }
- }
-
- /// <remarks/>
- public string HAddress {
- get {
- return this.hAddressField;
- }
- set {
- this.hAddressField = value;
- }
- }
-
- /// <remarks/>
- public string HLinkMan {
- get {
- return this.hLinkManField;
- }
- set {
- this.hLinkManField = value;
- }
- }
-
- /// <remarks/>
- public string HLinkPhone {
- get {
- return this.hLinkPhoneField;
- }
- set {
- this.hLinkPhoneField = value;
- }
- }
-
- /// <remarks/>
- public long HConveyTypeID {
- get {
- return this.hConveyTypeIDField;
- }
- set {
- this.hConveyTypeIDField = value;
- }
- }
-
- /// <remarks/>
- public long HConveyCompID {
- get {
- return this.hConveyCompIDField;
- }
- set {
- this.hConveyCompIDField = value;
- }
- }
-
- /// <remarks/>
- public double HConveyMoney {
- get {
- return this.hConveyMoneyField;
- }
- set {
- this.hConveyMoneyField = value;
- }
- }
-
- /// <remarks/>
- public string HStockStyle {
- get {
- return this.hStockStyleField;
- }
- set {
- this.hStockStyleField = value;
- }
- }
-
- /// <remarks/>
- public long HStockInOrgID {
- get {
- return this.hStockInOrgIDField;
- }
- set {
- this.hStockInOrgIDField = value;
- }
- }
-
- /// <remarks/>
- public long HStockOutOrgID {
- get {
- return this.hStockOutOrgIDField;
- }
- set {
- this.hStockOutOrgIDField = value;
- }
- }
-
- /// <remarks/>
- public long HSTOCKORGID {
- get {
- return this.hSTOCKORGIDField;
- }
- set {
- this.hSTOCKORGIDField = value;
- }
- }
-
- /// <remarks/>
- public long HOWNERID {
- get {
- return this.hOWNERIDField;
- }
- set {
- this.hOWNERIDField = value;
}
}
}
@@ -39985,6 +39724,279 @@
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
public partial class ClsKf_MoveStockStepInBillMain : ClsXt_BaseBillMain {
+
+ private long hSupIDField;
+
+ private long hWHIDField;
+
+ private long hSCWHIDField;
+
+ private long hEmpIDField;
+
+ private long hManagerIDField;
+
+ private long hSecManagerIDField;
+
+ private long hKeeperIDField;
+
+ private long hDeptIDField;
+
+ private string hExplanationField;
+
+ private string hInnerBillNoField;
+
+ private bool hRedBlueFlagField;
+
+ private string hAddressField;
+
+ private string hLinkManField;
+
+ private string hLinkPhoneField;
+
+ private long hConveyTypeIDField;
+
+ private long hConveyCompIDField;
+
+ private double hConveyMoneyField;
+
+ private string hStockStyleField;
+
+ private long hStockInOrgIDField;
+
+ private long hStockOutOrgIDField;
+
+ private long hSTOCKORGIDField;
+
+ private long hOWNERIDField;
+
+ /// <remarks/>
+ public long HSupID {
+ get {
+ return this.hSupIDField;
+ }
+ set {
+ this.hSupIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HWHID {
+ get {
+ return this.hWHIDField;
+ }
+ set {
+ this.hWHIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HSCWHID {
+ get {
+ return this.hSCWHIDField;
+ }
+ set {
+ this.hSCWHIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HEmpID {
+ get {
+ return this.hEmpIDField;
+ }
+ set {
+ this.hEmpIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HManagerID {
+ get {
+ return this.hManagerIDField;
+ }
+ set {
+ this.hManagerIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HSecManagerID {
+ get {
+ return this.hSecManagerIDField;
+ }
+ set {
+ this.hSecManagerIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HKeeperID {
+ get {
+ return this.hKeeperIDField;
+ }
+ set {
+ this.hKeeperIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HDeptID {
+ get {
+ return this.hDeptIDField;
+ }
+ set {
+ this.hDeptIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HExplanation {
+ get {
+ return this.hExplanationField;
+ }
+ set {
+ this.hExplanationField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HInnerBillNo {
+ get {
+ return this.hInnerBillNoField;
+ }
+ set {
+ this.hInnerBillNoField = value;
+ }
+ }
+
+ /// <remarks/>
+ public bool HRedBlueFlag {
+ get {
+ return this.hRedBlueFlagField;
+ }
+ set {
+ this.hRedBlueFlagField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HAddress {
+ get {
+ return this.hAddressField;
+ }
+ set {
+ this.hAddressField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HLinkMan {
+ get {
+ return this.hLinkManField;
+ }
+ set {
+ this.hLinkManField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HLinkPhone {
+ get {
+ return this.hLinkPhoneField;
+ }
+ set {
+ this.hLinkPhoneField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HConveyTypeID {
+ get {
+ return this.hConveyTypeIDField;
+ }
+ set {
+ this.hConveyTypeIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HConveyCompID {
+ get {
+ return this.hConveyCompIDField;
+ }
+ set {
+ this.hConveyCompIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public double HConveyMoney {
+ get {
+ return this.hConveyMoneyField;
+ }
+ set {
+ this.hConveyMoneyField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HStockStyle {
+ get {
+ return this.hStockStyleField;
+ }
+ set {
+ this.hStockStyleField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HStockInOrgID {
+ get {
+ return this.hStockInOrgIDField;
+ }
+ set {
+ this.hStockInOrgIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HStockOutOrgID {
+ get {
+ return this.hStockOutOrgIDField;
+ }
+ set {
+ this.hStockOutOrgIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HSTOCKORGID {
+ get {
+ return this.hSTOCKORGIDField;
+ }
+ set {
+ this.hSTOCKORGIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HOWNERID {
+ get {
+ return this.hOWNERIDField;
+ }
+ set {
+ this.hOWNERIDField = value;
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+ [System.SerializableAttribute()]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
+ public partial class ClsKf_MoveStockStepOutBillMain : ClsXt_BaseBillMain {
private long hSupIDField;
@@ -51243,6 +51255,40 @@
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+ public delegate void get_SourceBarCode_POStockInBackCompletedEventHandler(object sender, get_SourceBarCode_POStockInBackCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class get_SourceBarCode_POStockInBackCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal get_SourceBarCode_POStockInBackCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public ClsKf_ICStockBill_WMS Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((ClsKf_ICStockBill_WMS)(this.results[0]));
+ }
+ }
+
+ /// <remarks/>
+ public string sErrMsg {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[1]));
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
public delegate void get_SourceBarCode_MateOutBackCompletedEventHandler(object sender, get_SourceBarCode_MateOutBackCompletedEventArgs e);
/// <remarks/>
@@ -51254,6 +51300,40 @@
private object[] results;
internal get_SourceBarCode_MateOutBackCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public ClsKf_ICStockBill_WMS Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((ClsKf_ICStockBill_WMS)(this.results[0]));
+ }
+ }
+
+ /// <remarks/>
+ public string sErrMsg {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[1]));
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+ public delegate void get_SourceBarCode_SellOutBackCompletedEventHandler(object sender, get_SourceBarCode_SellOutBackCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class get_SourceBarCode_SellOutBackCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal get_SourceBarCode_SellOutBackCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
base(exception, cancelled, userState) {
this.results = results;
}
@@ -54105,6 +54185,32 @@
get {
this.RaiseExceptionIfNecessary();
return ((string)(this.results[7]));
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+ public delegate void get_ORGANIZATIONS_UserByOrgRelationCompletedEventHandler(object sender, get_ORGANIZATIONS_UserByOrgRelationCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class get_ORGANIZATIONS_UserByOrgRelationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal get_ORGANIZATIONS_UserByOrgRelationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public System.Data.DataSet Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((System.Data.DataSet)(this.results[0]));
}
}
}
@@ -57237,26 +57343,26 @@
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
- public delegate void get_SourceBarCode_POStockInBackCompletedEventHandler(object sender, get_SourceBarCode_POStockInBackCompletedEventArgs e);
+ public delegate void set_CheckEntrustInBillCompletedEventHandler(object sender, set_CheckEntrustInBillCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class get_SourceBarCode_POStockInBackCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+ public partial class set_CheckEntrustInBillCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
private object[] results;
- internal get_SourceBarCode_POStockInBackCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ internal set_CheckEntrustInBillCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
base(exception, cancelled, userState) {
this.results = results;
}
/// <remarks/>
- public ClsKf_ICStockBill_WMS Result {
+ public bool Result {
get {
this.RaiseExceptionIfNecessary();
- return ((ClsKf_ICStockBill_WMS)(this.results[0]));
+ return ((bool)(this.results[0]));
}
}
@@ -59425,26 +59531,34 @@
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
- public delegate void get_ORGANIZATIONS_UserByOrgRelationCompletedEventHandler(object sender, get_ORGANIZATIONS_UserByOrgRelationCompletedEventArgs e);
+ public delegate void set_SaveEntrustOutBill_NewCompletedEventHandler(object sender, set_SaveEntrustOutBill_NewCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class get_ORGANIZATIONS_UserByOrgRelationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+ public partial class set_SaveEntrustOutBill_NewCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
private object[] results;
- internal get_ORGANIZATIONS_UserByOrgRelationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ internal set_SaveEntrustOutBill_NewCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
base(exception, cancelled, userState) {
this.results = results;
}
/// <remarks/>
- public System.Data.DataSet Result {
+ public bool Result {
get {
this.RaiseExceptionIfNecessary();
- return ((System.Data.DataSet)(this.results[0]));
+ return ((bool)(this.results[0]));
+ }
+ }
+
+ /// <remarks/>
+ public string sErrMsg {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[1]));
}
}
}
@@ -61089,17 +61203,17 @@
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
- public delegate void set_CheckEntrustInBillCompletedEventHandler(object sender, set_CheckEntrustInBillCompletedEventArgs e);
+ public delegate void set_SaveMoveStockStepOutBill_CLD_NewCompletedEventHandler(object sender, set_SaveMoveStockStepOutBill_CLD_NewCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class set_CheckEntrustInBillCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+ public partial class set_SaveMoveStockStepOutBill_CLD_NewCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
private object[] results;
- internal set_CheckEntrustInBillCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ internal set_SaveMoveStockStepOutBill_CLD_NewCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
base(exception, cancelled, userState) {
this.results = results;
}
@@ -62743,40 +62857,6 @@
get {
this.RaiseExceptionIfNecessary();
return ((System.Data.DataSet)(this.results[0]));
- }
- }
- }
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
- public delegate void set_SaveEntrustOutBill_NewCompletedEventHandler(object sender, set_SaveEntrustOutBill_NewCompletedEventArgs e);
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class set_SaveEntrustOutBill_NewCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-
- private object[] results;
-
- internal set_SaveEntrustOutBill_NewCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
- base(exception, cancelled, userState) {
- this.results = results;
- }
-
- /// <remarks/>
- public bool Result {
- get {
- this.RaiseExceptionIfNecessary();
- return ((bool)(this.results[0]));
- }
- }
-
- /// <remarks/>
- public string sErrMsg {
- get {
- this.RaiseExceptionIfNecessary();
- return ((string)(this.results[1]));
}
}
}
@@ -64801,40 +64881,6 @@
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
- public delegate void set_SaveMoveStockBill_CLD_BillCheckCompletedEventHandler(object sender, set_SaveMoveStockBill_CLD_BillCheckCompletedEventArgs e);
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class set_SaveMoveStockBill_CLD_BillCheckCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-
- private object[] results;
-
- internal set_SaveMoveStockBill_CLD_BillCheckCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
- base(exception, cancelled, userState) {
- this.results = results;
- }
-
- /// <remarks/>
- public bool Result {
- get {
- this.RaiseExceptionIfNecessary();
- return ((bool)(this.results[0]));
- }
- }
-
- /// <remarks/>
- public string sErrMsg {
- get {
- this.RaiseExceptionIfNecessary();
- return ((string)(this.results[1]));
- }
- }
- }
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
public delegate void set_SaveMoveStockStepOutBill_NewCompletedEventHandler(object sender, set_SaveMoveStockStepOutBill_NewCompletedEventArgs e);
/// <remarks/>
@@ -64846,40 +64892,6 @@
private object[] results;
internal set_SaveMoveStockStepOutBill_NewCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
- base(exception, cancelled, userState) {
- this.results = results;
- }
-
- /// <remarks/>
- public bool Result {
- get {
- this.RaiseExceptionIfNecessary();
- return ((bool)(this.results[0]));
- }
- }
-
- /// <remarks/>
- public string sErrMsg {
- get {
- this.RaiseExceptionIfNecessary();
- return ((string)(this.results[1]));
- }
- }
- }
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
- public delegate void set_SaveMoveStockStepOutBill_CLD_NewCompletedEventHandler(object sender, set_SaveMoveStockStepOutBill_CLD_NewCompletedEventArgs e);
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class set_SaveMoveStockStepOutBill_CLD_NewCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-
- private object[] results;
-
- internal set_SaveMoveStockStepOutBill_CLD_NewCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
base(exception, cancelled, userState) {
this.results = results;
}
diff --git a/WebAPI/Web References/WebS/WebService1.wsdl b/WebAPI/Web References/WebS/WebService1.wsdl
index 17599d7..424b76f 100644
--- a/WebAPI/Web References/WebS/WebService1.wsdl
+++ b/WebAPI/Web References/WebS/WebService1.wsdl
@@ -2,7 +2,7 @@
<wsdl:definitions xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://tempuri.org/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
<s:schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/">
- <s:element name="get_SourceBarCode_MateOutBack">
+ <s:element name="get_SourceBarCode_POStockInBack">
<s:complexType>
<s:sequence>
<s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" />
@@ -16,10 +16,10 @@
</s:sequence>
</s:complexType>
</s:element>
- <s:element name="get_SourceBarCode_MateOutBackResponse">
+ <s:element name="get_SourceBarCode_POStockInBackResponse">
<s:complexType>
<s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="get_SourceBarCode_MateOutBackResult" type="tns:ClsKf_ICStockBill_WMS" />
+ <s:element minOccurs="0" maxOccurs="1" name="get_SourceBarCode_POStockInBackResult" type="tns:ClsKf_ICStockBill_WMS" />
<s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
@@ -66,6 +66,50 @@
<s:element minOccurs="1" maxOccurs="1" name="HSourceBarCodeFlag" type="s:boolean" />
</s:sequence>
</s:complexType>
+ <s:element name="get_SourceBarCode_MateOutBack">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillType" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HSourceBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HSourceBillType" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HMaker" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HStockOrgID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="get_SourceBarCode_MateOutBackResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="get_SourceBarCode_MateOutBackResult" type="tns:ClsKf_ICStockBill_WMS" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="get_SourceBarCode_SellOutBack">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillType" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HSourceBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HSourceBillType" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HMaker" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HStockOrgID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="get_SourceBarCode_SellOutBackResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="get_SourceBarCode_SellOutBackResult" type="tns:ClsKf_ICStockBill_WMS" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
<s:element name="get_BarCode">
<s:complexType>
<s:sequence>
@@ -2603,6 +2647,28 @@
</s:sequence>
</s:complexType>
</s:element>
+ <s:element name="get_ORGANIZATIONS_UserByOrgRelation">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="HUserNumber" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HOrgName" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="get_ORGANIZATIONS_UserByOrgRelationResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="get_ORGANIZATIONS_UserByOrgRelationResult">
+ <s:complexType>
+ <s:sequence>
+ <s:element ref="s:schema" />
+ <s:any />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ </s:sequence>
+ </s:complexType>
+ </s:element>
<s:element name="get_ORGANIZATIONSIDByName">
<s:complexType>
<s:sequence>
@@ -4574,29 +4640,7 @@
</s:sequence>
</s:complexType>
</s:element>
- <s:element name="get_SourceBarCode_POStockInBack">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HBillType" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HSourceBillNo" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HSourceBillType" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HMaker" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HStockOrgID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="get_SourceBarCode_POStockInBackResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="get_SourceBarCode_POStockInBackResult" type="tns:ClsKf_ICStockBill_WMS" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="set_AuditEntrustInBill">
+ <s:element name="set_CheckEntrustInBill">
<s:complexType>
<s:sequence>
<s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_EntrustInBillMain_K3" />
@@ -4628,6 +4672,22 @@
</s:extension>
</s:complexContent>
</s:complexType>
+ <s:element name="set_CheckEntrustInBillResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="set_CheckEntrustInBillResult" type="s:boolean" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="set_AuditEntrustInBill">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_EntrustInBillMain_K3" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
<s:element name="set_AuditEntrustInBillResponse">
<s:complexType>
<s:sequence>
@@ -6141,34 +6201,11 @@
</s:sequence>
</s:complexType>
</s:element>
- <s:element name="get_ORGANIZATIONS_UserByOrgRelation">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="HUserNumber" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HOrgName" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="get_ORGANIZATIONS_UserByOrgRelationResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="get_ORGANIZATIONS_UserByOrgRelationResult">
- <s:complexType>
- <s:sequence>
- <s:element ref="s:schema" />
- <s:any />
- </s:sequence>
- </s:complexType>
- </s:element>
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="set_SaveEntrustOutBill_CLD_New">
+ <s:element name="set_SaveEntrustOutBill_New">
<s:complexType>
<s:sequence>
<s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_EntrustOutBillMain" />
<s:element minOccurs="0" maxOccurs="1" name="sHSourceType" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="oSystemParameterMain" type="tns:ClsXt_SystemParameterMain" />
<s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
@@ -6194,6 +6231,24 @@
</s:extension>
</s:complexContent>
</s:complexType>
+ <s:element name="set_SaveEntrustOutBill_NewResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="set_SaveEntrustOutBill_NewResult" type="s:boolean" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="set_SaveEntrustOutBill_CLD_New">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_EntrustOutBillMain" />
+ <s:element minOccurs="0" maxOccurs="1" name="sHSourceType" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="oSystemParameterMain" type="tns:ClsXt_SystemParameterMain" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
<s:element name="set_SaveEntrustOutBill_CLD_NewResponse">
<s:complexType>
<s:sequence>
@@ -7153,18 +7208,50 @@
</s:sequence>
</s:complexType>
</s:element>
- <s:element name="set_CheckEntrustInBill">
+ <s:element name="set_SaveMoveStockStepOutBill_CLD_New">
<s:complexType>
<s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_EntrustInBillMain_K3" />
+ <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_MoveStockStepOutBillMain" />
+ <s:element minOccurs="0" maxOccurs="1" name="sHSourceType" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="oSystemParameterMain" type="tns:ClsXt_SystemParameterMain" />
<s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
</s:element>
- <s:element name="set_CheckEntrustInBillResponse">
+ <s:complexType name="ClsKf_MoveStockStepOutBillMain">
+ <s:complexContent mixed="false">
+ <s:extension base="tns:ClsXt_BaseBillMain">
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="HSupID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HWHID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSCWHID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HEmpID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HManagerID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSecManagerID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HKeeperID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HDeptID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HExplanation" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HInnerBillNo" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HRedBlueFlag" type="s:boolean" />
+ <s:element minOccurs="0" maxOccurs="1" name="HAddress" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HLinkMan" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HLinkPhone" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HConveyTypeID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HConveyCompID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HConveyMoney" type="s:double" />
+ <s:element minOccurs="0" maxOccurs="1" name="HStockStyle" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HStockInOrgID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HStockOutOrgID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSTOCKORGID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
+ </s:sequence>
+ </s:extension>
+ </s:complexContent>
+ </s:complexType>
+ <s:element name="set_SaveMoveStockStepOutBill_CLD_NewResponse">
<s:complexType>
<s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="set_CheckEntrustInBillResult" type="s:boolean" />
+ <s:element minOccurs="1" maxOccurs="1" name="set_SaveMoveStockStepOutBill_CLD_NewResult" type="s:boolean" />
<s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
@@ -8438,23 +8525,6 @@
</s:sequence>
</s:complexType>
</s:element>
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="set_SaveEntrustOutBill_New">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_EntrustOutBillMain" />
- <s:element minOccurs="0" maxOccurs="1" name="sHSourceType" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="set_SaveEntrustOutBill_NewResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="set_SaveEntrustOutBill_NewResult" type="s:boolean" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
</s:element>
@@ -10001,22 +10071,6 @@
</s:sequence>
</s:complexType>
</s:element>
- <s:element name="set_SaveMoveStockBill_CLD_BillCheck">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_MoveStockBillMain" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="set_SaveMoveStockBill_CLD_BillCheckResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="set_SaveMoveStockBill_CLD_BillCheckResult" type="s:boolean" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
<s:element name="set_SaveMoveStockStepOutBill_New">
<s:complexType>
<s:sequence>
@@ -10026,58 +10080,10 @@
</s:sequence>
</s:complexType>
</s:element>
- <s:complexType name="ClsKf_MoveStockStepOutBillMain">
- <s:complexContent mixed="false">
- <s:extension base="tns:ClsXt_BaseBillMain">
- <s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="HSupID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HWHID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HSCWHID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HEmpID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HManagerID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HSecManagerID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HKeeperID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HDeptID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="HExplanation" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HInnerBillNo" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HRedBlueFlag" type="s:boolean" />
- <s:element minOccurs="0" maxOccurs="1" name="HAddress" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HLinkMan" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HLinkPhone" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HConveyTypeID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HConveyCompID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HConveyMoney" type="s:double" />
- <s:element minOccurs="0" maxOccurs="1" name="HStockStyle" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HStockInOrgID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HStockOutOrgID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HSTOCKORGID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
- </s:sequence>
- </s:extension>
- </s:complexContent>
- </s:complexType>
<s:element name="set_SaveMoveStockStepOutBill_NewResponse">
<s:complexType>
<s:sequence>
<s:element minOccurs="1" maxOccurs="1" name="set_SaveMoveStockStepOutBill_NewResult" type="s:boolean" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="set_SaveMoveStockStepOutBill_CLD_New">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_MoveStockStepOutBillMain" />
- <s:element minOccurs="0" maxOccurs="1" name="sHSourceType" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="oSystemParameterMain" type="tns:ClsXt_SystemParameterMain" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="set_SaveMoveStockStepOutBill_CLD_NewResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="set_SaveMoveStockStepOutBill_CLD_NewResult" type="s:boolean" />
<s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
@@ -14169,11 +14175,23 @@
</s:element>
</s:schema>
</wsdl:types>
+ <wsdl:message name="get_SourceBarCode_POStockInBackSoapIn">
+ <wsdl:part name="parameters" element="tns:get_SourceBarCode_POStockInBack" />
+ </wsdl:message>
+ <wsdl:message name="get_SourceBarCode_POStockInBackSoapOut">
+ <wsdl:part name="parameters" element="tns:get_SourceBarCode_POStockInBackResponse" />
+ </wsdl:message>
<wsdl:message name="get_SourceBarCode_MateOutBackSoapIn">
<wsdl:part name="parameters" element="tns:get_SourceBarCode_MateOutBack" />
</wsdl:message>
<wsdl:message name="get_SourceBarCode_MateOutBackSoapOut">
<wsdl:part name="parameters" element="tns:get_SourceBarCode_MateOutBackResponse" />
+ </wsdl:message>
+ <wsdl:message name="get_SourceBarCode_SellOutBackSoapIn">
+ <wsdl:part name="parameters" element="tns:get_SourceBarCode_SellOutBack" />
+ </wsdl:message>
+ <wsdl:message name="get_SourceBarCode_SellOutBackSoapOut">
+ <wsdl:part name="parameters" element="tns:get_SourceBarCode_SellOutBackResponse" />
</wsdl:message>
<wsdl:message name="get_BarCodeSoapIn">
<wsdl:part name="parameters" element="tns:get_BarCode" />
@@ -14660,6 +14678,12 @@
</wsdl:message>
<wsdl:message name="set_SavePonderationBillMain_Temp_BarCode_MouldSoapOut">
<wsdl:part name="parameters" element="tns:set_SavePonderationBillMain_Temp_BarCode_MouldResponse" />
+ </wsdl:message>
+ <wsdl:message name="get_ORGANIZATIONS_UserByOrgRelationSoapIn">
+ <wsdl:part name="parameters" element="tns:get_ORGANIZATIONS_UserByOrgRelation" />
+ </wsdl:message>
+ <wsdl:message name="get_ORGANIZATIONS_UserByOrgRelationSoapOut">
+ <wsdl:part name="parameters" element="tns:get_ORGANIZATIONS_UserByOrgRelationResponse" />
</wsdl:message>
<wsdl:message name="get_ORGANIZATIONSIDByNameSoapIn">
<wsdl:part name="parameters" element="tns:get_ORGANIZATIONSIDByName" />
@@ -15159,11 +15183,11 @@
<wsdl:message name="get_SourceBarCode_MoveStockStepInSoapOut">
<wsdl:part name="parameters" element="tns:get_SourceBarCode_MoveStockStepInResponse" />
</wsdl:message>
- <wsdl:message name="get_SourceBarCode_POStockInBackSoapIn">
- <wsdl:part name="parameters" element="tns:get_SourceBarCode_POStockInBack" />
+ <wsdl:message name="set_CheckEntrustInBillSoapIn">
+ <wsdl:part name="parameters" element="tns:set_CheckEntrustInBill" />
</wsdl:message>
- <wsdl:message name="get_SourceBarCode_POStockInBackSoapOut">
- <wsdl:part name="parameters" element="tns:get_SourceBarCode_POStockInBackResponse" />
+ <wsdl:message name="set_CheckEntrustInBillSoapOut">
+ <wsdl:part name="parameters" element="tns:set_CheckEntrustInBillResponse" />
</wsdl:message>
<wsdl:message name="set_AuditEntrustInBillSoapIn">
<wsdl:part name="parameters" element="tns:set_AuditEntrustInBill" />
@@ -15555,11 +15579,11 @@
<wsdl:message name="get_ORGANIZATIONSSoapOut">
<wsdl:part name="parameters" element="tns:get_ORGANIZATIONSResponse" />
</wsdl:message>
- <wsdl:message name="get_ORGANIZATIONS_UserByOrgRelationSoapIn">
- <wsdl:part name="parameters" element="tns:get_ORGANIZATIONS_UserByOrgRelation" />
+ <wsdl:message name="set_SaveEntrustOutBill_NewSoapIn">
+ <wsdl:part name="parameters" element="tns:set_SaveEntrustOutBill_New" />
</wsdl:message>
- <wsdl:message name="get_ORGANIZATIONS_UserByOrgRelationSoapOut">
- <wsdl:part name="parameters" element="tns:get_ORGANIZATIONS_UserByOrgRelationResponse" />
+ <wsdl:message name="set_SaveEntrustOutBill_NewSoapOut">
+ <wsdl:part name="parameters" element="tns:set_SaveEntrustOutBill_NewResponse" />
</wsdl:message>
<wsdl:message name="set_SaveEntrustOutBill_CLD_NewSoapIn">
<wsdl:part name="parameters" element="tns:set_SaveEntrustOutBill_CLD_New" />
@@ -15843,11 +15867,11 @@
<wsdl:message name="set_CheckAddEntrustInBillSoapOut">
<wsdl:part name="parameters" element="tns:set_CheckAddEntrustInBillResponse" />
</wsdl:message>
- <wsdl:message name="set_CheckEntrustInBillSoapIn">
- <wsdl:part name="parameters" element="tns:set_CheckEntrustInBill" />
+ <wsdl:message name="set_SaveMoveStockStepOutBill_CLD_NewSoapIn">
+ <wsdl:part name="parameters" element="tns:set_SaveMoveStockStepOutBill_CLD_New" />
</wsdl:message>
- <wsdl:message name="set_CheckEntrustInBillSoapOut">
- <wsdl:part name="parameters" element="tns:set_CheckEntrustInBillResponse" />
+ <wsdl:message name="set_SaveMoveStockStepOutBill_CLD_NewSoapOut">
+ <wsdl:part name="parameters" element="tns:set_SaveMoveStockStepOutBill_CLD_NewResponse" />
</wsdl:message>
<wsdl:message name="set_SaveMoveStockStepInBill_NewSoapIn">
<wsdl:part name="parameters" element="tns:set_SaveMoveStockStepInBill_New" />
@@ -16142,12 +16166,6 @@
</wsdl:message>
<wsdl:message name="GetKf_EntrustOutBill_K3_SourceSoapOut">
<wsdl:part name="parameters" element="tns:GetKf_EntrustOutBill_K3_SourceResponse" />
- </wsdl:message>
- <wsdl:message name="set_SaveEntrustOutBill_NewSoapIn">
- <wsdl:part name="parameters" element="tns:set_SaveEntrustOutBill_New" />
- </wsdl:message>
- <wsdl:message name="set_SaveEntrustOutBill_NewSoapOut">
- <wsdl:part name="parameters" element="tns:set_SaveEntrustOutBill_NewResponse" />
</wsdl:message>
<wsdl:message name="set_ClearPonderationBillMain_Temp_ChangGuiSoapIn">
<wsdl:part name="parameters" element="tns:set_ClearPonderationBillMain_Temp_ChangGui" />
@@ -16539,23 +16557,11 @@
<wsdl:message name="set_SaveMoveStockBill_BillCheckSoapOut">
<wsdl:part name="parameters" element="tns:set_SaveMoveStockBill_BillCheckResponse" />
</wsdl:message>
- <wsdl:message name="set_SaveMoveStockBill_CLD_BillCheckSoapIn">
- <wsdl:part name="parameters" element="tns:set_SaveMoveStockBill_CLD_BillCheck" />
- </wsdl:message>
- <wsdl:message name="set_SaveMoveStockBill_CLD_BillCheckSoapOut">
- <wsdl:part name="parameters" element="tns:set_SaveMoveStockBill_CLD_BillCheckResponse" />
- </wsdl:message>
<wsdl:message name="set_SaveMoveStockStepOutBill_NewSoapIn">
<wsdl:part name="parameters" element="tns:set_SaveMoveStockStepOutBill_New" />
</wsdl:message>
<wsdl:message name="set_SaveMoveStockStepOutBill_NewSoapOut">
<wsdl:part name="parameters" element="tns:set_SaveMoveStockStepOutBill_NewResponse" />
- </wsdl:message>
- <wsdl:message name="set_SaveMoveStockStepOutBill_CLD_NewSoapIn">
- <wsdl:part name="parameters" element="tns:set_SaveMoveStockStepOutBill_CLD_New" />
- </wsdl:message>
- <wsdl:message name="set_SaveMoveStockStepOutBill_CLD_NewSoapOut">
- <wsdl:part name="parameters" element="tns:set_SaveMoveStockStepOutBill_CLD_NewResponse" />
</wsdl:message>
<wsdl:message name="GetSc_ICMOBillListSoapIn">
<wsdl:part name="parameters" element="tns:GetSc_ICMOBillList" />
@@ -17578,9 +17584,17 @@
<wsdl:part name="parameters" element="tns:GetSc_ICMOBackBillListResponse" />
</wsdl:message>
<wsdl:portType name="WebService1Soap">
+ <wsdl:operation name="get_SourceBarCode_POStockInBack">
+ <wsdl:input message="tns:get_SourceBarCode_POStockInBackSoapIn" />
+ <wsdl:output message="tns:get_SourceBarCode_POStockInBackSoapOut" />
+ </wsdl:operation>
<wsdl:operation name="get_SourceBarCode_MateOutBack">
<wsdl:input message="tns:get_SourceBarCode_MateOutBackSoapIn" />
<wsdl:output message="tns:get_SourceBarCode_MateOutBackSoapOut" />
+ </wsdl:operation>
+ <wsdl:operation name="get_SourceBarCode_SellOutBack">
+ <wsdl:input message="tns:get_SourceBarCode_SellOutBackSoapIn" />
+ <wsdl:output message="tns:get_SourceBarCode_SellOutBackSoapOut" />
</wsdl:operation>
<wsdl:operation name="get_BarCode">
<wsdl:input message="tns:get_BarCodeSoapIn" />
@@ -17905,6 +17919,10 @@
<wsdl:operation name="set_SavePonderationBillMain_Temp_BarCode_Mould">
<wsdl:input message="tns:set_SavePonderationBillMain_Temp_BarCode_MouldSoapIn" />
<wsdl:output message="tns:set_SavePonderationBillMain_Temp_BarCode_MouldSoapOut" />
+ </wsdl:operation>
+ <wsdl:operation name="get_ORGANIZATIONS_UserByOrgRelation">
+ <wsdl:input message="tns:get_ORGANIZATIONS_UserByOrgRelationSoapIn" />
+ <wsdl:output message="tns:get_ORGANIZATIONS_UserByOrgRelationSoapOut" />
</wsdl:operation>
<wsdl:operation name="get_ORGANIZATIONSIDByName">
<wsdl:input message="tns:get_ORGANIZATIONSIDByNameSoapIn" />
@@ -18238,9 +18256,9 @@
<wsdl:input message="tns:get_SourceBarCode_MoveStockStepInSoapIn" />
<wsdl:output message="tns:get_SourceBarCode_MoveStockStepInSoapOut" />
</wsdl:operation>
- <wsdl:operation name="get_SourceBarCode_POStockInBack">
- <wsdl:input message="tns:get_SourceBarCode_POStockInBackSoapIn" />
- <wsdl:output message="tns:get_SourceBarCode_POStockInBackSoapOut" />
+ <wsdl:operation name="set_CheckEntrustInBill">
+ <wsdl:input message="tns:set_CheckEntrustInBillSoapIn" />
+ <wsdl:output message="tns:set_CheckEntrustInBillSoapOut" />
</wsdl:operation>
<wsdl:operation name="set_AuditEntrustInBill">
<wsdl:input message="tns:set_AuditEntrustInBillSoapIn" />
@@ -18502,9 +18520,9 @@
<wsdl:input message="tns:get_ORGANIZATIONSSoapIn" />
<wsdl:output message="tns:get_ORGANIZATIONSSoapOut" />
</wsdl:operation>
- <wsdl:operation name="get_ORGANIZATIONS_UserByOrgRelation">
- <wsdl:input message="tns:get_ORGANIZATIONS_UserByOrgRelationSoapIn" />
- <wsdl:output message="tns:get_ORGANIZATIONS_UserByOrgRelationSoapOut" />
+ <wsdl:operation name="set_SaveEntrustOutBill_New">
+ <wsdl:input message="tns:set_SaveEntrustOutBill_NewSoapIn" />
+ <wsdl:output message="tns:set_SaveEntrustOutBill_NewSoapOut" />
</wsdl:operation>
<wsdl:operation name="set_SaveEntrustOutBill_CLD_New">
<wsdl:input message="tns:set_SaveEntrustOutBill_CLD_NewSoapIn" />
@@ -18694,9 +18712,9 @@
<wsdl:input message="tns:set_CheckAddEntrustInBillSoapIn" />
<wsdl:output message="tns:set_CheckAddEntrustInBillSoapOut" />
</wsdl:operation>
- <wsdl:operation name="set_CheckEntrustInBill">
- <wsdl:input message="tns:set_CheckEntrustInBillSoapIn" />
- <wsdl:output message="tns:set_CheckEntrustInBillSoapOut" />
+ <wsdl:operation name="set_SaveMoveStockStepOutBill_CLD_New">
+ <wsdl:input message="tns:set_SaveMoveStockStepOutBill_CLD_NewSoapIn" />
+ <wsdl:output message="tns:set_SaveMoveStockStepOutBill_CLD_NewSoapOut" />
</wsdl:operation>
<wsdl:operation name="set_SaveMoveStockStepInBill_New">
<wsdl:input message="tns:set_SaveMoveStockStepInBill_NewSoapIn" />
@@ -18893,10 +18911,6 @@
<wsdl:operation name="GetKf_EntrustOutBill_K3_Source">
<wsdl:input message="tns:GetKf_EntrustOutBill_K3_SourceSoapIn" />
<wsdl:output message="tns:GetKf_EntrustOutBill_K3_SourceSoapOut" />
- </wsdl:operation>
- <wsdl:operation name="set_SaveEntrustOutBill_New">
- <wsdl:input message="tns:set_SaveEntrustOutBill_NewSoapIn" />
- <wsdl:output message="tns:set_SaveEntrustOutBill_NewSoapOut" />
</wsdl:operation>
<wsdl:operation name="set_ClearPonderationBillMain_Temp_ChangGui">
<wsdl:input message="tns:set_ClearPonderationBillMain_Temp_ChangGuiSoapIn" />
@@ -19158,17 +19172,9 @@
<wsdl:input message="tns:set_SaveMoveStockBill_BillCheckSoapIn" />
<wsdl:output message="tns:set_SaveMoveStockBill_BillCheckSoapOut" />
</wsdl:operation>
- <wsdl:operation name="set_SaveMoveStockBill_CLD_BillCheck">
- <wsdl:input message="tns:set_SaveMoveStockBill_CLD_BillCheckSoapIn" />
- <wsdl:output message="tns:set_SaveMoveStockBill_CLD_BillCheckSoapOut" />
- </wsdl:operation>
<wsdl:operation name="set_SaveMoveStockStepOutBill_New">
<wsdl:input message="tns:set_SaveMoveStockStepOutBill_NewSoapIn" />
<wsdl:output message="tns:set_SaveMoveStockStepOutBill_NewSoapOut" />
- </wsdl:operation>
- <wsdl:operation name="set_SaveMoveStockStepOutBill_CLD_New">
- <wsdl:input message="tns:set_SaveMoveStockStepOutBill_CLD_NewSoapIn" />
- <wsdl:output message="tns:set_SaveMoveStockStepOutBill_CLD_NewSoapOut" />
</wsdl:operation>
<wsdl:operation name="GetSc_ICMOBillList">
<wsdl:input message="tns:GetSc_ICMOBillListSoapIn" />
@@ -19853,8 +19859,26 @@
</wsdl:portType>
<wsdl:binding name="WebService1Soap" type="tns:WebService1Soap">
<soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="get_SourceBarCode_POStockInBack">
+ <soap:operation soapAction="http://tempuri.org/get_SourceBarCode_POStockInBack" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="get_SourceBarCode_MateOutBack">
<soap:operation soapAction="http://tempuri.org/get_SourceBarCode_MateOutBack" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="get_SourceBarCode_SellOutBack">
+ <soap:operation soapAction="http://tempuri.org/get_SourceBarCode_SellOutBack" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -20584,6 +20608,15 @@
</wsdl:operation>
<wsdl:operation name="set_SavePonderationBillMain_Temp_BarCode_Mould">
<soap:operation soapAction="http://tempuri.org/set_SavePonderationBillMain_Temp_BarCode_Mould" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="get_ORGANIZATIONS_UserByOrgRelation">
+ <soap:operation soapAction="http://tempuri.org/get_ORGANIZATIONS_UserByOrgRelation" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -21338,8 +21371,8 @@
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="get_SourceBarCode_POStockInBack">
- <soap:operation soapAction="http://tempuri.org/get_SourceBarCode_POStockInBack" style="document" />
+ <wsdl:operation name="set_CheckEntrustInBill">
+ <soap:operation soapAction="http://tempuri.org/set_CheckEntrustInBill" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -21932,8 +21965,8 @@
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="get_ORGANIZATIONS_UserByOrgRelation">
- <soap:operation soapAction="http://tempuri.org/get_ORGANIZATIONS_UserByOrgRelation" style="document" />
+ <wsdl:operation name="set_SaveEntrustOutBill_New">
+ <soap:operation soapAction="http://tempuri.org/set_SaveEntrustOutBill_New" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -22364,8 +22397,8 @@
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="set_CheckEntrustInBill">
- <soap:operation soapAction="http://tempuri.org/set_CheckEntrustInBill" style="document" />
+ <wsdl:operation name="set_SaveMoveStockStepOutBill_CLD_New">
+ <soap:operation soapAction="http://tempuri.org/set_SaveMoveStockStepOutBill_CLD_New" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -22807,15 +22840,6 @@
</wsdl:operation>
<wsdl:operation name="GetKf_EntrustOutBill_K3_Source">
<soap:operation soapAction="http://tempuri.org/GetKf_EntrustOutBill_K3_Source" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="set_SaveEntrustOutBill_New">
- <soap:operation soapAction="http://tempuri.org/set_SaveEntrustOutBill_New" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -23408,26 +23432,8 @@
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="set_SaveMoveStockBill_CLD_BillCheck">
- <soap:operation soapAction="http://tempuri.org/set_SaveMoveStockBill_CLD_BillCheck" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
<wsdl:operation name="set_SaveMoveStockStepOutBill_New">
<soap:operation soapAction="http://tempuri.org/set_SaveMoveStockStepOutBill_New" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="set_SaveMoveStockStepOutBill_CLD_New">
- <soap:operation soapAction="http://tempuri.org/set_SaveMoveStockStepOutBill_CLD_New" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -24968,8 +24974,26 @@
</wsdl:binding>
<wsdl:binding name="WebService1Soap12" type="tns:WebService1Soap">
<soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="get_SourceBarCode_POStockInBack">
+ <soap12:operation soapAction="http://tempuri.org/get_SourceBarCode_POStockInBack" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="get_SourceBarCode_MateOutBack">
<soap12:operation soapAction="http://tempuri.org/get_SourceBarCode_MateOutBack" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="get_SourceBarCode_SellOutBack">
+ <soap12:operation soapAction="http://tempuri.org/get_SourceBarCode_SellOutBack" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
@@ -25699,6 +25723,15 @@
</wsdl:operation>
<wsdl:operation name="set_SavePonderationBillMain_Temp_BarCode_Mould">
<soap12:operation soapAction="http://tempuri.org/set_SavePonderationBillMain_Temp_BarCode_Mould" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="get_ORGANIZATIONS_UserByOrgRelation">
+ <soap12:operation soapAction="http://tempuri.org/get_ORGANIZATIONS_UserByOrgRelation" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
@@ -26453,8 +26486,8 @@
<soap12:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="get_SourceBarCode_POStockInBack">
- <soap12:operation soapAction="http://tempuri.org/get_SourceBarCode_POStockInBack" style="document" />
+ <wsdl:operation name="set_CheckEntrustInBill">
+ <soap12:operation soapAction="http://tempuri.org/set_CheckEntrustInBill" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
@@ -27047,8 +27080,8 @@
<soap12:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="get_ORGANIZATIONS_UserByOrgRelation">
- <soap12:operation soapAction="http://tempuri.org/get_ORGANIZATIONS_UserByOrgRelation" style="document" />
+ <wsdl:operation name="set_SaveEntrustOutBill_New">
+ <soap12:operation soapAction="http://tempuri.org/set_SaveEntrustOutBill_New" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
@@ -27479,8 +27512,8 @@
<soap12:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="set_CheckEntrustInBill">
- <soap12:operation soapAction="http://tempuri.org/set_CheckEntrustInBill" style="document" />
+ <wsdl:operation name="set_SaveMoveStockStepOutBill_CLD_New">
+ <soap12:operation soapAction="http://tempuri.org/set_SaveMoveStockStepOutBill_CLD_New" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
@@ -27922,15 +27955,6 @@
</wsdl:operation>
<wsdl:operation name="GetKf_EntrustOutBill_K3_Source">
<soap12:operation soapAction="http://tempuri.org/GetKf_EntrustOutBill_K3_Source" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="set_SaveEntrustOutBill_New">
- <soap12:operation soapAction="http://tempuri.org/set_SaveEntrustOutBill_New" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
@@ -28523,26 +28547,8 @@
<soap12:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="set_SaveMoveStockBill_CLD_BillCheck">
- <soap12:operation soapAction="http://tempuri.org/set_SaveMoveStockBill_CLD_BillCheck" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
<wsdl:operation name="set_SaveMoveStockStepOutBill_New">
<soap12:operation soapAction="http://tempuri.org/set_SaveMoveStockStepOutBill_New" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="set_SaveMoveStockStepOutBill_CLD_New">
- <soap12:operation soapAction="http://tempuri.org/set_SaveMoveStockStepOutBill_CLD_New" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index c248595..dbb8e11 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -441,6 +441,7 @@
<Compile Include="Controllers\CJGL\Sc_KeyElementBindingController.cs" />
<Compile Include="Controllers\CJGL\Sc_OEEReportController.cs" />
<Compile Include="Controllers\CKGL\TMZD\Gy_BarCodeBillListController.cs" />
+ <Compile Include="Controllers\JHGL\Gy_SourceMouldBillController.cs" />
<Compile Include="Controllers\Xt_DefineBillMainSetController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldBatchWorkCheckBillController.cs" />
<Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentCollectionTechParamController.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index acca40d..2570776 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -3,10 +3,10 @@
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
@@ -14,6 +14,14 @@
<IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
<IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
<UseGlobalApplicationHostFile />
+ <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
+ <Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
+ <WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
+ <WebStackScaffolding_IsLayoutPageSelected>True</WebStackScaffolding_IsLayoutPageSelected>
+ <WebStackScaffolding_IsPartialViewSelected>False</WebStackScaffolding_IsPartialViewSelected>
+ <WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
+ <WebStackScaffolding_LayoutPageFile />
+ <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index 4c84461..c37142c 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -4,9 +4,24 @@
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+<<<<<<< HEAD
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+=======
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+>>>>>>> 7cce3c1dbda47d04067ab78a6eebcdbbca9ba246
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
index 2eafeb3..444eaec 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
index f67032a..f9ed7a6 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -1,6 +1,15 @@
+<<<<<<< HEAD
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
+=======
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
+>>>>>>> 7cce3c1dbda47d04067ab78a6eebcdbbca9ba246
--
Gitblit v1.9.1