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

chenhaozhe

2025-08-18 da44d82e7f19e081f3c882c1e7934728e4ab534b

 WebTM/WebTM.csproj

@@ -138,6 +138,7 @@
    <Content Include="layuiadmin\layui\font\iconfont.woff" />
    <Content Include="layuiadmin\layui\font\iconfont.woff2" />
    <Content Include="layuiadmin\json\Test.json" />
    <Content Include="Download\WMS软件安装包.apk" />
    <None Include="Properties\PublishProfiles\JFTM.pubxml" />
    <Content Include="layuiadmin\layui\images\device.png" />
    <Content Include="layuiadmin\layui\images\erro.png" />
@@ -183,6 +184,7 @@
    <Content Include="views\Baseset\基础资料\Gy_ClassTimePrjList.html" />
    <Content Include="views\Baseset\基础资料\Gy_ConveyCompList.html" />
    <Content Include="views\Baseset\基础资料\Gy_ConveyTypeList.html" />
    <Content Include="views\Baseset\基础资料\Gy_DepartmentList_PDA.html" />
    <Content Include="views\Baseset\基础资料\Gy_EnvironmentTestItem.html" />
    <Content Include="views\Baseset\基础资料\Gy_ErrMsgBackType.html" />
    <Content Include="views\Baseset\基础资料\Gy_EnvironmentTestSchemeBillList.html" />
@@ -251,6 +253,7 @@
    <Content Include="views\indexMenu_PDA.html" />
    <Content Include="views\indexMenu_PingBan.html" />
    <Content Include="views\index_KaiBeiNaiTe.html" />
    <Content Include="views\index_mobile_JiaNanAutoLogin.html" />
    <Content Include="views\index_Mobile_KaiBeiNaiTe.html" />
    <Content Include="views\index_Mobile_QiaoYi.html" />
    <Content Include="views\index_pb.html" />
@@ -326,6 +329,8 @@
    <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_TrolleyPositionBill_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扫码模块\扫码验证\Gy_BarCodeConfirmBill_PDA.html" />
@@ -391,6 +396,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_SellOutBillList_YP_QiaoYi_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBill_YP_QiaoYi_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBackBill_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBill_Check_PDA.html" />
@@ -460,6 +467,7 @@
    <Content Include="views\基础资料\公用基础资料\excel\Gy_QualityStd_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_AreaSet_ExtendDoubleClickReturn.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_BadPhenomena_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_BarCodeReport.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PNLInfoEdit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_BarCodeBill_PNL_TempEdit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PNLInfoList.html" />
@@ -518,6 +526,8 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOOrderChangeBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Xs_SeOrderBill_StockInCodeNote.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlSRM_Web_BarCodeBillList.aspx" />
    <Content Include="views\基础资料\基础资料\Gy_MatePrice.html" />
    <Content Include="views\基础资料\基础资料\Gy_MatePriceEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_PatrolCheckItemMethod_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_PatrolCheckItemClass_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_PatrolCheck_Excel.html" />
@@ -639,6 +649,7 @@
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatForm.html" />
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatFormImport_SS_Sec.html" />
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatFormImport_SS.html" />
    <Content Include="views\生产管理\凯贝日计划导入\JIT_DayPlanPlatForm_KB.html" />
    <Content Include="views\生产管理\发货计划平台（三升）\Xs_SendGoodsPlanForm.html" />
    <Content Include="views\生产管理\发货计划平台（三升）\Xs_SendGoodsPlanImport.html" />
    <Content Include="views\生产管理\宝工排产\Cg_PODemandPlanConfigBillReportForLack.html" />
