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

zzr99

2022-03-30 23950227007759369c3f952483dec25c6e7c2374

 WebTM/WebTM.csproj

@@ -87,10 +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" />
@@ -184,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>
@@ -678,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" />
@@ -731,6 +737,7 @@
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldScrapOutBillList.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldDotCheckBill_PDA.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldMaintainBill_PDA.html" />
    <Content Include="views\模治具管理\模治具管理\BatchGen_MouldFile.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_CheckToolsFileMainList.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFileList.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFile.html" />
@@ -789,6 +796,9 @@
    <Content Include="views\生产管理\报工台工序\防错\Sc_MaterToSourceStepBillList.html" />
    <Content Include="views\生产管理\报工平台功能页\LineBindStep.html" />
    <Content Include="views\生产管理\报工平台功能页\LineBind.html" />
    <Content Include="views\生产管理\拣料配送单\JIT_ComplementGoodsBill.html" />
    <Content Include="views\生产管理\拣料配送单\JIT_ComplementGoodsBill_Sc.html" />
    <Content Include="views\生产管理\拣料配送单\JIT_ComplementGoodsList.html" />
    <Content Include="views\生产管理\生产上料单\Sc_MaterToSourceBillList - 复制.html" />
    <Content Include="views\生产管理\生产上料单\Sc_MaterToSourceBillList.html" />
    <Content Include="views\生产管理\生产停工单\Sc_Add_MESStopWorkBillList - 复制.html" />
@@ -796,6 +806,8 @@
    <Content Include="views\生产管理\生产停工单\Sc_MESStopWorkBillList.html" />
    <Content Include="views\生产管理\生产包装单\Sc_PackUnionBill.html" />
    <Content Include="views\生产管理\生产包装单\Sc_PackUnionBillEdit.html" />
    <Content Include="views\生产管理\生产叫料平台\JIT_ComplementGoodBillMain.html" />
    <Content Include="views\生产管理\生产叫料平台\JIT_HlpBillList.html" />
    <Content Include="views\生产管理\生产完工单\Sc_Add_MESEndWorkBillList - 复制.html" />
    <Content Include="views\生产管理\生产完工单\Sc_Add_MESEndWorkBillList.html" />
    <Content Include="views\生产管理\生产完工单\Sc_MESEndWorkBillList.html" />
@@ -807,11 +819,14 @@
    <Content Include="views\生产管理\生产汇报单\Sc_Add_ICMOReportBillList.html" />
    <Content Include="views\生产管理\生产物料清单\sc_Gy_ICBomBillMainList.html" />
    <Content Include="views\生产管理\生产组装追溯单\Sc_AssemblyBillList.html" />
    <Content Include="views\生产管理\生产装箱单\QK_PackedBillList.html" />
    <Content Include="views\生产管理\生产装箱单\QK_PackingBill.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" />
    <Content Include="views\生产管理\质量汇报单\Sc_QualityReportBillList.html" />
    <Content Include="views\生产管理\退料申请单\JIT_CallGoodsBackRequestBillList.html" />
    <Content Include="views\系统管理\会计期间\Xt_AccountPeriodList.html" />
    <Content Include="views\系统管理\会计期间\Xt_AccountPeriod_Edit.html" />
    <Content Include="views\系统管理\公告\GG_NoticeBillList.html" />
@@ -874,6 +889,11 @@
    <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\车间管理\叫料管理\叫料退料单\JIT_BackGoods.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" />
@@ -902,6 +922,7 @@
    <Content Include="views\销售管理\销售退货单\Add_Edit_Kf_ICStockBillMainList.html" />
    <Content Include="views\销售管理\销售退货单\Kf_ICStockBillMainList.html" />
    <Content Include="views\销售管理\销售订单\Add_Edit_Xs_SeOrderBillList.html" />
    <Content Include="views\领料发货\其他出库\Kf_OtherOutBill_Check.html" />
    <Content Include="views\领料发货\分步式调出单\Fb_StepFoldOutBillList.html" />
    <Content Include="views\领料发货\委外出库\Kf_EntrustOutBillList.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast.html" />