完善修复基础资料列表增删改查功能（物料，仓库，职员，部门，组织，计量单位）

yusijie

2022-11-16 a825c44ff42da28c26c26a17b65dba6c1c896262

完善修复基础资料列表增删改查功能（物料，仓库，职员，部门，组织，计量单位）

 BLL/ϵͳ¹«ÓÃCLS/ClsPub_BLL.cs

@@ -722,7 +722,7 @@
        public static void Sub_CheckUseStatus(DataGridView grd, int IDCol,string sProcName)
        {
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            Int64 sItemID;
            Int64 sItemID;            
            try
            {
                //循环当前网格选中项目

 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.CoreCompileInputs.cache

@@ -1 +1 @@
b14f4fcc24537f5a4b1d1021595a00930f37f5f5
2b98949b87d39f3f48ff12a0b7c639d4a4168873

 PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt

@@ -1025,3 +1025,211 @@
D:\Git仓库\MESWMS-API(最新)\MES-WEB-API\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.CopyComplete
D:\Git仓库\MESWMS-API(最新)\MES-WEB-API\MES-WEB-API\PayM\obj\x86\Debug\PayM.dll
D:\Git仓库\MESWMS-API(最新)\MES-WEB-API\MES-WEB-API\PayM\obj\x86\Debug\PayM.pdb
D:\智云LMes\MES-WEB-API\PayM\bin\x86\Debug\PayM.dll
D:\智云LMes\MES-WEB-API\PayM\bin\x86\Debug\PayM.pdb
D:\智云LMes\MES-WEB-API\PayM\bin\x86\Debug\BLL.dll
D:\智云LMes\MES-WEB-API\PayM\bin\x86\Debug\DAL.dll
D:\智云LMes\MES-WEB-API\PayM\bin\x86\Debug\DBUtility.dll
D:\智云LMes\MES-WEB-API\PayM\bin\x86\Debug\Model.dll
D:\智云LMes\MES-WEB-API\PayM\bin\x86\Debug\Pub_Class.dll
D:\智云LMes\MES-WEB-API\PayM\bin\x86\Debug\Pub_Control.dll
D:\智云LMes\MES-WEB-API\PayM\bin\x86\Debug\SQLHelper.dll
D:\智云LMes\MES-WEB-API\PayM\bin\x86\Debug\Kingdee.BOS.WebApi.Client.dll
D:\智云LMes\MES-WEB-API\PayM\bin\x86\Debug\Newtonsoft.Json.dll
D:\智云LMes\MES-WEB-API\PayM\bin\x86\Debug\BLL.pdb
D:\智云LMes\MES-WEB-API\PayM\bin\x86\Debug\DAL.pdb
D:\智云LMes\MES-WEB-API\PayM\bin\x86\Debug\DBUtility.pdb
D:\智云LMes\MES-WEB-API\PayM\bin\x86\Debug\Model.pdb
D:\智云LMes\MES-WEB-API\PayM\bin\x86\Debug\Pub_Class.pdb
D:\智云LMes\MES-WEB-API\PayM\bin\x86\Debug\Pub_Control.pdb
D:\智云LMes\MES-WEB-API\PayM\bin\x86\Debug\SQLHelper.pdb
D:\智云LMes\MES-WEB-API\PayM\bin\x86\Debug\Interop.gregn6Lib.dll
D:\智云LMes\MES-WEB-API\PayM\bin\x86\Debug\AxInterop.gregn6Lib.dll
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.csprojAssemblyReference.cache
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\Interop.gregn6Lib.dll
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\AxInterop.gregn6Lib.dll
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.ResolveComReference.cache
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Form2.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_ContractBookBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_ContractBookBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpChangeBillQuery.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpUpChangeBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpUpChangeBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_FamilyMemberBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_FamilyMemberBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_InsuranceBookBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_InsuranceBookBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_LearnHistoryBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_LearnHistoryBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_PaperPhotoBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_PaperPhotoBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_RewardsPunishBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_RewardsPunishBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkInjuryBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkInjuryBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkSkillBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkSkillBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkStoryBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkStoryBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpFosterBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpFosterBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.FrmChangeDate.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_AbsentBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_AbsentBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_DuSubsidyItemBillQuery.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_DuSubsidyItemBill_KS.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EarlyLateErrBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EarlyLateErrBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpInitChangeBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpInitChangeBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesSendBillQuery.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_GroupBalBillQuery.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthICMOStockSumBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthICMOStockSumBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OtherBalBillQuery.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutApplyBillQuery.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OverApplyBillQuery.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\HuanXin.ERP.Pay_PayMentBillListDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\HuanXin.ERP.Pay_PayMentBillListUnPayDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBillQuery.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMent_QC.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMent_QCAdd.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProcPriceRequestBillQuery.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_RewardPunishBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_RewardPunishBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillList_KS.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillQuery.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBill_Enter.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBill_KS.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBill_YR.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SumBalBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SumBalBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SumBalBill_JS.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkErrTimesBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkErrTimesBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesBillQuery.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesSumQueryBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesSumQueryBillListDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutForComApplyBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutForComApplyBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBillReport.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBillReportDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillEntryReport.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillEntryReportDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillSumReport.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillSumReportDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesPayMentEntryReport.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesPayMentEntryReportDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesPayMentSumReport.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesPayMentSumReportDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyYearReport.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_YearToCashBillReport.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_YearToCashBillReportDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Properties.Resources.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpDimissionBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpDimissionBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\OAM.HR_EmpEngageRequestBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\OAM.HR_EmpEngageRequestBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_CarOutApplyBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_CarOutApplyBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew1.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew2.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew3.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew4.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew5.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\BaseSet.Gy_DataInTmp_DuSubsidyItem.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_DuSubsidyItemBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_DuSubsidyItemBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesRequestBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesRequestBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesSendBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesSendBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_GetNeedCheckErrWorkTimesSendBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OtherMoney_Dlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpChangeBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpChangeBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_GroupBalBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_GroupBalBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDayBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDayBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProcPriceRequestBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProcPriceRequestBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OtherBalBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OtherBalBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutApplyBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutApplyBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OverApplyBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OverApplyBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SubsidyChangeBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SubsidyChangeBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpPayMentSumReport.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpPayMentSumReportDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpWorkQtyEntryReport.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpWorkQtyEntryReportDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_InnerScrap.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_InnerScrapDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OuterScrap.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OuterScrapDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDeptSendList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDeptSendListDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDeptYearReport.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDeptYearReportDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentPrintReport.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentPrintReportDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentSendList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentSendListDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentYearReport.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentYearReportDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProdWorkQtyEntryReport.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProdWorkQtyEntryReportDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProdWorkQtySumReport.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProdWorkQtySumReportDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesListDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthWriteBillReportMX.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthWriteBillReportMX2.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Err_MonthExpenseEntryBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Err_MonthExpenseEntryBillDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.KQ_sourceReport.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.KQ_sourceReportDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyEntryBillAdd.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyEntryBillReportMX.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_NoWorkTimesReport.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_NoWorkTimesReportDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill2.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill3.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill4.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill5.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill1.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill2.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill3.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill4.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill5.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBillReport.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBillReportDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyEntryBillReport.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyEntryBillReportDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthWriteBillReport.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthWriteBillReportDlg.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill1.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill2.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill3.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill4.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill5.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBillList.resources
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.GenerateResource.cache
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.CoreCompileInputs.cache
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.CopyComplete
D:\智云LMes\MES-WEB-API\PayM\obj\x86\Debug\PayM.dll
D:\智云LMes\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.csprojAssemblyReference.cache

Binary files differ

 PayM/obj/x86/Debug/PayM.dll

Binary files differ

 PayM/obj/x86/Debug/PayM.pdb

Binary files differ

 WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs

@@ -506,7 +506,7 @@
            }
            catch (Exception e)
            {
                oCN.RollBack();
                //oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.Message;

 WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs

@@ -328,8 +328,8 @@
                long HCTPrjID = list[0].HCTPrjID;
                long HProcID = list[0].HProcID;
                string HBasePay = list[0].HBasePay;
                DateTime HInComDate = list[0].HInComDate;
                DateTime HDimissionDate = list[0].HDimissionDate;
                DateTime HInComDate = list[0].HInComDate;   //进厂日期
                DateTime HDimissionDate = list[0].HDimissionDate;   //离职日期 (允许NULL)
                bool HOverType = list[0].HOverType;
                string HEmpType = list[0].HEmpType;
                string HOtherDeduct3 = list[0].HOtherDeduct3;
@@ -338,23 +338,23 @@
                string HMedicare = list[0].HMedicare;
                bool HNoBrushFlag = list[0].HNoBrushFlag;
                bool HShiftFlag = list[0].HShiftFlag;
                DateTime HContactDate = list[0].HContactDate;
                //DateTime HContactDate = list[0].HContactDate;  //合同日期
                bool HStopwagesFlag = list[0].HStopwagesFlag;
                string HDimissionReason = list[0].HDimissionReason;
                long HDormID = list[0].HDormID;
                string HArchivesNo = list[0].HArchivesNo;
                DateTime HStayCardEDate = list[0].HStayCardEDate;
                DateTime HCheckCardEDate = Convert.ToDateTime("1900/1/1");
                DateTime HStayCardEDate = list[0].HStayCardEDate;   //暂住证到期日
                DateTime HCheckCardEDate = Convert.ToDateTime("1900/1/1");  //审检证到期日
                string HJobCardNo = list[0].HJobCardNo ?? "";
                DateTime HJobCardEDate = Convert.ToDateTime("1900/1/1");
                DateTime HJobCardEDate = Convert.ToDateTime("1900/1/1");  //就业证到期日
                string HWorkType = list[0].HWorkType;
                long HContractYear = list[0].HContractYear;
                DateTime HContractBDate = list[0].HContractBDate;
                DateTime HContractEDate = list[0].HContractEDate;
                DateTime HContractBDate = list[0].HContractBDate;  //合同开始日
                DateTime HContractEDate = list[0].HContractEDate;   //合同到期日
                string HInsuranceNo = list[0].HInsuranceNo;
                DateTime HInsuranceDate = list[0].HInsuranceDate;
                DateTime HInsuranceDate = list[0].HInsuranceDate;   //参保日期
                bool HInsuranceStatus = list[0].HInsuranceStatus;
                DateTime HSignDate = list[0].HSignDate;
                DateTime HSignDate =  Convert.ToDateTime("1900/1/1");  //签约日期
                bool HSignStatus = list[0].HSignStatus;
                string HOldCompany = list[0].HOldCompany ?? "";
                string HMarr = list[0].HMarr ?? "";
@@ -363,7 +363,7 @@
                string HSpec = list[0].HSpec ?? "";
                string HCompLev = list[0].HCompLev ?? "";
                string HEngLev = list[0].HEngLev ?? "";
                DateTime HGradDate = list[0].HGradDate;
                DateTime HGradDate = list[0].HGradDate;  //毕业日期
                string HGradSchool = list[0].HGradSchool ?? "";
                string HSalaryLev = list[0].HSalaryLev ?? "";
                long HDutyID = list[0].HDutyID;
@@ -389,10 +389,12 @@
                string HStdDayPay = list[0].HStdDayPay ?? "";
                string HMinDayPay = list[0].HMinDayPay ?? "";
                string HMinMonthPay = list[0].HMinMonthPay ?? "";
                DateTime HMadeDate = list[0].HMadeDate;
                //DateTime HMadeDate = list[0].HMadeDate;  //建立日期
                string HEmpRate = list[0].HEmpRate ?? "";
                string HExamRate = list[0].HExamRate ?? "";
                DateTime HHealthCardEDate = Convert.ToDateTime("1900/1/1");
                DateTime HHealthCardEDate = Convert.ToDateTime("1900/1/1");  //健康证到期日
                long HUSEORGID = list[0].HUSEORGID;

                ////判断权限
                //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
                //{
@@ -442,25 +444,25 @@
                      ",HEmpType,HPayType,HOverType,HNoBrushFlag,HShiftFlag,HStopwagesFlag" +
                      ",HPostalCode,HBank,HBasePay,HExamLevPostMoney,HBSTDeptID" +
                      ",HOtherDeduct3,HInsurance,HMedicare,HDrydock" +
                      ",HBankAccount,HGroupID,HDeptID,HWorkTypeID,HCTPrjID,HAddress" +
                      ",HBankAccount,HGroupID,HDeptID,HWorkTypeID,HCTPrjID,HUSEORGID,HAddress" +
                      ") " +
                    " Values('" + HNumber + "','" + HName + "','" + HShortNumber + "'," + HEmpRate.ToString() + "," + HExamRate.ToString() +
                      "," + HLevel + "," + HParentID + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + HHighestPay.ToString() + "," + HOverPayRate.ToString() +
                      "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'" + ",'" + HHelpCode + "'," + HInsuranceSubsidy.ToString() + "" +
                      ",'" + HBirthDay + "','" + HGradDate + "','" + HInsuranceDate + "','" + HContractBDate + "','" + HContractEDate + "'" +
                   " Values('" + HNumber + "','" + HName + "','" + HShortNumber + "','" + HEmpRate.ToString() + "','" + HExamRate.ToString() +
                      "','" + HLevel + "','" + HParentID + "','" + Convert.ToString(HEndFlag ? 1 : 0) + "','" + HHighestPay.ToString() + "','" + HOverPayRate.ToString() +
                      "','" + Convert.ToString(HStopflag ? 1 : 0) + "','" + HRemark + "'" + ",'" + HHelpCode + "','" + HInsuranceSubsidy.ToString() +
                      "','" + HBirthDay + "','" + HGradDate + "','" + HInsuranceDate + "','" + HContractBDate + "','" + HContractEDate + "'" +
                      ",'" + HJobCardEDate + "','" + HCheckCardEDate + "','" + HStayCardEDate + "','" + HHealthCardEDate + "'" +
                      "," + HAge.ToString() + ",'" + HSalaryLev + "'," + HContractYear.ToString() + "," + Convert.ToString(HInsuranceStatus ? 1 : 0) + "," + Convert.ToString(HSignStatus ? 1 : 0) +
                      ",'" + HSex + "','" + HMarr + "','" + HBlighty + "','" + HNation + "','" + HBlightyType + "'" +
                      ",'" + HAge.ToString() + "','" + HSalaryLev + "','" + HContractYear.ToString() + "','" + Convert.ToString(HInsuranceStatus ? 1 : 0) + "','" + Convert.ToString(HSignStatus ? 1 : 0) +
                      "','" + HSex + "','" + HMarr + "','" + HBlighty + "','" + HNation + "','" + HBlightyType + "'" +
                      ",'" + HGovStatus + "','" + HBloodType + "','" + HStature + "','" + HAvoird + "','" + HKnowLev + "'" +
                      ",'" + HProTitleID + "','" + HGradSchool + "','" + HEngLev + "','" + HCompLev + "','" + HSpec + "'" +
                      ",'" + HEmail + "','" + HNowAdd + "','" + HHomeAdd + "','" + HIDCard + "','" + HLinkPhone + "','" + HMobilePhone + "','" + HFax + "'" +
                      ",'" + HOldCompany + "','" + HInsuranceNo + "','" + HJobCardNo + "','" + HArchivesNo + "','" + HWorkType + "','" + HDimissionReason + "'" +
                      ",'" + HDimissionDate + "','" + HInComDate + "','" + HSignDate + "','" + HRelDate + "'" +
                      "," + HPostID.ToString() + "," + HDormID.ToString() + "," + HDutyID.ToString() + "," + HLeftMoneyRate.ToString() +
                      ",'" + HEmpType + "'" + ",'" + HPayType + "'" + "," + DBUtility.ClsPub.BoolToString(HOverType) + "" + "," + DBUtility.ClsPub.BoolToString(HNoBrushFlag) + "" + "," + DBUtility.ClsPub.BoolToString(HShiftFlag) + "" + "," + DBUtility.ClsPub.BoolToString(HStopwagesFlag) + "" +
                      ",'" + HPostalCode + "','" + HBank + "'," + HBasePay.ToString() + "," + HExamLevPostMoney.ToString() + ",'" + HBSTDeptID + "'" +
                      "," + HOtherDeduct3.ToString() + "" + "," + HInsurance.ToString() + "" + "," + HMedicare.ToString() + "" + "," + HDrydock.ToString() + "" +
                      ",'" + HBankAccount + "'" + "," + HGroupID.ToString() + "" + "," + HDeptID.ToString() + "," + HWorkTypeID.ToString() + "," + HCTPrjID.ToString() + ",'" + HAddress + "'" + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                      ",'" + HPostID.ToString() + "','" + HDormID.ToString() + "','" + HDutyID.ToString() + "','" + HLeftMoneyRate.ToString() +
                      "','" + HEmpType + "'" + ",'" + HPayType + "'" + ",'" + DBUtility.ClsPub.BoolToString(HOverType) + "','" + DBUtility.ClsPub.BoolToString(HNoBrushFlag) + "','" + DBUtility.ClsPub.BoolToString(HShiftFlag) + "','" + DBUtility.ClsPub.BoolToString(HStopwagesFlag) +
                      "','" + HPostalCode + "','" + HBank + "','" + HBasePay.ToString() + "','" + HExamLevPostMoney.ToString() + "','" + HBSTDeptID + "'" +
                      ",'" + HOtherDeduct3.ToString() + "','" + HInsurance.ToString() + "','" + HMedicare.ToString() + "','" + HDrydock.ToString() +
                      "','" + HBankAccount + "'" + ",'" + HGroupID.ToString() + "','" + HDeptID.ToString() + "','" + HWorkTypeID.ToString() + "','" + HCTPrjID.ToString() + "','" + HUSEORGID + "','" + HAddress + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCN.RunProc("Update Gy_Employee set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();
@@ -565,7 +567,7 @@
            }
            catch (Exception e)
            {
                oCN.RollBack();
                //oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.Message;
@@ -870,7 +872,7 @@
                    return objJsonResult;
                }

                oCN.RunProc("update Gy_Employee set HStopflag=1 where HItemID=" + HItemID);
                oCN.RunProc("delete from Gy_Employee where HItemID=" + HItemID);
                oCN.Commit();//提交事务
                objJsonResult.code = "0";
                objJsonResult.count = 1;

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -7,6 +7,7 @@
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
using System.Windows.Forms;
using WebAPI.Models;
using WebAPI.Service;

@@ -20,6 +21,36 @@
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;



        ////检测 å½“前选中行的 é¡¹ç›®çŠ¶æ€
        //[Route("Gy_Material/CheckUseStatus")]
        //[HttpGet]
        //public void Sub_CheckUseStatus(int grd, int IDCol, string sProcName)
        //{
        //    SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
        //    Int64 sItemID;
        //    try
        //    {
        //        //循环当前网格选中项目
        //        for (int i = 0; i < grd.SelectedRows.Count; i++)
        //        {
        //            //得到内码
        //            sItemID = DBUtility.ClsPub.isLong(grd.Rows[grd.SelectedRows[i].Index].Cells[IDCol].Value);
        //            //调用储存过程 h_p_Gy_CheckUseDept 
        //            oCn.RunProc("exec " + sProcName + " " + sItemID.ToString(), ref ClsPub.sExeReturnInfo);
        //        }
        //    }
        //    catch (Exception e)
        //    {
        //        MessageBox.Show("检测错误！原因：" + ClsPub.sExeReturnInfo);
        //        //objJsonResult.code = "0";
        //        //objJsonResult.count = 0;
        //        //objJsonResult.Message = "检测错误！原因：" + ClsPub.sExeReturnInfo;
        //        //objJsonResult.data = null;
        //        //return objJsonResult;
        //    }
        //}

        /// <summary>
        /// è¿”回物料列表
@@ -104,6 +135,7 @@
            string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg1 = sArray[0].ToString();
            string msg2 = sArray[1].ToString();
            string msg_HUSEORGID = sArray[2].ToString();
            Int64 HItemID = 0;
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

@@ -253,7 +285,7 @@
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }

                    oItem.HUSEORGID = Convert.ToInt32(msg_HUSEORGID); //组织id
                    oItem.HShortNumber = sShortNumber;//短代码
                    oItem.HEndFlag = true;//末级标志
                    oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级
@@ -353,7 +385,7 @@
                    return objJsonResult;
                }

                oCN.RunProc("update Gy_Material set HStopflag=1 where HItemID=" + HItemID);
                oCN.RunProc("delete from Gy_Material where HItemID=" + HItemID);
                oCN.Commit();//提交事务
                objJsonResult.code = "0";
                objJsonResult.count = 1;

 WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs

