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" />
@@ -338,6 +341,8 @@
    <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扫码模块\收料通知单_条码生成\Add_Cg_POInStockBill_BarCore.html" />
    <Content Include="views\WMS扫码模块\收料通知单_条码生成\Cg_POInStockBill_BarCore.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" />
@@ -348,6 +353,10 @@
    <Content Include="views\WMS扫码模块\生产入库\Kf_ProductInBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产汇报\Sc_ICMOReportBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产汇报\Sc_ICMOReportBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产管理\删托单\Sc_UnPackUnionBill_Pallet_PDA.html" />
    <Content Include="views\WMS扫码模块\生产管理\删托单\Sc_UnPackUnionBill_Packing_PDA.html" />
    <Content Include="views\WMS扫码模块\生产管理\生产组托单\Sc_PackUnionBill_Pallet_PDA.html" />
    <Content Include="views\WMS扫码模块\生产管理\生产组托单\Sc_PackUnionBill_Packing_PDA.html" />
    <Content Include="views\WMS扫码模块\生产补料\Kf_MateReplenishOutBill_Check_PDA.html" />
    <Content Include="views\WMS扫码模块\生产补料\Kf_MateReplenishOutBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产补料\Kf_MateReplenishOutBill_PDA.html" />
@@ -387,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" />
@@ -422,7 +433,11 @@
    <Content Include="views\人事管理\职员异动单\HR_EmpChangeBill.html" />
    <Content Include="views\人事管理\职员异动单\HR_EmpChangeBillList.html" />
    <Content Include="views\仓存管理\条码报表\Kf_ICInvBalList.html" />
    <Content Include="views\仓存管理\条码生成\Gy_BarCodeBill_JiaNan.html" />
    <Content Include="views\仓存管理\条码生成\Gy_BarCodeBill_JiaNan_AutoLogin.html" />
    <Content Include="views\仓存管理\生产入库单\Kf_ProductInBillList.html" />
    <Content Include="views\仓存管理\组托单\Sc_PackUnionBillMain_Setto.html" />
    <Content Include="views\仓存管理\装箱单\Sc_PackUnionBillMain_Packing.html" />
    <Content Include="views\公共页面\Kf_ChaoBaoEditDlg.html" />
    <Content Include="views\公共页面\Kf_SourceBillEditDlg_PDA.html" />
    <Content Include="views\品质管理\客诉处理\QC_CustomerAppealReport_BadClass.html" />
@@ -452,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" />
@@ -489,6 +505,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_Kf_BarCodeDetailQuery.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_MoveStockBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_CustTagBarCodeList_Select.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_CustTagBarCodeList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPayMentBill.aspx" />
@@ -508,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" />
@@ -629,10 +649,12 @@
    <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" />
    <Content Include="views\生产管理\宝工排产\Gy_RoutingBillReportForLack.html" />
    <Content Include="views\生产管理\宝工排产\JIT_DayPlanPlatForm_DayImport.html" />
    <Content Include="views\生产管理\宝工排产\JIT_NeedMaterPlanConfigBillReportForLack.html" />
    <Content Include="views\生产管理\宝工排产\JIT_PickUpCalculate_BaoGong.html" />
    <Content Include="views\生产管理\宝工排产\JIT_UnLockRequestBillList.html" />
@@ -642,7 +664,6 @@
    <Content Include="views\生产管理\宝工排产\JIT_LockRequestBillList.html" />
    <Content Include="views\生产管理\宝工排产\ReportPODemandPlanBillList.html" />
    <Content Include="views\生产管理\宝工排产\ReportPODemandPlanBillList_S.html" />
    <Content Include="views\生产管理\客户标签\Sc_CustomerTagBarCodeList.html" />
    <Content Include="views\生产管理\客户标签\Sc_CustomerTagInfoExcel.html" />
    <Content Include="views\生产管理\客户标签\Sc_CustomerTagInfoEdit.html" />
    <Content Include="views\生产管理\客户标签\Sc_CustomerTagInfoList.html" />
@@ -664,6 +685,7 @@
    <Content Include="views\生产管理\日计划基础资料\JIT_NeedMaterPlanConfigBill_Excel.html" />
    <Content Include="views\生产管理\日计划报表\JIT_DayPlanPlatFormHistoryNoteReport.html" />
    <Content Include="views\生产管理\日计划报表\JIT_FuHeFenXiReportDetail.html" />
    <Content Include="views\生产管理\日计划报表\Sc_ArrangeRiskICMOBillReport.html" />
    <Content Include="views\生产管理\日计划报表\ReportMOMaterReadysBillTotalList.html" />
    <Content Include="views\生产管理\欠料运算\JIT_MaterialLevelShorAnalysisReport_His.html" />
    <Content Include="views\生产管理\欠料运算\JIT_MaterialLevelShorAnalysis.html" />
@@ -722,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" />
@@ -858,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" />
@@ -874,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" />
@@ -899,6 +925,7 @@
    <Content Include="views\采购管理\应付单\Cg_PayableBillQuery.html" />
    <Content Include="views\采购管理\应付单\Cg_PayableBillCheckQuery.html" />
    <Content Include="views\采购管理\收料通知单\Cg_POInStockBillQuery.html" />
    <Content Include="views\采购管理\收料通知单\Cg_POInStockBillList_JiaNan.html" />
    <Content Include="views\采购管理\采购报表\Gy_SupplierPayPlanReport.html" />
    <Content Include="views\采购管理\采购合同\Add_Edit_Cg_ContractBillList.html" />
    <Content Include="views\采购管理\采购合同\Cg_ContractBillList.html" />
@@ -932,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" />
@@ -1458,6 +1486,10 @@
    <Content Include="views\grf\15白标打印.grf" />
    <Content Include="views\grf\追溯码.grf" />
    <Content Include="views\grf\法律标签.grf" />
    <Content Include="views\grf\物料条码_迦南.grf" />
    <Content Include="views\grf\包条码_迦南1.grf" />
    <Content Include="views\grf\托条码_迦南1.grf" />
    <Content Include="views\grf\箱条码_迦南1.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -2435,12 +2467,14 @@
    <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" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill_Check_New.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBillList_BarCodeNote.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill_QiaoYi.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutRequestBill.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBackBillEdit.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBackBill_Fast.html" />
@@ -2599,6 +2633,20 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_StockPlaceList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Gy_StockPlaceList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_BarCodeDetailQuery.aspx.cs">
      <DependentUpon>xmlLBM_Kf_BarCodeDetailQuery.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_BarCodeDetailQuery.aspx.designer.cs">
      <DependentUpon>xmlLBM_Kf_BarCodeDetailQuery.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_MoveStockBillList.aspx.cs">
      <DependentUpon>xmlLBM_Kf_MoveStockBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_MoveStockBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Kf_MoveStockBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_CustTagBarCodeList_Select.aspx.cs">
      <DependentUpon>xmlLBM_Sc_CustTagBarCodeList_Select.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>