From c27a4d97237e233678deb34b474fe8538b75dcb8 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 20 六月 2025 15:43:41 +0800
Subject: [PATCH] 合并分支i
---
WebAPI/WebAPI.csproj | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 090ed99..635e6b1 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -20,7 +20,8 @@
<IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
<IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
<TargetFrameworkProfile />
- <Use64BitIISExpress />
+ <Use64BitIISExpress>
+ </Use64BitIISExpress>
<UseGlobalApplicationHostFile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
@@ -432,6 +433,7 @@
<Compile Include="Controllers\CGGL\Cg_PayableBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POStockInChangeBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POOrderChangeBillController.cs" />
+ <Compile Include="Controllers\CGGL\Cg_POStockInBillList_SecController.cs" />
<Compile Include="Controllers\CJGL\Cj_CallGoodsBillBackController.cs" />
<Compile Include="Controllers\CJGL\Cj_CallGoodsBillMainController.cs" />
<Compile Include="Controllers\CJGL\Cj_CenterCheckBillController.cs" />
@@ -444,7 +446,11 @@
<Compile Include="Controllers\CJGL\Sc_OEEReportController.cs" />
<Compile Include="Controllers\CKGL\TMZD\Gy_BarCodeBillListController.cs" />
<Compile Include="Controllers\JHGL\Gy_SourceMouldBillController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckRuleBillController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckPlanBillController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckBillController.cs" />
<Compile Include="Controllers\XSGL\Crm_ComplainVisitBillController.cs" />
+ <Compile Include="Controllers\XSGL\Xs_SellOutBillList_SecController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeQuotationBillController.cs" />
<Compile Include="Controllers\Xt_DefineBillMainSetController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldBatchWorkCheckBillController.cs" />
@@ -457,6 +463,9 @@
<Compile Include="Controllers\ZLGL\BaseSet\Gy_QualityController.cs" />
<Compile Include="Controllers\浜轰簨绠＄悊\浜哄憳灞ュ巻\HR_PersonnelResumeController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\Kf_MoveStockBillController.cs" />
+ <Compile Include="Controllers\浠撳瓨绠＄悊\鐢熶骇棰嗘枡\Kf_ProductReceiveMaterialBillController.cs" />
+ <Compile Include="Controllers\鍗庤繙datamapping\QC_CheckNote_PNL_TempController.cs" />
+ <Compile Include="Controllers\鍗庤繙datamapping\HY_DataMappingController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\鍩虹璧勬枡\Gy_BaseInformationController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\鐜妫�娴嬪崟\QC_EnvironmentTestDotCheckBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\璐ㄩ噺鏈堝害鐩爣鍗昞QC_MonthTarGetBillController.cs" />
@@ -596,12 +605,17 @@
<Compile Include="Controllers\鍝佽川绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityReportsController.cs" />
<Compile Include="Controllers\CJGL\CJ_WIPBeginStockBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\杞﹂棿鑷鍗昞QC_WorkSelfCheckBillController.cs" />
+ <Compile Include="Controllers\鍗庤繙datamapping\Gy_BarCodeBill_PNL_TempController.cs" />
+ <Compile Include="Controllers\鍗庤繙datamapping\Gy_BarCodeBill_Set_TempController.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_PatrolCheckBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PatrolCheckItemMethodController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PatrolCheckItemClassController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MateNumRelationController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassController.cs" />
@@ -614,6 +628,8 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_OperatorController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PaymentConditionListBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DisposeWayController.cs" />
+ <Compile Include="Controllers\鍗庤繙datamapping\Gy_PNLInfoController.cs" />
+ <Compile Include="Models\ClsGy_PNLInfoSub.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ProcMulController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckClassController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ScrapReasonController.cs" />
@@ -716,9 +732,11 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceController.cs" />
<Compile Include="Controllers\搴旀敹绠＄悊\YS_ReceiveReportController.cs" />
+ <Compile Include="Controllers\鏁版嵁鍚屾\灏忚钁涘悓姝XZG_DataSynchronizationController.cs" />
<Compile Include="Controllers\鏁版嵁鍚屾\閽夐拤鍚屾\DD_DataSynchronizationController.cs" />
<Compile Include="Controllers\鏉＄爜绠＄悊\MouldController.cs" />
<Compile Include="Controllers\鏉＄爜绠＄悊\WEBSController.cs" />
+ <Compile Include="Controllers\鐢熶骇绠＄悊\瀹㈡埛鏍囩\Sc_CustomerTagController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MaterToSourceStepBillController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MESBeginStepWorkBillController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MESEndStepWorkBillController.cs" />
@@ -747,6 +765,10 @@
<Compile Include="DbUntil\DataFormatUntil.cs" />
<Compile Include="DLL\ClsGy_BadPhenomena_Ctl.cs" />
<Compile Include="DLL\ClsGy_EnvironmentTestItem_Ctl.cs" />
+ <Compile Include="DLL\ClsGy_PiPe_Ctl.cs" />
+ <Compile Include="DLL\ClsGy_PiPeMaterial_Ctl.cs" />
+ <Compile Include="DLL\ClsEqiupMaterWorkTimes_Ctl.cs" />
+ <Compile Include="DLL\ClsGy_ProjectMoneyClass_Ctl.cs" />
<Compile Include="DLL\ClsGy_RoutingGroup_Ctl.cs" />
<Compile Include="DLL\ClsGy_ProcMul_Ctl.cs" />
<Compile Include="DLL\ClsGy_TechnologyParameterType_Ctl.cs" />
@@ -791,6 +813,8 @@
<Compile Include="DLL\ClsQC_NoPassProdCheckBill.cs" />
<Compile Include="DLL\ClsQC_PatrolProcCheckBill.cs" />
<Compile Include="DLL\ClsSb_EquipConkBookBill.cs" />
+ <Compile Include="DLL\ClsSb_EquipPatrolCheckRuleBill.cs" />
+ <Compile Include="DLL\ClsSb_EquipPatrolCheckBill.cs" />
<Compile Include="DLL\ClsSb_EquipDotCheckBill.cs" />
<Compile Include="DLL\ClsSb_EquipMaintainBill.cs" />
<Compile Include="DLL\ClsSb_EquipMaintainRuleBill.cs" />
@@ -827,6 +851,11 @@
<Compile Include="HttpClient.cs" />
<Compile Include="InvokeHelper.cs" />
<Compile Include="Log.cs" />
+ <Compile Include="Models\ClsGy_BarCodeBill_PNL_Temp.cs" />
+ <Compile Include="Models\ClsGy_BarCodeBill_Set_Temp.cs" />
+ <Compile Include="Models\ClsGy_PatrolCheck.cs" />
+ <Compile Include="Models\ClsGy_PNLInfo.cs" />
+ <Compile Include="Models\ClsGy_Supplier_Link.cs" />
<Compile Include="Models\ClsGy_Supplier_PayPlan.cs" />
<Compile Include="Models\ClsGy_MouldFileBillSub_DotCheckRule.cs" />
<Compile Include="Models\ClsGy_MouldFileBillSub_MaintainRule.cs" />
@@ -834,6 +863,10 @@
<Compile Include="Models\ClsGy_SupMaterial.cs" />
<Compile Include="Models\ClsGy_EquipFileBillSub_DotCheckRule.cs" />
<Compile Include="Models\ClsGy_EquipFileBillSub_MaintainRule.cs" />
+ <Compile Include="Models\ClsSb_EquipPatrolCheckBillMain.cs" />
+ <Compile Include="Models\ClsSb_EquipPatrolCheckBillSub.cs" />
+ <Compile Include="Models\ClsSb_EquipPatrolCheckRuleBillMain.cs" />
+ <Compile Include="Models\ClsSb_EquipPatrolCheckRuleBillSub.cs" />
<Compile Include="Models\ClsSb_EquipRepairSignBillMain.cs" />
<Compile Include="Models\ClsSb_EquipRepairSignBillSub.cs" />
<Compile Include="Models\ClsSc_AssemblyBillMain.cs" />
@@ -841,11 +874,13 @@
<Compile Include="Models\ClsSc_MESBeginWorkBillSub_RelationBill.cs" />
<Compile Include="Models\Gy_MouldFileSub_SubMater.cs" />
<Compile Include="Models\Gy_RoutingBillSub_WorkQty.cs" />
+ <Compile Include="Models\ClsQC_CheckNote_PNL_Temp.cs" />
<Compile Include="Models\QC_OutCompCheckBillSub_ValueGrid.cs" />
<Compile Include="Models\SBGL\SBBB\Sb_EquipMentCollectionTechParam_Temp.cs" />
<Compile Include="Models\SBGL\SBBB\Sb_EquipMentCollectionTechParam.cs" />
<Compile Include="Models\Sc_StationOutBillSub_Sup.cs" />
<Compile Include="Models\Gy_MateNumRelation_Sec.cs" />
+ <Compile Include="Models\Xs_SendGoodsPlanBillMain.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_ColorClass.cs" />
<Compile Include="Models\Employee.cs" />
<Compile Include="Models\Gy_UserCustomer.cs" />
@@ -1071,7 +1106,7 @@
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_WorkTimesBillSub.cs" />
<Compile Include="Models\椤圭洰绠＄悊\椤圭洰闃舵\ClsPM_CustomerProInfoBillSub.cs" />
<Compile Include="Models\椤圭洰绠＄悊\椤圭洰闃舵\ClsPM_CustomerProInfoBillMain.cs" />
- <Compile Include="obj\Debug\.NETFramework,Version=v4.5.AssemblyAttributes.cs" />
+ <!-- <Compile Include="obj\Debug\.NETFramework,Version=v4.5.AssemblyAttributes.cs" /> -->
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -1128,7 +1163,6 @@
<Content Include="fonts\glyphicons-halflings-regular.woff" />
<Content Include="fonts\glyphicons-halflings-regular.ttf" />
<Content Include="fonts\glyphicons-halflings-regular.eot" />
- <None Include="Properties\PublishProfiles\PDAWeb.pubxml" />
<Content Include="Views\Shared\Error.cshtml" />
<Content Include="Views\_ViewStart.cshtml" />
<Content Include="Views\Shared\_Layout.cshtml" />
@@ -1159,6 +1193,7 @@
<Folder Include="Views\Cj_SendGoodsBill\" />
<Folder Include="Views\Cj_SingleStation\" />
<Folder Include="Views\Gy_BarCodeBill_Out\" />
+ <Folder Include="Views\Gy_BarCodeBill_Set_Temp\" />
<Folder Include="Views\Gy_COMMONCONTACTBill\" />
<Folder Include="Views\Gy_ConkType\" />
<Folder Include="Views\Gy_CustLocation\" />
--
Gitblit v1.9.1