From 21432990c798ed5ad945e2eb2668f1ce197282cc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 27 五月 2021 15:06:18 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/task/OrderScheduler.java | 2 +-
src/main/webapp/views/pda/index.html | 6 +++---
src/main/java/zy/cloud/wms/manager/entity/Pakout.java | 1 +
src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/task/OrderScheduler.java b/src/main/java/zy/cloud/wms/common/service/task/OrderScheduler.java
index fa67b3b..f1b5e48 100644
--- a/src/main/java/zy/cloud/wms/common/service/task/OrderScheduler.java
+++ b/src/main/java/zy/cloud/wms/common/service/task/OrderScheduler.java
@@ -47,7 +47,7 @@
// 淇濆瓨璁㈠崟鏄庣粏鍘嗗彶妗�
int saveOrderDetlLog = jdbcTemplate.update("insert into man_order_detl_log select * from man_order_detl where order_id=" + order.getId());
if (saveOrderDetlLog == 0) {
- throw new CoolException("淇濆瓨璁㈠崟鍘嗗彶妗ｅけ璐�");
+ throw new CoolException("淇濆瓨璁㈠崟鏄庣粏鍘嗗彶妗ｅけ璐�");
}
// 鍒犻櫎璁㈠崟
int delOrder = jdbcTemplate.update("delete from man_order where id=" + order.getId());
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java b/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
index 4d1e4d2..e07d7cb 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
@@ -130,7 +130,7 @@
List<Map<String, Object>> retentionList = jdbcTemplate.queryForList("select top 7 CONVERT(decimal, DATEDIFF(second, man_loc_detl.create_time, GETDATE()) / 86400.0, 9) AS stayDays, * from man_loc_detl order by create_time desc");
for (int i=0;i<retentionList.size();i++) {
retentionList.get(i).put("no", i+1);
- Object create_time = combList.get(i).get("create_time");
+ Object create_time = retentionList.get(i).get("create_time");
retentionList.get(i).put("createTime", String.valueOf(create_time).substring(0, 11));
}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Pakout.java b/src/main/java/zy/cloud/wms/manager/entity/Pakout.java
index 88d438d..41e43d9 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Pakout.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Pakout.java
@@ -192,6 +192,7 @@
public Pakout() {}
public Pakout(String wrkNo,Long wrkSts,String zpallet,Double anfme,Long nodeId,String locNo,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,Long docId,String docNum,String custName,Integer itemNum,Integer count,Double weight,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.wrkNo = wrkNo;
this.wrkSts = wrkSts;
this.zpallet = zpallet;
this.anfme = anfme;
diff --git a/src/main/webapp/views/pda/index.html b/src/main/webapp/views/pda/index.html
index d52ea28..9d10855 100644
--- a/src/main/webapp/views/pda/index.html
+++ b/src/main/webapp/views/pda/index.html
@@ -75,11 +75,11 @@
<!-- 瀵艰埅鏍� -->
<ul class="nav">
<li><a id="pakin" onclick="nav(this.id)" class="nav-select" href="#">鍏ュ簱</a></li>
- <li><a id="pakout" onclick="nav(this.id)" class="nav-unselect" href="#">鍑哄簱</a></li>
+<!-- <li><a id="pakout" onclick="nav(this.id)" class="nav-unselect" href="#">鍑哄簱</a></li>-->
<li><a id="stockOut" onclick="nav(this.id)" class="nav-unselect" href="#">鎷ｈ揣</a></li>
<li><a id="stockCheck" onclick="nav(this.id)" class="nav-unselect" href="#">鐩樼偣</a></li>
-<!-- <li><a id="comb" onclick="nav(this.id)" class="nav-unselect" href="#">缁勬墭</a></li>-->
-<!-- <li><a id="stockIn" onclick="nav(this.id)" class="nav-unselect" href="#">涓婃灦</a></li>-->
+ <li><a id="comb" onclick="nav(this.id)" class="nav-unselect" href="#">缁勬墭</a></li>
+ <li><a id="stockIn" onclick="nav(this.id)" class="nav-unselect" href="#">涓婃灦</a></li>
</ul>
<!-- 涓讳綋鍐呭 -->
--
Gitblit v1.9.1