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

YL

2022-03-10 735bc39f7c133aaf3f1e90471c8db90dda094f5c

 WebTM/WebTM.csproj

@@ -61,6 +61,7 @@
  <ItemGroup>
    <Content Include="layuiadmin\echarts.min.js" />
    <Content Include="layuiadmin\layui\css\global.css" />
    <Content Include="layuiadmin\layui\css\layui - 复制.css" />
    <Content Include="layuiadmin\layui\css\modules\layim\html\getmsg.json" />
    <Content Include="layuiadmin\layui\css\ReportPlatform.css" />
    <Content Include="layuiadmin\layui\css\zgqlayui.css" />
@@ -86,8 +87,13 @@
    <Content Include="layuiadmin\PubCustom.js" />
    <Content Include="layuiadmin\PubJs\PubCheck.js" />
    <Content Include="views\Baseset\HBarPlanPrint.html" />
    <Content Include="views\Baseset\基础资料\Gy_ClassTimePrjGroupEdit.html" />
    <Content Include="views\Baseset\基础资料\Gy_ClassTimePrjList.html" />
    <Content Include="views\Baseset\基础资料\Gy_LineCenter.html" />
    <Content Include="views\Baseset\基础资料\Gy_OrganizationtList.html" />
    <Content Include="views\Baseset\基础资料\Gy_QCCheckProjectListView.html" />
    <Content Include="views\Baseset\基础资料\Gy_RoutingGroup.html" />
    <Content Include="views\Baseset\基础资料\Gy_WarehouseListNew.html" />
    <Content Include="views\Baseset\基础资料\Sc_ICMOBillListView2.html" />
    <Content Include="views\Baseset\基础资料\Sc_ProcessExchangeBillListView.html" />
    <Content Include="views\Baseset\基础资料\Gy_QCCheckItemListView.html" />
@@ -122,17 +128,22 @@
    <Content Include="views\PublicPage\PeopleInformation.html" />
    <Content Include="views\PublicPage\PowerInformation.html" />
    <Content Include="views\PublicPage\PurchOrder.html" />
    <Content Include="views\PublicPage\HSourceReportHtml.html" />
    <Content Include="views\PublicPage\transfer.html" />
    <Content Include="views\ReportHtml.html" />
    <Content Include="views\test\testRenderAutomationList.html" />
    <Content Include="views\video\1.wav" />
    <Content Include="views\video\jingbao.wav" />
    <Content Include="views\video\success.wav" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockRequestBillList.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockStepOutBill_Fast.html" />
    <Content Include="views\仓存管理\分步式调入单\Fb_StepFoldinBillList.html" />
    <Content Include="views\仓存管理\委外用料单\WW_PPBomBillList.html" />
    <Content Include="views\仓存管理\扫码异常记录表\KF_PonderationBillList.html" />
    <Content Include="views\仓存管理\条码出入库记录表\Kf_ICStockBillSubList.html" />
    <Content Include="views\仓存管理\条码库存\KF_ICInventoryByMaterID.html" />
    <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" />
@@ -176,6 +187,7 @@
    <Content Include="views\grf\设备档案.grf" />
    <Content Include="views\grf\器具档案.grf" />
    <Content Include="views\grf\销售退货单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\物料条码.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -587,6 +599,7 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipTypeBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_Material.aspx" />
    <Content Include="views\基础资料\公用基础资料\Gy_DepartmentList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_ICStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldDotCheckBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldDotCheckPlanBill.aspx" />
@@ -669,6 +682,8 @@
    <Content Include="views\工资管理\工资结算单%28其他%29\Pay_OtherBalBillList.html" />
    <Content Include="views\工资管理\工资结算单%28集体%29\Pay_GroupBalBillEdit.html" />
    <Content Include="views\工资管理\工资结算单%28集体%29\Pay_GroupBalBillList.html" />
    <Content Include="views\工资管理\工资运算\Pay_SingleBalBillOperation.html" />
    <Content Include="views\工资管理\核算方式\Gy_ClassTimePrjGroupBillList.html" />
    <Content Include="views\工资管理\核算方式\Gy_ClassTimePrjSubBillEdit.html" />
    <Content Include="views\工资管理\核算方式\Gy_ClassTimePrjBillEdit.html" />
    <Content Include="views\工资管理\核算方式\Gy_ClassTimePrjBillList.html" />
@@ -752,6 +767,7 @@
    <Content Include="views\生产工序管理\委外工序计划转出单\WW_EntrustProcessSendOutBill_PDA.html" />
    <Content Include="views\生产工序管理\工序汇报单\HBarPlanPrint.html" />
    <Content Include="views\生产工序管理\工序汇报单\xmlLBM_ProcessReport.aspx" />
    <Content Include="views\生产工序管理\工序计划单\Sc_ProcessPlanEdit.html" />
    <Content Include="views\生产管理\上料防错单\Sc_Add_MaterToSourceBillList.html" />
    <Content Include="views\生产管理\产量汇报单\Sc_Add_ProductReportBillList.html" />
    <Content Include="views\生产管理\产量汇报单\Sc_ProductReportBillList.html" />
