合并

ch

2022-12-27 c7ff91ac1c4674e411606f2183faf5dd856cf8af

 WebTM/WebTM.csproj

@@ -103,14 +103,19 @@
    <Content Include="views\Baseset\基础资料\Gy_BadWHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_ClassTimePrjGroupEdit.html" />
    <Content Include="views\Baseset\基础资料\Gy_ClassTimePrjList.html" />
    <Content Include="views\Baseset\基础资料\Gy_EquipFileBillMainList.html" />
    <Content Include="views\Baseset\基础资料\Gy_GetProcNoList.html" />
    <Content Include="views\Baseset\基础资料\Gy_LineCenter.html" />
    <Content Include="views\Baseset\基础资料\Gy_MaterList.html" />
    <Content Include="views\Baseset\基础资料\Gy_MouldFileMainList.html" />
    <Content Include="views\Baseset\基础资料\Gy_MouldList.html" />
    <Content Include="views\Baseset\基础资料\Gy_OrganizationtList.html" />
    <Content Include="views\Baseset\基础资料\Gy_PoStockStyle.html" />
    <Content Include="views\Baseset\基础资料\Gy_QCCheckProjectListView.html" />
    <Content Include="views\Baseset\基础资料\Gy_RoutingBillList.html" />
    <Content Include="views\Baseset\基础资料\Gy_RoutingGroup.html" />
    <Content Include="views\Baseset\基础资料\Gy_SellStyle.html" />
    <Content Include="views\Baseset\基础资料\Gy_SettleStyle.html" />
    <Content Include="views\Baseset\基础资料\Gy_TechnologyParameterList.html" />
    <Content Include="views\Baseset\基础资料\Gy_TechParameterUnitList.html" />
    <Content Include="views\Baseset\基础资料\Gy_StockPlaceListNew.html" />
@@ -167,6 +172,7 @@
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockBill_CheckList_New.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockBill_Check_New.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockOutBill_Fast.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockRequestBillEdit.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockRequestBillList.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockStepOutBill_Fast.html" />
    <Content Include="views\仓存管理\分步式调入单\Fb_StepFoldinBillList.html" />
@@ -187,6 +193,28 @@
    <Content Include="views\基础资料\公用基础资料\Gy_ConkType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PackType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_PackType.html" />
    <Content Include="views\基础资料\基础资料\Gy_CustLocationEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_CustLocationList.html" />
    <Content Include="views\基础资料\基础资料\Gy_MatePriceSup.html" />
    <Content Include="views\基础资料\基础资料\Gy_MatePriceSupEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_Operator.html" />
    <Content Include="views\基础资料\基础资料\Gy_OperatorEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_PaymentConditionEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_COMMONCONTACTEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_COMMONCONTACTList.html" />
    <Content Include="views\基础资料\基础资料\Gy_PropertyEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_RateTypeEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_RateTypeList.html" />
    <Content Include="views\基础资料\基础资料\Gy_SettleStyle.html" />
    <Content Include="views\基础资料\基础资料\Gy_SettleStyleEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_Staff.html" />
    <Content Include="views\基础资料\基础资料\Gy_StaffEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_TaxRateEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_TaxRateList.html" />
    <Content Include="views\基础资料\基础资料\Gy_RecConditionList.html" />
    <Content Include="views\基础资料\基础资料\Gy_StockStatusEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_PaymentConditionList.html" />
    <Content Include="views\基础资料\基础资料\Gy_StockStatusList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx" />
    <Content Include="views\基础资料\基础资料\Gy_MateMouldList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechnologyParameterUnitList.html" />
@@ -709,6 +737,11 @@
    <Content Include="views\基础资料\基础资料\Gy_RepairList.html" />
    <Content Include="views\基础资料\基础资料\Gy_StockCheckItemEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_StockCheckItemList.html" />
    <Content Include="views\基础资料\基础资料\Gy_RecConditionEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_SupplierContactEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_SupplierContactList.html" />
    <Content Include="views\基础资料\基础资料\Gy_Work.html" />
    <Content Include="views\基础资料\基础资料\Gy_WorkEdit.html" />
    <Content Include="views\基础资料\基础资料\InventoryAnalysis.html" />
    <Content Include="views\基础资料\基础资料\Sc_MouldStockBillMain_Temp.html" />
    <Content Include="views\基础资料\工资基础资料\Add_Edit_Gy_WorkDay.html" />
