合并

ch

2022-01-16 cf866c4946a15efa23b942f90f9f95da7a5d30c2

 WebTM/WebTM.csproj

@@ -680,6 +680,8 @@
    <Content Include="views\模治具管理\器具报表\ReportInventoryAccount.html" />
    <Content Include="views\模治具管理\器具报表\ReportMaterialReceipt.html" />
    <Content Include="views\模治具管理\器具报表\ReportMouldStock.html" />
    <Content Include="views\模治具管理\器具维修派工单\Sc_MouldRepairSendWorkBillEdit.html" />
    <Content Include="views\模治具管理\器具维修派工单\Sc_MouldRepairSendWorkBillList.html" />
    <Content Include="views\模治具管理\模具处理出库单\Sc_MouldScrapOutBill_PDA.html" />
    <Content Include="views\模治具管理\模具寿命调整单\Sc_MouldLifeChangeBill_PDA.html" />
    <Content Include="views\模治具管理\模具改制入库单\Sc_MouldRepairInBill_PDA.html" />
@@ -819,6 +821,7 @@
    <Content Include="views\设备管理\Sb_EqpMaintenanceBillList.html" />
    <Content Include="views\设备管理\Sb_EqpMaintenanceBillList_PDA.html" />
    <Content Include="views\设备管理\Sb_EqpRepairCheckBillList.html" />
    <Content Include="views\设备管理\Sb_EquipDocCheckItemBillList_PDAEdit.html" />
    <Content Include="views\设备管理\Sb_EquipDotCheckBillEdit.html" />
    <Content Include="views\设备管理\Sb_EquipDotCheckBillList.html" />
    <Content Include="views\设备管理\Sb_EquipDotCheckBillList_PDA.html" />
@@ -833,6 +836,7 @@
    <Content Include="views\设备管理\Sc_Add_MouldDotCheckBillList.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileMainEdit.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileMainList.html" />
    <Content Include="views\设备管理\设备维修派工单\Sb_EquipRepairSendWorkBillList.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipDotCheckRuleEdit.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipDotCheckRuleList.html" />
    <Content Include="views\设备管理\Sb_EquipMaintainBillList_MulEdit.html" />
@@ -871,6 +875,7 @@
    <Content Include="views\车间管理\工序进站接收单\MES_StationInBill_PDA.html" />
    <Content Include="views\车间管理\工序进站接收单\Sc_StationInBill_Mul_PDA.html" />
    <Content Include="views\车间管理\工序进站接收单\Sc_StationInBill_Mul.html" />
    <Content Include="views\车间管理\报表分析\Sc_StationInBillList.html" />
    <Content Include="views\采购管理\收料通知单\Add_Edit_Cg_POInStockBillList.html" />
    <Content Include="views\采购管理\退料通知单\Add_Edit_Cg_POInStockBackBillList.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBillList.html" />