From f4d88d94a86b8a067dfad51d5bc8efaf09a2d616 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 25 二月 2021 10:31:27 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/NodeMapper.xml | 4 ++++
src/main/webapp/views/pda/stockIn.html | 4 ++--
src/main/java/zy/cloud/wms/manager/service/impl/NodeServiceImpl.java | 5 +++++
src/main/java/zy/cloud/wms/manager/mapper/NodeMapper.java | 2 ++
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 2 +-
src/main/java/zy/cloud/wms/manager/service/NodeService.java | 3 ++-
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 13 ++++++++++++-
src/main/java/zy/cloud/wms/manager/service/WorkService.java | 3 ++-
8 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
index 244e90c..e73fa8e 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -23,7 +23,7 @@
@RequestMapping("/stock/in")
@ManagerAuth(memo = "涓婃灦")
public R fullStorePutStart(@RequestBody StockInParam stockInParam) {
- return R.ok("涓婃灦鎴愬姛").add(workService.stockIn(stockInParam, getUserId()));
+ return workService.stockIn(stockInParam, getUserId());
}
diff --git a/src/main/java/zy/cloud/wms/manager/mapper/NodeMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/NodeMapper.java
index 035f218..d68ee0c 100644
--- a/src/main/java/zy/cloud/wms/manager/mapper/NodeMapper.java
+++ b/src/main/java/zy/cloud/wms/manager/mapper/NodeMapper.java
@@ -9,4 +9,6 @@
@Repository
public interface NodeMapper extends BaseMapper<Node> {
+ Node selectByUuid(String uuid);
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/NodeService.java b/src/main/java/zy/cloud/wms/manager/service/NodeService.java
index 72126df..dae568d 100644
--- a/src/main/java/zy/cloud/wms/manager/service/NodeService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/NodeService.java
@@ -5,7 +5,8 @@
public interface NodeService extends IService<Node> {
-
String getPathName(Node node);
+ Node selectByUuid(String uuid);
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/WorkService.java b/src/main/java/zy/cloud/wms/manager/service/WorkService.java
index f45393c..a4cb2b4 100644
--- a/src/main/java/zy/cloud/wms/manager/service/WorkService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/WorkService.java
@@ -1,9 +1,10 @@
package zy.cloud.wms.manager.service;
+import com.core.common.R;
import zy.cloud.wms.manager.entity.param.StockInParam;
public interface WorkService {
- String stockIn(StockInParam param, Long userId);
+ R stockIn(StockInParam param, Long userId);
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/NodeServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/NodeServiceImpl.java
index c6a1df4..612289a 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/NodeServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/NodeServiceImpl.java
@@ -16,4 +16,9 @@
}
return null;
}
+
+ @Override
+ public Node selectByUuid(String uuid) {
+ return this.baseMapper.selectByUuid(uuid);
+ }
}
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 23e3801..e36f26c 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
@@ -1,8 +1,12 @@
package zy.cloud.wms.manager.service.impl;
import com.alibaba.fastjson.JSON;
+import com.core.common.R;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import zy.cloud.wms.manager.entity.Node;
import zy.cloud.wms.manager.entity.param.StockInParam;
+import zy.cloud.wms.manager.service.NodeService;
import zy.cloud.wms.manager.service.WorkService;
/**
@@ -11,10 +15,17 @@
@Service("workService")
public class WorkServiceImpl implements WorkService {
+ @Autowired
+ private NodeService nodeService;
@Override
- public String stockIn(StockInParam param, Long userId) {
+ public R stockIn(StockInParam param, Long userId) {
+ Node node = nodeService.selectById(param.getNodeId());
+ if (node == null) {
+ return R.error("璐т綅涓嶅瓨鍦�");
+ }
System.out.println(JSON.toJSONString(param));
return null;
}
+
}
diff --git a/src/main/resources/mapper/NodeMapper.xml b/src/main/resources/mapper/NodeMapper.xml
index 551c2fb..e7527e5 100644
--- a/src/main/resources/mapper/NodeMapper.xml
+++ b/src/main/resources/mapper/NodeMapper.xml
@@ -26,4 +26,8 @@
</resultMap>
+ <select id="selectByUuid" resultMap="BaseResultMap">
+ select * from man_node where 1=1 and uuid=#{uuid} and status = 1
+ </select>
+
</mapper>
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index 5a0add0..591af25 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -175,7 +175,7 @@
success: function (res) {
if (res.code === 200) {
if (res.data != null) {
- $('#pakin').focus();
+ // $('#pakin').focus();
$('#node-ok').show();
} else {
$('#node-ok').hide();
@@ -232,10 +232,10 @@
// 閲嶇疆
function reset() {
$('#code').val("");
+ $('#node').val("");
matData = [];
tableIns.reload({data: matData});
$('#node-ok').hide();
- $('#putSiteSelect').val("");
layui.form.render('select');
}
--
Gitblit v1.9.1