diff --git a/src/main/java/com/gaotao/modules/wms/data/PoOrderRollNoOutData.java b/src/main/java/com/gaotao/modules/wms/data/PoOrderRollNoOutData.java index 4981ba7..9e2613a 100644 --- a/src/main/java/com/gaotao/modules/wms/data/PoOrderRollNoOutData.java +++ b/src/main/java/com/gaotao/modules/wms/data/PoOrderRollNoOutData.java @@ -23,4 +23,5 @@ public class PoOrderRollNoOutData extends PoOrderRollNo { private Integer rollCount; private BigDecimal tailRollQty; private Integer expirationWarningDay; + private String batchFlag; // 批次管理标志 Y/N } diff --git a/src/main/resources/mapper/wms/WmsPrintMapper.xml b/src/main/resources/mapper/wms/WmsPrintMapper.xml index 6c5d2f1..0453cf5 100644 --- a/src/main/resources/mapper/wms/WmsPrintMapper.xml +++ b/src/main/resources/mapper/wms/WmsPrintMapper.xml @@ -122,6 +122,7 @@ ISNULL(b.expiration_flag ,'N') AS expiration_flag, b.exceed_in_ratio, b.expiration_warning_day, + ISNULL(b.batch_flag, 'N') AS batch_flag, ISNULL(a.batch_qualified_qty, 0) * (1 + ISNULL(b.exceed_in_ratio, 0) / 100.0) - ISNULL(( SELECT SUM(roll_qty)