From 64c5bb7bfadd7a3b7bf5e386a31208037b586026 Mon Sep 17 00:00:00 2001
From: DESKTOP-9BNTV8O <DESKTOP-9BNTV8O@163.com>
Date: 星期六, 14 十二月 2024 11:22:51 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/BllTransServer/RcsServer.cs | 6 +++---
HTML/web.config | 5 +++++
HTML/views/StatisticalReport/BoxInfor.html | 14 ++++++++++++++
3 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index b50c733..49f2323 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -219,6 +219,19 @@
<p>鏀剧疆鏈�</p>
{{# } }}
</script>
+ <script type="text/html" id="TempletStatus">
+ {{# if(d.Status == '0') { }}
+ <p>寰呭垎閰�</p>
+ {{# } else if(d.Status == '1'){ }}
+ <p>閮ㄥ垎鍒嗛厤</p>
+ {{# } else if(d.Status == '2'){ }}
+ <p>宸插垎閰�</p>
+ {{# } else if(d.Status == '3') { }}
+ <p>鐩樼偣閿佸畾</p>
+ {{# } else if(d.Status == '4') { }}
+ <p>绉诲簱閿佸畾</p>
+ {{# } }}
+ </script>
<script type="text/html" id="toolbarDemo">
<!-- <button class="layui-btn layuiadmin-btn-list layui-btn-sm addClass" lay-event="add">
@@ -368,6 +381,7 @@
{field: 'LotNo', title: '鎵规鍙�', align: 'center'},
{field: 'LotText', title: '鎵规鎻忚堪', align: 'center'},
//{field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center'},
+ {field: 'Status', title: '鍒嗛厤鐘舵��', align: 'center', templet: '#TempletStatus'},
{field: 'Qty', title: '鏁伴噺', align: 'center'},
{field: 'LockQty', title: '閿佸畾鏁伴噺', align: 'center',},
{field: 'FrozenQty', title: '鍐荤粨鏁伴噺', align: 'center'},
diff --git a/HTML/web.config b/HTML/web.config
index cbf85bb..7ca0896 100644
--- a/HTML/web.config
+++ b/HTML/web.config
@@ -6,6 +6,11 @@
<add value="Login.html" />
</files>
</defaultDocument>
+ <security>
+ <requestFiltering>
+ <requestLimits maxQueryString="2097151"/>
+ </requestFiltering>
+ </security>
<httpRedirect enabled="true" destination="/views" childOnly="true" />
</system.webServer>
</configuration>
diff --git a/Wms/WMS.BLL/BllTransServer/RcsServer.cs b/Wms/WMS.BLL/BllTransServer/RcsServer.cs
index 6024291..3193019 100644
--- a/Wms/WMS.BLL/BllTransServer/RcsServer.cs
+++ b/Wms/WMS.BLL/BllTransServer/RcsServer.cs
@@ -183,7 +183,7 @@
IsCancel = 1,//鏄惁鍙彇娑�
IsFinish = 1,//鏄惁鍙畬鎴�
Type = "1",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
- OrderType = "2",//鍗曟嵁绫诲瀷 0 鍏ュ簱 1 鍑哄簱 3鍏朵粬
+ OrderType = "3",//鍗曟嵁绫诲瀷 0 鍏ュ簱 1 鍑哄簱 3鍏朵粬
Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
NoticeDetailNo = int.Parse(noticeNo),
Msg = taskMsg, //鍏抽敭淇℃伅
@@ -257,7 +257,7 @@
IsCancel = 1,//鏄惁鍙彇娑�
IsFinish = 1,//鏄惁鍙畬鎴�
Type = "1",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
- OrderType = "2",//鍗曟嵁绫诲瀷 0 鍏ュ簱 1 鍑哄簱 3鍏朵粬
+ OrderType = "3",//鍗曟嵁绫诲瀷 0 鍏ュ簱 1 鍑哄簱 3鍏朵粬
Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
NoticeDetailNo = int.Parse(noticeNo),
Msg = taskMsg, //鍏抽敭淇℃伅
@@ -418,7 +418,7 @@
IsCancel = 1,//鏄惁鍙彇娑�
IsFinish = 1,//鏄惁鍙畬鎴�
Type = "0",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
- OrderType = "2",//鍗曟嵁绫诲瀷 0 鍏ュ簱 1 鍑哄簱 3鍏朵粬
+ OrderType = "3",//鍗曟嵁绫诲瀷 0 鍏ュ簱 1 鍑哄簱 3鍏朵粬
Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
NoticeDetailNo = int.Parse(noticeno),
Msg = taskMsg, //鍏抽敭淇℃伅
--
Gitblit v1.8.0