From 046476cb412140e8fc589845d5079cd784a64ba0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 06 九月 2021 13:45:07 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/pda/controller/MobileController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
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();
+ }
}
--
Gitblit v1.9.1