From be368ef45174e5e47c6896dea8abc87e3bb6293a Mon Sep 17 00:00:00 2001
From: cwjbxqmz <1134865194@qq.com>
Date: 星期三, 27 九月 2023 08:24:54 +0800
Subject: [PATCH] 增加 审核，反审核，禁用，反禁用，按钮设置 等按钮；并修改视图，将 审核人，审核日期，禁用人，禁用日期 4列 显示出来；
---
WebAPI/WebAPI.csproj | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index d4467a4..873af06 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -223,8 +223,6 @@
</Reference>
</ItemGroup>
<ItemGroup>
- <Content Include="bin\WebAPI.dll" />
- <Content Include="bin\WebAPI.pdb" />
<Content Include="Content\bootstrap.css" />
<Content Include="Content\bootstrap.min.css" />
<Content Include="Content\Site.css" />
@@ -243,6 +241,7 @@
<Content Include="Views\Scripts\bootstrap.js" />
<Content Include="Views\Scripts\bootstrap.min.js" />
<Content Include="Config\kdapi.config" />
+ <Content Include="libman.json" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -385,6 +384,8 @@
<Compile Include="Controllers\CGGL\Kf_POStockInBackBillController.cs" />
<Compile Include="Controllers\CGGL\Kf_POStockInBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POOrderBillController.cs" />
+ <Compile Include="Controllers\CGGL\Sup_AskPriceBillController.cs" />
+ <Compile Include="Controllers\CGGL\Sup_QuotePriceBillController.cs" />
<Compile Include="Controllers\CGGL\WW_EntrustOrderBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POInStockBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POInStockBackBillController.cs" />
@@ -403,6 +404,7 @@
<Compile Include="Controllers\CJGL\Sc_ProcessSendWorkController.cs" />
<Compile Include="Controllers\CJGL\Sc_ProcExchSendWorkBillController.cs" />
<Compile Include="Controllers\CJGL\Sc_ProcExchWorkBackBillController.cs" />
+ <Compile Include="Controllers\CJGL\Sc_ProcExchWWSendWorkBillController.cs" />
<Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" />
<Compile Include="Controllers\Gy_MateMouldController.cs" />
<Compile Include="Controllers\Gy_StdMinPickQtyController.cs" />
@@ -418,6 +420,7 @@
<Compile Include="Controllers\SBGL\SBTC\Sb_EquipWorkBeforeCheckBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipWorkBeforeCheckSBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipStockInCheckBillSController.cs" />
+ <Compile Include="Controllers\SCGL\Gy_SourceWorkStationSetController.cs" />
<Compile Include="Controllers\SCGL\Sc_ComplementGoodBill_ZXBZController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱DataHelper.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_Cg_PODemandPlanBillController.cs" />
@@ -459,11 +462,16 @@
<Compile Include="Controllers\Sc_MouldRepairSendWorkBillController.cs" />
<Compile Include="Controllers\Sc_ProcessMangementController.cs" />
<Compile Include="Controllers\Sc_ProcessReportController.cs" />
+ <Compile Include="Controllers\浜轰簨绠＄悊\鍏ヨ亴鐢宠\HR_EmpEngageRequestBillController.cs" />
+ <Compile Include="Controllers\浜轰簨绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackBillController.cs" />
+ <Compile Include="Controllers\浜轰簨绠＄悊\绂昏亴鐢宠\HR_EmpDimissionBillController.cs" />
+ <Compile Include="Controllers\浜轰簨绠＄悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\濮斿鐢ㄦ枡\WW_PPBomBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鎵爜寮傚父璁板綍\KF_PonderationBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜鍑哄叆搴撹褰昞Kf_ICStockInOutBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜搴撳瓨\KF_ICInventoryList_WMSBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜鐢熸垚\Gy_BarCodeBill_OutController.cs" />
+ <Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜鐢熸垚\Gy_SplitBarCodeController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜鐢熸垚\KF_BarCodeStatusChangeBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜鐢熸垚\Sc_BarCodeController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\璋冩嫧鐩樼偣\Kf_MoveStockRequestBillController.cs" />
@@ -472,6 +480,10 @@
<Compile Include="Controllers\浠撳瓨绠＄悊\棰嗘枡鍙戣揣\Kf_StockOutRequestBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\楠屾敹鍏ュ簱\Kf_StepFoldinBillController.cs" />
<Compile Include="Controllers\鍗氭棩鑷姩鎵爜绾縗ScanlineAPIController.cs" />
+ <Compile Include="Controllers\鍝佽川绠＄悊\浜х嚎璐ㄦ骞冲彴\Sc_ICMOBillQualityStatus_TmpController.cs" />
+ <Compile Include="Controllers\鍝佽川绠＄悊\浜х嚎杩斾慨骞冲彴\Sc_SourceLineRepairBillController.cs" />
+ <Compile Include="Controllers\鍝佽川绠＄悊\瀹㈣瘔澶勭悊鍗昞Crm_CustomerAppealBillController.cs" />
+ <Compile Include="Controllers\鍝佽川绠＄悊\宸℃鍗昞QC_PatrolProcCheckBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_COMMONCONTACTBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DutyBillController.cs" />
@@ -481,6 +493,7 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MouldStatusController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_OperatorController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PaymentConditionListBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_TemporaryAreaController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RateTypeController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RecConditionBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SettleStyleController.cs" />
@@ -498,6 +511,14 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkStationBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckFlowBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckItemBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPriceController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OutApplyBillController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OverApplyBillController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_PayMentBillController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_SalaryCalculateController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_DuSubsidyItemBillController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_ErrWorkTimesRequestBillController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_ProcPriceRequestBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_MonthlySalaryReportController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_PieceRateWageReportController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjBillController.cs" />
@@ -569,6 +590,11 @@
<Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_QualityReportStepBillController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillController.cs" />
+ <Compile Include="Controllers\椤圭洰绠＄悊\涓氱哗鎸囨爣\PM_YearEmployeeMoneyBillController.cs" />
+ <Compile Include="Controllers\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskBillController.cs" />
+ <Compile Include="Controllers\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBillController.cs" />
+ <Compile Include="Controllers\椤圭洰绠＄悊\鎶ヨ〃鍒嗘瀽\PM_ReportController.cs" />
+ <Compile Include="Controllers\椤圭洰绠＄悊\椤圭洰闃舵\Gy_ProjectStageController.cs" />
<Compile Include="Dapper\SqlHelper.cs" />
<Compile Include="Dapper\SqlPools.cs" />
<Compile Include="DbUntil\DataFormatUntil.cs" />
@@ -661,6 +687,7 @@
<Compile Include="Models\TechnologyParameter.cs" />
<Compile Include="Models\TechnologyParameterUnit.cs" />
<Compile Include="Models\TechParamByProc.cs" />
+ <Compile Include="Models\WorkCenter.cs" />
<Compile Include="Models\Xt_CheckFlowMain.cs" />
<Compile Include="Models\Xt_CheckFlowSub.cs" />
<Compile Include="Models\Xt_CheckItem.cs" />
@@ -669,6 +696,7 @@
<Compile Include="Models\鍩虹璧勬枡\ConkType.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_Duty.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\Gy_TemporaryArea.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_StockPlace.cs" />
<Compile Include="Models\鍩虹璧勬枡\WorkDay.cs" />
<Compile Include="Models\鍩虹璧勬枡\PackType.cs" />
@@ -919,6 +947,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
+ <Folder Include="bin\" />
<Folder Include="obj\x86\Debug\" />
<Folder Include="Views\Cg_PODemandPlanBill\" />
<Folder Include="Views\Cg_PurchaseReturn\" />
@@ -946,6 +975,8 @@
<Folder Include="Views\Gy_RoutingGroup\" />
<Folder Include="Views\Gy_SettleStyle\" />
<Folder Include="Views\Gy_SOPBill\" />
+ <Folder Include="Views\Gy_SourceWorkStationSet\" />
+ <Folder Include="Views\Gy_SplitBarCode\" />
<Folder Include="Views\Gy_Staff\" />
<Folder Include="Views\Gy_StdMinPickQty\" />
<Folder Include="Views\Gy_StockPlace_\" />
@@ -973,6 +1004,7 @@
<Folder Include="Views\ProductionPlanReport\" />
<Folder Include="Views\ProductionReturnBill\" />
<Folder Include="Views\QC_Management\" />
+ <Folder Include="Views\QC_PatrolProcCheckBill\" />
<Folder Include="Views\Sb_EquipRepairSendWorkBill\" />
<Folder Include="Views\Sb_EquipSparepartsBill\" />
<Folder Include="Views\Sb_EquipSparepartsChangeBill\" />
@@ -994,9 +1026,12 @@
<Folder Include="Views\Sc_ProcessSendWork\" />
<Folder Include="Views\Sc_ProcExchRecordBackBill\" />
<Folder Include="Views\Sc_ProcExchSendWorkBill\" />
+ <Folder Include="Views\Sc_ProcExchWWSendWorkBill\" />
<Folder Include="Views\Sc_WorkBillAutoSortBillMain\" />
<Folder Include="Views\Sc_WorkBillSortBill\" />
<Folder Include="Views\Sc_WorkDemandPlanBill\" />
+ <Folder Include="Views\Sup_AskPriceBill\" />
+ <Folder Include="Views\Sup_QuotePriceBill\" />
<Folder Include="Views\Xt_BillSubType\" />
<Folder Include="Views\Xt_CheckFlowBill\" />
<Folder Include="Views\Xt_CheckItem\" />
--
Gitblit v1.9.1