diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/ScDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/ScDto.java index ced0d6c..a22aa60 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/ScDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/ScDto.java @@ -11,5 +11,5 @@ public class ScDto { private String number; private String standingTime; private String usedTime; - private int state; + private String state; } 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 f3e5075..7743eaf 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 @@ -7,7 +7,7 @@ *, CASE WHEN b.standing_time > b.usedTime THEN - 0 ELSE 1 + '回温中' ELSE '回温完成' END AS state FROM ( @@ -28,7 +28,7 @@ FROM sch_base_vehiclematerialgroup WHERE - vehicle_code IN ( SELECT vehicle_code2 FROM sch_base_point WHERE region_code = #{region_code} AND vehicle_code IS NOT NULL )) a + vehicle_code IN ( SELECT vehicle_code2 FROM sch_base_point WHERE region_code = #{region_code} AND vehicle_code!='' AND vehicle_code IS NOT NULL )) a LEFT JOIN sch_base_material m ON a.vehicle_code = m.PalletSN AND m.group_bind_material_status = 2 ) b @@ -37,11 +37,11 @@ <select id="kn" resultType="org.nl.wms.board.service.dao.dto.WlDto"> SELECT a.palletSN, - any_value ( a.productName ), - any_value ( a.productDescription ), - sum( a.qty ), - sum( a.incomingWeight ), - any_value ( a.supplierName ) + any_value ( a.productName ) as productName, + any_value ( a.productDescription ) as productDescription, + sum( a.qty ) as qty, + sum( a.incomingWeight ) as incomingWeight, + any_value ( a.supplierName ) as supplierName FROM ( SELECT @@ -72,7 +72,7 @@ FROM sch_base_material m WHERE - m.PalletSN NOT IN ( SELECT vehicle_code2 FROM sch_base_point where vehicle_code2 is not null )) a + m.PalletSN NOT IN ( SELECT vehicle_code2 FROM sch_base_point where vehicle_code2!='' AND vehicle_code2 is not null )) a GROUP BY PalletSN; </select>