合并冲突

chenhaozhe

2025-05-30 edcd7574e709748c5d3ccc0bd54930414ddcfc9a

 WebAPI/WebAPI.csproj

@@ -446,6 +446,8 @@
    <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" />
@@ -724,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" />
@@ -803,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" />
@@ -848,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" />