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

王 垚

2022-09-06 19fa4fd07038a88604940d563c6703a43ebd4bfe

 WebTM/WebTM.csproj

@@ -80,6 +80,11 @@
    <Content Include="layuiadmin\layui\images\erro.png" />
    <Content Include="layuiadmin\layui\layui.js" />
    <Content Include="layuiadmin\layui\zgqlayui.js" />
    <Content Include="layuiadmin\modules\excel.js" />
    <Content Include="layuiadmin\modules\soulTable.js" />
    <Content Include="layuiadmin\modules\tableChild.js" />
    <Content Include="layuiadmin\modules\tableFilter.js" />
    <Content Include="layuiadmin\modules\tableMerge.js" />
    <Content Include="layuiadmin\modules\transfer.js" />
    <Content Include="layuiadmin\myicon\win.svg" />
    <Content Include="layuiadmin\myicon\yidongduan.svg" />
@@ -88,6 +93,7 @@
    <Content Include="layuiadmin\myicon\我的设置.svg" />
    <Content Include="layuiadmin\myicon\系统设置.svg" />
    <Content Include="layuiadmin\myicon\车间管理.svg" />
    <Content Include="layuiadmin\soulTable.slim.js" />
    <Content Include="layuiadmin\treeTable.js" />
    <Content Include="layuiadmin\PubCustom.js" />
    <Content Include="layuiadmin\PubJs\PubCheck.js" />
@@ -162,6 +168,7 @@
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Pay_PeriodInfoSet.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenterDyCol.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkPayType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkStationList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkType.html" />
    <Content Include="views\基础资料\公用基础资料\Pay_PeriodInfoSet.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_OrderBackInfo.html" />
@@ -216,6 +223,7 @@
    <Content Include="views\grf\工序流转.grf" />
    <Content Include="views\grf\cabinet-CG.grf" />
    <Content Include="views\grf\瑞与祺江苏打印模板.grf" />
    <Content Include="views\grf\cabinet-SB.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -625,6 +633,7 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainPlanBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipTypeBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_HEquipResumeBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_Material.aspx" />
    <Content Include="views\基础资料\公用基础资料\Gy_DepartmentList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill.aspx" />
@@ -739,6 +748,7 @@
    <Content Include="views\模治具管理\器具报表\ReportInventoryAccount.html" />
    <Content Include="views\模治具管理\器具报表\ReportMaterialReceipt.html" />
    <Content Include="views\模治具管理\器具报表\ReportMouldStock.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldAvailableList.html" />
    <Content Include="views\模治具管理\器具维修派工单\Sc_MouldRepairSendWorkBillEdit.html" />
    <Content Include="views\模治具管理\器具维修派工单\Sc_MouldRepairSendWorkBillList.html" />
    <Content Include="views\模治具管理\模具处理出库单\Sc_MouldScrapOutBill_PDA.html" />
@@ -754,6 +764,7 @@
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldMoveStockStepOutBill.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldMoveStockStepInBill.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldMoveStockStepInBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldMoveStockStepOutButNotStepInList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldProdMoveBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldMoveStockStepOutBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldProdInBillEdit.html" />
@@ -785,6 +796,7 @@
    <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\模治具管理\模治具管理\Sb_Add_MouldRepairWorkBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_Add_MouldConkBookBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_Add_MouldDotCheckBillList.html" />
@@ -852,6 +864,7 @@
    <Content Include="views\生产管理\日计划基础资料\Gy_WorkWarehouseBill_Add.html" />
    <Content Include="views\生产管理\日计划基础资料\JIT_NeedMaterPlanConfigBillList.html" />
    <Content Include="views\生产管理\日计划基础资料\JIT_NeedMaterPlanConfigBill_Add.html" />
    <Content Include="views\生产管理\日计划报表\ReportMOMaterReadysBillList.html" />
    <Content Include="views\生产管理\日计划报表\ReportPODemandPlanBillList.html" />
    <Content Include="views\生产管理\日计划报表\ReportPODemandPlanBillList_S.html" />
    <Content Include="views\生产管理\日计划报表\ReportWorkDemandPlanBillList.html" />
@@ -884,6 +897,7 @@
    <Content Include="views\生产管理\生产装箱单\Sc_PackUnionBill_Fast.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatForm.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatFormImport.html" />
    <Content Include="views\生产管理\生产计划平台\Sc_ICMOSortBillList.html" />
    <Content Include="views\生产管理\生产退库单\Sc_ProductionReturnList.html" />
    <Content Include="views\生产管理\组托单编辑\Sc_GroupOrderBillEdit_Fast.html" />
    <Content Include="views\生产管理\组装单\Sc_GroupOrderBillList.html" />
@@ -903,6 +917,11 @@
    <Content Include="views\系统管理\日志管理\Xt_SystemLogList.html" />
    <Content Include="views\系统管理\模块管理\Xt_Xtgnb_Edit.html" />
    <Content Include="views\系统管理\模块管理\Xt_XtgnbList.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserByOrg.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserByWorkStation.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserDept.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserGroup.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserStock.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserGroupList.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserList.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserListEdit.html" />
@@ -934,6 +953,7 @@
    <Content Include="views\设备管理\Sb_EquipMaintainPlanBillEdit.html" />
    <Content Include="views\设备管理\Sb_EquipMaintainPlanBillList.html" />
    <Content Include="views\设备管理\Sc_Add_MouldDotCheckBillList.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileBillResume.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileMainEdit.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileMainList.html" />
    <Content Include="views\设备管理\设备维修派工单\Sb_EquipRepairSendWorkBillEdit.html" />
@@ -971,16 +991,20 @@
    <Content Include="views\车间管理\委外工序接收单\Cj_StationEntrustOutBill_PDA.html" />
    <Content Include="views\车间管理\工序出站汇报单\Cj_StationOutBill.html" />
    <Content Include="views\车间管理\工序出站汇报单\MES_StationOutBill_PDA.html" />
    <Content Include="views\车间管理\工序出站汇报单\Sc_StationOutBill_Mul_RYQ.html" />
    <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_ProcessExchangeIssue.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeIssueBillList.html" />
    <Content Include="views\车间管理\工序进站接收单\Cj_StationInBill.html" />
    <Content Include="views\车间管理\工序进站接收单\Cj_StationInBillList.html" />
    <Content Include="views\车间管理\工序进站接收单\Cj_StationQty.html" />
    <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\车间管理\报表分析\ProductionPlanReportList.html" />
    <Content Include="views\车间管理\报表分析\Sc_StationInBillList.html" />
    <Content Include="views\车间管理\车间收料\JIT_SendGoodsBillList.html" />
    <Content Include="views\采购管理\收料通知单\Add_Edit_Cg_POInStockBillList.html" />
@@ -1139,6 +1163,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipTypeBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_HEquipResumeBillList.aspx.cs">
      <DependentUpon>xmlLBM_Gy_HEquipResumeBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_HEquipResumeBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Gy_HEquipResumeBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_Material.aspx.cs">
      <DependentUpon>xmlLBM_Gy_Material.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>