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

yxj

2025-11-20 e517f57a0b0489165012283c5ea40887fa84c943

 WebTM/WebTM.csproj

@@ -123,6 +123,7 @@
    <Content Include="layuiadmin\resize\ResizeLeftRight.css" />
    <Content Include="layuiadmin\resize\ResizeLeftRight.js" />
    <Content Include="layuiadmin\QueryScheme.js" />
    <Content Include="layuiadmin\Scripts\xlsx.full.min.js" />
    <Content Include="layuiadmin\SetColumn.js" />
    <Content Include="layuiadmin\modules\tableFilter2.js" />
    <Content Include="layuiadmin\PlateBinding.js" />
@@ -179,6 +180,7 @@
    <Content Include="layuiadmin\zy_dropdown.js" />
    <Content Include="views\Baseset\HBarPlanPrint.html" />
    <Content Include="views\Baseset\SRM_OpenTmpList_GXPG.html" />
    <Content Include="views\Baseset\基础资料\saomazutuo_xiaowei.html" />
    <Content Include="views\Baseset\基础资料\Gy_BadCountDevelopWHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_BadWHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_BankList.html" />
@@ -190,6 +192,9 @@
    <Content Include="views\Baseset\基础资料\Gy_EnvironmentTestItem.html" />
    <Content Include="views\Baseset\基础资料\Gy_ErrMsgBackType.html" />
    <Content Include="views\Baseset\基础资料\Gy_EnvironmentTestSchemeBillList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_OperationBill_Report.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MultipleCodes_Report.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PlanImplementation_Report.html" />
    <Content Include="views\Baseset\基础资料\Gy_Shifts.html" />
    <Content Include="views\Baseset\基础资料\Gy_GroupList.html" />
    <Content Include="views\Baseset\基础资料\Gy_Source.html" />
@@ -303,6 +308,7 @@
    <Content Include="views\WMS扫码模块\三点照合扫码记录单\WMS_CusBarCodeCheckBill_PDA.html" />
    <Content Include="views\WMS扫码模块\上料防错单\Sc_MaterToSourceBill_PDA.html" />
    <Content Include="views\WMS扫码模块\上料防错单\Sc_MaterToSourceBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\产量汇报\Sc_ICMOBillWorkQtyStatus_PDA.html" />
    <Content Include="views\WMS扫码模块\其他入库\Kf_OtherInBackBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\其他入库\Kf_OtherInBill_Check_PDA.html" />
    <Content Include="views\WMS扫码模块\其他入库\Kf_OtherInBill_PDA.html" />
@@ -332,10 +338,12 @@
    <Content Include="views\WMS扫码模块\客户条码扫描\Gy_getCusBarCodeBill_PDA.html" />
    <Content Include="views\WMS扫码模块\客户条码扫描\Gy_getCusBarCodeBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\小车锁定\Kf_TrolleyPositionBill_PDA.html" />
    <Content Include="views\WMS扫码模块\库存查询\KF_ICInventory_Clear_PDA.html" />
    <Content Include="views\WMS扫码模块\库存查询\KF_ICInventory_WorkShopByXJ_PDA.html" />
    <Content Include="views\WMS扫码模块\库存查询\KF_ICInventory_WorkShopByCLD_PDA.html" />
    <Content Include="views\WMS扫码模块\库存查询\KF_ICInventoryByWorkShop_PDA.html" />
    <Content Include="views\WMS扫码模块\库存查询\KF_ICInventoryByCLD_PDA.html" />
    <Content Include="views\WMS扫码模块\库存转移\kf_InventoryTransfer.html" />
    <Content Include="views\WMS扫码模块\扫码验证\Gy_BarCodeConfirmBill_PDA.html" />
    <Content Include="views\WMS扫码模块\扫码验证\Gy_BarCodeConfirmBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\扫码验证\Gy_BarCodeConfirmBillList.html" />
@@ -421,6 +429,7 @@
    <Content Include="views\仓存管理\分步式调入单\Fb_StepFoldinBillEdit.html" />
    <Content Include="views\仓存管理\条码库存\KF_PonderationBillMain_Temp.html" />
    <Content Include="views\仓存管理\条码报表\Kf_ICInventory_Cus.html" />
    <Content Include="views\仓存管理\条码报表\Kf_ICInventory_Cus_Emp.html" />
    <Content Include="views\仓存管理\条码报表\Kf_StockInOutEntryByPageReport.html" />
    <Content Include="views\仓存管理\条码报表\KF_StockInOutEntryReport.html" />
    <Content Include="views\仓存管理\条码报表\KF_StockInOutRecordReport.html" />
