合并冲突

chenhaozhe

2025-05-30 edcd7574e709748c5d3ccc0bd54930414ddcfc9a

 WebAPI/WebAPI.csproj

@@ -20,7 +20,8 @@
    <IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
    <IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
    <TargetFrameworkProfile />
    <Use64BitIISExpress />
    <Use64BitIISExpress>
    </Use64BitIISExpress>
    <UseGlobalApplicationHostFile />
    <NuGetPackageImportStamp>
    </NuGetPackageImportStamp>
@@ -430,6 +431,9 @@
    <Compile Include="Controllers\CGGL\Cg_POInStockBillController.cs" />
    <Compile Include="Controllers\CGGL\Cg_POInStockBackBillController.cs" />
    <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" />
@@ -442,6 +446,9 @@
    <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" />
@@ -602,6 +609,9 @@
    <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" />
@@ -716,9 +726,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 +759,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 +807,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 +845,7 @@
    <Compile Include="HttpClient.cs" />
    <Compile Include="InvokeHelper.cs" />
    <Compile Include="Log.cs" />
    <Compile Include="Models\ClsGy_PatrolCheck.cs" />
    <Compile Include="Models\ClsGy_Supplier_Link.cs" />
    <Compile Include="Models\ClsGy_Supplier_PayPlan.cs" />
    <Compile Include="Models\ClsGy_MouldFileBillSub_DotCheckRule.cs" />
@@ -835,6 +854,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" />
@@ -1072,7 +1095,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>
@@ -1129,7 +1152,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" />