合并

ch

2022-11-17 d271cd6aa2c4d76e0dbe34e7aa8a8a498a20fd40

 WebTM/WebTM.csproj

@@ -79,6 +79,7 @@
    <Content Include="layuiadmin\layui\images\device.png" />
    <Content Include="layuiadmin\layui\images\erro.png" />
    <Content Include="layuiadmin\layui\layui.js" />
    <Content Include="layuiadmin\layui\layui1.js" />
    <Content Include="layuiadmin\layui\zgqlayui.js" />
    <Content Include="layuiadmin\modules\excel.js" />
    <Content Include="layuiadmin\modules\soulTable.js" />
@@ -704,6 +705,8 @@
    <Content Include="views\基础资料\基础资料\Gy_StockCheckItemList.html" />
    <Content Include="views\基础资料\基础资料\InventoryAnalysis.html" />
    <Content Include="views\基础资料\基础资料\Sc_MouldStockBillMain_Temp.html" />
    <Content Include="views\基础资料\工资基础资料\Add_Edit_Gy_WorkDay.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_WorkDay.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcPriceList.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_Group_Add_Edit.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcPrice.html" />
@@ -908,6 +911,8 @@
    <Content Include="views\生产管理\日计划报表\ReportWorkDemandPlanBillList.html" />
    <Content Include="views\生产管理\生产上料单\Sc_MaterToSourceBillList - 复制.html" />
    <Content Include="views\生产管理\生产上料单\Sc_MaterToSourceBillList.html" />
    <Content Include="views\生产管理\生产任务单\Sc_ICMOBillEdit.html" />
    <Content Include="views\生产管理\生产任务单\Sc_ICMOBillImport.html" />
    <Content Include="views\生产管理\生产停工单\Sc_Add_MESStopWorkBillList - 复制.html" />
    <Content Include="views\生产管理\生产停工单\Sc_Add_MESStopWorkBillList.html" />
    <Content Include="views\生产管理\生产停工单\Sc_MESStopWorkBillList.html" />
@@ -954,6 +959,11 @@
    <Content Include="views\系统管理\公告\GG_NoticeBillEdit.html" />
    <Content Include="views\系统管理\单据类型\Xt_BillType_Edit.html" />
    <Content Include="views\系统管理\单据类型\Xt_BillTypeList.html" />
    <Content Include="views\系统管理\多级审批\审核流程单\Xt_CheckFlowEdit.html" />
    <Content Include="views\系统管理\多级审批\审核流程单\Xt_CheckFlowList.html" />
    <Content Include="views\系统管理\多级审批\审核流程单\Xt_CheckUserRight.html" />
    <Content Include="views\系统管理\多级审批\审核项目\Xt_CheckItemEdit.html" />
    <Content Include="views\系统管理\多级审批\审核项目\Xt_CheckItemList.html" />
    <Content Include="views\系统管理\日志管理\Xt_SystemLogList.html" />
    <Content Include="views\系统管理\模块管理\Xt_Xtgnb_Edit.html" />
    <Content Include="views\系统管理\模块管理\Xt_XtgnbList.html" />
@@ -967,11 +977,14 @@
    <Content Include="views\系统管理\用户管理\Gy_UserMater.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserStock.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserGroupList.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserGroupListEdit.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserList.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserListEdit.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserSuplies.html" />
    <Content Include="views\系统管理\系统参数管理\Xt_SystemParameter_Edit.html" />
    <Content Include="views\系统管理\系统参数管理\Xt_SystemParameterList.html" />
    <Content Include="views\系统管理\组织架构设置\Gy_DutyEdit.html" />
    <Content Include="views\系统管理\组织架构设置\Gy_DutyList.html" />
    <Content Include="views\组装单\Sc_PCruxBindingPDA.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBill.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillimport.html" />