@@ -440,6 +449,7 @@
    <Content Include="views\仓存管理\条码报表\Kf_ICInvBalList.html" />
    <Content Include="views\仓存管理\条码生成\Gy_BarCodeBill_JiaNan.html" />
    <Content Include="views\仓存管理\条码生成\Gy_BarCodeBill_JiaNan_AutoLogin.html" />
    <Content Include="views\仓存管理\条码生成\Gy_BarCodeBill_XingDa.html" />
    <Content Include="views\仓存管理\生产入库单\Kf_ProductInBillList.html" />
    <Content Include="views\仓存管理\组托单\Sc_PackUnionBillMain_Setto.html" />
    <Content Include="views\仓存管理\装箱单\Sc_PackUnionBillMain_Packing.html" />
@@ -454,6 +464,7 @@
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBill_KaiBei.html" />
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBill.html" />
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBillList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlzuotuo_xiaowei.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_XinDa.aspx" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CheckNoteItem.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_EnvironmentTestItem.html" />
@@ -471,6 +482,7 @@
    <Content Include="views\基础资料\公用基础资料\excel\Gy_InspectValue_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_QCCheckClass_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_QualityStd_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_Warehouse_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_AreaSet_ExtendDoubleClickReturn.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_BadPhenomena_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_BarCodeReport.html" />
@@ -515,6 +527,7 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_StockPlaceList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_BarCodeDetailQuery.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_MoveStockBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_OtherInBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_CustTagBarCodeList_Select.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_CustTagBarCodeList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPayMentBill.aspx" />
@@ -599,6 +612,7 @@
    <Content Include="views\工资管理\工资运算\Pay_SalaryCalculate_New.html" />
    <Content Include="views\工资管理\技能考核\HR_EmployeeSkillExamBill.html" />
    <Content Include="views\工资管理\技能考核\HR_EmployeeSkillExamBillList.html" />
    <Content Include="views\应收管理\报表分析\Xs_CusShouGongChaoBaoSumReport.html" />
    <Content Include="views\应收管理\报表分析\Xs_CusShouGongChaoBaoReport.html" />
    <Content Include="views\应收管理\报表分析\Kf_SellOutEntryReport_YP.html" />
    <Content Include="views\应收管理\报表分析\Xs_OutDoorBillReport.html" />
@@ -618,6 +632,8 @@
    <Content Include="views\模治具管理\器具报表\Sc_MouldResumeCheckQuery.html" />
    <Content Include="views\模治具管理\器具点检规程单\Sc_MouldDotCheckRuleBillList_PDA.html" />
    <Content Include="views\模治具管理\器具点检规程单\Sc_MouldDotCheckRuleBill_Excel.html" />
    <Content Include="views\模治具管理\器具调拨申请单\Sc_MouldMoveStockRequestBillList.html" />
    <Content Include="views\模治具管理\器具调拨申请单\Sc_MouldMoveStockRequestBillEdit.html" />
    <Content Include="views\模治具管理\模具其他入库单\Sc_MouldOtherInBillList_PDA.html" />
    <Content Include="views\模治具管理\模具其他入库单\Sc_MouldOtherInBill_PDA_old.html" />
    <Content Include="views\模治具管理\模具其他出库单\Sc_MouldOtherOutBillList_PDA.html" />
@@ -664,6 +680,8 @@
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatForm.html" />
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatFormImport_SS_Sec.html" />
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatFormImport_SS.html" />
    <Content Include="views\生产管理\制造周期报表\Sc_ProductionCycleBillList.html" />
    <Content Include="views\生产管理\宝工排产\JIT_DayPlanPlatForm_New.html" />
    <Content Include="views\生产管理\报工台工序\停工恢复单\Sc_MESStopRestoreWorkBill.html" />
    <Content Include="views\生产管理\凯贝日计划导入\JIT_DayPlanPlatForm_KB.html" />
    <Content Include="views\生产管理\发货计划平台（三升）\Xs_SendGoodsPlanForm.html" />
@@ -712,6 +730,8 @@
    <Content Include="views\生产管理\添康三周排产\Cg_PODemandPlanConfigBillReportForLack_TK.html" />
    <Content Include="views\生产管理\添康三周排产\Gy_RoutingBillReportForLack_TK.html" />
    <Content Include="views\生产管理\添康三周排产\JIT_CompleteDetailList_TK.html" />
    <Content Include="views\生产管理\添康三周排产\JIT_DayPlanPlatFormImport_Reply.html" />
    <Content Include="views\生产管理\添康三周排产\JIT_DayPlanPlatForm_Reply.html" />
    <Content Include="views\生产管理\添康三周排产\JIT_DayPlanPlatForm_TK2.html" />
    <Content Include="views\生产管理\添康三周排产\JIT_DayPlanPlatForm_TK.html" />
    <Content Include="views\生产管理\添康三周排产\JIT_LiftMaterPlaBillnList_TK.html" />
