src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/zy/cloud/wms/pda/controller/MobileController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/views/pda/pakin.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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("货位不存在"); 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(); } } 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> </html>