1
duhe
2023-11-16 76b2a7873334db640eb0072f83793017311a0dcd
1
32个文件已修改
1个文件已添加
544 ■■■■■ 已修改文件
Model/生产管理/设备管理/ClsSb_EquipRepairCheckBillMain.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/BLL.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/BLL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/DBUtility.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/DBUtility.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/Interop.gregn6Lib.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/PayM.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/PayM.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/Pub_Class.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/Pub_Class.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/Pub_Control.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/Pub_Control.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/SQLHelper.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/SQLHelper.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/Interop.gregn6Lib.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/PayM.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt 208 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/PayM.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/PayM.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WarM/仓库管理/Kf_SellOutBill_BarCodeNote.cs 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WarM/仓库管理/Kf_SellOutBill_BarCodeNote.designer.cs 73 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Sb_EquipConkBookBillController.cs 173 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/WebAPIController.cs 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/基础资料/基础资料/Gy_SOPBillController.cs 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/ClsSb_EquipRepairCheckBill.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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.dll
Binary files differ
PayM/bin/x86/Debug/BLL.pdb
Binary files differ
PayM/bin/x86/Debug/DAL.dll
Binary files differ
PayM/bin/x86/Debug/DAL.pdb
Binary files differ
PayM/bin/x86/Debug/DBUtility.dll
Binary files differ
PayM/bin/x86/Debug/DBUtility.pdb
Binary files differ
PayM/bin/x86/Debug/Interop.gregn6Lib.dll
Binary files differ
PayM/bin/x86/Debug/Model.dll
Binary files differ
PayM/bin/x86/Debug/Model.pdb
Binary files differ
PayM/bin/x86/Debug/PayM.dll
Binary files differ
PayM/bin/x86/Debug/PayM.pdb
Binary files differ
PayM/bin/x86/Debug/Pub_Class.dll
Binary files differ
PayM/bin/x86/Debug/Pub_Class.pdb
Binary files differ
PayM/bin/x86/Debug/Pub_Control.dll
Binary files differ
PayM/bin/x86/Debug/Pub_Control.pdb
Binary files differ
PayM/bin/x86/Debug/SQLHelper.dll
Binary files differ
PayM/bin/x86/Debug/SQLHelper.pdb
Binary files differ
PayM/obj/x86/Debug/Interop.gregn6Lib.dll
Binary files differ
PayM/obj/x86/Debug/PayM.csproj.AssemblyReference.cache
Binary 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.cache
Binary files differ
PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache
Binary files differ
PayM/obj/x86/Debug/PayM.dll
Binary files differ
PayM/obj/x86/Debug/PayM.pdb
Binary 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" />