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-25 10:26:12 +08:00
parent 03861d0c1c
commit 517f97f896
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,5 +11,5 @@ public class ScDto {
private String number; private String number;
private String standingTime; private String standingTime;
private String usedTime; private String usedTime;
private int state; private String state;
} }

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

@@ -7,7 +7,7 @@
*, *,
CASE CASE
WHEN b.standing_time > b.usedTime THEN WHEN b.standing_time > b.usedTime THEN
0 ELSE 1 '回温中' ELSE '回温完成'
END AS state END AS state
FROM FROM
( (
@@ -28,7 +28,7 @@
FROM FROM
sch_base_vehiclematerialgroup sch_base_vehiclematerialgroup
WHERE 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 LEFT JOIN sch_base_material m ON a.vehicle_code = m.PalletSN
AND m.group_bind_material_status = 2 AND m.group_bind_material_status = 2
) b ) b
@@ -37,11 +37,11 @@
<select id="kn" resultType="org.nl.wms.board.service.dao.dto.WlDto"> <select id="kn" resultType="org.nl.wms.board.service.dao.dto.WlDto">
SELECT SELECT
a.palletSN, a.palletSN,
any_value ( a.productName ), any_value ( a.productName ) as productName,
any_value ( a.productDescription ), any_value ( a.productDescription ) as productDescription,
sum( a.qty ), sum( a.qty ) as qty,
sum( a.incomingWeight ), sum( a.incomingWeight ) as incomingWeight,
any_value ( a.supplierName ) any_value ( a.supplierName ) as supplierName
FROM FROM
( (
SELECT SELECT
@@ -72,7 +72,7 @@
FROM FROM
sch_base_material m sch_base_material m
WHERE 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 GROUP BY
PalletSN; PalletSN;
</select> </select>