From 6aeb5730b008eda9f9b6797f457f7a257ec5ed14 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 18 六月 2021 15:44:47 +0800
Subject: [PATCH] # pda入库时自动查找推荐货位
---
src/main/java/zy/cloud/wms/pda/controller/MobileController.java | 12 +++++++++++-
src/main/webapp/views/pda/pakin.html | 10 +++++++++-
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 6 +++++-
3 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index b494987..57cf3e2 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -67,7 +67,11 @@
public R stockPakin(PakinParam param, Long userId) {
Node node = nodeService.selectByUuid(param.getNodeId());
if (node == null) {
- node = nodeService.selectById(param.getNodeId());
+ try {
+ node = nodeService.selectById(param.getNodeId());
+ } catch (Exception e) {
+ return R.error("璐т綅涓嶅瓨鍦�");
+ }
}
if (node == null) {
return R.error("璐т綅涓嶅瓨鍦�");
diff --git a/src/main/java/zy/cloud/wms/pda/controller/MobileController.java b/src/main/java/zy/cloud/wms/pda/controller/MobileController.java
index 2cfc734..74384bf 100644
--- a/src/main/java/zy/cloud/wms/pda/controller/MobileController.java
+++ b/src/main/java/zy/cloud/wms/pda/controller/MobileController.java
@@ -2,14 +2,17 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
+import com.core.common.Cools;
import com.core.common.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.Comb;
import zy.cloud.wms.manager.entity.Node;
+import zy.cloud.wms.manager.entity.Prior;
import zy.cloud.wms.manager.service.CombService;
import zy.cloud.wms.manager.service.NodeService;
+import zy.cloud.wms.manager.service.PriorService;
import zy.cloud.wms.pda.entity.CombParam;
import zy.cloud.wms.pda.service.MobileService;
@@ -29,6 +32,8 @@
private CombService combService;
@Autowired
private NodeService nodeService;
+ @Autowired
+ private PriorService priorService;
/**
* 缁勬墭
@@ -57,7 +62,12 @@
@ManagerAuth
public R getNode(@RequestParam String node){
Node one = nodeService.selectOne(new EntityWrapper<Node>().eq("uuid", node).eq("status", 1));
- return R.ok().add(one);
+ if (null != one) {
+ List<Prior> priors = priorService.selectList(new EntityWrapper<Prior>().eq("node_id", one.getId()));
+ return R.ok().add(Cools.add("node", one).add("priors", priors));
+ } else {
+ return R.ok();
+ }
}
diff --git a/src/main/webapp/views/pda/pakin.html b/src/main/webapp/views/pda/pakin.html
index e431c72..17a6058 100644
--- a/src/main/webapp/views/pda/pakin.html
+++ b/src/main/webapp/views/pda/pakin.html
@@ -172,6 +172,14 @@
if (res.data != null) {
$('#node-ok').show();
$("#mat-btn").focus();
+ // 濉厖鎺ㄨ崘鐗╂枡
+ var priors = res.data.priors;
+ if (priors.length > 0 && matData.length === 0) {
+ for (var i = 0; i < priors.length; i++){
+ priors[i].count = 1;
+ addTableData(priors[i]);
+ }
+ }
} else {
$('#node-ok').hide();
}
@@ -337,4 +345,4 @@
}
}
</script>
-</html>
\ No newline at end of file
+</html>
--
Gitblit v1.9.1