From 72e14e618ca851a91ae2a61ec02f29af2a142e7c Mon Sep 17 00:00:00 2001 From: psh Date: Tue, 16 Apr 2024 18:02:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BFfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/board/controller/BoardController.java | 34 +++---------------- .../nl/wms/board/service/BoardService.java | 7 +--- .../nl/wms/board/service/dao/dto/KcDto.java | 14 ++++++++ .../wms/board/service/dao/dto/WuliaoDto.java | 9 +++++ .../board/service/dao/mapper/BoardMapper.java | 8 +++-- .../board/service/dao/mapper/BoardMapper.xml | 29 ++++++++++++++++ .../board/service/impl/BoardServiceImpl.java | 32 +++++++---------- 7 files changed, 76 insertions(+), 57 deletions(-) create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/KcDto.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/WuliaoDto.java diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/controller/BoardController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/controller/BoardController.java index db781e2..9e92775 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/controller/BoardController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/controller/BoardController.java @@ -45,36 +45,12 @@ public class BoardController { return new ResponseEntity<>(boardService.cz(param), HttpStatus.OK); } - @PostMapping("/rk/kc") - @Log("入库看板库存") - @ApiOperation("入库看板库存") + @PostMapping("/rk") + @Log("入库看板") + @ApiOperation("入库看板") @SaIgnore - public ResponseEntity kc(@RequestBody JSONObject param){ - return new ResponseEntity<>(boardService.kc(), HttpStatus.OK); - } - - @PostMapping("/rk/hw") - @Log("入库看板货位占用") - @ApiOperation("入库看板货位占用") - @SaIgnore - public ResponseEntity hw(@RequestBody JSONObject param){ - return new ResponseEntity<>(boardService.hw(), HttpStatus.OK); - } - - @PostMapping("/rk/kn") - @Log("入库看板库内物料") - @ApiOperation("入库看板库内物料") - @SaIgnore - public ResponseEntity kn(@RequestBody JSONObject param){ - return new ResponseEntity<>(boardService.kn(), HttpStatus.OK); - } - - @PostMapping("/rk/wrk") - @Log("入库看板未入库物料") - @ApiOperation("入库看板未入库物料") - @SaIgnore - public ResponseEntity wrk(@RequestBody JSONObject param){ - return new ResponseEntity<>(boardService.wrk(), HttpStatus.OK); + public ResponseEntity rk(@RequestBody JSONObject param){ + return new ResponseEntity<>(boardService.rk(), HttpStatus.OK); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/BoardService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/BoardService.java index 41882af..2e3f769 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/BoardService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/BoardService.java @@ -11,13 +11,8 @@ import java.util.List; public interface BoardService { PdaResponseVo cz(JSONObject param); - PdaResponseVo kc(); + JSONObject rk(); - HwDto hw(); - - List kn(); - - List wrk(); List sc(String region_code); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/KcDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/KcDto.java new file mode 100644 index 0000000..9616f59 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/KcDto.java @@ -0,0 +1,14 @@ +package org.nl.wms.board.service.dao.dto; + +import lombok.Data; + +import java.util.List; + +@Data +public class KcDto { + private String sum; + private String weight; + private String pendSum; + private String pendWeight; + private List list; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/WuliaoDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/WuliaoDto.java new file mode 100644 index 0000000..b02bad2 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/WuliaoDto.java @@ -0,0 +1,9 @@ +package org.nl.wms.board.service.dao.dto; + +import lombok.Data; + +@Data +public class WuliaoDto { + String name; + String number; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.java index ff977d1..12c5010 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.java @@ -1,9 +1,7 @@ package org.nl.wms.board.service.dao.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.wms.board.service.dao.dto.HwDto; -import org.nl.wms.board.service.dao.dto.ScDto; -import org.nl.wms.board.service.dao.dto.WlDto; +import org.nl.wms.board.service.dao.dto.*; import org.nl.wms.pdm.service.dao.PointDetail; import java.util.List; @@ -17,4 +15,8 @@ public interface BoardMapper { List wrk(); HwDto hw(); + + KcDto kc(); + + List wuliao(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml index f72afcd..5b354f5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml @@ -105,4 +105,33 @@ )b + + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/impl/BoardServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/impl/BoardServiceImpl.java index fd2fec2..4914bc7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/impl/BoardServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/impl/BoardServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.nl.wms.board.service.BoardService; import org.nl.wms.board.service.dao.dto.HwDto; +import org.nl.wms.board.service.dao.dto.KcDto; import org.nl.wms.board.service.dao.dto.ScDto; import org.nl.wms.board.service.dao.dto.WlDto; import org.nl.wms.board.service.dao.mapper.BoardMapper; @@ -22,25 +23,18 @@ public class BoardServiceImpl implements BoardService { return PdaResponseVo.pdaResultOk("回温状态查询成功"); } - public PdaResponseVo rk(JSONObject param){ - return PdaResponseVo.pdaResultOk("回温状态查询成功"); - } - - public PdaResponseVo kc(){ - return PdaResponseVo.pdaResultOk("回温状态查询成功"); - } - - public HwDto hw(){ - return boardMapper.hw(); - } - - - public List kn(){ - return boardMapper.kn(); - } - - public List wrk(){ - return boardMapper.wrk(); + public JSONObject rk(){ + KcDto kcDto=boardMapper.kc(); + kcDto.setList(boardMapper.wuliao()); + HwDto hwDto=boardMapper.hw(); + List knList= boardMapper.kn(); + List wrkList=boardMapper.wrk(); + JSONObject jsonObject=new JSONObject(); + jsonObject.put("kc",kcDto); + jsonObject.put("hw",hwDto); + jsonObject.put("kn",knList); + jsonObject.put("wrk",wrkList); + return jsonObject; } public List sc(String region_code){