@@ -768,9 +784,11 @@
    <Content Include="views\生产管理\报工台工序\停工\Sc_MESStopStepWorkBillList.html" />
    <Content Include="views\生产管理\报工台工序\完工\Sc_Add_MESEndStepWorkBillList.html" />
    <Content Include="views\生产管理\报工台工序\完工\Sc_MESEndStepWorkBillList.html" />
    <Content Include="views\生产管理\报工台工序\工序汇报\Sc_Add_ProcessReportBillList.html" />
    <Content Include="views\生产管理\报工台工序\开工\Sc_Add_MESBeginStepWorkBillList.html" />
    <Content Include="views\生产管理\报工台工序\开工\Sc_MESBeginStepWorkBillList.html" />
    <Content Include="views\生产管理\报工台工序\生产汇报\Sc_ICMOReportBillList.html" />
    <Content Include="views\生产管理\报工台工序\工序汇报\Sc_ProcessReportBillList.html" />
    <Content Include="views\生产管理\报工台工序\返工\Sc_Add_MESReturnStepWorkBillList.html" />
    <Content Include="views\生产管理\报工台工序\返工\Sc_MESReturnStepWorkBillList.html" />
    <Content Include="views\生产管理\报工台工序\防错\Sc_Add_MaterToSourceStepBillList.html" />
@@ -790,9 +808,12 @@
    <Content Include="views\生产管理\生产开工单\Sc_Add_MESBeginWorkBillList - 复制.html" />
    <Content Include="views\生产管理\生产开工单\Sc_Add_MESBeginWorkBillList.html" />
    <Content Include="views\生产管理\生产开工单\Sc_MESBeginWorkBillList.html" />
    <Content Include="views\生产管理\生产拆箱单\Sc_PackSplitBill_Fast.html" />
    <Content Include="views\生产管理\生产汇报单\Sc_ICMOReportBill_FastNew.html" />
    <Content Include="views\生产管理\生产汇报单\Sc_Add_ICMOReportBillList.html" />
    <Content Include="views\生产管理\生产物料清单\sc_Gy_ICBomBillMainList.html" />
    <Content Include="views\生产管理\生产组装追溯单\Sc_AssemblyBillList.html" />
    <Content Include="views\生产管理\生产装箱单\Sc_PackUnionBill_Fast.html" />
    <Content Include="views\生产管理\生产退库单\Sc_ProductionReturnList.html" />
    <Content Include="views\生产管理\组装单\Sc_GroupOrderBillList.html" />
    <Content Include="views\生产管理\质量汇报单\Sc_QualityReportBill.html" />
@@ -820,7 +841,9 @@
    <Content Include="views\设备管理\Sb_EqpConkBookBillList.html" />
    <Content Include="views\设备管理\Sb_EqpMaintenanceBillList.html" />
    <Content Include="views\设备管理\Sb_EqpMaintenanceBillList_PDA.html" />
    <Content Include="views\设备管理\Sb_EqpMaintenanceBillList_PDAEdit.html" />
    <Content Include="views\设备管理\Sb_EqpRepairCheckBillList.html" />
    <Content Include="views\设备管理\Sb_EquipDocCheckItemBillList_PDAEdit.html" />
    <Content Include="views\设备管理\Sb_EquipDotCheckBillEdit.html" />
    <Content Include="views\设备管理\Sb_EquipDotCheckBillList.html" />
    <Content Include="views\设备管理\Sb_EquipDotCheckBillList_PDA.html" />
@@ -835,6 +858,7 @@
    <Content Include="views\设备管理\Sc_Add_MouldDotCheckBillList.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileMainEdit.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileMainList.html" />
    <Content Include="views\设备管理\设备维修派工单\Sb_EquipRepairSendWorkBillEdit.html" />
    <Content Include="views\设备管理\设备维修派工单\Sb_EquipRepairSendWorkBillList.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipDotCheckRuleEdit.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipDotCheckRuleList.html" />
@@ -856,6 +880,10 @@
    <Content Include="views\质量管理\检验方案单\QC_CheckProjectList.html" />
    <Content Include="views\质量管理\首件检验单\QC_FirstPieceCheckBillList.html" />
    <Content Include="views\质量管理\首件检验单\QC_Add_Edit_FirstPieceCheckBill.html" />
    <Content Include="views\车间管理\叫料管理\Jl_CallGoodsBillMain.html" />
    <Content Include="views\车间管理\叫料管理\叫料退料单\Jl_CallGoodsBillBackMain.html" />
    <Content Include="views\车间管理\叫料管理\拣料配送单\Jl_ComplementGoodsBillMain.html" />
    <Content Include="views\车间管理\叫料管理\生产日计划单\Sc_WorkBillAutoSortBillMain.html" />
    <Content Include="views\车间管理\委外工序发出单\Cj_StationEntrustInBill_Mul_PDA.html" />
    <Content Include="views\车间管理\委外工序发出单\Cj_StationEntrustInBill_PDA.html" />
    <Content Include="views\车间管理\委外工序发出单\Cj_StationEntrustInBill_Mul.html" />
@@ -981,6 +1009,7 @@
    <Content Include="views\验收入库\委外入库\Kf_EntrustInBackBill.html" />
    <Content Include="views\验收入库\委外入库\Kf_EntrustInBill_FastList.html" />
    <Content Include="views\验收入库\委外入库\Kf_EntrustInBillList.html" />
    <Content Include="views\验收入库\委外入库\Kf_EntrustOutBackBill.html" />
    <Content Include="Web.config" />
    <None Include="Properties\PublishProfiles\Web.pubxml" />
  </ItemGroup>
@@ -1030,6 +1059,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_Department_Edit.aspx.designer.cs">
      <DependentUpon>xmlLBM_Gy_Department_Edit.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill.aspx.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_ICStockBill.aspx.cs">
      <DependentUpon>xmlLBM_ICStockBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>