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

yusijie

2024-12-20 95280f8a0a87c191d1b91b30ab70ce1319ce6983

 WebTM/WebTM.csproj

@@ -272,6 +272,8 @@
    <Content Include="views\WMS扫码模块\其他入库\Kf_OtherInBill_Check_PDA.html" />
    <Content Include="views\WMS扫码模块\其他入库\Kf_OtherInBill_PDA.html" />
    <Content Include="views\WMS扫码模块\其他入库\Kf_OtherInBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\其他入库\Kf_OtherInBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\其他出库\Kf_OtherOutBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\其他出库\Kf_OtherOutBill_PDA.html" />
    <Content Include="views\WMS扫码模块\其他出库\Kf_OtherOutBackBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\其他出库\Kf_OtherOutBillList_PDA.html" />
@@ -282,8 +284,10 @@
    <Content Include="views\WMS扫码模块\委外入库\Kf_EntrustInBackBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\委外入库\Kf_EntrustInBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\委外入库\Kf_EntrustInBill_PDA.html" />
    <Content Include="views\WMS扫码模块\委外补料\Kf_EntrustReplenishOutBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\委外领料\Kf_EntrustOutBackBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\委外领料\Kf_EntrustOutBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\委外领料\Kf_EntrustOutBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\客户条码扫描\Gy_getCusBarCodeBillList.html" />
    <Content Include="views\WMS扫码模块\客户条码扫描\Gy_getCusBarCodeBillList_BarCodeList.html" />
    <Content Include="views\WMS扫码模块\客户条码扫描\Gy_getCusBarCodeBill_PDA.html" />
@@ -296,6 +300,7 @@
    <Content Include="views\WMS扫码模块\条码出入库查询\Gy_BarCodeBillInOut__PDA.html" />
    <Content Include="views\WMS扫码模块\委外领料\Kf_EntrustOutBill_PDA.html" />
    <Content Include="views\WMS扫码模块\条码查询\Gy_BarCodeBill_QiaoYi_PDA.html" />
    <Content Include="views\WMS扫码模块\生产入库\Kf_ProductInBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产入库\Kf_ProductInBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产入库\Kf_ProductInBackBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产入库\Kf_ProductInBillList_PDA.html" />
@@ -303,6 +308,7 @@
    <Content Include="views\WMS扫码模块\生产汇报\Sc_ICMOReportBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产补料\Kf_MateReplenishOutBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产补料\Kf_MateReplenishOutBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产补料\Kf_MateReplenishOutBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockBillList_Mould_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockBill_CusBar_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockBill_Mould_PDA.html" />
@@ -316,10 +322,13 @@
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockStepOutBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产领料\Kf_MateOutBackBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产领料\Kf_MateOutBackBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产领料\Kf_MateOutBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产领料\Kf_MateOutBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产领料\Kf_MateOutBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\采购入库\Kf_POStockInBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\采购入库\Kf_POStockInBackBill_PDA.html" />
    <Content Include="views\WMS扫码模块\采购入库\Kf_POStockInBill_Mould_PDA.html" />
    <Content Include="views\WMS扫码模块\采购入库\Kf_POStockInBill_PDA.html" />
@@ -330,6 +339,8 @@
    <Content Include="views\WMS扫码模块\生产管理\生产组托单\Sc_PackUnionBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\调拨换托\Kf_MoveStockBill_HuanTuo_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\调拨换托\Kf_MoveStockBillList_HuanTuo_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBill_Check_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBillList_Mould_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBill_CusBar_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBill_Mould_PDA.html" />
@@ -431,7 +442,10 @@
    <Content Include="views\基础资料\生产基础资料\Gy_PostSkill_Excel.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_Post_Excel.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_Process_Excel.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_WorkShiftList.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_WorkShiftEdit.html" />
    <Content Include="views\基础资料\通用基础资料\Gy_CommonBaseData.html" />
    <Content Include="views\基础资料\通用基础资料\Gy_GeneralLookDown.html" />
    <Content Include="views\基础资料\隐藏列设置\Gy_GridView_Hide_New.html" />
    <Content Include="views\工资管理\定额申请\Pay_ProcPriceRequestBillCheckQuery.html" />
    <Content Include="views\工资管理\工资报表\Pay_PayrollReportByKD.html" />
@@ -521,6 +535,7 @@
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillCloseList.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillToInvalidatedList.html" />
    <Content Include="views\计划管理\工艺路线\Pay_ProcPriceTypeChangeReport.html" />
    <Content Include="views\计划管理\工艺路线\Gy_MaterialTechParamBill_Excel.html" />
    <Content Include="views\设备管理\Sb_Add_EquipRepairSignBillList.html" />
    <Content Include="views\设备管理\Sb_EquipRepairSignBillList_PDA.html" />
    <Content Include="views\设备管理\Sb_EquipRepairSignBill_PDA.html" />
@@ -619,6 +634,7 @@
    <Content Include="views\车间管理\关键件绑定\Sc_KeyElementBindingList.html" />
    <Content Include="views\车间管理\关键件绑定\Sc_KeyElementBinding.html" />
    <Content Include="views\车间管理\单品过站\SingleItemTransitList.html" />
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBill_Excel.html" />
    <Content Include="views\车间管理\启动点检单\Sc_WorkBeginDotCheckBill.html" />
    <Content Include="views\车间管理\启动点检单\Sc_WorkBeginDotCheckBillList.html" />
    <Content Include="views\设备管理\设备停机单\Sb_EquipStopBill.html" />
@@ -652,6 +668,7 @@
    <Content Include="views\车间管理\车间在制品期初单\CJ_WIPBeginStockBillList.html" />
    <Content Include="views\车间管理\防错验证\Gy_MaterPreventErrMouldBill.html" />
    <Content Include="views\车间管理\防错验证\Gy_MaterPreventErrMouldBillList.html" />
    <Content Include="views\车间管理\防错验证\Gy_MaterPreventErrMouldBill_Excel.html" />
    <Content Include="views\车间管理\防错验证\Qc_PreventErrMouldCheckBill.html" />
    <Content Include="views\车间管理\防错验证\Qc_PreventErrMouldCheckBillList.html" />
    <Content Include="views\车间管理\报表分析\Kf_PressurizedWaterNoOutReport.html" />