From 46316be02efd767ad2dfb864158e942b9a67c382 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 23 三月 2021 16:51:59 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/LocDetlMapper.xml | 8 ++++++++
src/main/java/zy/cloud/wms/manager/mapper/LocDetlMapper.java | 1 +
src/main/java/zy/cloud/wms/manager/service/LocDetlService.java | 7 +++++++
src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java | 11 +++++++++++
src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java | 5 +++++
src/main/webapp/views/pda/stockCheck.html | 15 +++++++--------
6 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java b/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java
index 2ff8b0b..1d9eb87 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java
@@ -27,6 +27,17 @@
@Autowired
private LocDetlService locDetlService;
+ @RequestMapping(value = "/locDetl/queryDetl/auth")
+ @ManagerAuth
+ public R queryDetl(@RequestParam(required = false) String uuid) {
+ if (Cools.isEmpty(uuid)) {
+ return R.ok();
+ }
+ List<LocDetl> locDetls = locDetlService.findByNodeUuid(uuid);
+ return R.ok().add(locDetls);
+ }
+
+
@RequestMapping(value = "/locDetl/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
diff --git a/src/main/java/zy/cloud/wms/manager/mapper/LocDetlMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/LocDetlMapper.java
index be5674f..c372d49 100644
--- a/src/main/java/zy/cloud/wms/manager/mapper/LocDetlMapper.java
+++ b/src/main/java/zy/cloud/wms/manager/mapper/LocDetlMapper.java
@@ -31,4 +31,5 @@
List<LocDetl> getLocDetlStatis();
+ List<LocDetl> selectByNodeUuid(String uuid);
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/LocDetlService.java b/src/main/java/zy/cloud/wms/manager/service/LocDetlService.java
index 0607190..a5c32af 100644
--- a/src/main/java/zy/cloud/wms/manager/service/LocDetlService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/LocDetlService.java
@@ -62,4 +62,11 @@
*/
Double selectCountByMatnr(String matnr);
+ /**
+ * 鏍规嵁璐т綅uuid鏌ユ壘璐т綅鏄庣粏
+ * @param uuid
+ * @return
+ */
+ List<LocDetl> findByNodeUuid(String uuid);
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java
index 5a1277b..6d88519 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java
@@ -136,5 +136,10 @@
return this.baseMapper.selectCountByMatnr(matnr);
}
+ @Override
+ public List<LocDetl> findByNodeUuid(String uuid) {
+ return this.baseMapper.selectByNodeUuid(uuid);
+ }
+
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index d62caa9..57207b4 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -140,4 +140,12 @@
group by a.matnr
</select>
+ <select id="selectByNodeUuid" resultMap="BaseResultMap">
+ select * from man_loc_detl mld left join man_node mn on mld.node_id = mn.id
+ where 1=1
+ and mn.uuid = #{uuid}
+ and mld.status = 1
+ order by mld.create_time
+ </select>
+
</mapper>
diff --git a/src/main/webapp/views/pda/stockCheck.html b/src/main/webapp/views/pda/stockCheck.html
index efda29a..3fc9f20 100644
--- a/src/main/webapp/views/pda/stockCheck.html
+++ b/src/main/webapp/views/pda/stockCheck.html
@@ -95,7 +95,7 @@
</div>
</body>
<script>
- window.onload = function(){document.getElementById("code").focus();}
+ window.onload = function(){document.getElementById("locNo").focus();}
var tableIns;
var countLayer;
layui.use(['table','laydate', 'form'], function() {
@@ -159,7 +159,7 @@
}
}
tableIns.reload({data: matData});
- $("#comb-btn").focus();
+ // $("#comb-btn").focus();
}
@@ -170,14 +170,13 @@
if (isEmpty(el.value)) {
return;
}
- var billNo = el.value.split(",")[0].split("=")[1];
$.ajax({
- url: baseUrl + "/mobile/bill/query/auth",
+ url: baseUrl + "/locDetl/queryDetl/auth",
headers: {'token': localStorage.getItem('token')},
data: {
- billNo: billNo
+ uuid: el.value
},
- method: 'POST',
+ method: 'GET',
success: function (res) {
if (res.code === 200) {
if (res.data != null) {
@@ -324,8 +323,8 @@
$("#comb-btn").focus();
comb();
} else if (key === 113) {
- $("#code").val("");
- $("#code").focus();
+ $("#locNo").val("");
+ $("#locNo").focus();
}
}
</script>
--
Gitblit v1.9.1