1

wangyi

2026-02-25 af4999990724f2cc2474afaa81d5baa96284c4cf

1

 WebTM/WebTM.csproj

@@ -652,13 +652,10 @@
    <Content Include="views\应收管理\报表分析\Xs_SellOutCompareToProductReport.html" />
    <Content Include="views\应收管理\报表分析\Xs_SeOrderBarCodeInAndOutStockDetailReport.html" />
    <Content Include="views\应收管理\报表分析\YS_CusShouldIncomeMaterEntryReport.html" />
<<<<<<< HEAD
    <Content Include="views\成本管理\成本费用单\CB_ItemMoneyBillList.html" />
    <Content Include="views\成本管理\成本费用单\CB_ItemMoneyBillEdit.html" />
=======
    <Content Include="views\成本管理\费用单引入\CB_CostProjectImport.html" />
    <Content Include="views\成本管理\费用单引入\CB_ItemMoneyBillImport.html" />
>>>>>>> 3744dfa85c558f1131afa9cf3cb6054884678c3c
    <Content Include="views\条码明细\Kf_MateOutBillList_CodeDetail.html" />
    <Content Include="views\案例代码\华远\HY_HistogramReport_ForPCSCheckNote.html" />
    <Content Include="views\案例代码\华远\HY_HistogramReport.html" />

 WebTM/WebTM.csproj.user

@@ -2,15 +2,12 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<<<<<<< HEAD
    <NameOfLastUsedPublishProfile>D:\工作代码\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
=======
    <NameOfLastUsedPublishProfile>D:\智云LMes\MESWMS-LayUI\WebTM\Properties\PublishProfiles\SWETM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
>>>>>>> 3744dfa85c558f1131afa9cf3cb6054884678c3c
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -5,13 +5,13 @@
    /*var WEBURL = "http://localhost/API/";             //颜晓军本地配置*/
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
   /*  var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置*/
     //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
     var WEBURL = "http://localhost:8080/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
   /* var WEBURL = "http://localhost:8082/LuBaoAPI/";  //余思杰本地配置*/
    //var WEBURL = "http://localhost:81/API/";            // 陈镐哲本地配置*/
     var WEBURL = "http://localhost:8082/LuBaoAPI/";  //李林俊本地配置
     /*var WEBURL = "http://localhost:8080/LuBaoAPI/";  //李林俊本地配置*/
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //奥邦
    //var WEBURL = "http://10.1.4.155/API/";            //江丰客户NEW