Pda/View/SoSetting/palletOut.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Wms/Wms/appsettings.json | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Pda/View/SoSetting/palletOut.html
@@ -69,10 +69,11 @@ <div class="layui-input-block" id="selectDiv"> <select id="bar" lay-filter="getbar" lay-verify="required" lay-search> <option value=""></option> <option value="1">1</option> <option value="2">2</option> <option value="3">3</option> <option value="4">4</option> <option value="033">033</option> <option value="039">039</option> <option value="044">044</option> <option value="051">051</option> <option value="059">059</option> </select> <!-- <img src="/assets/down_arraw.png" > --> </div> Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -1370,14 +1370,9 @@ } roadList2.AddRange(roadLarge); roadList2.AddRange(roadSmall); roadList = roadList2; } else { roadList2 = roadList; } roadList = roadList2; if (roadList.Count == 0) { throw new Exception("未查询到可能使用的巷道"); @@ -1408,14 +1403,14 @@ roadNo = l; } //当前巷有位置则退出 if (roadNo != null) if (!string.IsNullOrWhiteSpace(roadNo)) { break; } } //如果跳巷道并且未找到合适空储位,则跳到最后一次使用的巷道查询 if (roadNo == null) if (string.IsNullOrWhiteSpace(roadNo)) { if (useLog != null) { @@ -1448,7 +1443,7 @@ roadNo = item; } //当前巷有位置则退出 if (roadNo != null) if (!string.IsNullOrWhiteSpace(roadNo)) { break; } @@ -1680,13 +1675,9 @@ } roadList2.AddRange(roadLarge); roadList2.AddRange(roadSmall); } else { roadList2 = roadList; roadList = roadList2; } roadList = roadList2; if (roadList.Count == 0) { throw new Exception("未查询到可能使用的巷道"); Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -1101,7 +1101,7 @@ PalletNo = exTask.PalletNo,//托盘号 StartLocate = exTask.StartLocat, // 起始位置 StartRoadway = locat.RoadwayNo, //所属巷道 EndLocate = "", // 目标位置 EndLocate = model.OutMode, // 目标位置 TaskNo = exTask.TaskNo, // 任务号 TaskType = "1",// 任务类型 (出库) OutMode = model.OutMode, //目标地址 Wms/Wms/appsettings.json
@@ -12,8 +12,8 @@ //"ConnectionString": "Server=47.95.120.53;Database=WMS_JC09;User ID=sa;Password=boxline!@#;Integrated Security=False;", //"ConnectionString": "Server=192.168.62.106;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;", //"ConnectionString": "Server=192.168.62.200;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;" //"ConnectionString": "Server=10.18.99.10;Database=WMS_JC24;User ID=sa;Password=sql2024;Integrated Security=False;", "ConnectionString": "Server=.;Database=WMS_JC24;User ID=sa;Password=sql2022;Integrated Security=False;" "ConnectionString": "Server=10.18.99.10;Database=WMS_JC24;User ID=sa;Password=sql2024;Integrated Security=False;" //"ConnectionString": "Server=.;Database=WMS_JC24;User ID=sa;Password=sql2022;Integrated Security=False;" //"ConnectionString": "Data Source=DESKTOP-0EJDG95\\MSSQLSERVER1;Initial Catalog=WMS_V01;Integrated Security=True;" }, "JWTConfig": { @@ -25,12 +25,12 @@ "ApiUrlConfig": { "ErpHost": "http://10.110.24.30:8081", //erpIP "MesHost": "http://10.110.24.30:8081", //mesIP "WcsHost": "http://localhost:57061", //wcsIPhttp://localhost:57061/ "WcsHost": "http://localhost:5005", // "http://localhost:57061", //wcsIPhttp://localhost:57061/ "BoxHost": "http://10.110.24.30:8081", //boxIP // WCS "IssueComApiUrl": "/api/WCSApi/AddTasks", //下发命令(出库、移库) "IssueComApiUrl2": "/api/WCSApi/AddTask", //重新下发命令(出库、移库) "IssueComApiUrl": "/api/demo/wcsTasks", //下发命令(出库、移库) "IssueComApiUrl2": "/api/demo/wcsTask", //"/api/WCSApi/AddTask", //重新下发命令(出库、移库) // ERP "AsnFinishUrl": "/api/wmsInterface/OutStockTask", //入库订单关闭