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

yusijie

2025-06-10 b67d9d05337e6b866a98707cfe6567420a2fc14d

 WebTM/WebTM.csproj

@@ -96,6 +96,7 @@
    <Content Include="layuiadmin\ax\main.css" />
    <Content Include="layuiadmin\BillMainAutoLoad.js" />
    <Content Include="layuiadmin\ckou.js" />
    <Content Include="layuiadmin\common.js" />
    <Content Include="layuiadmin\echarts.min.js" />
    <Content Include="layuiadmin\ext\excel.js" />
    <Content Include="layuiadmin\ext\soulTable.css" />
@@ -316,11 +317,16 @@
    <Content Include="views\WMS扫码模块\客户条码扫描\Gy_getCusBarCodeBillList_BarCodeList_Batch.html" />
    <Content Include="views\WMS扫码模块\客户条码扫描\Gy_getCusBarCodeBill_PDA.html" />
    <Content Include="views\WMS扫码模块\客户条码扫描\Gy_getCusBarCodeBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\库存查询\KF_ICInventoryByWorkShop_PDA.html" />
    <Content Include="views\WMS扫码模块\库存查询\KF_ICInventoryByCLD_PDA.html" />
    <Content Include="views\WMS扫码模块\扫码验证\Gy_BarCodeConfirmBill_PDA.html" />
    <Content Include="views\WMS扫码模块\扫码验证\Gy_BarCodeConfirmBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\扫码验证\Gy_BarCodeConfirmBillList.html" />
    <Content Include="views\WMS扫码模块\扫码验证\Gy_BarCodeConfirmBillList_BarCodeList.html" />
    <Content Include="views\WMS扫码模块\找货上架单\Kf_MaterialUpperBill_PDA.html" />
    <Content Include="views\WMS扫码模块\找货上架单\Kf_MaterialUpperBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\找货下架单\Kf_MaterialLowerBill_PDA.html" />
    <Content Include="views\WMS扫码模块\找货下架单\Kf_MaterialLowerBillList_PDA.html" />
    <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" />
@@ -464,6 +470,8 @@
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenter_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_UnitConvertRateList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_StockPlaceList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_CustTagBarCodeList_Select.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_CustTagBarCodeList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPayMentBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOOrderBillByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOStockInBillByID.aspx" />
@@ -606,6 +614,10 @@
    <Content Include="views\生产管理\宝工排产\JIT_LockRequestBill.html" />
    <Content Include="views\生产管理\宝工排产\JIT_DayPlanPlatForm.html" />
    <Content Include="views\生产管理\宝工排产\JIT_LockRequestBillList.html" />
    <Content Include="views\生产管理\客户标签\Sc_CustomerTagInfoExcel.html" />
    <Content Include="views\生产管理\客户标签\Sc_CustomerTagInfoEdit.html" />
    <Content Include="views\生产管理\客户标签\Sc_CustomerTagBarCodeList.html" />
    <Content Include="views\生产管理\客户标签\Sc_CustomerTagInfoList.html" />
    <Content Include="views\生产管理\异常反馈单\OA_ErrMsgBackSignBill_BrushCard.html" />
    <Content Include="views\生产管理\异常反馈单\Sc_MESExecptFeedBackBillResumeList.html" />
    <Content Include="views\生产管理\异常反馈单\Sc_MESExecptFeedBackBillType.html" />
@@ -622,6 +634,7 @@
    <Content Include="views\生产管理\报工平台功能页\Gy_ButtonList.html" />
    <Content Include="views\生产管理\报工平台功能页\LineBind_Button.html" />
    <Content Include="views\生产管理\日计划基础资料\JIT_NeedMaterPlanConfigBill_Excel.html" />
    <Content Include="views\生产管理\日计划报表\JIT_DayPlanPlatFormHistoryNoteReport.html" />
    <Content Include="views\生产管理\日计划报表\JIT_FuHeFenXiReportDetail.html" />
    <Content Include="views\生产管理\欠料运算\JIT_MaterialLevelShorAnalysis.html" />
    <Content Include="views\生产管理\欠料运算\JIT_MaterialLevelShorAnalysisDetailReport.html" />
@@ -679,6 +692,7 @@
    <Content Include="views\设备管理\Sb_EquipRepairSignBillMain.html" />
    <Content Include="views\设备管理\设备停机单\Sb_EquipStopBillList_PDA.html" />
    <Content Include="views\设备管理\设备停机单\Sb_EquipStopBill_PDA.html" />
    <Content Include="views\设备管理\设备工艺参数订单点检表\SB_EquipICMOTechParamBillEdit_HistoryRecord.html" />
    <Content Include="views\设备管理\设备工艺参数订单点检表\SB_EquipICMOTechParamBillList_Detail.html" />
    <Content Include="views\设备管理\设备工艺参数订单点检表\Sb_EquipMentCollectionTechParam_ERRList.html" />
    <Content Include="views\设备管理\设备工艺参数订单点检表\SB_EquipICMOTechParamBillList.html" />
@@ -756,6 +770,7 @@
    <Content Include="views\质量管理\质量报表\QC_TechParamReport.html" />
    <Content Include="views\质量管理\质量报表\QC_BackWorkReport.html" />
    <Content Include="views\质量管理\质量报表\Sc_StationOutBil_HProc.html" />
    <Content Include="views\质量管理\质量报表\QC_EnvironmentTestDotCheckReport.html" />
    <Content Include="views\质量管理\质量月度目标单\QC_MonthTarGetBill.html" />
    <Content Include="views\质量管理\质量月度目标单\QC_MonthTarGetBillList.html" />
    <Content Include="views\质量管理\车间自检单\QC_Add_Edit_WorkSelfCheckBill.html" />
@@ -794,6 +809,7 @@
    <Content Include="views\车间管理\工序出站汇报单\Cj_StationOutBill_Sup.html" />
    <Content Include="views\车间管理\工序流转\MES_CenterCheckBill.html" />
    <Content Include="views\车间管理\工序流转\MES_CenterCheckBillList.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBillLIst_QueryCheckRecord.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill_Exchange.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBillList_Source.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeArrangement_PG.html" />
@@ -805,6 +821,8 @@
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBill.html" />
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBillList.html" />
    <Content Include="views\车间管理\报表分析\Mes_OrderProcFlowAllReport_ICMO.html" />
    <Content Include="views\车间管理\报表分析\Qc_PreventErrMouldCheckReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_WorkBeginDotCheckReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_MouldRequirementDay.html" />
    <Content Include="views\车间管理\报表分析\Sc_CompareOrderToSelloutReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_HICMMaterStatisticsList.html" />
@@ -1384,6 +1402,7 @@
    <Content Include="views\grf\取样卡.grf" />
    <Content Include="views\grf\15白标打印.grf" />
    <Content Include="views\grf\追溯码.grf" />
    <Content Include="views\grf\法律标签.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -2523,6 +2542,20 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_StockPlaceList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Gy_StockPlaceList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_CustTagBarCodeList_Select.aspx.cs">
      <DependentUpon>xmlLBM_Sc_CustTagBarCodeList_Select.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_CustTagBarCodeList_Select.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_CustTagBarCodeList_Select.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_CustTagBarCodeList.aspx.cs">
      <DependentUpon>xmlLBM_Sc_CustTagBarCodeList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_CustTagBarCodeList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_CustTagBarCodeList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_CardChangeType.aspx.cs">
      <DependentUpon>xmlLBM_HGy_CardChangeType.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>