root/yiBinGaoCe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

看板fix

Browse Source
This commit is contained in:
psh
2024-04-16 18:02:46 +08:00
parent 4d237db025
commit 72e14e618c
7 changed files with 76 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/controller/BoardController.java
View File

@@ -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<Object> kc(@RequestBody JSONObject param){
return new ResponseEntity<>(boardService.kc(), HttpStatus.OK);
}
@PostMapping("/rk/hw")
@Log("入库看板货位占用")
@ApiOperation("入库看板货位占用")
@SaIgnore
public ResponseEntity<Object> hw(@RequestBody JSONObject param){
return new ResponseEntity<>(boardService.hw(), HttpStatus.OK);
}
@PostMapping("/rk/kn")
@Log("入库看板库内物料")
@ApiOperation("入库看板库内物料")
@SaIgnore
public ResponseEntity<Object> kn(@RequestBody JSONObject param){
return new ResponseEntity<>(boardService.kn(), HttpStatus.OK);
}
@PostMapping("/rk/wrk")
@Log("入库看板未入库物料")
@ApiOperation("入库看板未入库物料")
@SaIgnore
public ResponseEntity<Object> wrk(@RequestBody JSONObject param){
return new ResponseEntity<>(boardService.wrk(), HttpStatus.OK);
public ResponseEntity<Object> rk(@RequestBody JSONObject param){
return new ResponseEntity<>(boardService.rk(), HttpStatus.OK);
}

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/BoardService.java
View File

@@ -11,13 +11,8 @@ import java.util.List;
public interface BoardService {
PdaResponseVo cz(JSONObject param);
PdaResponseVo kc();
JSONObject rk();
HwDto hw();
List<WlDto> kn();
List<WlDto> wrk();
List<ScDto> sc(String region_code);
}

14
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/KcDto.java Normal file
View File

@@ -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<WuliaoDto> list;
}

9
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/WuliaoDto.java Normal file
View File

@@ -0,0 +1,9 @@
package org.nl.wms.board.service.dao.dto;
import lombok.Data;
@Data
public class WuliaoDto {
String name;
String number;
}

8
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.java
View File

@@ -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<WlDto> wrk();
HwDto hw();
KcDto kc();
List<WuliaoDto> wuliao();
}

29
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml
View File

@@ -105,4 +105,33 @@
)b
</select>
<select id="kc" resultType="org.nl.wms.board.service.dao.dto.KcDto">
SELECT
a.*,
c.*
FROM
( SELECT count(*) AS sum, FORMAT( sum( qty )/ 1000, 2 ) AS weight FROM sch_base_material ) a,
(
SELECT
count(*) AS pendSum,
FORMAT( sum( qty )/ 1000, 2 ) AS pendWeight
FROM
( SELECT m.* FROM sch_base_material m WHERE m.PalletSN NOT IN ( SELECT vehicle_code2 FROM sch_base_point WHERE vehicle_code2 IS NOT NULL and vehicle_code2!='' ) )b ) c
</select>
<select id="wuliao" resultType="org.nl.wms.board.service.dao.dto.WuliaoDto">
SELECT
a.*,
c.*
FROM
( SELECT count(*) AS sum, FORMAT( sum( qty )/ 1000, 2 ) AS weight FROM sch_base_material where group_bind_material_status = 2 ) a,
(
SELECT
count(*) AS pendSum,
FORMAT( sum( qty )/ 1000, 2 ) AS pendWeight
FROM
( SELECT m.* FROM sch_base_material m WHERE group_bind_material_status = 2 and m.PalletSN NOT IN ( SELECT vehicle_code2 FROM sch_base_point WHERE vehicle_code2 IS NOT NULL and vehicle_code2!='' ) )b ) c
</select>
</mapper>

32
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/impl/BoardServiceImpl.java
View File

@@ -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<WlDto> kn(){
return boardMapper.kn();
}
public List<WlDto> wrk(){
return boardMapper.wrk();
public JSONObject rk(){
KcDto kcDto=boardMapper.kc();
kcDto.setList(boardMapper.wuliao());
HwDto hwDto=boardMapper.hw();
List<WlDto> knList= boardMapper.kn();
List<WlDto> 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<ScDto> sc(String region_code){