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

yusijie

2025-03-31 3c105b866ddcd6853783d1fb8174d86a5bf7e686

 WebTM/WebTM.csproj

@@ -310,6 +310,7 @@
    <Content Include="views\WMS扫码模块\委外领料\Kf_EntrustOutBill_Check_PDA.html" />
    <Content Include="views\WMS扫码模块\客户条码扫描\Gy_getCusBarCodeBillList.html" />
    <Content Include="views\WMS扫码模块\客户条码扫描\Gy_getCusBarCodeBillList_BarCodeList.html" />
    <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_ICInventoryByCLD_PDA.html" />
@@ -412,6 +413,9 @@
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBillList.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CheckNoteItem.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_EnvironmentTestItem.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_PiPeMaterial.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_PiPe.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ProjectMoneyClass.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_TechnologyParameterType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_MaintainLev.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_CheckItem_Excel.html" />
@@ -423,6 +427,9 @@
    <Content Include="views\基础资料\公用基础资料\excel\Gy_QCCheckClass_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_QualityStd_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_BadPhenomena_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PiPeMaterial.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PiPe.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ProjectMoneyClass.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_SupType_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_EquipType_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CheckNoteItem_Excel.html" />
@@ -450,6 +457,7 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOStockInBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOInStockBillByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HSeOutStockBillListByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_ProductReceiveMaterialBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillListByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOBillListTK.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOReportBillList2.aspx" />
@@ -572,6 +580,13 @@
    <Content Include="views\生产管理\异常反馈单\Sc_MESExecptFeedBackBillType.html" />
    <Content Include="views\生产管理\报工台工序\开工\Sc_SwipeCardStart.html" />
    <Content Include="views\生产管理\报工台工序\微瑕品记录单\Sc_SubtleFlawBillList.html" />
    <Content Include="views\生产管理\报工平台_PDA\IpadIndex_PDA.html" />
    <Content Include="views\生产管理\报工平台_PDA\IpadSourceIndex_PDA.html" />
    <Content Include="views\生产管理\报工平台_PDA\LineBind_PDA.html" />
    <Content Include="views\生产管理\报工平台_PDA\产量汇报\Sc_ProductReportBillList_PDA.html" />
    <Content Include="views\生产管理\报工平台_PDA\产量汇报\Sc_Add_ProductReportBillList_PDA.html" />
    <Content Include="views\生产管理\报工平台_PDA\完工\Sc_Add_MESEndWorkBillList_PDA.html" />
    <Content Include="views\生产管理\报工平台_PDA\开工\Sc_Add_MESBeginWorkBillList_PDA.html" />
    <Content Include="views\生产管理\报工平台功能页\Gy_ButtonList.html" />
    <Content Include="views\生产管理\报工平台功能页\LineBind_Button.html" />
    <Content Include="views\生产管理\欠料运算\JIT_MaterialLevelShorAnalysis.html" />
@@ -582,6 +597,7 @@
    <Content Include="views\生产管理\班次开班单\Sc_ShiftsBeginInfoBill_Add_Edit.html" />
    <Content Include="views\生产管理\提料计划\JIT_PickUpCalculate.html" />
    <Content Include="views\生产管理\生产任务单\Sc_ICMOBillOrProcessExchangeResumeList.html" />
    <Content Include="views\生产管理\报工平台_PDA\停工\Sc_Add_MESStopWorkBillList_PDA.html" />
    <Content Include="views\生产管理\生产开工单\Sc_MESBeginWorkBillList_PDA.html" />
    <Content Include="views\生产管理\生产报表\SC_BOMReport.html" />
    <Content Include="views\生产管理\生产报表\Sc_ProductionInProgressReport.html" />
@@ -770,8 +786,10 @@
    <Content Include="views\采购管理\采购报表\Cg_POMaterialPriceReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POOrderBillProcessSumReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POOrderInStockSumReport.html" />
    <Content Include="views\采购管理\采购核销\Cg_POStockInBillList_Sec.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBillCheckQuery.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBillQuery.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBill_LookDown.html" />
    <Content Include="views\采购管理\采购订单变更单\Cg_POOrderChangeBill.html" />
    <Content Include="views\采购管理\采购订单变更单\Cg_POOrderChangeBillList.html" />
    <Content Include="views\采购管理\采购调价单\Cg_POStockInChangeBill.html" />
@@ -788,6 +806,7 @@
    <Content Include="views\销售管理\销售报价单\Xs_SeQuotationBillMain.html" />
    <Content Include="views\销售管理\销售报价单\Xs_SeQuotationBillMainList.html" />
    <Content Include="views\销售管理\销售报表\Xs_SeOrderOutStockSumReport.html" />
    <Content Include="views\销售管理\销售核销\XS_SellOutBillList_Sec.html" />
    <Content Include="views\销售管理\销售订单\Xs_SeOrderBillQuery.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_PM_CustomerProInfoBill.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_Gy_TaskClass.html" />
@@ -2534,6 +2553,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_ICStockBackBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Kf_ICStockBackBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_ProductReceiveMaterialBillList.aspx.cs">
      <DependentUpon>xmlLBM_Kf_ProductReceiveMaterialBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_ProductReceiveMaterialBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Kf_ProductReceiveMaterialBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillListByID.aspx.cs">
      <DependentUpon>xmlLBM_Kf_SellOutBillListByID.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>