From eacfa6b5bb3dbea3e59a11bd5f058812508bdf49 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期一, 29 七月 2024 09:44:10 +0800
Subject: [PATCH] 修改问题
---
Wms/Wms/wwwRoot/index.html | 10 ++++++++++
Wms/Wms/Controllers/DownApiController.cs | 6 +++---
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 10 +++++-----
Wms/Wms/Startup.cs | 4 +++-
4 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index e213d45..b82f204 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -1250,7 +1250,7 @@
- var areaNoStr = "婕旂ず鍖哄煙";
+ var areaNoStr = "A07";
var allotLocate = new AllotLocation();
#region 鏍规嵁sku纭鍖哄煙鍒掑垎
@@ -1336,14 +1336,14 @@
roadNo = l;
}
//褰撳墠宸锋湁浣嶇疆鍒欓��鍑�
- if (roadNo != null)
+ if (!string.IsNullOrWhiteSpace(roadNo))
{
break;
}
}
//濡傛灉璺冲贩閬撳苟涓旀湭鎵惧埌鍚堥�傜┖鍌ㄤ綅,鍒欒烦鍒版渶鍚庝竴娆′娇鐢ㄧ殑宸烽亾鏌ヨ
- if (roadNo == null)
+ if (string.IsNullOrWhiteSpace(roadNo))
{
if (useLog != null)
{
@@ -1376,7 +1376,7 @@
roadNo = item;
}
//褰撳墠宸锋湁浣嶇疆鍒欓��鍑�
- if (roadNo != null)
+ if (!string.IsNullOrWhiteSpace(roadNo))
{
break;
}
@@ -1915,7 +1915,7 @@
SysStorageLocat locate;
var areaList = new List<string>();
- areaList.Add("婕旂ず鍖哄煙");
+ areaList.Add("A07");
locate = allotLocate.GetSuiTableLocate(houseNo, areaList, roadwayNo);
Db.BeginTran();
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index 0640314..153772c 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -297,12 +297,12 @@
string pallet = model.PalletNo.Substring(0, 8);
OutCommandDto list;
if (model.TaskModel == "1")
- {
- list = _asnPalletBindSvc.RequestLocation(pallet, model.HouseNo, model.RoadwayNo);
+ {
+ list = _asnPalletBindSvc.RequestLocationModel(pallet, model.HouseNo, model.RoadwayNo);
}
else
{
- list = _asnPalletBindSvc.RequestLocationModel(pallet, model.HouseNo, model.RoadwayNo);
+ list = _asnPalletBindSvc.RequestLocation(pallet, model.HouseNo, model.RoadwayNo);
}
if (model.PalletNo.Length == 9)
diff --git a/Wms/Wms/Startup.cs b/Wms/Wms/Startup.cs
index 0abb15e..378cf57 100644
--- a/Wms/Wms/Startup.cs
+++ b/Wms/Wms/Startup.cs
@@ -135,7 +135,9 @@
app.UseAuthentication();
app.UseAuthorization();
app.UseCors("MyCors");//跨域
-
+ //发布后展示页面
+ app.UseDefaultFiles();
+ app.UseStaticFiles();
app.UseEndpoints(endpoints =>
{
diff --git a/Wms/Wms/wwwRoot/index.html b/Wms/Wms/wwwRoot/index.html
new file mode 100644
index 0000000..4fb1016
--- /dev/null
+++ b/Wms/Wms/wwwRoot/index.html
@@ -0,0 +1,10 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title></title>
+</head>
+<body>
+ <p>涓婚〉闈�</p>
+</body>
+</html>
\ No newline at end of file
--
Gitblit v1.8.0