admin
2 天以前 49bb2841cc45fea723667672e56c8c7510165ba8
格式化代码
7个文件已修改
27 ■■■■ 已修改文件
HTML/.vscode/settings.json 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/js/public.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pda/js/public.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Wms/Controllers/BllSoController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Wms/Controllers/PdaAsnController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Wms/appsettings.json 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/.vscode/settings.json
@@ -1,3 +1,4 @@
{
    "liveServer.settings.port": 5503
    "liveServer.settings.port": 5503,
    "editor.wordWrap": "on"
}
HTML/js/public.js
@@ -8,6 +8,8 @@
//var IP = "http://192.168.62.200:8888/api";//bkl服务器
//运行
var IP = "https://localhost:44363/api";
//本地发布
//var IP = "http://localhost:8034/api";
Pda/js/public.js
@@ -8,6 +8,8 @@
//var IP = "http://192.168.62.200:8888/api";
//运行
var IP = "https://localhost:44363/api";
//本地发布
//var IP = "http://localhost:8034/api";
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -2297,7 +2297,8 @@
                            CreateUser = 0
                        };
                        boxList.Add(boxInfo);
                    };
                    }
                    ;
                }
                try
                {
Wms/Wms/Controllers/BllSoController.cs
@@ -22,7 +22,7 @@
{
    [Route("api/[controller]/[action]")]
    [ApiController]
    [Authorize]
    //[Authorize]
    public class BllSoController : ControllerBase
    {
        /// <summary>
Wms/Wms/Controllers/PdaAsnController.cs
@@ -27,7 +27,7 @@
{
    [Route("api/[controller]/[action]")]
    [ApiController]
    [Authorize]
    //[Authorize]
    public class PdaAsnController : ControllerBase
    {
        private readonly ApiUrlConfig _config; //接口交互路径
Wms/Wms/appsettings.json
@@ -15,7 +15,11 @@
    //"ConnectionString": "Server=192.168.62.200;Database=WMS_JC34;User ID=sa;Password=sql2019;Integrated Security=False;"
    //"ConnectionString": "Server=.;Database=WMS_JC09;User ID=sa;Password=sql2019;Integrated Security=False;"
    //"ConnectionString": "Data Source=DESKTOP-0EJDG95\\MSSQLSERVER1;Initial Catalog=WMS_V01;Integrated Security=True;"
    "ConnectionString": "Server=.\\MSSQLSERVER2019;Database=WMS_JC34;User ID=sa;Password=admin2023@;Integrated Security=False;"
    //"ConnectionString": "Server=.\\MSSQLSERVER2019;Database=WMS_JC34;User ID=sa;Password=admin2023@;Integrated Security=False;"
    //本地地址
    //"ConnectionString": "Server=localhost;Database=wmsjc34;User ID=sa;Password=root1234;Integrated Security=False;"
    "ConnectionString": "Server=localhost;Database=WMS_JC34;User ID=sa;Password=root1234;Integrated Security=False;"
  },
  "JWTConfig": {
    "Issuer": "WYY", //Token      
@@ -25,7 +29,8 @@
  },
  "ApiUrlConfig": {
    "ErpHost": "http://172.16.68.156:50000", //erpIP
    "WcsHost": "http://10.26.254.34:5005", //wcsIPhttp://localhost:57061/
    //"WcsHost": "http://10.26.254.34:5005", //wcsIPhttp://localhost:57061/
    "WcsHost": "http://localhost:9034",
    "BoxHost": "http://10.110.24.30:8081", //boxIP
    "LimesHost": "http://10.110.24.30:8081", //LimesIP
@@ -51,7 +56,9 @@
  },
  "Quartz": {
    "dbProviderName": "SqlServer",
    "ConnectionString": "Server=.\\MSSQLSERVER2019;Database=QRTZ;User ID=sa;Password=admin2023@;Integrated Security=False;"
    //"ConnectionString": "Server=.\\MSSQLSERVER2019;Database=QRTZ;User ID=sa;Password=admin2023@;Integrated Security=False;"
    //本地地址
    "ConnectionString": "Server=localhost;Database=wmsjc34qrtz;User ID=sa;Password=root1234;Integrated Security=False;"
    //"connectionString": "Server=192.168.62.200;Database=WMS_JC34QRTZ;User ID=sa;Password=sql2019;Integrated Security=False;"
    //"connectionString": "Server=10.26.200.29;Database=WMS_JC34QRTZ;User ID=sa;Password=boxline@2016;Integrated Security=False;"
  }