@@ -841,10 +874,14 @@
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldDotCheckBill_PDA.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldMaintainBill_PDA.html" />
    <Content Include="views\模治具管理\模治具管理\BatchGen_MouldFile.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_BarCodeBill_Out.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_BarCodeBill_OutList.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_CheckToolsFileMainList.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFileList.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFile.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFileResume.html" />
    <Content Include="views\模治具管理\模治具管理\KF_BarCodeStatusChangeBill.html" />
    <Content Include="views\模治具管理\模治具管理\KF_BarCodeStatusChangeBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sb_Add_MouldRepairWorkBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_Add_MouldConkBookBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_Add_MouldDotCheckBillList.html" />
@@ -936,6 +973,7 @@
    <Content Include="views\生产管理\生产开工单\Sc_Add_MESBeginWorkBillList - 复制.html" />
    <Content Include="views\生产管理\生产开工单\Sc_Add_MESBeginWorkBillList.html" />
    <Content Include="views\生产管理\生产开工单\Sc_MESBeginWorkBillList.html" />
    <Content Include="views\生产管理\生产投料单\Sc_PPBomBill.html" />
    <Content Include="views\生产管理\生产投料单\Sc_PPickingBillList.html" />
    <Content Include="views\生产管理\生产拆箱单\Sc_PackSplitBill_Fast.html" />
    <Content Include="views\生产管理\生产日计划工单\JIT_DayPlanBillEdit.html" />
@@ -1018,6 +1056,10 @@
    <Content Include="views\设备管理\Sb_EquipMaintainPlanBillEdit.html" />
    <Content Include="views\设备管理\Sb_EquipMaintainPlanBillList.html" />
    <Content Include="views\设备管理\Sc_Add_MouldDotCheckBillList.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\设备管理\设备档案\Gy_EquipFileBillResume.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileMainEdit.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileMainList.html" />
@@ -1082,6 +1124,7 @@
    <Content Include="views\车间管理\车间收料\JIT_SendGoodsBillList.html" />
    <Content Include="views\采购管理\收料通知单\Add_Edit_Cg_POInStockBillList.html" />
    <Content Include="views\采购管理\退料通知单\Add_Edit_Cg_POInStockBackBillList.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBillEdit.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBillList.html" />
    <Content Include="views\采购管理\采购退料单\Cg_PurchaseReturnList.html" />
    <Content Include="views\采购管理\采购退料单\Cg_PurchaseReturn_Add_Up.html" />
@@ -1093,6 +1136,10 @@
    <Content Include="views\领料发货\其他出库\Kf_OtherOutBill_Check.html" />
    <Content Include="views\领料发货\分步式调出单\Fb_StepFoldOutBillList.html" />
    <Content Include="views\领料发货\委外出库\Kf_EntrustOutBillList.html" />
    <Content Include="views\领料发货\委外出库\Kf_EntrustOutBill_Check_New.html" />
    <Content Include="views\领料发货\委外出库\Kf_EntrustOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\委外补料\Kf_EntrustReplenishOutBill_Check_New.html" />
    <Content Include="views\领料发货\委外补料\Kf_EntrustReplenishOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Check.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast_AR.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast.html" />
@@ -1107,6 +1154,8 @@
    <Content Include="views\领料发货\领料出库\Kf_MateOutBill_FastCheck.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBill_Check_New.html" />
    <Content Include="views\领料发货\领料出库\Kf_StockOutRequestBill.html" />
    <Content Include="views\领料发货\领料出库\Kf_StockOutRequestBillList.html" />
    <Content Include="views\验收入库\产品入库\Kf_ICStockBillSub_WMS_List.html" />
    <Content Include="views\验收入库\产品入库\Kf_ProductInBillList.html" />
    <Content Include="views\验收入库\其他入库\Kf_OtherInBillList.html" />