Model/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipRepairCheckBillMain.cs
@@ -15,6 +15,7 @@ public string HExplanation; public string HInnerBillNo; public int HMouldRepairWorkID; public string HRepairCheckMainContent; public int HRepairCheckMainID; } } 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/Model.dllBinary files differ
PayM/bin/x86/Debug/Model.pdbBinary 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/Interop.gregn6Lib.dllBinary files differ
PayM/obj/x86/Debug/PayM.csproj.AssemblyReference.cacheBinary files differ
PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache
@@ -1 +1 @@ 3fadbf89317467dfe910ad93be6dc1c3a5e2a3e3 8e7594ca4172d1e4918a1c55e0b9d55e5ef86939 PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt
@@ -1441,3 +1441,211 @@ D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.CopyComplete D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\PayM\obj\x86\Debug\PayM.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\PayM\obj\x86\Debug\PayM.pdb D:\GITä»åº\MES-WEB-API\PayM\bin\x86\Debug\PayM.dll D:\GITä»åº\MES-WEB-API\PayM\bin\x86\Debug\PayM.pdb D:\GITä»åº\MES-WEB-API\PayM\bin\x86\Debug\BLL.dll D:\GITä»åº\MES-WEB-API\PayM\bin\x86\Debug\DAL.dll D:\GITä»åº\MES-WEB-API\PayM\bin\x86\Debug\DBUtility.dll D:\GITä»åº\MES-WEB-API\PayM\bin\x86\Debug\Model.dll D:\GITä»åº\MES-WEB-API\PayM\bin\x86\Debug\Pub_Class.dll D:\GITä»åº\MES-WEB-API\PayM\bin\x86\Debug\Pub_Control.dll D:\GITä»åº\MES-WEB-API\PayM\bin\x86\Debug\SQLHelper.dll D:\GITä»åº\MES-WEB-API\PayM\bin\x86\Debug\Kingdee.BOS.WebApi.Client.dll D:\GITä»åº\MES-WEB-API\PayM\bin\x86\Debug\Newtonsoft.Json.dll D:\GITä»åº\MES-WEB-API\PayM\bin\x86\Debug\BLL.pdb D:\GITä»åº\MES-WEB-API\PayM\bin\x86\Debug\DAL.pdb D:\GITä»åº\MES-WEB-API\PayM\bin\x86\Debug\DBUtility.pdb D:\GITä»åº\MES-WEB-API\PayM\bin\x86\Debug\Model.pdb D:\GITä»åº\MES-WEB-API\PayM\bin\x86\Debug\Pub_Class.pdb D:\GITä»åº\MES-WEB-API\PayM\bin\x86\Debug\Pub_Control.pdb D:\GITä»åº\MES-WEB-API\PayM\bin\x86\Debug\SQLHelper.pdb D:\GITä»åº\MES-WEB-API\PayM\bin\x86\Debug\Interop.gregn6Lib.dll D:\GITä»åº\MES-WEB-API\PayM\bin\x86\Debug\AxInterop.gregn6Lib.dll D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.AssemblyReference.cache D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\Interop.gregn6Lib.dll D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\AxInterop.gregn6Lib.dll D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.ResolveComReference.cache D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Form2.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_ContractBookBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_ContractBookBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpChangeBillQuery.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpUpChangeBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpUpChangeBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_FamilyMemberBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_FamilyMemberBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_InsuranceBookBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_InsuranceBookBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_LearnHistoryBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_LearnHistoryBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_PaperPhotoBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_PaperPhotoBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_RewardsPunishBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_RewardsPunishBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkInjuryBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkInjuryBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkSkillBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkSkillBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkStoryBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkStoryBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpFosterBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpFosterBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.FrmChangeDate.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_AbsentBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_AbsentBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_DuSubsidyItemBillQuery.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_DuSubsidyItemBill_KS.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EarlyLateErrBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EarlyLateErrBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpInitChangeBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpInitChangeBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesSendBillQuery.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_GroupBalBillQuery.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthICMOStockSumBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthICMOStockSumBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OtherBalBillQuery.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutApplyBillQuery.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OverApplyBillQuery.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\HuanXin.ERP.Pay_PayMentBillListDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\HuanXin.ERP.Pay_PayMentBillListUnPayDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBillQuery.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMent_QC.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMent_QCAdd.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProcPriceRequestBillQuery.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_RewardPunishBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_RewardPunishBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillList_KS.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillQuery.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBill_Enter.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBill_KS.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBill_YR.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SumBalBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SumBalBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SumBalBill_JS.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkErrTimesBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkErrTimesBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesBillQuery.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesSumQueryBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesSumQueryBillListDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutForComApplyBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutForComApplyBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBillReport.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBillReportDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillEntryReport.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillEntryReportDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillSumReport.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillSumReportDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesPayMentEntryReport.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesPayMentEntryReportDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesPayMentSumReport.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesPayMentSumReportDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyYearReport.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_YearToCashBillReport.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_YearToCashBillReportDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Properties.Resources.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpDimissionBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpDimissionBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\OAM.HR_EmpEngageRequestBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\OAM.HR_EmpEngageRequestBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_CarOutApplyBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_CarOutApplyBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew1.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew2.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew3.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew4.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew5.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\BaseSet.Gy_DataInTmp_DuSubsidyItem.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_DuSubsidyItemBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_DuSubsidyItemBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesRequestBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesRequestBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesSendBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesSendBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_GetNeedCheckErrWorkTimesSendBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OtherMoney_Dlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpChangeBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpChangeBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_GroupBalBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_GroupBalBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDayBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDayBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProcPriceRequestBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProcPriceRequestBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OtherBalBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OtherBalBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutApplyBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutApplyBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OverApplyBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OverApplyBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SubsidyChangeBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SubsidyChangeBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpPayMentSumReport.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpPayMentSumReportDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpWorkQtyEntryReport.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpWorkQtyEntryReportDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_InnerScrap.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_InnerScrapDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OuterScrap.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OuterScrapDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDeptSendList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDeptSendListDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDeptYearReport.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDeptYearReportDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentPrintReport.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentPrintReportDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentSendList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentSendListDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentYearReport.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentYearReportDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProdWorkQtyEntryReport.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProdWorkQtyEntryReportDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProdWorkQtySumReport.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProdWorkQtySumReportDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesListDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthWriteBillReportMX.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthWriteBillReportMX2.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Err_MonthExpenseEntryBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Err_MonthExpenseEntryBillDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.KQ_sourceReport.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.KQ_sourceReportDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyEntryBillAdd.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyEntryBillReportMX.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_NoWorkTimesReport.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_NoWorkTimesReportDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill2.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill3.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill4.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill5.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill1.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill2.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill3.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill4.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill5.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBillReport.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBillReportDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyEntryBillReport.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyEntryBillReportDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthWriteBillReport.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthWriteBillReportDlg.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill1.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill2.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill3.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill4.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill5.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBillList.resources D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.GenerateResource.cache D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.CoreCompileInputs.cache D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.CopyComplete D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.dll D:\GITä»åº\MES-WEB-API\PayM\obj\x86\Debug\PayM.pdb PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cacheBinary files differ
PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cacheBinary files differ
PayM/obj/x86/Debug/PayM.dllBinary files differ
PayM/obj/x86/Debug/PayM.pdbBinary files differ
WarM/²Ö¿â¹ÜÀí/Kf_SellOutBill_BarCodeNote.cs
@@ -53,6 +53,7 @@ grdMain.DataSource = null; grdSub.DataSource = null; grdBarCode.DataSource = null; grdTM.DataSource = null; } //çªä½å è½½ @@ -87,6 +88,7 @@ DBUtility.Xt_BaseBillFun.initGridList(grdMain, this.Name); DBUtility.Xt_BaseBillFun.initGridList(grdSub, this.Name + "grdSub"); DBUtility.Xt_BaseBillFun.initGridList(grdBarCode, this.Name + "grdBarCode"); DBUtility.Xt_BaseBillFun.initGridList(grdTM, this.Name + "grdTM"); } @@ -126,6 +128,15 @@ DBUtility.Xt_BaseBillFun.GraphicsGrid(grdBarCode); } private void grdTM_Paint(object sender, PaintEventArgs e) { GraphicsGridTM(); } private void GraphicsGridTM() { DBUtility.Xt_BaseBillFun.GraphicsGrid(grdTM); } private Int32 Fun_GetCol(string sCol) { return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain); @@ -139,6 +150,11 @@ private Int32 Fun_GetBarCodeCol(string sCol) { return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdBarCode); } private Int32 Fun_GetTMCol(string sCol) { return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdTM); } //ç»çº¿ @@ -161,6 +177,12 @@ string s3 = frmCondition.cmbHComplete.Text; long n3 = 0; DBUtility.Xt_BaseBillFun.GraphLine(grdBarCode, MainIDCol3, SubIDCol3, s3, ref n3); int MainIDCol4 = Fun_GetTMCol("hmainid"); int SubIDCol4 = Fun_GetTMCol("hsubid"); string s4 = frmCondition.cmbHComplete.Text; long n4 = 0; DBUtility.Xt_BaseBillFun.GraphLine(grdTM, MainIDCol4, SubIDCol4, s4, ref n4); } //ä¿åå宽 @@ -169,6 +191,7 @@ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name); DBUtility.Xt_BaseBillFun.SaveGrid(grdSub, this.Name + "grdSub"); DBUtility.Xt_BaseBillFun.SaveGrid(grdBarCode, this.Name + "grdBarCode"); DBUtility.Xt_BaseBillFun.SaveGrid(grdTM, this.Name + "grdTM"); } //é»è®¤å宽 @@ -177,6 +200,7 @@ DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name); DBUtility.Xt_BaseBillFun.DefaultGridView(grdSub, this.Name + "grdSub"); DBUtility.Xt_BaseBillFun.DefaultGridView(grdBarCode, this.Name + "grdBarCode"); DBUtility.Xt_BaseBillFun.DefaultGridView(grdTM, this.Name + "grdTM"); } #endregion @@ -298,17 +322,19 @@ cmbHStockOrgID.Text = DSet.Tables[0].Rows[0]["éå®ç»ç»"].ToString(); cmbHBillStatus.Text = DSet.Tables[0].Rows[0]["åæ®ç¶æ"].ToString(); txtHMoney.Text = DSet.Tables[0].Rows[0]["æ¬åéé¢"].ToString(); txtHCreditDifference.Text = DSet.Tables[0].Rows[0]["ä¿¡æ¯å·®é¢"].ToString(); txtHCreditDifference.Text = DSet.Tables[0].Rows[0]["ä¿¡ç¨å·®é¢"].ToString(); HInterID = DBUtility.ClsPub.isLong(DSet.Tables[0].Rows[0]["HInterID"]); //è¿ååºæ¬ä¿¡æ¯ãç åä¿¡æ¯ grdMain.DataSource = DSet.Tables[1].DefaultView; grdBarCode.DataSource = DSet.Tables[2].DefaultView; grdTM.DataSource = DSet.Tables[3].DefaultView; //å»ç» int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text); string s = frmCondition.cmbHComplete.Text; DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s, FrCol); DBUtility.Xt_BaseBillFun.DisplayGrid(grdBarCode, this.Name + "grdBarCode", s, FrCol); DBUtility.Xt_BaseBillFun.DisplayGrid(grdTM, this.Name + "grdTM", s, FrCol); //ç»çº¿ GraphLine(); @@ -566,5 +592,6 @@ } #endregion } } WarM/²Ö¿â¹ÜÀí/Kf_SellOutBill_BarCodeNote.designer.cs
@@ -30,8 +30,8 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Kf_SellOutBill_BarCodeNote)); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.Tool = new System.Windows.Forms.ToolStrip(); this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); this.mrlk = new System.Windows.Forms.ToolStripButton(); @@ -111,6 +111,8 @@ this.ä¸é´ = new System.Windows.Forms.Panel(); this.åºé¨ = new System.Windows.Forms.Panel(); this.å³ä¾§ = new System.Windows.Forms.Panel(); this.tabPage3 = new System.Windows.Forms.TabPage(); this.grdTM = new System.Windows.Forms.DataGridView(); this.Tool.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit(); this.gbUp.SuspendLayout(); @@ -123,6 +125,8 @@ this.panel1.SuspendLayout(); this.groupBox1.SuspendLayout(); this.panel2.SuspendLayout(); this.tabPage3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.grdTM)).BeginInit(); this.SuspendLayout(); // // Tool @@ -309,14 +313,14 @@ this.grdMain.AllowUserToDeleteRows = false; this.grdMain.BackgroundColor = System.Drawing.SystemColors.ControlLightLight; this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; dataGridViewCellStyle1.Font = new System.Drawing.Font("å®ä½", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.grdMain.DefaultCellStyle = dataGridViewCellStyle1; dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; dataGridViewCellStyle3.Font = new System.Drawing.Font("å®ä½", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.grdMain.DefaultCellStyle = dataGridViewCellStyle3; this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill; this.grdMain.Location = new System.Drawing.Point(3, 3); this.grdMain.Margin = new System.Windows.Forms.Padding(0); @@ -866,14 +870,14 @@ this.grdSub.AllowUserToDeleteRows = false; this.grdSub.BackgroundColor = System.Drawing.SystemColors.ControlLightLight; this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; dataGridViewCellStyle2.Font = new System.Drawing.Font("å®ä½", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.grdSub.DefaultCellStyle = dataGridViewCellStyle2; dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; dataGridViewCellStyle4.Font = new System.Drawing.Font("å®ä½", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.grdSub.DefaultCellStyle = dataGridViewCellStyle4; this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill; this.grdSub.Location = new System.Drawing.Point(0, 73); this.grdSub.Margin = new System.Windows.Forms.Padding(0); @@ -890,6 +894,7 @@ // this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage2); this.tabControl1.Controls.Add(this.tabPage3); this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.tabControl1.Location = new System.Drawing.Point(0, 218); this.tabControl1.Name = "tabControl1"; @@ -1035,6 +1040,34 @@ this.å³ä¾§.Size = new System.Drawing.Size(12, 627); this.å³ä¾§.TabIndex = 64; // // tabPage3 // this.tabPage3.Controls.Add(this.grdTM); this.tabPage3.Location = new System.Drawing.Point(4, 22); this.tabPage3.Name = "tabPage3"; this.tabPage3.Padding = new System.Windows.Forms.Padding(3); this.tabPage3.Size = new System.Drawing.Size(1097, 383); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "æ¡ç æç»"; this.tabPage3.UseVisualStyleBackColor = true; // // grdTM // this.grdTM.AllowUserToAddRows = false; this.grdTM.AllowUserToDeleteRows = false; this.grdTM.BackgroundColor = System.Drawing.SystemColors.ControlLightLight; this.grdTM.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.grdTM.Dock = System.Windows.Forms.DockStyle.Fill; this.grdTM.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.grdTM.Location = new System.Drawing.Point(3, 3); this.grdTM.Name = "grdTM"; this.grdTM.ReadOnly = true; this.grdTM.RowHeadersWidth = 30; this.grdTM.RowTemplate.Height = 23; this.grdTM.Size = new System.Drawing.Size(1091, 377); this.grdTM.TabIndex = 47; this.grdTM.Paint += new System.Windows.Forms.PaintEventHandler(this.grdTM_Paint); // // Kf_SellOutBill_BarCodeNote // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -1068,6 +1101,8 @@ this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); this.panel2.ResumeLayout(false); this.tabPage3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.grdTM)).EndInit(); this.ResumeLayout(false); } @@ -1152,5 +1187,7 @@ private System.Windows.Forms.ComboBox cmbHStockOrgID; private System.Windows.Forms.Label label18; private System.Windows.Forms.PictureBox pic1; private System.Windows.Forms.TabPage tabPage3; private System.Windows.Forms.DataGridView grdTM; } } WebAPI/Controllers/SBGL/Sb_EquipConkBookBillController.cs
New file @@ -0,0 +1,173 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Pub_Class; using System; using System.Collections.Generic; using System.Data; using System.Linq; using System.Net; using System.Net.Http; using System.Web.Http; using WebAPI.Models; namespace WebAPI.Controllers { public class Sb_EquipConkBookBillController : ApiController { private json objJsonResult = new json(); public DataSet ds = new DataSet(); public WebServer webserver = new WebServer(); #region è®¾å¤æ éç»è®°åä¿å/ç¼è¾ /// <summary> /// ä¿åè®¾å¤æ éç»è®°å /// </summary> /// <param name="msg"></param> /// <returns></returns> [Route("Sb_EquipConkBookBill/SaveSb_EquipConkBookBillList")] [HttpPost] public object SaveSb_EquipConkBookBillList([FromBody] JObject msg) { var _value = msg["msg"].ToString(); string msg1 = _value.ToString(); string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string msg3 = sArray[1].ToString(); string msg4 = sArray[2].ToString(); Int64 OperationType = Convert.ToInt64(sArray[3]); //string UserName = ""; ListModels oListModels = new ListModels(); try { if (!DBUtility.ClsPub.Security_Log("Sb_EquipConkBookBill_Edit", 1, false, msg4)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ ä¿åæéï¼"; objJsonResult.data = null; return objJsonResult; } DLL.ClsSb_EquipConkBookBill oBill = new DLL.ClsSb_EquipConkBookBill(); List<Model.ClsSb_EquipConkBookBillMain> lsmain = new List<Model.ClsSb_EquipConkBookBillMain>(); msg2 = msg2.Replace("\\", ""); msg2 = msg2.Replace("\n", ""); //\n lsmain = oListModels.getObjectByJson_Gy_EquipConkBookBillMain(msg2); foreach (Model.ClsSb_EquipConkBookBillMain oItem in lsmain) { //oItem.HMaker = ""; //UserName = oItem.HMaker; //å¶å人 oItem.HBillType = "3097"; oItem.HBillSubType = "3097"; //oItem.HBillNo = ""; //åæ®å· //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --æ¥æ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year); oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd")); //oItem.HEquipID = 0; //设å¤ID(Gy_EquipMent) //oItem.HPeriod = 0; //oItem.HRepairBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --ç»´ä¿®å¼å§æ¥æ //oItem.HRepairEndDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --ç»´ä¿®ç»ææ¥æ //oItem.HRepairContent = ""; //ç»´ä¿®å 容 //oItem.HCycleUnit = ""; //æ¶é´åä½(å°æ¶ï¼å¤©) //oItem.HPlanTimes = 0; //计åç»´ä¿®å·¥æ¶ //oItem.HTimes = 0; //å®é ç»´ä¿®å·¥æ¶ //oItem.HEmpID = 0; //维修人(Gy_Employee) //oItem.HManagerID = 0; //主管(Gy_Employee) //oItem.HDeptID = 0; //ç»´ä¿®é¨é¨(Gy_Department) //oItem.HExplanation = ""; //--ç»´ä¿®è¦æ± //oItem.HInnerBillNo = ""; // --å é¨åæ®å· //oItem.HMouldID = 0; //æåæ¨¡å ·ID //oItem.HSupID = 0; //--ä¾åºåï¼Gy_Supplierï¼ //oItem.HRepairType = ""; //--维修类åï¼å é¨ç»´ä¿®ï¼å§å¤ç»´ä¿®ï¼ addnew //oItem.HNewModel = ""; //ç»´ä¿®åæ°è§æ ¼ //oItem.HNewDesignLife = 0; //æ°è®¾è®¡å¯¿å½ //oItem.HRepairID = 0; //维修项ç®(Gy_Repair) //oItem.HRemark = ""; //夿³¨ //oItem.HMainSourceInterID = oItem.HInterID; //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo); if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "ä¿åå¤±è´¥ï¼æ²¡æåæ®æ¥æï¼æ æ³ä¿åï¼"; objJsonResult.data = 1; return objJsonResult; } oBill.omodel = oItem; } //è¡¨ä½æ°æ® //æ },{æ¥æåæ°ç» //廿ãåã msg3 = msg3.Substring(1, msg3.Length - 2); msg3 = msg3.Replace("\\", ""); msg3 = msg3.Replace("\n", ""); //\n //msg2 = msg2.Replace("'", "â"); List<Model.ClsSb_EquipConkBookBillSub> ls = new List<Model.ClsSb_EquipConkBookBillSub>(); ls = oListModels.getObjectByJson_Gy_EquipConkBookBillSub(msg3); int i = 0; foreach (Model.ClsSb_EquipConkBookBillSub oItemSub in ls) { i++; oItemSub.HEntryID = i; //oItemSub.HCloseMan = ""; //è¡å ³é oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now); oItemSub.HCloseType = false; //å ³éç±»å //oItemSub.HRemark = ""; //夿³¨ oItemSub.HSourceInterID = 0; // æºå主å ç oItemSub.HSourceEntryID = 0; //æºååå ç //oItemSub.HSourceBillNo = ""; //æºååå· //oItemSub.HSourceBillType = ""; //æºåç±»å oItemSub.HRelationQty = 0; //å ³èæ°é //oItemSub.HRelationMoney = 0; //å ³èéé¢ //oItemSub.HRepairID = 0; //ç»´ä¿®é¡¹ç® //oItemSub.HRepairExplanation =""; //ç»´ä¿®è¦æ± //oItemSub.HManagerID = 0; //è´è´£äººID //oItemSub.HMoney = 0; //ç»´ä¿®è´¹ç¨ oBill.DetailColl.Add(oItemSub); } //ä¿å //ä¿å宿¯åå¤ç bool bResult; if (OperationType == 1) { // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); } else { bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo); } if (bResult) { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "ä¿åæåï¼"; //WebAPIController.Add_Log("éè´§å䏿¨", UserName, "çæéè´§å"); objJsonResult.data = 1; return objJsonResult; } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "ä¿å失败ï¼" + DBUtility.ClsPub.sExeReturnInfo; objJsonResult.data = 1; return objJsonResult; } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "ä¿å失败ï¼" + e.ToString(); objJsonResult.data = 1; return objJsonResult; } } #endregion } } WebAPI/Controllers/WebAPIController.cs
@@ -4541,6 +4541,12 @@ case "WX": HView = "h_v_Sb_EquipRepairCheckBillList"; break; case "GZ": HView = "h_v_Sb_EquipConkBookBillList"; break; case "YS": HView = "h_v_Sb_EquipRepairCheckBillList"; break; default: objjson.code = "0"; objjson.count = 0; @@ -4550,7 +4556,7 @@ } SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); string sql = string.Format(@"select * from " + HView + " where 1 = 1 "); string sql = string.Format(@"select * from " + HView + " where 1 = 1 " + sWhere); ds = oCN.RunProcReturn(sql, HView); //æ·»å åå foreach (DataColumn col in ds.Tables[0].Columns) @@ -4561,9 +4567,9 @@ } if (ds == null || ds.Tables[0].Rows.Count <= 0) { objjson.code = "0"; objjson.count = 0; objjson.Message = "è·å失败,æ¥æ æ°æ®" + DBUtility.ClsPub.sErrInfo; objjson.code = "1"; objjson.count = 1; objjson.Message = "è·å失败,æ¥æ æ°æ®"; objjson.data = null; objjson.list = columnNameList; return objjson; WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_SOPBillController.cs
@@ -179,5 +179,42 @@ } } /// <summary> /// æ ¹æ®ç©æï¼å·¥åæ¥æ¾ä½ä¸æå¯¼ä¹¦ ///åæ°ï¼string sqlã ///è¿åå¼ï¼objectã /// </summary> [Route("Gy_SopBill/getListByMaterID")] [HttpGet] public object getListByMaterID(Int64 HMaterID, string HSourceNo) { try { var sWhere = ""; if (Convert.ToInt32(HMaterID) != 0 && HMaterID.ToString() != "" && HSourceNo != null && HSourceNo.ToString() != "" ) { sWhere += " and HMaterID = " + HMaterID + " and HSourceNo = '" + HSourceNo + "'"; } string sql1 = string.Format(@"select * from h_v_Sc_ICMOBillList_ToSop where 1 = 1 " + sWhere); ds = oCN.RunProcReturn(sql1, "h_v_Sc_ICMOBillList_ToSop"); 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; } } } } WebAPI/DLL/ClsSb_EquipRepairCheckBill.cs
@@ -99,12 +99,12 @@ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" + ",HYear,HPeriod,HRemark,HMaker,HMakeDate" + ",HEquipID,HExplanation,HInnerBillNo,HEmpID" + ",HManagerID,HDeptID,HCheckResult,HCheckBeginDate,HMouldRepairWorkID" + ",HManagerID,HDeptID,HCheckResult,HCheckBeginDate,HMouldRepairWorkID,HRepairCheckMainID,HRepairCheckMainContent" + ") " + " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" + ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker+ "',getdate()" + ", " + omodel.HEquipID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HCheckResult + "','" + omodel.HCheckBeginDate + "'," + omodel.HMouldRepairWorkID + "," + omodel.HManagerID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HCheckResult + "','" + omodel.HCheckBeginDate + "'," + omodel.HMouldRepairWorkID + "," + omodel.HRepairCheckMainID + ",'" + omodel.HRepairCheckMainContent + "'" + ") "); ////æå ¥å表 foreach (Model.ClsSb_EquipRepairCheckBillSub oSub in DetailColl) WebAPI/WebAPI.csproj
@@ -414,6 +414,7 @@ <Compile Include="Controllers\MJGL\Sc_MouldScrapRequestBillController.cs" /> <Compile Include="Controllers\MJGL\Sc_MouldStatusChangeBillController.cs" /> <Compile Include="Controllers\Pay_ReportController.cs" /> <Compile Include="Controllers\SBGL\Sb_EquipConkBookBillController.cs" /> <Compile Include="Controllers\SBGL\Sb_EquipSparepartsBillController.cs" /> <Compile Include="Controllers\SBGL\Sb_EquipSparepartsChangeBillController.cs" /> <Compile Include="Controllers\SBGL\Sb_EquipStatusChangeBillController.cs" />