From c2d3213ba82b7b97d6f85274d3086fff076495d7 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期一, 23 九月 2024 19:16:35 +0800
Subject: [PATCH] 修改测试问题
---
Wms/Wms/appsettings.json | 10 +++++-----
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 2 +-
Pda/View/SoSetting/palletOut.html | 9 +++++----
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 21 ++++++---------------
4 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/Pda/View/SoSetting/palletOut.html b/Pda/View/SoSetting/palletOut.html
index a539625..0cbc81f 100644
--- a/Pda/View/SoSetting/palletOut.html
+++ b/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>
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 807f202..eb2d920 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/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("鏈煡璇㈠埌鍙兘浣跨敤鐨勫贩閬�");
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 1909858..b506589 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/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, //鐩爣鍦板潃
diff --git a/Wms/Wms/appsettings.json b/Wms/Wms/appsettings.json
index e34e40d..7402f8d 100644
--- a/Wms/Wms/appsettings.json
+++ b/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", //鍏ュ簱璁㈠崟鍏抽棴
--
Gitblit v1.8.0