@@ -203,6 +203,8 @@
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();
                string AddOrEdit = sArray[2].ToString(); //1新增3编辑
                //int ItemID = Convert.ToInt32(sArray[2]);
                //string msg4 = sArray[2].ToString();
                //string msg5 = sArray[3].ToString();
                //反序列化
@@ -218,6 +220,7 @@
                string HRemark = list[0].HRemark;
                bool HStopflag = list[0].HStopflag;
                int ChangeHStopflag = 0;

                if (HStopflag)
                {
                    ChangeHStopflag = 1;
@@ -251,31 +254,40 @@
                //}
                //保存
                //保存完毕后处理
                if (HItemID == 0)
                if (AddOrEdit == "1")
                {
                    oCN.BeginTran();
                    oCN.RunProc("Insert into Xt_ORGANIZATIONS " +
                    " (HNumber,HName,HParentID" +
                   ",HStopflag,HMakeTime" +
                   ",HStopflag,HMakeTime,HItemID" +
                   ",HRemark) " +
                   " Values('" + HNumber + "','" + HName + "','" + HParentID.ToString() +
                   "','" + ChangeHStopflag + "'," + "getdate()" +
                   "','" + ChangeHStopflag + "'," + "getdate()" + ",'" + HItemID + "'" +
                   ",'" + HRemark + "')", ref DBUtility.ClsPub.sExeReturnInfo);

                    //修改上级为非末级代码
                    oCN.RunProc("Update Xt_ORGANIZATIONS set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();
                }
                else
                else if(AddOrEdit == "3")
                {
                    int Stopflag;
                    if (HStopflag)
                    {
                        Stopflag = 1;
                    }
                    else
                    {
                        Stopflag = 0;
                    }
                    //若MAINDI重复则重新获取
                    oCN.BeginTran();
                    oCN.RunProc("Update Xt_ORGANIZATIONS set " +
                               " HNumber='" + HNumber + "'" +
                                 ",HName='" + HName + "'" +
                                  ",HParentID=" + HParentID +
                                  ",HMakeTime=" + HMakeTime +
                                 ",HStopflag='" + HStopflag + "'" +
                                  ",HParentID='" + HParentID + "'" +
                                  ",HMakeTime='" + HMakeTime + "'" +
                                 ",HStopflag='" + Stopflag + "'" +
                                 ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.RunProc("Update Xt_ORGANIZATIONS set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();
@@ -298,6 +310,37 @@
            }
        }
        /// <summary>
        /// èŽ·å–最大HItemID
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Xt_ORGANIZATIONS/GetMaxHItemID")]
        [HttpGet]
        public object GetMaxHItemID()
        {
            try
            {
               
                ds = oCN.RunProcReturn("select MAX(HItemID) from Xt_ORGANIZATIONS ", "Xt_ORGANIZATIONS");
               

              
                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;
            }
        }
        /// <summary>
        /// ç»„织设置删除功能
        /// </summary>
        /// <returns></returns>

 WebAPI/Controllers/PublicPageMethodController.cs

@@ -3614,13 +3614,13 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName  from Gy_ClassTimePrj where HStopflag=0 Order by HItemID ", "Gy_ClassTimePrj");
                    ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName  from Gy_ClassTimePrjGroup where HStopflag=0 Order by HItemID ", "Gy_ClassTimePrjGroup");
                }
                else
                {
                    string sql1 = "Select HItemID,HNumber ,HName  from Gy_ClassTimePrj where HStopflag=0  ";
                    string sql1 = "Select HItemID,HNumber ,HName  from Gy_ClassTimePrjGroup where HStopflag=0  ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrj");
                    ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
                }

                //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);

 WebAPI/Controllers/WebAPIController.cs

@@ -1286,6 +1286,65 @@
        }

        /// <summary>
        /// èŽ·å–计量单位组列表
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetUnitGroupList_Json")]
        [HttpGet]
        public object GetUnitGroupList_Json(string Unit)
        {
            //sWhere = " Where HStopFlag=0  and HEndFlag=1";
            //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
            if (Unit != "" && Unit != null)
            {
                sWhere = sWhere + " and ( HNumber like '%" + Unit + "%' or HName like '%" + Unit + "%' ) ";
            }
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("Select HItemID,HNumber è®¡é‡å•ä½ç»„代码,HName è®¡é‡å•ä½ç»„ from Gy_UnitGroup where HStopflag=0 Order by HItemID ", "Gy_UnitGroup");
                }
                else
                {
                    string sql1 = "Select HItemID,HNumber è®¡é‡å•ä½ç»„代码,HName è®¡é‡å•ä½ç»„ from Gy_UnitGroup where HStopflag=0 and HEndFlag=1 ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "Gy_UnitGroup");
                }

                //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);


                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "0";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            }
            catch (Exception ex)
            {

                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }

        /// <summary>
        /// èŽ·å–客户列表
        /// </summary>
        /// <returns></returns>

 WebAPI/DLL/ClsGy_Material_Ctl.cs

