Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

ch

2023-02-07 9295f911481903d03bbe14273e64fcc326dc3a10

 WebTM/WebTM.csproj

@@ -184,6 +184,8 @@
    <Content Include="views\仓存管理\条码库存\KF_ICInventoryByMaterID.html" />
    <Content Include="views\仓存管理\条码库存\KF_ICInventoryList_WMS.html" />
    <Content Include="views\仓存管理\条码生成\Gy_BarCodeBill.html" />
    <Content Include="views\基础资料\产品基础资料\Gy_StdMinPickQty.html" />
    <Content Include="views\基础资料\产品基础资料\Gy_StdMinPickQtyList.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ConkType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderBackInfo.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderLev.html" />
@@ -194,10 +196,16 @@
    <Content Include="views\基础资料\公用基础资料\Gy_ConkType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PackType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_PackType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_StockPlace_Edit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_StockPlace_List.html" />
    <Content Include="views\基础资料\基础资料\Gy_CustLocationEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_CustLocationList.html" />
    <Content Include="views\基础资料\基础资料\Gy_EquipStatus.html" />
    <Content Include="views\基础资料\基础资料\Gy_EquipStatusEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_MatePriceSup.html" />
    <Content Include="views\基础资料\基础资料\Gy_MatePriceSupEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_MouldStatus.html" />
    <Content Include="views\基础资料\基础资料\Gy_MouldStatusEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_Operator.html" />
    <Content Include="views\基础资料\基础资料\Gy_OperatorEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_PaymentConditionEdit.html" />
@@ -831,6 +839,8 @@
    <Content Include="views\模治具管理\器具报表\ReportMaterialReceipt.html" />
    <Content Include="views\模治具管理\器具报表\ReportMouldStock.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldAvailableList.html" />
    <Content Include="views\模治具管理\器具点检规程单\Sc_MouldDotCheckRuleBillEdit.html" />
    <Content Include="views\模治具管理\器具点检规程单\Sc_MouldDotCheckRuleBillList.html" />
    <Content Include="views\模治具管理\器具维修派工单\Sc_MouldRepairSendWorkBillEdit.html" />
    <Content Include="views\模治具管理\器具维修派工单\Sc_MouldRepairSendWorkBillList.html" />
    <Content Include="views\模治具管理\模具处理出库单\Sc_MouldScrapOutBill_PDA.html" />
@@ -843,6 +853,8 @@
    <Content Include="views\模治具管理\模具其他出库单\Sc_MouldOtherOutBill_PDA.html" />
    <Content Include="views\模治具管理\模具其他入库单\Sc_MouldOtherInBill_PDA.html" />
    <Content Include="views\模治具管理\模具采购入库单\Sc_MouldProdInBill_PDA.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_Add_MouldLifeUseBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldLifeUseBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldMoveStockStepOutBill.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldMoveStockStepInBill.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldMoveStockStepInBillList.html" />
@@ -872,6 +884,10 @@
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldProdOutBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldScrapInBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldScrapOutBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldScrapRequestBill.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldScrapRequestBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldStatusChangeBill.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldStatusChangeBillList.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldDotCheckBill_PDA.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldMaintainBill_PDA.html" />
    <Content Include="views\模治具管理\模治具管理\BatchGen_MouldFile.html" />
@@ -884,6 +900,11 @@
    <Content Include="views\模治具管理\模治具管理\KF_BarCodeStatusChangeBill.html" />
    <Content Include="views\模治具管理\模治具管理\KF_BarCodeStatusChangeBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sb_Add_MouldRepairWorkBillList.html" />
    <Content Include="views\生产工序管理\工序汇报单\Sc_ProcessReportList_Last.html" />
    <Content Include="views\系统管理\单据类型\Xt_BillSubTypeList.html" />
    <Content Include="views\系统管理\单据类型\Xt_BillSubType_Edit.html" />
    <Content Include="views\设备管理\设备入库检验验收单\Sb_EquipStockInCheckBillEdit.html" />
    <Content Include="views\设备管理\设备入库检验验收单\Sb_EquipStockInCheckBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_Add_MouldConkBookBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_Add_MouldDotCheckBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_Add_MouldDotCheckPlanBillList.html" />
@@ -1057,13 +1078,21 @@
    <Content Include="views\设备管理\Sb_EquipMaintainPlanBillEdit.html" />
    <Content Include="views\设备管理\Sb_EquipMaintainPlanBillList.html" />
    <Content Include="views\设备管理\Sc_Add_MouldDotCheckBillList.html" />
    <Content Include="views\设备管理\设备入库\Sb_EquipStockInCheckBill.html" />
    <Content Include="views\设备管理\设备入库\Sb_EquipStockInCheckBillList.html" />
    <Content Include="views\设备管理\设备备品备件\Sb_EquipSparepartsBill.html" />
    <Content Include="views\设备管理\设备备品备件\Sb_EquipSparepartsBillList.html" />
    <Content Include="views\设备管理\设备备品备件\Sb_EquipSparepartsChangeBill.html" />
    <Content Include="views\设备管理\设备备品备件\Sb_EquipSparepartsChangeBillList.html" />
    <Content Include="views\设备管理\设备投产检验验收单\Sb_EquipWorkBeforeCheckBillEdit.html" />
    <Content Include="views\设备管理\设备投产检验验收单\Sb_EquipWorkBeforeCheckBillList.html" />
    <Content Include="views\设备管理\设备投产\Sb_EquipWorkBeforeCheckBill.html" />
    <Content Include="views\设备管理\设备投产\Sb_EquipWorkBeforeCheckBillList.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileBillResume.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileMainEdit.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileMainList.html" />
    <Content Include="views\设备管理\设备状态\Sb_EquipStatusChangeBill.html" />
    <Content Include="views\设备管理\设备状态\Sb_EquipStatusChangeBillList.html" />
    <Content Include="views\设备管理\设备维修派工单\Sb_EquipRepairSendWorkBillEdit.html" />
    <Content Include="views\设备管理\设备维修派工单\Sb_EquipRepairSendWorkBillList.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipDotCheckRuleEdit.html" />
@@ -1106,6 +1135,7 @@
    <Content Include="views\车间管理\工序出站汇报单\Sc_StationOutBill_Mul_PDA.html" />
    <Content Include="views\车间管理\工序出站汇报单\Sc_StationOutBill_Mul.html" />
    <Content Include="views\车间管理\工序出站汇报单\Cj_StationOutBillList.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill_CF.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangePlanDate.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeIssue.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill.html" />