From 89742acf77b33c3acb5b306d4d99f4ae01bb2e64 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 27 三月 2024 16:32:55 +0800
Subject: [PATCH] 销售订单：增加 待关闭项 按钮，点击后数据只显示 剩余订金 在(0,500]区间审核状态且没有进行行关闭的记录。 销售订单：同一个单据只有第一条记录显示主表信息 与 layui自带的排序功能 ，问题解决。(使用layui的排序时，触发事件，不在进行同一个单据只有第一条记录显示主表信息处理)
---
WebAPI/WebAPI.csproj | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 023f3be..7d13559 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -342,8 +342,6 @@
<Compile Include="Controllers\BaseSet\Pay_PeriodInfoSetController.cs" />
<Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
<Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
- <Compile Include="Controllers\BaseSet\Gy_WorkTypeController.cs" />
- <Compile Include="Controllers\BaseSet\Gy_WorkPayTypeController.cs" />
<Compile Include="Controllers\BaseSet\Xt_DataDictionary_ProcController.cs" />
<Compile Include="Controllers\BaseSet\Xt_DataDictionary_TableController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ModelTypeController.cs" />
@@ -390,6 +388,7 @@
<Compile Include="Controllers\CGGL\WW_EntrustOrderBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POInStockBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POInStockBackBillController.cs" />
+ <Compile Include="Controllers\CGGL\Cg_PayableBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_CallGoodsBillBackController.cs" />
<Compile Include="Controllers\CJGL\Cj_CallGoodsBillMainController.cs" />
<Compile Include="Controllers\CJGL\Cj_ComplementGoodsBillController.cs" />
@@ -410,11 +409,15 @@
<Compile Include="Controllers\CJGL\Cj_SingleStationController.cs" />
<Compile Include="Controllers\Gy_MateMouldController.cs" />
<Compile Include="Controllers\Gy_StdMinPickQtyController.cs" />
+ <Compile Include="Controllers\JHGL\Gy_MaterialTechParamBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldinventoryBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldDotCheckRuleBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldLifeUseBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldScrapRequestBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldStatusChangeBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldUpperBillController.cs" />
<Compile Include="Controllers\Pay_ReportController.cs" />
+ <Compile Include="Controllers\SBGL\Gy_FixCardBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipConkBookBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipSparepartsBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipSparepartsChangeBillController.cs" />
@@ -427,6 +430,8 @@
<Compile Include="Controllers\SCGL\Sc_ComplementGoodBill_ZXBZController.cs" />
<Compile Include="Controllers\SCGL\Sc_ICMOBillWorkQtyStatus_TmpController.cs" />
<Compile Include="Controllers\SCGL\Sc_ICMOChangeBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_MyTicketController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_WorkBillMonthPlanController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱DataHelper.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_Cg_PODemandPlanBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_CallGoodsBackRequestBillController.cs" />
@@ -443,8 +448,6 @@
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Sc_WorkDemandPlanBillController.cs" />
<Compile Include="Controllers\Sc_PckSplitBillController.cs" />
<Compile Include="Controllers\GZGL\Gy_DuSubsidyItemBillController.cs" />
- <Compile Include="Controllers\GZGL\Gy_WorkPayTypeBillController.cs" />
- <Compile Include="Controllers\GZGL\Gy_WorkTypeBillController.cs" />
<Compile Include="Controllers\JHGL\Gy_RoutingBillController.cs" />
<Compile Include="Controllers\Kf_ICStockBillMainController.cs" />
<Compile Include="Controllers\MateOutController.cs" />
@@ -467,12 +470,21 @@
<Compile Include="Controllers\Sc_MouldRepairSendWorkBillController.cs" />
<Compile Include="Controllers\Sc_ProcessMangementController.cs" />
<Compile Include="Controllers\Sc_ProcessReportController.cs" />
+ <Compile Include="Controllers\XSGL\Kf_ICStockBackBillController.cs" />
+ <Compile Include="Controllers\XSGL\Kf_SellOutEntryReportController.cs" />
+ <Compile Include="Controllers\XSGL\Xs_OutDoorCheckBillController.cs" />
+ <Compile Include="Controllers\XSGL\Xs_SellOutChangeBillController.cs" />
+ <Compile Include="Controllers\XSGL\Xs_CusBalanceReportController.cs" />
+ <Compile Include="Controllers\XSGL\Xs_ReceivableBillController.cs" />
+ <Compile Include="Controllers\XSGL\YS_ContactBalController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOrderChangeBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_ExceptiveCheckRequestBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_CusRatingChangeBillController.cs" />
<Compile Include="Controllers\CGGL\YF_PayMentBackBillController.cs" />
<Compile Include="Controllers\CGGL\YF_PayMentBillController.cs" />
<Compile Include="Controllers\XSGL\YS_ReceiveBackBillController.cs" />
+ <Compile Include="Controllers\CGGL\YF_PayMentOtherBillController.cs" />
+ <Compile Include="Controllers\XSGL\YS_ReceiveOtherBillController.cs" />
<Compile Include="Controllers\XSGL\YS_ReceiveBillController.cs" />
<Compile Include="Controllers\XSGL\Kf_SellOutBillController.cs" />
<Compile Include="Controllers\浜轰簨绠＄悊\鍏ヨ亴鐢宠\HR_EmpEngageRequestBillController.cs" />
@@ -500,6 +512,10 @@
<Compile Include="Controllers\鍝佽川绠＄悊\宸℃鍗昞QC_PatrolProcCheckBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBill_PDAController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityReportsController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardChangeTypeController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardStatusController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardAddressController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardTypeController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_COMMONCONTACTBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DutyBillController.cs" />
@@ -509,6 +525,8 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MouldStatusController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_OperatorController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PaymentConditionListBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DisposeWayController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ScrapReasonController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_TemporaryAreaController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RateTypeController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RecConditionBillController.cs" />
@@ -527,7 +545,11 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkStationBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckFlowBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckItemBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_FastICSchemeController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPriceController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkTypeController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkPayTypeController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjGroupController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OutApplyBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OverApplyBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_PayMentBillController.cs" />
@@ -537,7 +559,7 @@
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_ProcPriceRequestBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_MonthlySalaryReportController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_PieceRateWageReportController.cs" />
- <Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjSubController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OtherBalBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_GroupBalBillController.cs" />
@@ -623,6 +645,7 @@
<Compile Include="DLL\ClsGy_AreaSet_Ctl.cs" />
<Compile Include="DLL\ClsGy_CusType_Ctl.cs" />
<Compile Include="DLL\ClsGy_StockCheckItem_Ctl.cs" />
+ <Compile Include="DLL\ClsGy_ProjectMoney_Ctl.cs" />
<Compile Include="DLL\ClsGy_SupType_Ctl.cs" />
<Compile Include="DLL\ClsGy_SellStyle_Ctl.cs" />
<Compile Include="DLL\ClsGy_PostSkill_Ctl.cs" />
@@ -1059,12 +1082,14 @@
<Folder Include="Views\Sc_MouldRepairSendWorkBill\" />
<Folder Include="Views\Sc_MouldScrapRequestBill\" />
<Folder Include="Views\Sc_MouldStatusChangeBill\" />
+ <Folder Include="Views\Sc_MouldUpperBill\" />
<Folder Include="Views\Sc_ProcessExchangeIssueBill\" />
<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_WorkBillMonthPlan\" />
<Folder Include="Views\Sc_WorkBillSortBill\" />
<Folder Include="Views\Sc_WorkDemandPlanBill\" />
<Folder Include="Views\Sup_AskPriceBill\" />
@@ -1117,10 +1142,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <WebReferenceUrl Include="http://192.168.63.20/WEBS-WMS/WebService1.asmx">
+ <WebReferenceUrl Include="http://192.168.63.53/WEBS-WMS/WebService1.asmx">
<UrlBehavior>Dynamic</UrlBehavior>
<RelPath>Web References\WebS\</RelPath>
- <UpdateFromURL>http://192.168.63.20/WEBS-WMS/WebService1.asmx</UpdateFromURL>
+ <UpdateFromURL>http://192.168.63.53/WEBS-WMS/WebService1.asmx</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>
@@ -1137,6 +1162,8 @@
<PlatformTarget>x86</PlatformTarget>
<OutputPath>bin\</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
+ <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+ <RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<PlatformTarget>x86</PlatformTarget>
--
Gitblit v1.9.1