合并

ch

2022-10-25 93c726c837be5eecadc040253cc6c24acd16efe0

 WebTM/WebTM.csproj

@@ -98,14 +98,24 @@
    <Content Include="layuiadmin\PubCustom.js" />
    <Content Include="layuiadmin\PubJs\PubCheck.js" />
    <Content Include="views\Baseset\HBarPlanPrint.html" />
    <Content Include="views\Baseset\基础资料\Gy_BadCountDevelopWHList.html" />
    <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_GetProcNoList.html" />
    <Content Include="views\Baseset\基础资料\Gy_LineCenter.html" />
    <Content Include="views\Baseset\基础资料\Gy_MaterList.html" />
    <Content Include="views\Baseset\基础资料\Gy_MouldList.html" />
    <Content Include="views\Baseset\基础资料\Gy_OrganizationtList.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_WarehouseListNew.html" />
    <Content Include="views\Baseset\基础资料\Gy_WasterWHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_WHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_WWBadWHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_WWWasterWHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_WarehouseList_JIT.html" />
    <Content Include="views\Baseset\基础资料\Sc_ICMOBillListView2.html" />
    <Content Include="views\Baseset\基础资料\Sc_ProcessExchangeBillListView.html" />
    <Content Include="views\Baseset\基础资料\Gy_QCCheckItemListView.html" />
@@ -128,6 +138,7 @@
    <Content Include="views\index - 复制.html" />
    <Content Include="views\indexMenu.html" />
    <Content Include="views\IpadStepIndex.html" />
    <Content Include="views\PublicPage\MaterialInfo.html" />
    <Content Include="views\PublicPage\MouldDotCheckRuleInterList.html" />
    <Content Include="views\PublicPage\MouldMaintainRuleInterList.html" />
    <Content Include="views\PublicPage\OrderBackInfomation.html" />
@@ -161,11 +172,11 @@
    <Content Include="views\仓存管理\条码库存\KF_ICInventoryList_WMS.html" />
    <Content Include="views\仓存管理\条码生成\Gy_BarCodeBill.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderBackInfo.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderBackInfo.html.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderLev.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_WorkPayType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_WorkType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Pay_PeriodInfoSet.html" />
    <Content Include="views\基础资料\基础资料\Gy_MateMouldList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechnologyParameterUnitList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechnologyParameterUnit_Add_Edit_.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechnologyParameter_Add_Edit_.html" />
@@ -679,6 +690,7 @@
    <Content Include="views\基础资料\基础资料\Gy_DotCheckList.html" />
    <Content Include="views\基础资料\基础资料\Gy_MaintainEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_MaintainList.html" />
    <Content Include="views\基础资料\基础资料\Gy_MateMould.html" />
    <Content Include="views\基础资料\基础资料\Gy_RepairCheckEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_RepairCheckList.html" />
    <Content Include="views\基础资料\基础资料\Gy_RepairEdit.html" />
@@ -733,6 +745,17 @@
    <Content Include="views\工资管理\Gy_WorkTypeBillList.html" />
    <Content Include="views\工资管理\外购墙布工资\Pay_PurchaseWallclothBillEdit.html" />
    <Content Include="views\工资管理\外购墙布工资\Pay_PurchaseWallclothBillList.html" />
    <Content Include="views\工资管理\工资报表\Pay_EmpPayMentSumReport.html" />
    <Content Include="views\工资管理\工资报表\Pay_EmpWorkQtyEntryReport.html" />
    <Content Include="views\工资管理\工资报表\Pay_PayMentDeptSendList.html" />
    <Content Include="views\工资管理\工资报表\Pay_PayMentDeptYearReport.html" />
    <Content Include="views\工资管理\工资报表\Pay_PayMentSendList.html" />
    <Content Include="views\工资管理\工资报表\Pay_PayMentYearReport.html" />
    <Content Include="views\工资管理\工资报表\Pay_SingleBalBillEntryReport.html" />
    <Content Include="views\工资管理\工资报表\Pay_SingleBalBillSumReport.html" />
    <Content Include="views\工资管理\工资报表\Pay_WorkTimesList.html" />
    <Content Include="views\工资管理\工资报表\Pay_WorkTimesPayMentEntryReport.html" />
    <Content Include="views\工资管理\工资报表\Pay_WorkTimesPayMentSumReport.html" />
    <Content Include="views\工资管理\工资报表\ReportList2.html" />
    <Content Include="views\工资管理\工资报表\ReportList.html" />
    <Content Include="views\工资管理\工资结算单%28个人%29\Pay_SingleBalBillEdit.html" />
@@ -884,6 +907,7 @@
    <Content Include="views\生产管理\生产包装单\Sc_PackUnionBill.html" />
    <Content Include="views\生产管理\生产包装单\Sc_PackUnionBillEdit.html" />
    <Content Include="views\生产管理\生产叫料平台\JIT_ComplementGoodBillMain.html" />
    <Content Include="views\生产管理\生产叫料平台\JIT_ComplementGoodPT.html" />
    <Content Include="views\生产管理\生产叫料平台\JIT_HlpBillList.html" />
    <Content Include="views\生产管理\生产完工单\Sc_Add_MESEndWorkBillList - 复制.html" />
    <Content Include="views\生产管理\生产完工单\Sc_Add_MESEndWorkBillList.html" />
@@ -926,9 +950,13 @@
    <Content Include="views\系统管理\模块管理\Xt_Xtgnb_Edit.html" />
    <Content Include="views\系统管理\模块管理\Xt_XtgnbList.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserByOrg.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserByUser.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserByWorkStation.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserCustomer.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserDept.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserEmployee.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserGroup.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserMater.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserStock.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserGroupList.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserList.html" />
@@ -1004,6 +1032,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_ProcessExchangePlanDate.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeIssue.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeIssueBillList.html" />
@@ -1013,8 +1042,12 @@
    <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\车间管理\报表分析\DefectiveDetailedYieldReport.html" />
    <Content Include="views\车间管理\报表分析\Mes_OrderProcFlowAllReport.html" />
    <Content Include="views\车间管理\报表分析\Mes_WIPProcReport.html" />
    <Content Include="views\车间管理\报表分析\ProductionPlanReportList.html" />
    <Content Include="views\车间管理\报表分析\Sc_StationInBillList.html" />
    <Content Include="views\车间管理\报表分析\Sc_StationOutSumReport.html" />
    <Content Include="views\车间管理\车间收料\JIT_SendGoodsBillList.html" />
    <Content Include="views\采购管理\收料通知单\Add_Edit_Cg_POInStockBillList.html" />
    <Content Include="views\采购管理\退料通知单\Add_Edit_Cg_POInStockBackBillList.html" />