BLL/bin/Release/BLL.dllBinary files differ
BLL/bin/Release/BLL.pdbBinary files differ
BLL/bin/Release/DAL.dllBinary files differ
BLL/bin/Release/DAL.pdbBinary files differ
BLL/bin/Release/DBUtility.dllBinary files differ
BLL/bin/Release/DBUtility.pdbBinary files differ
BLL/bin/Release/Model.dllBinary files differ
BLL/bin/Release/Model.pdbBinary files differ
BLL/bin/Release/Pub_Class.dllBinary files differ
BLL/bin/Release/Pub_Class.pdbBinary files differ
BLL/bin/Release/Pub_Control.dllBinary files differ
BLL/bin/Release/Pub_Control.pdbBinary files differ
BLL/bin/Release/SQLHelper.dllBinary files differ
BLL/bin/Release/SQLHelper.pdbBinary files differ
DAL/bin/Release/DAL.dllBinary files differ
DAL/bin/Release/DAL.pdbBinary files differ
DAL/bin/Release/DBUtility.dllBinary files differ
DAL/bin/Release/DBUtility.pdbBinary files differ
DAL/bin/Release/Model.dllBinary files differ
DAL/bin/Release/Model.pdbBinary files differ
DAL/bin/Release/Pub_Class.dllBinary files differ
DAL/bin/Release/Pub_Class.pdbBinary files differ
DAL/bin/Release/Pub_Control.dllBinary files differ
DAL/bin/Release/Pub_Control.pdbBinary files differ
DAL/bin/Release/SQLHelper.dllBinary files differ
DAL/bin/Release/SQLHelper.pdbBinary files differ
DBUtility/bin/Release/DBUtility.dllBinary files differ
DBUtility/bin/Release/DBUtility.pdbBinary files differ
DBUtility/bin/Release/Pub_Class.dllBinary files differ
DBUtility/bin/Release/Pub_Class.pdbBinary files differ
DBUtility/bin/Release/Pub_Control.dllBinary files differ
DBUtility/bin/Release/Pub_Control.pdbBinary files differ
DBUtility/bin/Release/SQLHelper.dllBinary files differ
DBUtility/bin/Release/SQLHelper.pdbBinary files differ
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cacheBinary files differ
DBUtility/obj/Release/DBUtility.dllBinary files differ
DBUtility/obj/Release/DBUtility.pdbBinary files differ
Model/bin/Release/DBUtility.dllBinary files differ
Model/bin/Release/DBUtility.pdbBinary files differ
Model/bin/Release/Model.dllBinary files differ
Model/bin/Release/Model.pdbBinary files differ
Model/bin/Release/Pub_Class.dllBinary files differ
Model/bin/Release/Pub_Class.pdbBinary files differ
Model/bin/Release/Pub_Control.dllBinary files differ
Model/bin/Release/Pub_Control.pdbBinary files differ
Model/bin/Release/SQLHelper.dllBinary files differ
Model/bin/Release/SQLHelper.pdbBinary files differ
Model/obj/Release/Model.csproj.AssemblyReference.cacheBinary files differ
Model/obj/Release/Model.dllBinary files differ
Model/obj/Release/Model.pdbBinary files differ
NETERPNoWin/bin/x86/Debug/AxInterop.grdes6Lib.dllBinary files differ
NETERPNoWin/bin/x86/Debug/AxInterop.gregn6Lib.dllBinary files differ
NETERPNoWin/bin/x86/Debug/BLL.dllBinary files differ
NETERPNoWin/bin/x86/Debug/BLL.pdbBinary files differ
NETERPNoWin/bin/x86/Debug/BaseSet.dllBinary files differ
NETERPNoWin/bin/x86/Debug/BaseSet.pdbBinary files differ
NETERPNoWin/bin/x86/Debug/DAL.dllBinary files differ
NETERPNoWin/bin/x86/Debug/DAL.pdbBinary files differ
NETERPNoWin/bin/x86/Debug/DBUtility.dllBinary files differ
NETERPNoWin/bin/x86/Debug/DBUtility.pdbBinary files differ
NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dllBinary files differ
NETERPNoWin/bin/x86/Debug/Kanban.dllBinary files differ
NETERPNoWin/bin/x86/Debug/Kanban.pdbBinary files differ
NETERPNoWin/bin/x86/Debug/Kingdee.BOS.WebApi.Client.dllBinary files differ
NETERPNoWin/bin/x86/Debug/M2Mqtt.Net.dllBinary files differ
NETERPNoWin/bin/x86/Debug/M2Mqtt.Net.pdbBinary files differ
NETERPNoWin/bin/x86/Debug/Model.dllBinary files differ
NETERPNoWin/bin/x86/Debug/Model.pdbBinary files differ
NETERPNoWin/bin/x86/Debug/NETERPNoWin.exeBinary files differ
NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe.config
File was deleted NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdbBinary files differ
NETERPNoWin/bin/x86/Debug/NPOI.OOXML.dllBinary files differ
NETERPNoWin/bin/x86/Debug/NPOI.OpenXml4Net.dllBinary files differ
NETERPNoWin/bin/x86/Debug/NPOI.OpenXmlFormats.dllBinary files differ
NETERPNoWin/bin/x86/Debug/NPOI.dllBinary files differ
NETERPNoWin/bin/x86/Debug/Newtonsoft.Json.dllBinary files differ
NETERPNoWin/bin/x86/Debug/OAM.dllBinary files differ
NETERPNoWin/bin/x86/Debug/OAM.pdbBinary files differ
NETERPNoWin/bin/x86/Debug/PlanM.dllBinary files differ
NETERPNoWin/bin/x86/Debug/PlanM.pdbBinary files differ
NETERPNoWin/bin/x86/Debug/Pub_Class.dllBinary files differ
NETERPNoWin/bin/x86/Debug/Pub_Class.pdbBinary files differ
NETERPNoWin/bin/x86/Debug/Pub_Control.dllBinary files differ
NETERPNoWin/bin/x86/Debug/Pub_Control.pdbBinary files differ
NETERPNoWin/bin/x86/Debug/SQLHelper.dllBinary files differ
NETERPNoWin/bin/x86/Debug/SQLHelper.pdbBinary files differ
NETERPNoWin/bin/x86/Debug/WarM.dllBinary files differ
NETERPNoWin/bin/x86/Debug/WarM.dll.config
File was deleted NETERPNoWin/bin/x86/Debug/WarM.pdbBinary files differ
NETERPNoWin/bin/x86/Debug/WorkM.dllBinary files differ
NETERPNoWin/bin/x86/Debug/WorkM.pdbBinary files differ
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
@@ -274,60 +274,3 @@ C:\Users\86130\Desktop\智云迈思\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.pdb C:\Users\86130\Desktop\智云迈思\MES-WEB-API\NETERPNoWin\bin\x86\Debug\M2Mqtt.Net.dll C:\Users\86130\Desktop\智云迈思\MES-WEB-API\NETERPNoWin\bin\x86\Debug\M2Mqtt.Net.pdb D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NETERPNoWin.exe.config D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NETERPNoWin.exe D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NETERPNoWin.pdb D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\BaseSet.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\BLL.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\DAL.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\DBUtility.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Kanban.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Model.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\OAM.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\PlanM.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Pub_Class.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Pub_Control.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\SQLHelper.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WarM.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WorkM.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\AxInterop.gregn6Lib.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.OOXML.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Kingdee.BOS.WebApi.Client.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\M2Mqtt.Net.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Newtonsoft.Json.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\AxInterop.grdes6Lib.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.OpenXmlFormats.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.OpenXml4Net.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\BaseSet.pdb D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\BLL.pdb D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\DAL.pdb D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\DBUtility.pdb D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Kanban.pdb D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Model.pdb D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\OAM.pdb D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\PlanM.pdb D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Pub_Class.pdb D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Pub_Control.pdb D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\SQLHelper.pdb D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WarM.pdb D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WarM.dll.config D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WorkM.pdb D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\M2Mqtt.Net.pdb D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Interop.gregn6Lib.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.AssemblyReference.cache D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\Interop.gregn6Lib.dll D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.ResolveComReference.cache D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Form1.resources D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Frm_MESSetIni.resources D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.OA_MessageBox.resources D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Frm_Show.resources D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.MDIMain.resources D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Properties.Resources.resources D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Xt_Wait.resources D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.MESMain.resources D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.GenerateResource.cache D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.CoreCompileInputs.cache D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.CopyComplete D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.exe D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.pdb PayM/bin/x86/Debug/AxInterop.gregn6Lib.dllBinary files differ
PayM/bin/x86/Debug/BLL.dllBinary files differ
PayM/bin/x86/Debug/BLL.pdbBinary files differ
PayM/bin/x86/Debug/DAL.dllBinary files differ
PayM/bin/x86/Debug/DAL.pdbBinary files differ
PayM/bin/x86/Debug/DBUtility.dllBinary files differ
PayM/bin/x86/Debug/DBUtility.pdbBinary files differ
PayM/bin/x86/Debug/Interop.gregn6Lib.dllBinary files differ
PayM/bin/x86/Debug/Kingdee.BOS.WebApi.Client.dllBinary files differ
PayM/bin/x86/Debug/Model.dllBinary files differ
PayM/bin/x86/Debug/Model.pdbBinary files differ
PayM/bin/x86/Debug/Newtonsoft.Json.dllBinary files differ
PayM/bin/x86/Debug/PayM.dllBinary files differ
PayM/bin/x86/Debug/PayM.pdbBinary files differ
PayM/bin/x86/Debug/Pub_Class.dllBinary files differ
PayM/bin/x86/Debug/Pub_Class.pdbBinary files differ
PayM/bin/x86/Debug/Pub_Control.dllBinary files differ
PayM/bin/x86/Debug/Pub_Control.pdbBinary files differ
PayM/bin/x86/Debug/SQLHelper.dllBinary files differ
PayM/bin/x86/Debug/SQLHelper.pdbBinary files differ
PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt
@@ -1859,211 +1859,3 @@ C:\Users\86130\Desktop\智云迈思\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.CopyComplete C:\Users\86130\Desktop\智云迈思\MES-WEB-API\PayM\obj\x86\Debug\PayM.dll C:\Users\86130\Desktop\智云迈思\MES-WEB-API\PayM\obj\x86\Debug\PayM.pdb D:\WorkBench\MES-WEB-API\PayM\bin\x86\Debug\PayM.dll D:\WorkBench\MES-WEB-API\PayM\bin\x86\Debug\PayM.pdb D:\WorkBench\MES-WEB-API\PayM\bin\x86\Debug\BLL.dll D:\WorkBench\MES-WEB-API\PayM\bin\x86\Debug\DAL.dll D:\WorkBench\MES-WEB-API\PayM\bin\x86\Debug\DBUtility.dll D:\WorkBench\MES-WEB-API\PayM\bin\x86\Debug\Model.dll D:\WorkBench\MES-WEB-API\PayM\bin\x86\Debug\Pub_Class.dll D:\WorkBench\MES-WEB-API\PayM\bin\x86\Debug\Pub_Control.dll D:\WorkBench\MES-WEB-API\PayM\bin\x86\Debug\SQLHelper.dll D:\WorkBench\MES-WEB-API\PayM\bin\x86\Debug\Kingdee.BOS.WebApi.Client.dll D:\WorkBench\MES-WEB-API\PayM\bin\x86\Debug\Newtonsoft.Json.dll D:\WorkBench\MES-WEB-API\PayM\bin\x86\Debug\BLL.pdb D:\WorkBench\MES-WEB-API\PayM\bin\x86\Debug\DAL.pdb D:\WorkBench\MES-WEB-API\PayM\bin\x86\Debug\DBUtility.pdb D:\WorkBench\MES-WEB-API\PayM\bin\x86\Debug\Model.pdb D:\WorkBench\MES-WEB-API\PayM\bin\x86\Debug\Pub_Class.pdb D:\WorkBench\MES-WEB-API\PayM\bin\x86\Debug\Pub_Control.pdb D:\WorkBench\MES-WEB-API\PayM\bin\x86\Debug\SQLHelper.pdb D:\WorkBench\MES-WEB-API\PayM\bin\x86\Debug\Interop.gregn6Lib.dll D:\WorkBench\MES-WEB-API\PayM\bin\x86\Debug\AxInterop.gregn6Lib.dll D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.AssemblyReference.cache D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\Interop.gregn6Lib.dll D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\AxInterop.gregn6Lib.dll D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.ResolveComReference.cache D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Form2.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_ContractBookBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_ContractBookBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpChangeBillQuery.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpUpChangeBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpUpChangeBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_FamilyMemberBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_FamilyMemberBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_InsuranceBookBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_InsuranceBookBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_LearnHistoryBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_LearnHistoryBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_PaperPhotoBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_PaperPhotoBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_RewardsPunishBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_RewardsPunishBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkInjuryBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkInjuryBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkSkillBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkSkillBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkStoryBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkStoryBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpFosterBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpFosterBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.FrmChangeDate.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_AbsentBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_AbsentBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_DuSubsidyItemBillQuery.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_DuSubsidyItemBill_KS.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EarlyLateErrBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EarlyLateErrBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpInitChangeBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpInitChangeBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesSendBillQuery.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_GroupBalBillQuery.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthICMOStockSumBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthICMOStockSumBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OtherBalBillQuery.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutApplyBillQuery.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OverApplyBillQuery.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\HuanXin.ERP.Pay_PayMentBillListDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\HuanXin.ERP.Pay_PayMentBillListUnPayDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBillQuery.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMent_QC.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMent_QCAdd.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProcPriceRequestBillQuery.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_RewardPunishBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_RewardPunishBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillList_KS.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillQuery.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBill_Enter.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBill_KS.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBill_YR.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SumBalBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SumBalBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SumBalBill_JS.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkErrTimesBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkErrTimesBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesBillQuery.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesSumQueryBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesSumQueryBillListDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutForComApplyBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutForComApplyBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBillReport.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBillReportDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillEntryReport.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillEntryReportDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillSumReport.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillSumReportDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesPayMentEntryReport.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesPayMentEntryReportDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesPayMentSumReport.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesPayMentSumReportDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyYearReport.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_YearToCashBillReport.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_YearToCashBillReportDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Properties.Resources.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpDimissionBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpDimissionBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\OAM.HR_EmpEngageRequestBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\OAM.HR_EmpEngageRequestBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_CarOutApplyBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_CarOutApplyBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew1.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew2.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew3.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew4.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew5.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\BaseSet.Gy_DataInTmp_DuSubsidyItem.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_DuSubsidyItemBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_DuSubsidyItemBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesRequestBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesRequestBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesSendBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesSendBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_GetNeedCheckErrWorkTimesSendBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OtherMoney_Dlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpChangeBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpChangeBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_GroupBalBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_GroupBalBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDayBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDayBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProcPriceRequestBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProcPriceRequestBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OtherBalBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OtherBalBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutApplyBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutApplyBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OverApplyBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OverApplyBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SubsidyChangeBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SubsidyChangeBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpPayMentSumReport.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpPayMentSumReportDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpWorkQtyEntryReport.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpWorkQtyEntryReportDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_InnerScrap.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_InnerScrapDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OuterScrap.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OuterScrapDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDeptSendList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDeptSendListDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDeptYearReport.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDeptYearReportDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentPrintReport.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentPrintReportDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentSendList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentSendListDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentYearReport.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentYearReportDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProdWorkQtyEntryReport.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProdWorkQtyEntryReportDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProdWorkQtySumReport.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProdWorkQtySumReportDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesListDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthWriteBillReportMX.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthWriteBillReportMX2.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Err_MonthExpenseEntryBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Err_MonthExpenseEntryBillDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.KQ_sourceReport.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.KQ_sourceReportDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyEntryBillAdd.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyEntryBillReportMX.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_NoWorkTimesReport.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_NoWorkTimesReportDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill2.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill3.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill4.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill5.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill1.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill2.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill3.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill4.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill5.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBillReport.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBillReportDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyEntryBillReport.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyEntryBillReportDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthWriteBillReport.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthWriteBillReportDlg.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill1.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill2.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill3.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill4.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill5.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBillList.resources D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.GenerateResource.cache D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.CoreCompileInputs.cache D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.CopyComplete D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.dll D:\WorkBench\MES-WEB-API\PayM\obj\x86\Debug\PayM.pdb Pub_Class/bin/Release/Pub_Class.dllBinary files differ
Pub_Class/bin/Release/Pub_Class.pdbBinary files differ
Pub_Control/bin/Release/Pub_Class.dllBinary files differ
Pub_Control/bin/Release/Pub_Class.pdbBinary files differ
Pub_Control/bin/Release/Pub_Control.dllBinary files differ
Pub_Control/bin/Release/Pub_Control.pdbBinary files differ
SQLHelper/bin/Release/Pub_Class.dllBinary files differ
SQLHelper/bin/Release/Pub_Class.pdbBinary files differ
SQLHelper/bin/Release/SQLHelper.dllBinary files differ
SQLHelper/bin/Release/SQLHelper.pdbBinary files differ
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cacheBinary files differ
SQLHelper/obj/Release/SQLHelper.dllBinary files differ
SQLHelper/obj/Release/SQLHelper.pdbBinary files differ
SyntacticSugar/bin/Debug/SyntacticSugar.dllBinary files differ
SyntacticSugar/bin/Debug/SyntacticSugar.pdbBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache
File was deleted SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -10,8 +10,3 @@ C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb SyntacticSugar/obj/Debug/SyntacticSugar.dllBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.pdbBinary files differ
WebAPI/Controllers/BaseSet/Gy_TechnologyController.cs
@@ -247,6 +247,7 @@ DateTime HMakeTime = list[0].HMakeTime; string HMakeEmp = list[0].HMakeEmp; if (!DBUtility.ClsPub.AllowNumber(HNumber)) { objJsonResult.code = "0"; @@ -323,7 +324,9 @@ DateTime HMakeTime = list[0].HMakeTime; string HMakeEmp = list[0].HMakeEmp; long HUSEORGID = list[0].HUSEORGID; long HCREATEORGID = list[0].HCREATEORGID; long HCREATEORGID = list[0].HCREATEORGID; long HUnitID = list[0].HUnitID; long HClassID = list[0].HClassID; //判断权限 if (!ClsPub.Security_Log("Gy_TechnologyParameter_Edit", 1, false, msg3)) @@ -343,6 +346,8 @@ objJsonResult.data = null; return objJsonResult; } //if (oDept.HavSameNumber(HItemID, HNumber)) //{ @@ -357,6 +362,8 @@ if (HItemID == 0) { oCN.BeginTran(); //保存前控制========================================= string sql1 = "exec h_p_Gy_TechnologyParameter_BeforeSaveCtrl " + HMakeEmp + ",'" + 1 + "'"; @@ -380,14 +387,25 @@ oCN.RollBack(); return objJsonResult; } string _sql = "select HItemID from Gy_TechnologyParameter where HNumber = N'" + HNumber + "'"; DataSet _ds = oCN.RunProcReturn(_sql, "Gy_TechnologyParameter"); if (_ds.Tables[0].Rows.Count > 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "保存失败: 工艺代码重复!"; objJsonResult.data = null; return objJsonResult; } //================================================================================== oCN.RunProc("Insert into Gy_TechnologyParameter " + " (HNumber,HName,HHelpCode,HShortNumber,HParentID,HLevel" + ",HEndFlag,HStopflag,HRemark,HUseFlag,HMakeTime,HMakeEmp,HUSEORGID,HCREATEORGID) " + ",HEndFlag,HStopflag,HRemark,HUseFlag,HMakeTime,HMakeEmp,HUSEORGID,HCREATEORGID, HClassID, HUnitID) " + " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HParentID.ToString() + "','" + HLevel.ToString() + "','" + HEndFlag + "','" + HStopflag + "','" + HRemark + "','" + HUseFlag + "',getdate(),'" + HMakeEmp + "','" + HUSEORGID + "','" + HCREATEORGID + "')", ref DBUtility.ClsPub.sExeReturnInfo); "','" + HLevel.ToString() + "','" + HEndFlag + "','" + HStopflag + "','" + HRemark + "','" + HUseFlag + "',getdate(),'" + HMakeEmp + "','" + HUSEORGID + "','" + HCREATEORGID + "','" + HClassID + "','" + HUnitID + "')", ref DBUtility.ClsPub.sExeReturnInfo); // Convert.ToString(HEndFlag ? 1 : 0); Convert.ToString(HStopflag ? 1 : 0);HUseFlag //修改上级为非末级代码 oCN.RunProc("Update Gy_TechnologyParameter set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo); @@ -461,6 +479,9 @@ ",HUseFlag='" + HUseFlag + "'" + ",HModifyTime= getdate()" + ",HModifyEmp='" + HMakeEmp + "'" + ",HClassID='" + HClassID + "'" + ",HUnitID='" + HUnitID + "'" + ",HUSEORGID='" + HUSEORGID + "'" + ",HRemark='" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo); //修改子项目代码 //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Warehouse,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo); WebAPI/Controllers/BaseSet/Gy_TechnologyParUnitController.cs
@@ -221,8 +221,8 @@ { try { DAL.ClsGy_Warehouse_Ctl oDept = new DAL.ClsGy_Warehouse_Ctl(); DAL.ClsGy_Warehouse_View oDeptHlp = new DAL.ClsGy_Warehouse_View(); //DAL.ClsGy_Warehouse_Ctl oDept = new DAL.ClsGy_Warehouse_Ctl(); //DAL.ClsGy_Warehouse_View oDeptHlp = new DAL.ClsGy_Warehouse_View(); var _value = oMain["oMain"].ToString(); string msg1 = _value.ToString(); @@ -233,7 +233,6 @@ //反序列化 msg2 = "[" + msg2.ToString() + "]"; List<TechnologyParameterUnit> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<TechnologyParameterUnit>>(msg2); long HItemID = list[0].HItemID; string HNumber = list[0].HNumber; string HName = list[0].HName; @@ -247,7 +246,12 @@ string HUseFlag = list[0].HUseFlag; DateTime HMakeTime = list[0].HMakeTime; string HMakeEmp = list[0].HMakeEmp; string HCheckTime = list[0].HCheckTime; string HStopTime = list[0].HStopTime; string HCheckEmp = list[0].HCheckEmp; string HStopEmp = list[0].HCheckTime; long HUSEORGID = list[0].HUSEORGID; long HCREATEORGID = list[0].HCREATEORGID; ////判断权限 //if (!ClsPub.Security_Log("Gy_TechnologyParameter_Add_Edit_", 1, false, msg3)) //{ @@ -266,27 +270,28 @@ // objJsonResult.data = null; // return objJsonResult; //} //if (oDept.HavSameNumber(HItemID, HNumber)) //{ // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = "代码重复！"; // objJsonResult.data = null; // return objJsonResult; //} //保存 //保存完毕后处理 if (HItemID == 0) { oCN.BeginTran(); var ds2 = oCN.RunProcReturn("select HItemID from Gy_TechnologyParameterUnit where HNumber = N'" + HNumber + "'", "Gy_TechnologyParameterUnit"); if(ds2.Tables[0].Rows.Count > 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "代码重复！"; objJsonResult.data = null; return objJsonResult; } //当前时间 var currentTime = DateTime.Now.ToString(); oCN.BeginTran(); oCN.RunProc("Insert into Gy_TechnologyParameterUnit " + " (HNumber,HName,HHelpCode,HShortNumber,HParentID,HLevel" + ",HEndFlag,HStopflag,HRemark,HUseFlag,HMakeTime,HMakeEmp) " + ",HEndFlag,HStopflag,HRemark,HUseFlag,HMakeTime,HMakeEmp, HUSEORGID, HCREATEORGID) " + " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HParentID.ToString() + "','" + HLevel.ToString() + "','" + HEndFlag + "','" + HStopflag + "','" + HRemark + "','" + HUseFlag + "','" + currentTime + "','" + HMakeEmp + "')", ref DBUtility.ClsPub.sExeReturnInfo); "','" + HLevel.ToString() + "','" + HEndFlag + "','" + HStopflag + "','" + HRemark + "','" + HUseFlag + "','" + currentTime + "','" + HMakeEmp +"','" + HUSEORGID + "','" + HCREATEORGID + "')", ref DBUtility.ClsPub.sExeReturnInfo); // Convert.ToString(HEndFlag ? 1 : 0); Convert.ToString(HStopflag ? 1 : 0);HUseFlag //修改上级为非末级代码 oCN.RunProc("Update Gy_TechnologyParameterUnit set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo); @@ -424,5 +429,391 @@ } } #region 工艺参数单位 审核、反审核 [Route("Gy_TechnologyParameterUnit/AuditGy_TechnologyParameterUnit")] [HttpGet] public object AuditGy_TechnologyParameterUnit(int HInterID, int IsAudit, string CurUserName) { try { //审核权限 if (!DBUtility.ClsPub.Security_Log_second("Gy_TechnologyParameterUnit_Check", 1, false, CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "审核失败！无权限！"; objJsonResult.data = null; return objJsonResult; } var ds = oCN.RunProcReturn("select * from Gy_TechnologyParameterUnit where HItemID=" + HInterID, "Gy_TechnologyParameterUnit"); if (ds.Tables[0].Rows.Count > 0) { if (IsAudit == 0) //审核判断 { if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "单据已审核!不能再次审核！"; objJsonResult.data = null; return objJsonResult; } } if (IsAudit == 1) //反审核判断 { if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() == "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "单据未审核!不需要反审核!"; objJsonResult.data = null; return objJsonResult; } } } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "单据不存在!"; objJsonResult.data = null; return objJsonResult; } oCN.BeginTran(); if (IsAudit == 0) //审核判断 { //审核前控制========================================= string sql1 = "exec h_p_Gy_TechnologyParameter_BeforeCheckCtrl " + HInterID + ",'" + CurUserName + "'"; ds = oCN.RunProcReturn(sql1, "h_p_Gy_TechnologyParameterUnit_BeforeCheckCtrl"); if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "审核失败!原因:审核前判断失败，请与网络管理人员联系"; objJsonResult.data = null; oCN.RollBack(); return objJsonResult; } if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0") { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "审核失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ; objJsonResult.data = null; oCN.RollBack(); return objJsonResult; } //================================================================================== oCN.RunProc("update Gy_TechnologyParameterUnit set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID); //审核后控制========================================= string sql2 = "exec h_p_Gy_TechnologyParameter_AfterCheckCtrl " + HInterID + ",'" + CurUserName + "'"; ds = oCN.RunProcReturn(sql2, "h_p_Gy_TechnologyParameter_AfterCheckCtrl"); if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "审核失败!原因:审核后判断失败，请与网络管理人员联系"; objJsonResult.data = null; oCN.RollBack(); return objJsonResult; } if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0") { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "审核失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ; objJsonResult.data = null; oCN.RollBack(); return objJsonResult; } //================================================================================== objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "审核成功"; objJsonResult.data = null; } if (IsAudit == 1) //反审核判断 { //反审核前控制========================================= string sql1 = "exec h_p_Gy_TechnologyParameterUnit_BeforeUnCheckCtrl " + HInterID + ",'" + CurUserName + "'"; ds = oCN.RunProcReturn(sql1, "h_p_Gy_TechnologyParameter_BeforeCheckCtrl"); if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "反审核失败!原因:反审核前判断失败，请与网络管理人员联系"; objJsonResult.data = null; oCN.RollBack(); return objJsonResult; } if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0") { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "反审核失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ; objJsonResult.data = null; oCN.RollBack(); return objJsonResult; } //================================================================================== oCN.RunProc("update Gy_TechnologyParameterUnit set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID); //反审核后控制========================================= string sql2 = "exec h_p_Gy_TechnologyParameterUnit_AfterUnCheckCtrl " + HInterID + ",'" + CurUserName + "'"; ds = oCN.RunProcReturn(sql2, "h_p_Gy_TechnologyParameter_AfterCheckCtrl"); if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "反审核失败!原因:反审核后判断失败，请与网络管理人员联系"; objJsonResult.data = null; oCN.RollBack(); return objJsonResult; } if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0") { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "反审核失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ; objJsonResult.data = null; oCN.RollBack(); return objJsonResult; } //================================================================================== objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "反审核成功"; objJsonResult.data = null; } oCN.Commit(); return objJsonResult; } catch (Exception e) { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "审核失败或者反审核失败！" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region 工艺参数单位 禁用、反禁用 [Route("Gy_TechnologyParameterUnit/StopGy_TechnologyParameterUnit")] [HttpGet] public object Gy_TechnologyParameterUnit(int HInterID, int IsStop, string CurUserName) { try { //禁用权限 if (!DBUtility.ClsPub.Security_Log_second("Gy_TechnologyParameterUnit_Stop", 1, false, CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "禁用失败！无权限！"; objJsonResult.data = null; return objJsonResult; } var ds = oCN.RunProcReturn("select * from Gy_TechnologyParameterUnit where HItemID=" + HInterID, "Gy_Material"); if (ds.Tables[0].Rows.Count > 0) { if (IsStop == 0) //禁用判断 { if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "单据已禁用!不能再次禁用！"; objJsonResult.data = null; return objJsonResult; } } if (IsStop == 1) //反禁用判断 { if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() == "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "单据未禁用!不需要反禁用!"; objJsonResult.data = null; return objJsonResult; } } } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "单据不存在!"; objJsonResult.data = null; return objJsonResult; } oCN.BeginTran(); if (IsStop == 0) //禁用判断 { //禁用前控制========================================= string sql1 = "exec h_p_Gy_TechnologyParameterUnit_BeforeStopCtrl " + HInterID + ",'" + CurUserName + "'"; ds = oCN.RunProcReturn(sql1, "h_p_Gy_TechnologyParameterUnit_BeforeStopCtrl"); if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "禁用失败!原因:禁用前判断失败，请与网络管理人员联系"; objJsonResult.data = null; oCN.RollBack(); return objJsonResult; } if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0") { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "禁用失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ; objJsonResult.data = null; oCN.RollBack(); return objJsonResult; } //================================================================================== oCN.RunProc("update Gy_TechnologyParameterUnit set HStopEmp='" + CurUserName + "',HStopTime=getdate(),HStopflag=1 where HItemID=" + HInterID); //禁用后控制========================================= string sql2 = "exec h_p_Gy_TechnologyParameterUnit_AfterStopCtrl " + HInterID + ",'" + CurUserName + "'"; ds = oCN.RunProcReturn(sql2, "h_p_Gy_TechnologyParameterUnit_AfterStopCtrl"); if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "禁用失败!原因:禁用后判断失败，请与网络管理人员联系"; objJsonResult.data = null; oCN.RollBack(); return objJsonResult; } if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0") { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "禁用失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ; objJsonResult.data = null; oCN.RollBack(); return objJsonResult; } //================================================================================== objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "禁用成功"; objJsonResult.data = null; } if (IsStop == 1) //反禁用判断 { //反禁用前控制========================================= string sql1 = "exec h_p_Gy_TechnologyParameterUnit_BeforeUnStopCtrl " + HInterID + ",'" + CurUserName + "'"; ds = oCN.RunProcReturn(sql1, "h_p_Gy_TechnologyParameterUnit_BeforeUnStopCtrl"); if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "反禁用失败!原因:反禁用前判断失败，请与网络管理人员联系"; objJsonResult.data = null; oCN.RollBack(); return objJsonResult; } if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0") { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "反禁用失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ; objJsonResult.data = null; oCN.RollBack(); return objJsonResult; } //================================================================================== oCN.RunProc("update Gy_TechnologyParameterUnit set HStopEmp='',HStopTime=null,HStopflag=0 where HItemID=" + HInterID); //反禁用后控制========================================= string sql2 = "exec h_p_Gy_TechnologyParameterUnit_AfterUnStopCtrl " + HInterID + ",'" + CurUserName + "'"; ds = oCN.RunProcReturn(sql2, "h_p_Gy_TechnologyParameterUnit_AfterUnStopCtrl"); if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "反禁用失败!原因:反禁用后判断失败，请与网络管理人员联系"; objJsonResult.data = null; oCN.RollBack(); return objJsonResult; } if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0") { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "反禁用失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ; objJsonResult.data = null; oCN.RollBack(); return objJsonResult; } //================================================================================== objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "反禁用成功"; objJsonResult.data = null; } oCN.Commit(); return objJsonResult; } catch (Exception e) { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "禁用失败或者反禁用失败！" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion } } WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
@@ -85,6 +85,91 @@ } public class TreeModel { public string Id { get; set; } public string Number { get; set; } public string Title { get; set; } public List<TreeModel> children = new List<TreeModel>(); } /// <summary> /// 返回仓库列表 ///参数：string sql。 ///返回值：object。 /// </summary> [Route("Gy_Warehouse/listTree")] [HttpGet] public object listTree(string sWhere, string user, string Organization) { try { List<object> columnNameList = new List<object>(); //编辑权限 if (!DBUtility.ClsPub.Security_Log_second("Gy_Warehouse", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "无查看权限！"; objJsonResult.data = null; return objJsonResult; } string sql1 = string.Format(@"select * from h_v_IF_WareHouseList_ExtendWHType where 组织名称='" + Organization + "'"); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn(sql1 + sWhere + " order by 仓库代码 ", "h_v_IF_WareHouseList_ExtendWHType"); } else { string sql = sql1 + sWhere + " order by 仓库代码 "; ds = oCN.RunProcReturn(sql, "h_v_IF_WareHouseList_ExtendWHType"); } List<TreeModel> treeModels = new List<TreeModel>(); TreeModel first = new TreeModel(); first.Id = "0"; first.Title = "模具仓库"; first.Number = "0"; treeModels.Add(first); foreach (DataRow row in ds.Tables[0].Rows) { var strLen = row["hitemid"].ToString().Split('.'); if (strLen.Length == 1) { TreeModel tree = new TreeModel(); tree.Id = row["hitemid"].ToString(); tree.Title = row["hname"].ToString(); tree.Number = row["HNumber"].ToString(); treeModels[0].children.Add(tree); } } digui(ds.Tables[0], treeModels[0].children, 2); //添加列名 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));//获取到DataColumn列对象的列名 } objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucess！"; objJsonResult.data = Newtonsoft.Json.JsonConvert.SerializeObject(treeModels); objJsonResult.list = columnNameList; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exception！" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } /// <summary> /// 根据基础资料ID 查找记录 @@ -1239,5 +1324,35 @@ } #endregion #region 递归生成树状结构 /// <summary> /// 递归函数 /// </summary> public void digui(DataTable dt, List<TreeModel> tree, int num) { for (int m = 0; m < tree.Count; m++) { tree[m].children = new List<TreeModel>(); for (int i = 0; i < dt.Rows.Count; i++)//第一次循环，得到所有根节点的子集 { var strLen = dt.Rows[i]["hnumber"].ToString().Split('.'); if (strLen.Length == num && dt.Rows[i]["hnumber"].ToString().Contains(tree[m].Id + ".")) { TreeModel tbjson = new TreeModel(); tbjson.Id = dt.Rows[i]["hitemid"].ToString(); tbjson.Title = dt.Rows[i]["hname"].ToString(); tbjson.Number = dt.Rows[i]["HNumber"].ToString(); tree[m].children.Add(tbjson); } } var strLens = tree[m].Id.Split('.'); for (int i = 0; i < tree[m].children.Count; i++) { digui(dt, tree[m].children, strLens.Length + 2);//再次用子集去循环，拿出子集的子集 } } } #endregion } } WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs
@@ -455,6 +455,8 @@ bool bResult; if (oBill.omodel.HInterID == 0) { // 判断是否单据号是否重复 // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); } WebAPI/Controllers/SBGL/Sb_EquipPatrolCheckRuleBillController.cs
@@ -422,7 +422,7 @@ { try { //判断是否有删除权限 //判断是否有审核权限 if (!DBUtility.ClsPub.Security_Log("Sb_EquipPatrolCheckRuleBill_Check", 1, false, user)) { objJsonResult.code = "0"; @@ -471,6 +471,18 @@ return objJsonResult; } //================================================================================== string sql2 = "select hmainid,审核人 from h_v_Sb_EquipPatrolCheckRuleList where hmainid = " + HInterID; var ds2 = oCN.RunProcReturn(sql2, "h_v_Sb_EquipPatrolCheckRuleList"); if (ds2.Tables[0].Rows[0]["审核人"].ToString() != string.Empty) { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "审核失败!原因: 单据已被审核!"; objJsonResult.data = null; return objJsonResult; } if (!BillOld.CheckBill(int.Parse(HInterID),oBill.omodel.HBillNo, "h_p_Sb_EquipPatrolCheckRuleBill_AfterCheckCtrl",user, ref ClsPub.sExeReturnInfo)) { WebAPI/Controllers/WebAPIController.cs
@@ -19220,6 +19220,60 @@ } /// <summary> /// 根据模具仓库编号获取模具数据 /// </summary> /// <param name="sWhere">筛选条件</param> /// <param name="user">操作用户</param> /// <param name="Organization">组织</param> /// <returns>模具数据清单</returns> [Route("Web/Get_Sc_MouldStatusAnalysisList")] [HttpGet] public object Get_Sc_MouldStatusAnalysisList(string sWhere, string user, string Organization) { try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("Select * from h_v_Sc_MouldStatusAnalysisList where 1=1 Order by HInterID DESC", "h_v_Sc_MouldStatusAnalysisList"); } else { string sql1 = "Select * from h_v_Sc_MouldStatusAnalysisList where 1=1 "; string sql = sql1 + sWhere + " Order by HInterID DESC"; ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldStatusAnalysisList"); } if (ds == null || ds.Tables[0].Rows.Count <= 0) { objjson.code = "0"; objjson.count = 0; objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo; objjson.data = null; return objjson; } else { objjson.code = "0"; objjson.count = 1; objjson.Message = "获取成功!"; objjson.data = ds.Tables[0]; return objjson; } } catch (Exception ex) { objjson.code = "0"; objjson.count = 0; objjson.Message = "获取失败" + ex.ToString(); objjson.data = null; return objjson; } } /// <summary> /// 获取器具列表 /// </summary> /// <returns></returns> WebAPI/DLL/ClsSb_EquipMaintainRuleBill.cs
@@ -137,6 +137,13 @@ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo); //若MAINDI重复则重新获取 oCn.BeginTran(); DataSet _ds = oCn.RunProcReturn("select HInterID from Sb_EquipMaintainRuleBillMain where HBillNo = N'" + omodel.HBillNo + "'", "Sb_EquipMaintainRuleBillMain"); if(_ds.Tables[0].Rows.Count > 0) { sReturn = "单据号重复！"; oCn.RollBack(); return false; } //主表 oCn.RunProc("Insert Into Sb_EquipMaintainRuleBillMain " + "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" + WebAPI/DLL/ClsSb_EquipPatrolCheckRuleBill.cs
@@ -19,7 +19,7 @@ base.MvarItemKeySub4 = ""; base.MvarItemKey = "Sb_EquipPatrolCheckRuleBillMain"; base.MvarReportTitle = "设备巡检规程"; base.BillType = "3913"; base.BillType = "5015"; } //修改单据 public override bool ModifyBill(Int64 lngBillKey, ref string sReturn) WebAPI/Models/TechnologyParameter.cs
@@ -20,6 +20,9 @@ public string HMakeEmp { get; set; } public long HUSEORGID { get; set; } public long HCREATEORGID { get; set; } public long HUnitID { get; set; } public long HClassID { get; set; } } } WebAPI/Models/TechnologyParameterUnit.cs
@@ -20,5 +20,12 @@ public string HUseFlag { get; set; } public DateTime HMakeTime { get; set; } public string HMakeEmp { get; set; } public string HCheckEmp { get; set; } public string HCheckTime { get; set; } public string HStopEmp { get; set; } public string HStopTime { get; set; } public Int64 HUSEORGID { get; set; } public Int64 HCREATEORGID { get; set; } } } WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user
@@ -4,7 +4,7 @@ --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <History>True|2025-06-06T08:03:17.1598940Z;True|2025-06-06T15:55:14.1548669+08:00;True|2025-06-06T15:45:09.1494579+08:00;True|2025-06-06T15:23:44.6000261+08:00;True|2025-06-06T09:05:20.9891447+08:00;True|2025-06-06T08:59:02.9102042+08:00;True|2025-06-06T08:53:57.5240160+08:00;True|2025-06-06T08:41:52.8398696+08:00;True|2025-06-06T08:26:11.0482137+08:00;False|2025-06-06T08:21:34.3977767+08:00;True|2025-06-05T17:02:46.4387841+08:00;True|2025-06-05T16:57:31.4312343+08:00;False|2025-06-05T16:56:51.6475141+08:00;</History> <History>True|2025-06-12T00:07:24.1394475Z;False|2025-06-12T08:06:50.5818604+08:00;True|2025-06-11T16:48:49.8379362+08:00;True|2025-06-11T16:46:41.1653890+08:00;True|2025-06-11T15:14:56.0474555+08:00;True|2025-06-11T14:49:30.2313205+08:00;True|2025-06-11T09:50:30.2697257+08:00;False|2025-06-11T09:49:07.3377795+08:00;False|2025-06-11T09:48:11.3043148+08:00;True|2025-06-10T14:53:27.3976234+08:00;True|2025-06-10T14:44:36.0667571+08:00;True|2025-06-10T12:37:55.9999249+08:00;True|2025-06-10T12:29:06.7152828+08:00;True|2025-06-10T11:19:52.9755229+08:00;True|2025-06-10T10:53:25.1516678+08:00;True|2025-06-10T10:49:46.3257234+08:00;True|2025-06-10T10:43:16.9567222+08:00;True|2025-06-10T10:35:40.8073924+08:00;True|2025-06-10T09:22:25.3761297+08:00;True|2025-06-10T08:53:14.1233640+08:00;False|2025-06-10T08:52:28.7445604+08:00;True|2025-06-09T15:47:05.0949232+08:00;True|2025-06-09T15:43:36.4410743+08:00;True|2025-06-09T15:34:26.1974700+08:00;True|2025-06-09T15:23:58.3542656+08:00;True|2025-06-09T10:03:14.0853098+08:00;True|2025-06-09T09:53:44.2860790+08:00;True|2025-06-09T09:50:36.4046416+08:00;True|2025-06-09T09:46:34.4404919+08:00;True|2025-06-09T09:43:11.5230900+08:00;True|2025-06-09T09:38:48.8356797+08:00;True|2025-06-09T09:19:56.4222144+08:00;False|2025-06-09T09:17:45.0139215+08:00;True|2025-06-06T16:03:17.1598940+08:00;True|2025-06-06T15:55:14.1548669+08:00;True|2025-06-06T15:45:09.1494579+08:00;True|2025-06-06T15:23:44.6000261+08:00;True|2025-06-06T09:05:20.9891447+08:00;True|2025-06-06T08:59:02.9102042+08:00;True|2025-06-06T08:53:57.5240160+08:00;True|2025-06-06T08:41:52.8398696+08:00;True|2025-06-06T08:26:11.0482137+08:00;False|2025-06-06T08:21:34.3977767+08:00;True|2025-06-05T17:02:46.4387841+08:00;True|2025-06-05T16:57:31.4312343+08:00;False|2025-06-05T16:56:51.6475141+08:00;</History> <_PublishTargetUrl>D:\网站发布\智云MESWMS\LAYAPI</_PublishTargetUrl> </PropertyGroup> <ItemGroup> @@ -45,28 +45,28 @@ <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>06/06/2025 16:02:57</publishTime> <publishTime>06/09/2025 09:19:24</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>06/06/2025 16:02:57</publishTime> <publishTime>06/09/2025 09:19:24</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>06/06/2025 16:02:54</publishTime> <publishTime>06/09/2025 09:19:22</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>06/06/2025 16:02:54</publishTime> <publishTime>06/09/2025 09:19:22</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>06/05/2025 16:56:58</publishTime> <publishTime>06/09/2025 09:19:18</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>06/05/2025 16:56:58</publishTime> <publishTime>06/09/2025 09:19:18</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>06/06/2025 08:25:50</publishTime> <publishTime>06/09/2025 09:19:18</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>06/06/2025 08:25:50</publishTime> <publishTime>06/09/2025 09:19:18</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>04/21/2025 11:46:16</publishTime> @@ -147,34 +147,34 @@ <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>06/05/2025 16:56:56</publishTime> <publishTime>06/09/2025 09:19:15</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>06/05/2025 16:56:56</publishTime> <publishTime>06/09/2025 09:19:15</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>06/05/2025 16:56:57</publishTime> <publishTime>06/09/2025 09:19:17</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>06/05/2025 16:56:57</publishTime> <publishTime>06/09/2025 09:19:17</publishTime> </File> <File Include="bin/RestSharp.dll"> <publishTime>08/31/2012 06:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>06/05/2025 16:56:57</publishTime> <publishTime>06/09/2025 09:19:17</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>06/05/2025 16:56:57</publishTime> <publishTime>06/09/2025 09:19:17</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/16/2015 01:57:08</publishTime> </File> <File Include="bin/SyntacticSugar.dll"> <publishTime>06/05/2025 16:48:16</publishTime> <publishTime>06/06/2025 16:42:55</publishTime> </File> <File Include="bin/SyntacticSugar.pdb"> <publishTime>06/05/2025 16:48:16</publishTime> <publishTime>06/06/2025 16:42:55</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>06/05/2025 16:48:17</publishTime> <publishTime>06/06/2025 16:42:55</publishTime> </File> <File Include="bin/TopSdk.pdb"> <publishTime>06/05/2025 16:48:17</publishTime> <publishTime>06/06/2025 16:42:55</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>06/06/2025 15:55:07</publishTime> <publishTime>06/12/2025 08:07:04</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>06/06/2025 15:55:07</publishTime> <publishTime>06/12/2025 08:07:04</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>06/06/2025 16:03:16</publishTime> <publishTime>06/12/2025 08:07:22</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> @@ -492,7 +492,7 @@ <publishTime>04/21/2025 11:46:17</publishTime> </File> <File Include="Web.config"> <publishTime>06/05/2025 16:57:27</publishTime> <publishTime>06/09/2025 09:19:56</publishTime> </File> </ItemGroup> </Project> WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig> <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile11.pubxml</NameOfLastUsedPublishProfile> <UseIISExpress>true</UseIISExpress> sdk_dingding/TopSdk/bin/Debug/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdbBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.CoreCompileInputs.cache
File was deleted sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -3,8 +3,3 @@ C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache 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 D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb sdk_dingding/TopSdk/obj/Debug/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdbBinary files differ