@@ -681,6 +692,25 @@
    <Content Include="views\生产管理\欠料运算\JIT_MaterialLevelShorAnalysisDetailReport.html" />
    <Content Include="views\生产管理\欠料运算\JIT_MaterialLevelShorAnalysisReport.html" />
    <Content Include="views\生产管理\日计划报表\JIT_FuHeFenXiReport.html" />
    <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_DayPlanPlatForm_TK2.html" />
    <Content Include="views\生产管理\添康三周排产\JIT_DayPlanPlatForm_TK.html" />
    <Content Include="views\生产管理\添康三周排产\JIT_LiftMaterPlaBillnList_TK.html" />
    <Content Include="views\生产管理\添康三周排产\JIT_LiftMaterPlanBillEdit.html" />
    <Content Include="views\生产管理\添康三周排产\JIT_LockRequestBill.html" />
    <Content Include="views\生产管理\添康三周排产\JIT_LockRequestBillList.html" />
    <Content Include="views\生产管理\添康三周排产\JIT_MaterialLevelShorAnalysis_TK.html" />
    <Content Include="views\生产管理\添康三周排产\JIT_MaterialLevelShorAnalysisDetailReport.html" />
    <Content Include="views\生产管理\添康三周排产\JIT_MaterialLevelShorAnalysisReport_TK.html" />
    <Content Include="views\生产管理\添康三周排产\JIT_MaterialLevelShorAnalysisReport_His_TK.html" />
    <Content Include="views\生产管理\添康三周排产\JIT_NeedMaterPlanConfigBillReportForLack_TK.html" />
    <Content Include="views\生产管理\添康三周排产\JIT_PickUpCalculate_TK.html" />
    <Content Include="views\生产管理\添康三周排产\JIT_UnLockRequestBill.html" />
    <Content Include="views\生产管理\添康三周排产\JIT_UnLockRequestBillList.html" />
    <Content Include="views\生产管理\添康三周排产\ReportPODemandPlanBillList.html" />
    <Content Include="views\生产管理\添康三周排产\ReportPODemandPlanBillList_S_TK.html" />
    <Content Include="views\生产管理\班次开班单\Sc_ShiftsBeginInfoBillList.html" />
    <Content Include="views\生产管理\班次开班单\Sc_ShiftsBeginInfoBill_Add_Edit.html" />
    <Content Include="views\生产管理\提料计划\JIT_PickUpCalculate.html" />
@@ -714,6 +744,7 @@
    <Content Include="views\计划管理\产线对应器具清单\Gy_SourceMouldBill.html" />
    <Content Include="views\计划管理\产线对应器具清单\Gy_SourceMouldList.html" />
    <Content Include="views\计划管理\工艺路线\Gy_BulkEditWorkQty.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillHSEQ.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillCheckQuery.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillCloseList.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillToInvalidatedList.html" />
@@ -850,6 +881,7 @@
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBillList.html" />
    <Content Include="views\质量管理\巡检记录单\MES_QC_PatrolProcCheckOtherBill_PDA.html" />
    <Content Include="views\车间管理\启动点检单\Sc_WorkDotCheckBillList_Day.html" />
    <Content Include="views\车间管理\委外工序接收单\Sc_ProcessExchangeIssueBillList_PDA.html" />
    <Content Include="views\车间管理\工序出站汇报单\Cj_StationOutBill_Sup.html" />
    <Content Include="views\车间管理\工序流转\MES_CenterCheckBill.html" />
    <Content Include="views\车间管理\工序流转\MES_CenterCheckBillList.html" />
@@ -866,6 +898,8 @@
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBillList.html" />
    <Content Include="views\车间管理\报表分析\Mes_OrderProcFlowAllReport_ICMO.html" />
    <Content Include="views\车间管理\报表分析\Qc_PreventErrMouldCheckReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_AllowedPrintProcExchangeBillList.html" />
    <Content Include="views\车间管理\报表分析\Sc_OrderDelistingList_Query.html" />
    <Content Include="views\车间管理\报表分析\Sc_OEEReport_RunLogs.html" />
    <Content Include="views\车间管理\报表分析\Sc_WorkBeginDotCheckReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_MouldRequirementDay.html" />
@@ -925,6 +959,7 @@
    <Content Include="views\销售管理\销售报表\Xs_SeOrderOutStockSumReport_QX.html" />
    <Content Include="views\销售管理\销售报表\Xs_SeOrderOutStockSumReport.html" />
    <Content Include="views\销售管理\销售核销\XS_SellOutBillList_Sec.html" />
    <Content Include="views\销售管理\销售订单\Xs_SeOrderBillList_YP.html" />
    <Content Include="views\销售管理\销售订单\Xs_SeOrderBillQuery.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_PM_CustomerProInfoBill.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_Gy_TaskClass.html" />
@@ -2432,6 +2467,7 @@
    <Content Include="views\领料发货\生产补料\Kf_MateReplenishOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\生产领料\Kf_ProductReceiveMaterialBillEdit.html" />
    <Content Include="views\领料发货\生产领料\Kf_ProductReceiveMaterialBillList.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBillList_YP.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBillQuery.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBillList_LookDown.html" />