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

yangle

2022-07-19 65f755d746ef0c9319faf42d577bcebf0786bd74

 WebTM/WebTM.csproj

@@ -143,12 +143,14 @@
    <Content Include="views\video\success.wav" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockBill_CheckList_New.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockBill_Check_New.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockOutBill_Fast.html" />
    <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_PonderationBillList_Query.html" />
    <Content Include="views\仓存管理\条码库存\KF_ICInventoryByMaterID.html" />
    <Content Include="views\仓存管理\条码库存\KF_ICInventoryList_WMS.html" />
    <Content Include="views\仓存管理\条码生成\Gy_BarCodeBill.html" />
@@ -158,6 +160,7 @@
    <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_WorkCenterDyCol.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkPayType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkType.html" />
    <Content Include="views\基础资料\公用基础资料\Pay_PeriodInfoSet.html" />
@@ -724,7 +727,9 @@
    <Content Include="views\工资管理\核算方式\Gy_ClassTimePrjSubBillList.html" />
    <Content Include="views\工资管理\班组职员清单\Gy_GroupEmpBillEdit.html" />
    <Content Include="views\工资管理\班组职员清单\Gy_GroupEmpBillList.html" />
    <Content Include="views\工资管理\考勤汇报单\Pay_WorkTimesBillEdit_yqn.html" />
    <Content Include="views\工资管理\考勤汇报单\Pay_WorkTimesBillEdit.html" />
    <Content Include="views\工资管理\考勤汇报单\Pay_WorkTimesBillList_yqn.html" />
    <Content Include="views\工资管理\考勤汇报单\Pay_WorkTimesBillList.html" />
    <Content Include="views\模治具管理\器具报表\ReportInventoryAccount.html" />
    <Content Include="views\模治具管理\器具报表\ReportMaterialReceipt.html" />
@@ -801,6 +806,7 @@
    <Content Include="views\生产工序管理\委外工序计划转出单\WW_EntrustProcessSendOutBillList.html" />
    <Content Include="views\生产工序管理\委外工序计划转出单\WW_EntrustProcessSendOutBill_PDA.html" />
    <Content Include="views\生产工序管理\工序汇报单\HBarPlanPrint.html" />
    <Content Include="views\生产工序管理\工序汇报单\Sc_ProcessReportOverList.html" />
    <Content Include="views\生产工序管理\工序汇报单\xmlLBM_ProcessReport.aspx" />
    <Content Include="views\生产工序管理\工序计划单\Sc_ProcessPlanEdit.html" />
    <Content Include="views\生产管理\上料防错单\Sc_Add_MaterToSourceBillList.html" />
@@ -976,6 +982,7 @@
    <Content Include="views\采购管理\采购退料单\Cg_PurchaseReturnList.html" />
    <Content Include="views\采购管理\采购退料单\Cg_PurchaseReturn_Add_Up.html" />
    <Content Include="views\销售管理\发货通知单\Add_Edit_Xs_SeOutStockBillList.html" />
    <Content Include="views\销售管理\销售订单\Xs_SeOrderBillDyColList.html" />
    <Content Include="views\销售管理\销售退货单\Add_Edit_Kf_ICStockBillMainList.html" />
    <Content Include="views\销售管理\销售退货单\Kf_ICStockBillMainList.html" />
    <Content Include="views\销售管理\销售订单\Add_Edit_Xs_SeOrderBillList.html" />
@@ -984,6 +991,8 @@
    <Content Include="views\领料发货\委外出库\Kf_EntrustOutBillList.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Check.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBackBillEdit.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBackBill_Fast.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBillLEdit.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBackBillList.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBill_FastCheck.html" />