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-18 17:41:59 +08:00
parent b1ea92b9f4
commit 58742e78ab
3 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/CzDto.java
View File

@@ -14,10 +14,10 @@ public class CzDto {
private String locationCode; private String locationCode;
private String supplierName; private String supplierName;
private String point_qty; private String point_qty;
private Integer device_type; private String device_type;
private Integer frame_type; private String frame_type;
private Integer mother_type; private String mother_type;
private Integer sub_type; private String sub_type;
private Integer error; private String error;
} }

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

@@ -116,22 +116,14 @@
count(*) AS pendSum, count(*) AS pendSum,
FORMAT( sum( qty )/ 1000, 2 ) AS pendWeight FORMAT( sum( qty )/ 1000, 2 ) AS pendWeight
FROM 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 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> </select>
<select id="wuliao" resultType="org.nl.wms.board.service.dao.dto.WuliaoDto"> <select id="wuliao" resultType="org.nl.wms.board.service.dao.dto.WuliaoDto">
SELECT select productName as name,count(*) as number
a.*, from sch_base_material
c.* GROUP BY productName
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> </select>
<select id="cz" resultType="org.nl.wms.board.service.dao.dto.CzDto"> <select id="cz" resultType="org.nl.wms.board.service.dao.dto.CzDto">

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

@@ -29,11 +29,11 @@ public class BoardServiceImpl implements BoardService {
} }
czDto.setMother_tray(String.valueOf(redisUtils.get("mother_tray"))); czDto.setMother_tray(String.valueOf(redisUtils.get("mother_tray")));
czDto.setPoint_qty(String.valueOf(redisUtils.get("point_qty"))); czDto.setPoint_qty(String.valueOf(redisUtils.get("point_qty")));
czDto.setDevice_type((Integer) redisUtils.get("device_type")); czDto.setDevice_type(String.valueOf(redisUtils.get("device_type")));
czDto.setFrame_type((Integer) redisUtils.get("frame_type")); czDto.setFrame_type(String.valueOf(redisUtils.get("frame_type")));
czDto.setMother_type((Integer) redisUtils.get("mother_type")); czDto.setMother_type(String.valueOf(redisUtils.get("mother_type")));
czDto.setSub_type((Integer) redisUtils.get("sub_type")); czDto.setSub_type(String.valueOf(redisUtils.get("sub_type")));
czDto.setError((Integer) redisUtils.get("error")); czDto.setError(String.valueOf(redisUtils.get("error")));
return JSONObject.parseObject(JSON.toJSONString(czDto, SerializerFeature.WriteNullStringAsEmpty)); return JSONObject.parseObject(JSON.toJSONString(czDto, SerializerFeature.WriteNullStringAsEmpty));
} }