@@ -806,9 +826,12 @@
    <Content Include="views\设备管理\设备规程单\Sb_EquipMaintainRuleBill_Excel.html" />
    <Content Include="views\质量管理\PNL检验信息\QC_CheckNote_PNL_TempEdit.html" />
    <Content Include="views\质量管理\PNL检验信息\QC_CheckNote_PNL_TempList.html" />
    <Content Include="views\质量管理\产品入库检验单\QC_LastPieceCheckBillList_v2.html" />
    <Content Include="views\质量管理\产品入库检验单\QC_LastPieceCheckBill_v2.html" />
    <Content Include="views\质量管理\基础建模\Gy_ErrMsgBackType_Excel.html" />
    <Content Include="views\质量管理\基础建模\Gy_ErrType_Excel.html" />
    <Content Include="views\质量管理\基础建模\QC_SpcCenterlineList.html" />
    <Content Include="views\质量管理\巡检记录单\QC_Add_Edit_PatrolProcCheckBill_XW.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackSelfQuery_BGT.html" />
    <Content Include="views\质量管理\环境检测单\QC_EnvironmentTestDotCheckBillList_PDA.html" />
    <Content Include="views\质量管理\检验取样还样单\QC_Add_BackSampleCheckBill_PDA.html" />
@@ -891,6 +914,14 @@
    <Content Include="views\车间管理\关键件绑定\Sc_KeyElementBindingList.html" />
    <Content Include="views\车间管理\关键件绑定\Sc_KeyElementBinding.html" />
    <Content Include="views\车间管理\单品过站\SingleItemTransitList.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_generateSNCode.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_checkSN.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_generateCaseCode.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_UnbindEdit.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_UnbindList.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_KeyElement.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_batchKeyElement.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_batch.html" />
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBill_Excel.html" />
    <Content Include="views\车间管理\启动点检单\Sc_WorkBeginDotCheckBill.html" />
    <Content Include="views\车间管理\启动点检单\Sc_WorkBeginDotCheckBillList.html" />
@@ -907,6 +938,7 @@
    <Content Include="views\车间管理\工序出站汇报单\Cj_StationOutBillSync.html" />
    <Content Include="views\车间管理\工序流转\MES_CenterCheckBill.html" />
    <Content Include="views\车间管理\工序流转\MES_CenterCheckBillList.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeArrangementHEmp.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBillLIst_QueryCheckRecord.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill_Exchange.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBillList_Source.html" />
@@ -918,6 +950,7 @@
    <Content Include="views\车间管理\报表分析\Kf_PressurizedWaterNoOutReport.html" />
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBill.html" />
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBillList.html" />
    <Content Include="views\车间管理\报表分析\Mes_OrderProcFlowAllReport_TK.html" />
    <Content Include="views\车间管理\报表分析\Mes_OrderProcFlowAllReport_ICMO.html" />
    <Content Include="views\车间管理\报表分析\Qc_PreventErrMouldCheckReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_AllowedPrintProcExchangeBillList.html" />
@@ -949,6 +982,7 @@
    <Content Include="views\采购管理\付款单\YF_PayMentBillQuery.html" />
    <Content Include="views\采购管理\应付单\Cg_PayableBillQuery.html" />
    <Content Include="views\采购管理\应付单\Cg_PayableBillCheckQuery.html" />
    <Content Include="views\采购管理\收料通知单\Add_Edit_Cg_POInStockBillList_TestByLLJ.html" />
    <Content Include="views\采购管理\收料通知单\Cg_POInStockBillQuery.html" />
    <Content Include="views\采购管理\收料通知单\Cg_POInStockBillList_JiaNan.html" />
    <Content Include="views\采购管理\采购报表\Gy_SupplierPayPlanReport.html" />
@@ -2626,6 +2660,13 @@
    <Compile Include="App_Data\MssqlReportData.cs" />
    <Compile Include="App_Data\ReportData.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="views\基础资料\公用基础资料\xmlzuotuo_xiaowei.aspx.cs">
      <DependentUpon>xmlzuotuo_xiaowei.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlzuotuo_xiaowei.aspx.designer.cs">
      <DependentUpon>xmlzuotuo_xiaowei.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_XinDa.aspx.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill_XinDa.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -2682,6 +2723,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_MoveStockBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Kf_MoveStockBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_OtherInBillList.aspx.cs">
      <DependentUpon>xmlLBM_Kf_OtherInBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_OtherInBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Kf_OtherInBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_CustTagBarCodeList_Select.aspx.cs">
      <DependentUpon>xmlLBM_Sc_CustTagBarCodeList_Select.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>