diff --git a/src/main/java/com/gaotao/modules/autoWareHourceHaian/entity/dashboard/HaiAnSortingBoardItem.java b/src/main/java/com/gaotao/modules/autoWareHourceHaian/entity/dashboard/HaiAnSortingBoardItem.java index 148c27b4..b7586449 100644 --- a/src/main/java/com/gaotao/modules/autoWareHourceHaian/entity/dashboard/HaiAnSortingBoardItem.java +++ b/src/main/java/com/gaotao/modules/autoWareHourceHaian/entity/dashboard/HaiAnSortingBoardItem.java @@ -15,6 +15,8 @@ public class HaiAnSortingBoardItem { private String partNo; /** handling_unit.part_desc物料名称;未找到或跨账套重码为空,不落库供看板展示 - rqrq */ private String partDesc; + /** handling_unit.qty标签数量;唯一命中时回填,未找到或跨账套重码为空。不落库,仅人工看板展示,禁止作为发料数量依据 - rqrq */ + private java.math.BigDecimal qty; /** 人工看板标签无有效预留申请单时为“数据异常”,其余按site+标签号的out_wcs_flag区分未完成/已完成;自动看板仍为两态,不落库供页面展示 - rqrq */ private String status; /** 标签及预定匹配提示,缺失或重码时保留RFID并说明原因,不落库供现场核对 - rqrq */ diff --git a/src/main/resources/mapper/autoWareHourceHaian/HaiAnSortingBoardMapper.xml b/src/main/resources/mapper/autoWareHourceHaian/HaiAnSortingBoardMapper.xml index 6d901bfb..0e9d00ff 100644 --- a/src/main/resources/mapper/autoWareHourceHaian/HaiAnSortingBoardMapper.xml +++ b/src/main/resources/mapper/autoWareHourceHaian/HaiAnSortingBoardMapper.xml @@ -10,6 +10,8 @@ THEN ISNULL(ord.orderPartNo, '') ELSE '' END AS orderPartNo, CASE WHEN hu.matchCount = 1 THEN ISNULL(hu.partNo, '') ELSE '' END AS partNo, CASE WHEN hu.matchCount = 1 THEN ISNULL(hu.partDesc, '') ELSE '' END AS partDesc, + + CASE WHEN hu.matchCount = 1 THEN hu.qty ELSE NULL END AS qty, CASE WHEN ISNULL(hu.hasReservation, 0) = 0 THEN N'数据异常' WHEN EXISTS ( @@ -43,6 +45,7 @@ MAX(h.site) AS subSite, MAX(h.part_no) AS partNo, MAX(h.part_desc) AS partDesc, + MAX(h.qty) AS qty, MAX(h.reserve_flag) AS reserveFlag, MAX(CASE WHEN h.reserve_flag = 'Y' AND NULLIF(LTRIM(RTRIM(h.reserve_order_ref1)), '') IS NOT NULL