@@ -24,14 +24,14 @@
                    ",HWhID,HRoutingID,HBomID,HSecUnitID,HSecUnitRate" +
                    ",HHighStock,HLowStock,HSafeStock,HOrderPrice,HSalePrice" +
                    ",HKeepDays,HPlanPrice,HstdPrice,HQtyMin,HQtyMax" +
                    ",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID,HMinPickQty) " +
                    ",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID,HMinPickQty,HUSEORGID) " +
                    " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
                    ", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
                    ",'" + oModel.HModel + "'," + oModel.HUnitID.ToString() + "," + oModel.HMaterClsID.ToString() + "," + oModel.HMaterTypeID.ToString() + "," + oModel.HUnitGroupID.ToString() +
                    ", " + oModel.HWhID.ToString() + "," + oModel.HRoutingID.ToString() + "," + oModel.HBomID.ToString() + "," + oModel.HSecUnitID.ToString() + "," + oModel.HSecUnitRate.ToString() +
                    ", " + oModel.HHighStock.ToString() + "," + oModel.HLowStock.ToString() + "," + oModel.HSafeStock.ToString() + "," + oModel.HOrderPrice.ToString() + ",'" + oModel.HSalePrice + "'" +
                    ", " + oModel.HKeepDays.ToString() + "," + oModel.HPlanPrice.ToString() + "," + oModel.HstdPrice.ToString() + "," + oModel.HQtyMin.ToString() + "," + oModel.HQtyMax.ToString() +
                    ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                oCn.Commit();

 WebAPI/Models/ClsGy_Material_Model.cs

@@ -39,6 +39,6 @@
        public long HUnitGroupID;
        public long HMaterTypeID;
        public double HPlanPrice;

        public int HUSEORGID;
    }
}

 WebAPI/Models/»ù´¡×ÊÁÏ/Gy_Employee.cs

@@ -104,5 +104,6 @@
        public string HEmpRate { get; set; }
        public string HExamRate { get; set; }
        public DateTime HHealthCardEDate { get; set; }
        public long HUSEORGID { get; set; }
    }
}